From 636a9b27c7b63c5356dd52a947d0f3f9c9e02486 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 14 Jan 2022 10:22:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 814cf97f8..af8bb3d17 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -62,7 +62,7 @@ @@ -284,20 +284,11 @@ - - - + Date: Fri, 14 Jan 2022 11:37:34 +0800 Subject: [PATCH 2/5] commit --- src/pages/home2/components/todoList/index.vue | 20 +++++++++---------- .../pages/components/ProcessFooter.vue | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 1a8af79fd..0b983eee9 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -514,7 +514,7 @@ export default { } break; case '3': - if (row.taskInfo === '责任部门对接人选择责任人') { + if (row.taskInfo === '任务分发') { this.$router.push({ name: 'bzzqyjStep2', query: { @@ -525,7 +525,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人反馈'){ + } else if (row.taskInfo === '意见反馈'){ this.$router.push({ name: 'bzzqyjStep3', query: { @@ -536,7 +536,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') { + } else if (row.taskInfo === '意见汇总报批') { this.$router.push({ name: 'bzzqyjStep4', query: { @@ -547,7 +547,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '审批人审批') { + } else if (row.taskInfo === '意见审批(经理、研发副总裁)') { this.$router.push({ name: 'bzzqyjStep4-1', query: { @@ -558,7 +558,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师分线审核') { + } else if (row.taskInfo === '管理员(起草节点一个人)') { this.$router.push({ name: 'bzzqyjStep4-2', query: { @@ -569,7 +569,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师汇总') { + } else if (row.taskInfo === '意见处理') { this.$router.push({ name: 'bzzqyjStep5', query: { @@ -580,7 +580,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人会签') { + } else if (row.taskInfo === '会签(选择会签人部长)') { this.$router.push({ name: 'bzzqyjStep6', query: { @@ -591,7 +591,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '部长+对接人审核') { + } else if (row.taskInfo === '审核(李部、会签人部长)') { this.$router.push({ name: 'bzzqyjStep7', query: { @@ -602,7 +602,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任审定' ) { + } else if (row.taskInfo === '审定(阚主任、技术委员会相关专委会主任/研究总院职能部门领导)' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -613,7 +613,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '工程研究总院院长批准') { + } else if (row.taskInfo === '批准(工程研究总院院长批准、标准法规主管副院长)') { this.$router.push({ name: 'bzzqyjStep9', query: { diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 3da84e3d5..cc93a03d2 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -59,7 +59,6 @@ v-if="showOver" >撤销申请 Date: Fri, 14 Jan 2022 13:23:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 3 ++- .../processCenter/pages/creatProcess/bzrk/step4.vue | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d60390b86..2a46bd620 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1715,8 +1715,9 @@ export default { filterText(val) { this.$refs.tree.filter(val); }, - 'form.standInData' : { + 'form' : { handler: function () { + console.log(this.form.standInData) if(this.form.standInData === '1') { this.rules.standYear[0].required = false; this.rules.standName[0].required = false diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 35421bf11..a7fc7b201 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -44,7 +44,7 @@ - + - + From 1319fd5cf883ad972d7f98c695bd5088fce774cf Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 14 Jan 2022 13:55:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 12180b323..b0c5d5ea0 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3305,7 +3305,7 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit' From e23c1c2a8ab24a7c1834d699ce26d2b74bc8a2c9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 14 Jan 2022 14:01:37 +0800 Subject: [PATCH 5/5] feat: There is no way the, --- .../qbrk-product/common/formListIn.vue | 1120 +++++++++------- .../creatProcess/qbrk-product/step13.vue | 3 + .../pages/creatProcess/qbrk-product/step3.vue | 4 +- .../pages/creatProcess/qbrk-product/step5.vue | 2 +- .../pages/creatProcess/qbrk-product/step6.vue | 4 +- .../creatProcess/qbrk-product/stepC3.vue | 7 +- .../creatProcess/qbrk-product/stepC6.vue | 9 +- .../creatProcess/qbrk-product/stepDetail.vue | 2 +- .../creatProcess/qbrk/common/formListIn.vue | 1132 +++++++++-------- .../pages/creatProcess/qbrk/step12.vue | 18 +- .../pages/creatProcess/qbrk/step13.vue | 18 +- .../pages/creatProcess/qbrk/step2.vue | 2 +- .../pages/creatProcess/qbrk/step3.vue | 5 +- .../pages/creatProcess/qbrk/step5.vue | 3 +- .../pages/creatProcess/qbrk/step6.vue | 3 +- .../pages/creatProcess/qbrk/step7.vue | 2 +- .../pages/creatProcess/qbrk/step8.vue | 2 +- .../pages/creatProcess/qbrk/step9.vue | 2 +- .../pages/creatProcess/qbrk/stepC3.vue | 3 +- .../pages/creatProcess/qbrk/stepC6.vue | 3 +- .../pages/processDetail/index.vue | 3 + 21 files changed, 1299 insertions(+), 1048 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue index 9d1c608b3..dcf660dfe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue @@ -1,515 +1,659 @@