diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d991f2dac..1ce3a071e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,7 +252,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index c89b69426..0c8c81b6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -333,13 +333,12 @@ this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) - _formData.append('pId', this.pId) _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText, itemList: this.itemList, - sarType: this.sarType + standInData: this.sarType })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -394,14 +393,19 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data - var arr = [] - arr = JSON.parse(data.itemList) + let arr + if (typeof(data.itemList) === 'string') { + arr = JSON.parse(data.itemList) + } else { + arr = data.itemList + } arr.forEach(item => { item.zxUserId = '' item.zxUserIdName = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index e953869f4..6151086e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -288,6 +288,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -558,11 +576,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data let itemList if (typeof (data.itemList) == 'string') { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 6b90b2415..68fabb96b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 834bc18af..f71fe132b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 67a6dabe4..a9b831392 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -377,11 +377,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index b5a354cbf..f914cb989 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1035,7 +1035,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 7551a83f2..29e3b1b73 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -595,7 +595,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index bb41705bd..d9fbcfd23 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -994,6 +994,8 @@ export default { }, // 点击批量删除事件 deleteList() { + console.log(this.selectList); + console.log(this.dataList); if (this.selectList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -1007,10 +1009,12 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); + console.log(index); if (index > -1) { this.dataList.splice(index, 1); + console.log(this.dataList); } exits.push(item); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 3fc280f48..04d2e535d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -598,7 +598,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 0804ddc82..895b38f72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -263,7 +263,6 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - console.log(data); }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index b5642945f..ba084d8ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -317,7 +317,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index d3f760def..dce75e757 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -394,7 +394,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); @@ -430,7 +430,7 @@ export default { this.selectedList.map(item => { let addList; addList = this.dataList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 454d4c8bc..c38ec4a01 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -631,7 +631,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 1d9ea32d5..3f3b33a3b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -605,7 +605,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 296f65bc7..93412800f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -450,8 +450,13 @@ export default { }, { _this: this }, res => { - this.ProjectDatas = res.data.Maintenance.records; - this.total = res.data.Maintenance.total; + if(res.data === null){ + this.ProjectDatas = '' + this.total = 0 + }else{ + this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; + } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index d53cb2820..2828bd0e0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -44,7 +44,7 @@
- 批量分发责任人 + 批量分发责任人
-