From 41e50bf6f55a2e70ee0850452d2b34f608060a01 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 08 一月 2024 16:22:44 +0800
Subject: [PATCH] 1.项目中多处优化
---
src/views/systemSetting/dataImport.vue | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 7d0ce9a..c4c8aa5 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -144,7 +144,10 @@
item.indexOf('淇濆吇閮ㄤ綅瑕佹眰')!==-1||
item.indexOf('淇濆吇椤圭洰瑕佹眰')!==-1||
item.indexOf('鐐规閮ㄤ綅瑕佹眰')!==-1||
- item.indexOf('鐐规椤圭洰瑕佹眰')!==-1
+ item.indexOf('鐐规椤圭洰瑕佹眰')!==-1||
+
+ item.indexOf('浠撳簱缂栫爜')!==-1||
+ item.indexOf('搴撲綅缂栫爜')!==-1
"
>
<el-input v-model="row[item]" placeholder="璇疯緭鍏�" />
@@ -545,6 +548,17 @@
this.tableData[0].forEach(j => {
j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
j['*搴撲綅绠＄悊'] = j['*搴撲綅绠＄悊'] ? this.isYesOrNo.find(e => e.name === j['*搴撲綅绠＄悊']).code : ''
+ j.uuid = nanoid()
+ })
+ }
+
+ if (this.sheetName.indexOf('搴撲綅璁剧疆') !== -1) {
+ this.statusArr = [
+ { code: '0', name: '姝ｅ父' },
+ { code: '1', name: '鍋滅敤' }
+ ]
+ this.tableData[0].forEach(j => {
+ j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
j.uuid = nanoid()
})
}
@@ -1413,6 +1427,14 @@
flag = false
msg = '*鐘舵�佷笉鑳戒负绌猴紒'
}
+ if (!j['*浠撳簱缂栫爜']) {
+ flag = false
+ msg = '*浠撳簱缂栫爜涓嶈兘涓虹┖锛�'
+ }
+ if (!j['*搴撲綅缂栫爜']) {
+ flag = false
+ msg = '*搴撲綅缂栫爜涓嶈兘涓虹┖锛�'
+ }
})
this.tableData[1].forEach(j => {
if (!j['妯″叿缂栫爜'] && j['浜у搧缂栫爜']) {
@@ -1981,8 +2003,11 @@
'*妯″叿鍚嶇О': '',
'瑙勬牸鍨嬪彿': '',
'*鐘舵��': 'Y',
+ '*浠撳簱缂栫爜': '',
+ '*搴撲綅缂栫爜': '',
'棰勮瀵垮懡(娆�)': '',
'鍓╀綑瀵垮懡(娆�)': ''
+
})
}
if (this.sheetName.indexOf('妯″叿鍏宠仈浜у搧') !== -1 && this.activeName === '1') {
--
Gitblit v1.9.3