52729 标准入库流程,国内入库,批准节点 手机端驳回 驳回后 PC端提交 再次走到批准节点时
This commit is contained in:
@@ -1127,6 +1127,7 @@ export default {
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
if (res) {
|
||||
console.log(res);
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.xgdFileId = processForm.xgd
|
||||
this.fbgbjbdFileId = processForm.fbgbjbd
|
||||
|
||||
@@ -2628,6 +2628,12 @@ export default {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
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.defaultCheckedKeys1 = [this.form.cycvppsbm];
|
||||
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
|
||||
@@ -2639,14 +2645,6 @@ export default {
|
||||
this.form.prcName = this.prcName
|
||||
this.form['id'] = item.id
|
||||
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()
|
||||
})
|
||||
},
|
||||
@@ -2668,6 +2666,7 @@ export default {
|
||||
// })
|
||||
// },
|
||||
initializeFileList(property, value) {
|
||||
console.log('执行文件方法');
|
||||
switch (property) {
|
||||
case 'xgd':
|
||||
this.getFileList(value, this.xgdFileList);
|
||||
|
||||
@@ -857,46 +857,75 @@ export default {
|
||||
this.handleSubmit()
|
||||
},
|
||||
handleSubmit() {
|
||||
this.getRule()
|
||||
const val = this.form.country;
|
||||
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
||||
if (val !== "" && val !== null && typeof (val) !== "undefined") {
|
||||
if (val instanceof Array) {
|
||||
this.form.country = val.join(",");
|
||||
} else {
|
||||
this.form.country = val
|
||||
this.form.country = val;
|
||||
}
|
||||
} else if (val === '') {
|
||||
this.form.country = []
|
||||
} else if (val === "") {
|
||||
this.form.country = [];
|
||||
}
|
||||
this.$refs['formTongGuo'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion);
|
||||
if (this.formTongGuo.approvalOpinion == '1') {
|
||||
console.log("shibai");
|
||||
this.$message.warning("驳回成功")
|
||||
this.isSubmit = false
|
||||
// 流程提交之后,应该流转至待办任务页面
|
||||
this.$router.push("/processCenter");
|
||||
} else {
|
||||
console.log("hello");
|
||||
this.processCreateStand(json)
|
||||
}
|
||||
this.isSubmit = true;
|
||||
this.form.commentText = this.commentText;
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
|
||||
if (this.form.syrz.length === 0) {
|
||||
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);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
if (this.formTongGuo.approvalOpinion == "1") {
|
||||
this.$message.warning("驳回成功");
|
||||
this.isSubmit = false;
|
||||
this.formTongGuo.commentText = "";
|
||||
// 流程提交之后,应该流转至待办任务页面
|
||||
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
||||
} else {
|
||||
this.processCreateStand(json);
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user