diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 33ecbeebf..7a653f206 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -305,7 +305,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, @@ -336,6 +336,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 306985a27..2c1a0851c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -327,7 +327,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, @@ -358,6 +358,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index e21492e45..d8fa3bc70 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -1,91 +1,109 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index cc5897e1e..d55961518 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -3,86 +3,48 @@ - - - - - 根据企标编号、名称查询 - - - - - - - - - - - - - - - 根据企标编号、名称、类别查询 - - - - - - - - - - - - - - - -
+ + + + 根据企标编号、名称查询 + + + + + + + + + + + + + + + 根据企标编号、名称、类别查询 + + + + + + + + + + + + + + + @@ -106,11 +68,10 @@ - + + + - + + + @@ -137,18 +102,15 @@ - + + + - + + 带入
+ + + @@ -310,6 +286,14 @@ export default { props: ['message'], data(){ return { + drawerTitle2: '', + drawerTitle: '', + type: '', + modalshowflag2: false, + modalshowflag: false, + nodeList2: [], + nodeList: [], + qcdwOptions: [], standShow: false, standShow2: false, ListModel: false, @@ -319,7 +303,44 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, selectList: [], - formRules: {}, + qbfsFormRules: { + esName1: [ + {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, + ], + esName2: [ + {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, + ], + unit: [ + {required: true, message: '请输入单位', trigger: 'blur'}, + ], + esName: [ + {required: true, message: '请输入企标名称', trigger: 'blur'}, + ], + planStatus: [ + {required: true, message: '请选择计划状态', trigger: 'change'}, + ], + reviseStatus: [ + {required: true, message: '请选择制修订状态', trigger: 'change'}, + ], + resPerson: [ + {required: true, message: '请输入评审责任人', trigger: 'blur'}, + ], + wgLeader: [ + {required: true, message: '请输入工作组组长', trigger: 'blur'}, + ], + draftTime: [ + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + ], + releaseTime: [ + {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, + ], + drafter: [ + {required: true, message: '请输入起草人', trigger: 'blur'}, + ], + mergeReason: [ + {required: true, message: '请输入合并原因', trigger: 'blur'}, + ], + }, standinfoList: [], standardSearch: { reviseStatus: "", @@ -334,6 +355,9 @@ export default { isSubTime: "", mergeReason: "", company: "", + resPersonName: '', + drafterName: '', + wgLeaderName:'', groupLeader: "", drafterPeople: "", formulateStatus: "", @@ -357,21 +381,16 @@ export default { reviewDate: '', abolishCause:'', }, - qbzxdForm2: { - standCode: "", - standName: "", - enName: '', - entCategory: '', - replaceNumber: '', - replacedNumber: '', - releaseDate: '', - implementDate: '', - reviewDate: '', - abolishCause:'', - }, } }, mounted() { + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + console.log(res); + this.qcdwOptions = res.data.QCDW // 起草单位 + }) this.getStandDataBtn() }, @@ -385,6 +404,52 @@ export default { } }, methods: { + choiceZRR() { + this.nodeList = []; + this.drawerTitle = '请选择工作组组长'; + this.modalshowflag = true; + }, + checkedRole(data) { + this.qbfsForm.wgLeader = data[0].id; + this.qbfsForm.wgLeaderName = data[0].name; + this.modalshowflag = false; + }, + choiceZRRS(type) { + this.type = type + if(type === '1' ){ + this.drawerTitle2 = '请选择起草人' + this.nodeList2 = []; + if (this.qbfsForm.drafter !== undefined) { + this.nodeList2 = this.qbfsForm.drafter.split(","); + } + }else if(type === '2'){ + this.drawerTitle2 = '请选择评审责任人' + this.nodeList2 = []; + if (this.qbfsForm.resPerson !== undefined) { + this.nodeList2 = this.qbfsForm.resPerson.split(","); + } + } + this.modalshowflag2 = true; + }, + checkedRole2(data) { + var idList = ""; + var nameList = ""; + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + if(this.type === '1'){ + this.qbfsForm.drafter = idList; + this.qbfsForm.drafterName = nameList; + }else if(this.type === '2'){ + this.qbfsForm.resPerson = idList; + this.qbfsForm.resPersonName = nameList; + } + }, validateForm () { let flag = null this.$refs['qbfsForm'].validate((valid) => { @@ -418,14 +483,16 @@ export default { this.$message.warning('请至少选择一条数据进行带入') }else{ if(this.showType === 'one'){ - this.qbzxdForm.esName = this.selectList[0].esName || '--' - this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--' - this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--' + this.qbfsForm.esId1 = this.selectList[0].id || '--' + this.qbfsForm.esName1 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--' this.standShow = true }else{ - this.qbzxdForm2.esName = this.selectList[0].esName || '--' - this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--' - this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--' + this.qbfsForm.esId2 = this.selectList[0].id || '--' + this.qbfsForm.esName2 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' this.standShow2 = true } this.ListModel = false @@ -434,7 +501,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index cfb23dd2a..725f7bce6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -315,7 +315,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 2df447bac..d4a9a3e8a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -268,6 +268,7 @@ export default { }, data() { return { + comFlag: 0, active: "1", commentText: "", comName: "merge", @@ -414,22 +415,71 @@ export default { this.saveLoading = false }) }, + repeatName(){ + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, { + _this: this + }, res => { + let dataList = res.data + dataList.forEach(item => { + if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){ + this.comFlag++ + }else{ + this.comFlag = 0 + } + }) + }) + }, //流程提交 handleSubmit() { - if (this.$route.query.prcNum === undefined) { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { - _this: this - }, res => { - if (res.ok) { + this.repeatName() + if(this.comFlag === '0'){ + this.$message.warning('请更改企标名称') + }else { + if (this.$route.query.prcNum === undefined) { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + _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.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } + }); + } else { + this.$message.warning("请完善人员信息"); + } + }); + } else { + this.$message.warning("请完善基础信息"); + } + } else { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, + taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json) }, { @@ -441,46 +491,15 @@ export default { this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); + } else { + this.$message.warning("请完善人员信息"); } }); } else { - this.$message.warning("请完善人员信息"); + this.$message.warning("请完善基础信息"); } - }); - } else { - this.$message.warning("请完善基础信息"); + } } - } else { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - 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.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); - } - }); - } else { - this.$message.warning("请完善人员信息"); - } - }); - } else { - this.$message.warning("请完善基础信息"); - } - } - - }, // 流程阶段负责人选择 choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9309fe961..e479a69a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -36,21 +36,21 @@ - + - + - +
- +
{ - 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 => { + }); + } }, - }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 1ecb8b369..57e57c3f0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -148,7 +148,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.deptCenterFlag = '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 => { + }); + } }, - }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 9a3df7276..7fd695344 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -148,7 +148,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.bzFlag = '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 => { + }); + } }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index d23f72d5a..903dbd509 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -148,7 +148,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.bzfgbzFlag = '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 => { + }); + } }, },