From 32ed9569dfafc13a01b35f8fa7e2602fac5f8350 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 27 三月 2024 13:52:25 +0800
Subject: [PATCH] 1.工单审核新增审核状态
---
src/views/systemSetting/dataImport.vue | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 5e67f31..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="璇疯緭鍏�" />
@@ -549,6 +552,17 @@
})
}
+ 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()
+ })
+ }
+
if (this.sheetName.indexOf('瀛樿揣鍒嗙被') !== -1) {
this.statusArr = [
{ code: '0', name: '姝ｅ父' },
@@ -830,7 +844,7 @@
}
// 鏁版嵁鎻愪氦鍓嶅幓闄ょ┖鏍兼柟娉�
- this.tableDataTrim()
+ // this.tableDataTrim()
const data = {
fileCode: this.excelCode,
@@ -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') {
@@ -2171,7 +2196,9 @@
// 妯℃澘涓嬭浇
async getExcel() {
const res = await DownLoadExcel({ FileCode: this.excelCode })
- window.location.href = res.data
+ if (res.code === '200') {
+ window.location.href = res.data
+ }
},
async getSelectArr() {
await this.getPrentOrganization()
--
Gitblit v1.9.3