From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index 4321fb6..59d2b8c 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -14,7 +14,7 @@
</div>
<div>
<el-button size="medium" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
- <el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="headers" :on-error="onError"
+ <el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp" :show-file-list="false"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
style="display: inline-block; margin-left: 10px;">
@@ -96,6 +96,7 @@
addSearchNewArchived, exportMethodSearchNew,
pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, ratifySearchNewArchivedr
} from '@/api/cnas/process/method/standardNoveltyRetrieval'
+import {selectUserCondition} from "@/api/performance/class";
export default {
name: 'a7-standard-novelty-retrieval',
@@ -468,7 +469,6 @@
writeDate: '',
ratifyDate: '',
},
- userList: [],
approvalDialog: false,
approvalDialog1: false,
viewRocordDia: false,
@@ -670,30 +670,9 @@
this.oldPage.size = page.limit
this.searchList();
},
- //
- getUserList() {
- this.$axios.post(this.$api.user.selectUserList, {
- page: { current: -1, size: -1, },
- entity: { name: null }
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code === 201) {
- return
- }
- this.userList = res.data.body.records
- })
- },
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'token': sessionStorage.getItem('token')
- }
- },
action() {
return this.javaApi + '/processMethodSearchNew/importMethodSearchNew'
}
--
Gitblit v1.9.3