From 9862248787934f4242ac9636e0c4d5b8ee0870b8 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 20 十月 2026 16:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index a459b37..06292dc 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -24,12 +24,8 @@
</div>
<div style="line-height: 30px;" v-if="tabIndex === '0'">
<el-button size="small" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
- <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;">
- <el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
- </el-upload>
+ <el-button size="small" type="primary" style="margin-left: 10px;"
+ @click="$refs.importDialog.open()">瀵煎叆</el-button>
<el-button size="small" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button>
</div>
</div>
@@ -88,12 +84,28 @@
@pagination="pagination1">
</limsTable>
</el-dialog>
+ <import-dialog
+ ref="importDialog"
+ title="瀵煎叆鏍囧噯鏌ユ柊"
+ :action="action"
+ accept=".xls,.xlsx"
+ template-url="/import-templates/鏍囧噯鏌ユ柊瀵煎叆妯℃澘.xlsx"
+ template-name="鏍囧噯鏌ユ柊瀵煎叆妯℃澘.xlsx"
+ :tips="[
+ '琛ㄥご涓轰袱琛岋紝璇蜂粠绗� 3 琛屽紑濮嬪～鍐欐暟鎹�',
+ '鏍囧噯鍚嶇О銆佹爣鍑嗗彿璇峰～鍐欑幇琛屾爣鍑嗙殑鍚嶇О鍜岀紪鍙�',
+ '鏌ユ柊鏉ユ簮鎸夆�滄爣鍑嗙綉 鈫� 濮旀墭鎯呮姤鎵� 鈫� 鏍囧噯涔﹀簵 鈫� 鍏朵粬鈥濈殑椤哄簭鍙栫涓�涓潪绌洪」',
+ '澶囨敞鍒楀彧鑳藉～鍐欌�滄浛鎹⑩�濇垨鈥滀綔搴熲�濓紝鐣欑┖琛ㄧず鏃犲娉�'
+ ]"
+ @success="searchList"
+ />
</div>
</div>
</template>
<script>
import limsTable from '@/components/Table/lims-table.vue'
+import ImportDialog from '@/components/ImportDialog/index.vue'
import FormDialog from './component/FormDialog.vue';
import EditFormDia from './component/EditFormDia.vue';
import {
@@ -107,6 +119,7 @@
components: {
FormDialog,
limsTable,
+ ImportDialog,
EditFormDia
},
data() {
@@ -483,7 +496,6 @@
],
formDialog: false,
editFormDialog: false,
- upLoading: false,
outLoading: false,
ratifyInfo: {
writeUserId: '',
@@ -657,28 +669,6 @@
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '鏍囧噯鏌ユ柊瀵煎嚭.xlsx')
})
- },
- // 瀵煎叆
- beforeUpload(file) {
- if (file.size > 1024 * 1024 * 10) {
- this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
- this.$refs.upload.clearFiles()
- return false;
- } else {
- this.upLoading = true;
- return true;
- }
- },
- onError(err, file, fileList) {
- this.$message.error('涓婁紶澶辫触')
- this.$refs.upload.clearFiles()
- },
- handleSuccessUp(response) {
- this.upLoading = false;
- if (response.code == 200) {
- this.$message.success('涓婁紶鎴愬姛');
- this.searchList()
- }
},
// 鍒嗛〉
pagination(page) {
--
Gitblit v1.9.3