diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 7d09cb7ab..e39220c2f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -266,8 +266,8 @@ export default { jgUser: "" }, formRules: { - jgUser: [ - {required: true, message: "请选择工作组成员", trigger: "change"} + reviewComments: [ + {required: true, message: "请输入评审意见", trigger: "change"} ], }, } @@ -321,25 +321,31 @@ export default { }, //流程提交 handleSubmit(){ - this.isSubmit = true - this.qbfsForm.commentText = this.commentText - this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName - this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId - let json = JSON.stringify(this.qbfsForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') + this.$refs['qbfsForm'].validate((valid) => { + if(valid){ + this.isSubmit = true + this.qbfsForm.commentText = this.commentText + this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName + this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.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('请完善基础信息') } - this.isSubmit = false - }, e => { - }); + }) }, //转办事件 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index 7cf58a79f..a69e73a26 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -23,30 +23,22 @@
- + - + - - - - - - - - + + + + + - - + + + + + - -
-

{{ item.name }} - - -

-
-
- 暂无数据 -
- - - - - - - - - -
@@ -370,6 +340,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)); let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; @@ -381,50 +352,34 @@ export default { people: item.split("-")[0] }); }); - let list = []; - this.dataList.forEach(item => { - list.push(item.opinion); - this.findMost(list); - }); - }); }, - findMost(arr) { - if (!arr.length) return; - if (arr.length === 1) return 1; - let res = {}; - let maxName, maxNum = 0; - // 遍历数组 - arr.forEach((item) => { - res[item] ? res[item] += 1 : res[item] = 1; - if (res[item] > maxNum) { - maxName = item; - maxNum = res[item]; - } - }); - this.qbfsForm.nextStatus = maxName - // return "出现次数最多的元素为:" + maxName + ", 出现次数为:" + maxNum; - }, //流程提交 handleSubmit() { - this.isSubmit = true; - this.qbfsForm.commentText = this.commentText; - this.qbfsForm.dataList = this.dataList; - let json = JSON.stringify(this.qbfsForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + this.$refs['qbfsForm'].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.dataList = this.dataList; + let json = JSON.stringify(this.qbfsForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.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('请完善基础信息') } - this.isSubmit = false; - }, e => { - }); + }) }, handleTabs(name) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue new file mode 100644 index 000000000..ef0fe56a1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue new file mode 100644 index 000000000..c9a238d51 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue new file mode 100644 index 000000000..6b17384ce --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 4efa8606f..08489d798 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1593,19 +1593,29 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '起草人修改标准状态') { + this.$router.push({ + name: 'qbfzStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审核1') { + this.$router.push({ + name: 'qbfzStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - // else if(row.taskInfo === '工作组组长审批') { - // this.$router.push({ - // name: 'qbfsStep4', - // query:{ - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) - // } break } }, diff --git a/src/router/index.js b/src/router/index.js index 244374c0a..1a20dec60 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1485,6 +1485,33 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep5', + name: 'qbfzStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step5.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, + { + path: '/qbfzStep6', + name: 'qbfzStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step6.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, + { + path: '/qbfzStep7', + name: 'qbfzStep7', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step7.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, //企标制修订计划管控流程 { path: '/qbzxdjhgkStep1',