From 729bb3b1bac72bd760638e6329ba77cf1a8fb43f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 07 十月 2023 15:16:05 +0800
Subject: [PATCH] 1.工序报工100%
---
src/views/systemSetting/dataImport.vue | 134 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 131 insertions(+), 3 deletions(-)
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 105cbde..353c595 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -167,6 +167,22 @@
/>
</el-select>
</div>
+ <div v-else-if="item.indexOf('宸ュ簭绫诲瀷')!==-1">
+ <el-select
+ v-model="row[item]"
+ placeholder="璇烽�夋嫨"
+ filterable
+ style="width:100%"
+ clearable
+ >
+ <el-option
+ v-for="item in stepTypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
<div
v-else-if="
item.indexOf('搴撲綅绠$悊')!==-1||
@@ -373,6 +389,10 @@
{ code: '1', name: '鏄�' },
{ code: '0', name: '鍚�' }
],
+ stepTypeArr: [
+ { code: 'Z', name: '鑷埗' },
+ { code: 'W', name: '澶栧崗' }
+ ],
orgArr: [], // 缁勭粐
orgOptions: [],
defaultProps: {
@@ -507,8 +527,8 @@
}
if (this.sheetName.indexOf('璁惧绫诲瀷') !== -1) {
this.statusArr = [
- { code: '0', name: '姝e父' },
- { code: '1', name: '鍋滅敤' }
+ { code: 'Y', name: '姝e父' },
+ { code: 'N', name: '鍋滅敤' }
]
const orgArr = this.orgArr.map(i => i.torg_code)
@@ -518,6 +538,18 @@
this.tableData[1].forEach(j => {
j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
j['*鎵�灞炵粍缁囩紪鐮�'] = j['*鎵�灞炵粍缁囩紪鐮�'] ? (orgArr.includes(j['*鎵�灞炵粍缁囩紪鐮�']) ? this.findParent([], j['*鎵�灞炵粍缁囩紪鐮�'], this.orgOptions).reverse() : '') : ''
+ j.uuid = nanoid()
+ })
+ }
+
+ if (this.sheetName.indexOf('宸ュ簭璁剧疆') !== -1) {
+ this.statusArr = [
+ { code: 'Y', name: '姝e父' },
+ { code: 'N', name: '鍋滅敤' }
+ ]
+ this.tableData[0].forEach(j => {
+ j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
+ j['*宸ュ簭绫诲瀷'] = j['*宸ュ簭绫诲瀷'] ? this.stepTypeArr.find(e => e.name === j['*宸ュ簭绫诲瀷']).code : ''
j.uuid = nanoid()
})
}
@@ -583,6 +615,18 @@
}
if (this.sheetName.indexOf('璁惧绫诲瀷') !== -1) {
const res = this.handleDeviceListSubmitData()
+ if (res.code !== '200') {
+ return this.$message.info(res.message)
+ }
+ }
+ if (this.sheetName.indexOf('宸ュ簭璁剧疆') !== -1) {
+ const res = this.handleProcessListSubmitData()
+ if (res.code !== '200') {
+ return this.$message.info(res.message)
+ }
+ }
+ if (this.sheetName.indexOf('缂洪櫡瀹氫箟') !== -1) {
+ const res = this.handleDefectDefineSubmitData()
if (res.code !== '200') {
return this.$message.info(res.message)
}
@@ -1082,6 +1126,70 @@
return { code: '200', message: '鎴愬姛锛�' }
},
+ // 澶勭悊宸ュ簭璁剧疆鎻愪氦鏁版嵁
+ handleProcessListSubmitData() {
+ let flag = true
+ let msg = ''
+ if ([...new Set(this.tableData[0].map(i => i['*宸ュ簭缂栧彿(鍞竴)']))].length !== this.tableData[0].length) {
+ return this.$message.info('缂栫爜涓嶈兘閲嶅锛�')
+ }
+ this.tableData[0].forEach(j => {
+ if (!j['*宸ュ簭缂栧彿(鍞竴)']) {
+ flag = false
+ msg = '*宸ュ簭缂栧彿(鍞竴)'
+ }
+ if (!j['*宸ュ簭鍚嶇О']) {
+ flag = false
+ msg = '*宸ュ簭鍚嶇О'
+ }
+ if (!j['*宸ュ簭绫诲瀷']) {
+ flag = false
+ msg = '*宸ュ簭绫诲瀷'
+ }
+ if (!j['*鐘舵��']) {
+ flag = false
+ msg = '*鐘舵��'
+ }
+ })
+
+ if (!flag) {
+ return { code: '301', message: msg + '涓嶈兘涓虹┖锛�' }
+ }
+
+ this.tableData[0].map(item => {
+ delete (item.uuid)
+ })
+
+ return { code: '200', message: '鎴愬姛锛�' }
+ },
+ // 澶勭悊缂洪櫡瀹氫箟鎻愪氦鏁版嵁
+ handleDefectDefineSubmitData() {
+ let flag = true
+ let msg = ''
+ if ([...new Set(this.tableData[0].map(i => i['*缂洪櫡缂栧彿(鍞竴)']))].length !== this.tableData[0].length) {
+ return this.$message.info('缂栫爜涓嶈兘閲嶅锛�')
+ }
+ this.tableData[0].forEach(j => {
+ if (!j['*缂洪櫡缂栧彿(鍞竴)']) {
+ flag = false
+ msg = '*缂洪櫡缂栧彿(鍞竴)'
+ }
+ if (!j['*缂洪櫡鍚嶇О']) {
+ flag = false
+ msg = '*缂洪櫡鍚嶇О'
+ }
+ })
+
+ if (!flag) {
+ return { code: '301', message: msg + '涓嶈兘涓虹┖锛�' }
+ }
+
+ this.tableData[0].map(item => {
+ delete (item.uuid)
+ })
+
+ return { code: '200', message: '鎴愬姛锛�' }
+ },
// parents:鐢ㄤ簬杩斿洖鐨勬暟缁勶紝childNode:瑕佹煡璇㈢殑鑺傜偣锛宼reeData锛歫son鏍戝舰鏁版嵁
findParent(parents, childNode, treeData) {
@@ -1238,7 +1346,27 @@
'*璁惧鍚嶇О': '',
'*鎵�灞炵粍缁囩紪鐮�': '',
'璁惧绫诲瀷缂栫爜': '',
- '*鐘舵��': '0'
+ '*鐘舵��': 'Y'
+ })
+ }
+ // 宸ュ簭璁剧疆
+ if (this.sheetName.indexOf('宸ュ簭璁剧疆') !== -1) {
+ this.tableData[0].unshift({
+ uuid: nanoid(),
+ '*宸ュ簭缂栧彿(鍞竴)': '',
+ '*宸ュ簭鍚嶇О': '',
+ '*宸ュ簭绫诲瀷': 'Z',
+ '*鐘舵��': 'Y',
+ '鎻忚堪': ''
+ })
+ }
+ // 缂洪櫡瀹氫箟
+ if (this.sheetName.indexOf('缂洪櫡瀹氫箟') !== -1) {
+ this.tableData[0].unshift({
+ uuid: nanoid(),
+ '*缂洪櫡缂栧彿(鍞竴)': '',
+ '*缂洪櫡鍚嶇О': '',
+ '缂洪櫡鎻忚堪': ''
})
}
},
--
Gitblit v1.9.3