diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index dee59aabe..db0421945 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -389,11 +389,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.DOC' || fileSuffix === '.doc' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF'|| fileSuffix === '.ZIP'|| fileSuffix === '.zip'|| fileSuffix === '.RAR'|| fileSuffix === '.rar') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF,ZIP,RAR,DOC文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 0db6af885..66a91e213 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2538,6 +2538,7 @@ this.modelFunc() this.menu2("",this.form.standSystem) this.$forceUpdate() + this.ccc = false } // 遍历对象初始化文件信息 for (const p in this.form) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 7434f27ee..37dd29b84 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -2488,6 +2488,7 @@ } }) }else{ + this.$message.warning('请确认审批意见是否填写完整') } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 5747e3e5c..5df04c68b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -566,7 +566,6 @@ export default { return res }) } - this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } @@ -577,6 +576,7 @@ export default { this.$message.warning("请完善人员信息"); } }); + }); // if (flag) { @@ -587,30 +587,75 @@ export default { } else { let flag = this.$refs["childForm"].validateForm(() => { let qbzxdFrom = this.$refs["childForm"].qbfsForm; - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - qbzxdFrom.commentText = this.commentText; - qbzxdFrom.addFlag = '0' - var json = Object.assign(qbzxdFrom, this.roleForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.isSubmit = false; - this.addLog(qbzxdFrom) - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); - } - }); - } else { - this.$message.warning("请完善人员信息"); - } - }); + if(this.$route.query.taskInfo == '重新起草'){ + this.isSubmit = true; + qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' + let json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.addLog(qbzxdFrom) + if (this.bpnId !== '' && this.bpnId !== undefined) { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } + }); + }else { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' + var json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.isSubmit = false; + this.addLog(qbzxdFrom) + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } else { + this.$message.warning("请完善人员信息"); + } + }); + } }); // if (flag) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index b7127391c..5746cc13e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -23,8 +23,9 @@ + { @@ -404,20 +405,26 @@ export default { this.listForm.children = dataListChildren; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + // this.$refs['listForm'].validate((valid) => { + // if (valid) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + // }else { + // this.$message.warning('请确认复审评分是否填写完整') + // } + // }) }, //批量分发按钮 choiceZRRS(row, type, index) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index a197fcf5e..39983ba25 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2209,6 +2209,7 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, + taskInfo: row.taskInfo, prcType: row.prcType } })