diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index dc828cc1e..fce97e9d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -42,7 +42,7 @@ readonly > - + - + - + - + - + - +
- + @@ -408,7 +408,6 @@ export default { modalshowflag: false, modalshowflag2: false, nodeList2: [], - standShow: false, standardSearch: { standCode: "", standName: "", @@ -421,6 +420,10 @@ export default { reviewDate: '', abolishCause:'', }, + standardSearchs:{ + standCode: "", + standName: "", + }, roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUser: this.$store.getters.userInfo.userId, @@ -436,8 +439,17 @@ export default { //必填人员校验规则 roleFormRules: { dockUserName: [ - {required: true, message: "请选择工作组组长", trigger: "change"} + {required: true, message: "请选择标准法规部部长", trigger: "change"} ], + countersignerName: [ + {required: true, message: '请选择会签人员', trigger: 'change'} + ], + examineName: [ + {required: true, message: '请选择审定责任人', trigger: 'change'} + ], + approverName: [ + {required: true, message: '请选择批准负责人', trigger: 'change'} + ] }, formRules: { standCode: [ @@ -465,7 +477,6 @@ export default { let mes = JSON.parse(res.mes) this.roleForm = mes.roleForm this.standardSearch = mes.qbfsForm - this.standShow = true this.commentText = mes.commentText }); }, @@ -502,8 +513,8 @@ export default { }, getStandDataBtns(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ - standCode: this.standardSearch.standCode, - standName: this.standardSearch.standName, + standCode: this.standardSearchs.standCode, + standName: this.standardSearchs.standName, page: 1, pageSize: this.pageSize, }, { @@ -517,8 +528,8 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ - standCode: this.standardSearch.standCode, - standName: this.standardSearch.standName, + standCode: this.standardSearchs.standCode, + standName: this.standardSearchs.standName, page: this.page, pageSize: this.pageSize, }, { @@ -532,7 +543,7 @@ export default { //企业标准清空 clearSearch(){ this.page = 1 - this.standardSearch = { + this.standardSearchs = { standCode: '', standName: '' } @@ -555,7 +566,6 @@ export default { this.standardSearch.implementDate = this.selectList[0].putTime || '--' this.standardSearch.reviewDate = '--' //复审日期字段未确定 this.fileList = this.selectList[0].standFileList - this.standShow = true this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index e4355ac77..9a1ffe0a0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -100,7 +100,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + 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 => { + }); + } }, //流程提交 handleSubmit(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index a69e73a26..8da1aebcf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index ef0fe56a1..a225a466e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.bzFlag = '1' + 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 => { + }); + } }, //流程提交 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index c9a238d51..cf8da71f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.sdFlag = '1' + 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 => { + }); + } }, //流程提交 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 791ce3969..3fbd3b60f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
@@ -358,25 +358,29 @@ export default { }, //流程驳回 beforeBack(){ - this.isSubmit = true; - this.qbfsForm.commentText = this.commentText; - this.qbfsForm.bafzFlag = '1' - 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 => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.bafzFlag = '1' + 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 => { + }); + } }, //流程提交 handleSubmit() {