From 9b7f2bc10441861fa1341f658f52d808b8eaedfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 17 Nov 2021 10:01:49 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step1.vue | 14 +- .../pages/creatProcess/qbfz/step2.vue | 28 +- .../pages/creatProcess/qbfz/step3.vue | 16 +- .../pages/creatProcess/qbfz/step4.vue | 622 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 37 ++ src/router/index.js | 9 + 6 files changed, 706 insertions(+), 20 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfz/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 4655f8afd..93f144a02 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -496,7 +496,7 @@ export default { this.getStandDataBtn() this.ListModel = true; }, - //企业标准查询this.standardSearch, + //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ standCode: this.standardSearch.standCode, @@ -570,7 +570,7 @@ export default { _formData.append('prcType', '23') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - qbfsForm: this.qbfsForm, + qbfsForm: this.standardSearch, commentText: this.commentText })) saveTaskFirst(_formData).then(res => { @@ -589,9 +589,9 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) + this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { if (res.ok) { @@ -624,8 +624,8 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/completeTask', { taskIds: res.data, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 30c7c4a51..e4355ac77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -22,18 +22,18 @@ > - + - + @@ -309,11 +309,29 @@ export default { }, //流程驳回 beforeBack(){ - + 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(){ this.isSubmit = true + this.qbfsForm.passFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 5a771a8ee..7d09cb7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -22,18 +22,18 @@ > - + - + @@ -191,14 +191,12 @@ @@ -250,8 +248,8 @@ export default { modalshowflag: false, // drawer开关 loading: false, qbfsForm:{ - entNumber: '', - cnName: '', + standCode: '', + standName: '', enName: '', entCategory: '', replaceNumber: '', @@ -325,6 +323,8 @@ 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, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue new file mode 100644 index 000000000..7cf58a79f --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -0,0 +1,622 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 190ceff58..f3a79ea35 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1570,6 +1570,43 @@ export default { }) } break + case '24': + if (row.taskInfo === '标准法规部部长审核') { + this.$router.push({ + name: 'qbfzStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '会签并填写意见') { + this.$router.push({ + name: 'qbfzStep3', + 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 } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 78653f5fb..244374c0a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1476,6 +1476,15 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep4', + name: 'qbfzStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step4.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, //企标制修订计划管控流程 { path: '/qbzxdjhgkStep1', From f3d6d648ed51f27840c35a8438bc1cdd79de3cd6 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 17 Nov 2021 10:39:09 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20=E9=A3=8E=E9=99=A9=E9=A1=B9=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/zdrzbzORzchgxxmsc/step5.vue | 19 +++++++++--- .../creatProcess/zdrzbzORzchgxxmsc/step7.vue | 16 ++++++++++ .../creatProcess/zdrzbzORzchgxxmsc/step8.vue | 15 +++++++++- .../creatProcess/zdrzbzORzchgxxmsc/step9.vue | 29 ++++++++++++++++++- .../tabComponents/processCenter/index.vue | 2 +- 5 files changed, 74 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue index b7e8f2ff6..18b11c498 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue @@ -71,10 +71,15 @@ prop="implTime" sortable="custom" align="center" - width="120" + width="155" label="实施日期"> + + + @@ -431,8 +443,12 @@ export default { handleSubmit() { this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => { if (valid) { + let infoTableDatas = [] + infoTableDatas = JSON.stringify(this.infoTableDatas) this.isSubmit = true; + localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) var json = this.json; + json.infoTableDatas = infoTableDatas json.commentText = this.commentText; json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue index 87fd916f2..8f2c63a09 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue @@ -107,6 +107,12 @@ width="400" label="SOP时间超过法规时限的空档期的业务应对方案"> + + @@ -487,7 +493,14 @@ export default { } let data = JSON.parse(res.mesg) this.infoTableDatas = JSON.parse(data.infoTableDatas) - this.form.cid = data.cid + console.log('490',this.infoTableDatas) + for (let i = 0; i < this.infoTableDatas.length; i++) { + if (this.infoTableDatas[i].isRisk === "1"){ + this.infoTableDatas[i].isRiskShow = '是' + }else { + this.infoTableDatas[i].isRiskShow = '否' + } + } this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue index e18dd9549..e9bfa7af1 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue @@ -107,6 +107,12 @@ width="400" label="SOP时间超过法规时限的空档期的业务应对方案"> + + @@ -434,11 +440,25 @@ export default { this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => { if (valid) { this.isSubmit = true; + let infoTableDatas = [] + infoTableDatas = JSON.stringify(this.infoTableDatas) + localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) var json = this.json; + json.feedbackDept = this.feedbackDept + console.log('448',json.feedbackDept) json.commentText = this.commentText; + json.infoTableDatas = infoTableDatas json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; json.introduce = false; + this.$http.postData("policy/activiti/enterIssue",{ + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + },{},res=> { + console.log('455',res) + this.isSubmit = false; + }); this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -487,7 +507,14 @@ export default { } let data = JSON.parse(res.mesg) this.infoTableDatas = JSON.parse(data.infoTableDatas) - this.form.cid = data.cid + console.log('490',data) + for (let i = 0; i < this.infoTableDatas.length; i++) { + if (this.infoTableDatas[i].isRisk === "1"){ + this.infoTableDatas[i].isRiskShow = '是' + }else { + this.infoTableDatas[i].isRiskShow = '否' + } + } this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 190ceff58..7647615c3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1075,7 +1075,7 @@ export default { } }) } - else if(row.taskInfo === '法规认证部副总监批准'){ + else if(row.taskInfo === '法规认证部副总监审定'){ this.$router.push({ name: 'zdrzbzORzchgxxmscStep9', query: { From e51db41c374d9a676c19ba70460b5040570eed96 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 17 Nov 2021 10:50:36 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=A8=AA=E6=8B=89=E6=9D=A1=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8F=B3=E4=BE=A7UI?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 662bfdf1a..4d6e1fcad 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -279,7 +279,7 @@ {{ textStatusMap[scope.row.textStatus] }} - From fda6078786d5c452e4bd3d0923d72b0df739b04c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 17 Nov 2021 10:58:01 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=A8=AA=E6=8B=89=E6=9D=A1=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8F=B3=E4=BE=A7UI?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 3 +-- .../components/EnterpriseStandardDatabase.vue | 2 -- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 2 -- .../foreignStandardsAndRegulations/index.vue | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 4d6e1fcad..ce1980d1c 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -212,7 +212,6 @@ show-overflow-tooltip prop="standName" label="标准名称" - width="350" > - diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index b8d729ce2..df83d8c4f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -314,7 +314,6 @@ show-overflow-tooltip prop="standName" label="中文名称" - width="350" >