diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 3133c870f..48daaee9f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1571,7 +1571,7 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '会签并填写意见') { + } else if(row.taskInfo === '会签') { this.$router.push({ name: 'qbfzStep3', query:{ @@ -1605,7 +1605,7 @@ export default { } }) } - else if(row.taskInfo === '审定责任人审定') { + else if(row.taskInfo === '审定') { this.$router.push({ name: 'qbfzStep6', query:{ @@ -1616,7 +1616,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准负责人批准') { + }else if(row.taskInfo === '批准') { this.$router.push({ name: 'qbfzStep7', query:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index e3f943558..a0eef35a7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index be20c9c24..64e8f9364 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -126,19 +126,19 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

-
- @@ -152,43 +152,43 @@ - -

会签人员

+

相关责任人

-
- -

审定责任人

+

标准体系工作组组长

- +
- -

批准负责人

+

标准法规部高级经理

- +
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 6dea54c04..08b1e52a3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 735f75c30..539b6778e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index db380c5f2..18d3b1ce6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -292,15 +292,17 @@ export default { { required: true, message: "请选择下一步状态", trigger: "change" } ] }, - associationOptions: [{ - value: "修订", - label: "修订" - }, { + associationOptions: [ + // { + // value: "修订", + // label: "修订" + // }, + { value: "废止", label: "废止" }, { - value: "有效", - label: "有效" + value: "现行有效", + label: "现行有效" }] }; }, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index 0fcf7f0b6..df8739020 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index 83cda9209..fd8a46009 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 94a04acb1..3753323b5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index c7e7fd021..dd5edaf33 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -532,12 +532,23 @@ export default { _this: this }, res => { if(res.ok){ - this.qblx_pageData.qblxData = res.data + if(res.data.length){ + this.qblx_pageData.qblxData = res.data + this.$message.success('文件上传成功') + }else{ + this.$message.warning('请勿上传为空的文件') + } }else{ - alert(res.message) + this.$confirm(res.message, "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + }).catch(() => { + }); } }) - this.$message.success('文件上传成功') this.importModalshowflag = false this.$nextTick(() => { this.$refs.importFileAboutStand.clearFiles() @@ -946,9 +957,10 @@ export default { }, //流程提交事件 handleSubmit() { - let jsonData = this.qblx_pageData.qblxData - this.qblx_pageData.qblxFile = this.fileInfoList - this.qblx_pageData.commentText = this.commentText; + if(this.qblx_pageData.qblxData.length){ + let jsonData = this.qblx_pageData.qblxData + this.qblx_pageData.qblxFile = this.fileInfoList + this.qblx_pageData.commentText = this.commentText; this.$refs["qblx_pageData"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate(async (valid) => { @@ -960,7 +972,7 @@ export default { .then(() => { finishCount++ }).catch(e => { - }) + }) } if (finishCount === jsonData.length) { this.isSubmit = false @@ -975,6 +987,10 @@ export default { return this.$message.warning("请完善基础信息"); } }); + }else{ + this.$message.warning('立项列表不能为空') + } + }, } diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index f8ceee7e6..2f00bbe89 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -220,7 +220,7 @@
- +
@@ -250,7 +250,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 88f47ebbb..25581178b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2081,7 +2081,7 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '会签并填写意见') { + } else if(row.taskInfo === '会签') { this.$router.push({ name: 'qbfzStep3', query:{ @@ -2115,7 +2115,7 @@ export default { } }) } - else if(row.taskInfo === '审定责任人审定') { + else if(row.taskInfo === '审定') { this.$router.push({ name: 'qbfzStep6', query:{ @@ -2126,7 +2126,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准负责人批准') { + }else if(row.taskInfo === '批准') { this.$router.push({ name: 'qbfzStep7', query:{ diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 9c077fb25..e52bb846e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -878,7 +878,7 @@ export default { name: 'qbfzStep1', query: { type: '24', - processName: '企标废止流程', + processName: mes.taskInfo, bpnId: id } })