52729 标准入库流程,国内入库,批准节点 手机端驳回 驳回后 PC端提交 再次走到批准节点时

This commit is contained in:
宋伟佳
2022-05-10 15:21:59 +08:00
parent ec2b7e5ecf
commit ebacbf636a
3 changed files with 68 additions and 39 deletions
@@ -1127,6 +1127,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res);
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd this.fbgbjbdFileId = processForm.fbgbjbd
@@ -2628,6 +2628,12 @@ export default {
console.log(item); console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
// 遍历对象
for (const p in this.form) {
if (typeof (this.form[p]) != "function") {
this.initializeFileList(p, this.form[p]);
}
}
this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2639,14 +2645,6 @@ export default {
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
this.form.country = item.country.split(',') this.form.country = item.country.split(',')
// 遍历对象
for (const p in this.form) {
if (typeof (this.form[p]) != "function") {
this.initializeFileList(p, this.form[p]);
}
}
this.$forceUpdate() this.$forceUpdate()
}) })
}, },
@@ -2668,6 +2666,7 @@ export default {
// }) // })
// }, // },
initializeFileList(property, value) { initializeFileList(property, value) {
console.log('执行文件方法');
switch (property) { switch (property) {
case 'xgd': case 'xgd':
this.getFileList(value, this.xgdFileList); this.getFileList(value, this.xgdFileList);
@@ -857,24 +857,57 @@ export default {
this.handleSubmit() this.handleSubmit()
}, },
handleSubmit() { handleSubmit() {
this.getRule()
const val = this.form.country; const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== "" && val !== null && typeof (val) !== "undefined") {
if (val instanceof Array) { if (val instanceof Array) {
this.form.country = val.join(","); this.form.country = val.join(",");
} else { } else {
this.form.country = val this.form.country = val;
} }
} else if (val === '') { } else if (val === "") {
this.form.country = [] this.form.country = [];
} }
this.$refs['formTongGuo'].validate((valid) => { this.isSubmit = true;
if (valid) { this.form.commentText = this.commentText;
this.isSubmit = true this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
this.form.commentText = this.formTongGuo.commentText if (this.form.syrz.length === 0) {
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.syrz = "";
}
if (this.form.nylx.length === 0) {
this.form.nylx = "";
}
if (this.form.zrbm.length === 0) {
this.form.zrbm = "";
}
if (this.form.qcdw.length === 0) {
this.form.qcdw = "";
}
if (this.form.cllx.length === 0) {
this.form.cllx = "";
}
if (this.form.sycpx.length === 0) {
this.form.sycpx = "";
}
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
let qcdwName = []
if(this.form.qcdw && this.form.qcdw.length > 0){
this.form.qcdw.map(item => {
this.qcdwOptions.forEach(items => {
if(item === items.value){
qcdwName.push(items.label)
}
})
})
}
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
this.form.qcdw = qcdwName
this.form.qcdw = qcdwName.splice(',')
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
json: json json: json
@@ -882,21 +915,17 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion); if (this.formTongGuo.approvalOpinion == "1") {
if (this.formTongGuo.approvalOpinion == '1') { this.$message.warning("驳回成功");
console.log("shibai"); this.isSubmit = false;
this.$message.warning("驳回成功") this.formTongGuo.commentText = "";
this.isSubmit = false
// 流程提交之后,应该流转至待办任务页面 // 流程提交之后,应该流转至待办任务页面
this.$router.push("/processCenter"); this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} else { } else {
console.log("hello"); this.processCreateStand(json);
this.processCreateStand(json)
} }
} }
}) });
}
})
}, },
/** /**