From dc6a55942f3151280915369f2eddc3f2d25ade17 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 15:38:58 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/phone.less | 4 ++ .../pages/phone/bzhHd-ch/step2.vue | 47 ++++++++++--------- .../pages/phone/bzhHd-ch/step4.vue | 21 +++++---- .../pages/phone/bzhHd-ch/step6.vue | 21 +++++---- .../pages/phone/bzhHd-hh/step2.vue | 21 +++++---- .../pages/phone/bzhHd-rh/step2.vue | 21 +++++---- .../pages/phone/bzhHd-rh/step4.vue | 23 ++++----- .../pages/phone/bzhHd-rh/step6.vue | 23 ++++----- 8 files changed, 99 insertions(+), 82 deletions(-) diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less index d73daf347..510f507af 100644 --- a/src/assets/styles/phone.less +++ b/src/assets/styles/phone.less @@ -6,4 +6,8 @@ .el-message { min-width: 200px !important; } + .el-message-box { + width: 270px!important; + top: -60px!important; + } } diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 0652e0c00..3b738d887 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -14,50 +14,50 @@
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} @@ -67,26 +67,26 @@ - + 计划内 计划外 - + - - - + + + @@ -359,6 +359,10 @@ export default { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue new file mode 100644 index 000000000..9429b17af --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -0,0 +1,580 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index dfdcc7173..e5ac293ed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2034,6 +2034,26 @@ const routes = [ title: '标准合规评估流程' } }, + { + path: '/phoneXmpg2Step2', + name: 'phoneXmpg2Step22', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/phoneXmpg2Step7', + name: 'phoneXmpg2Step7', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5', From db559920d2ebfc70af2cec5ef62493ab6eb244ea Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 7 Dec 2021 16:28:39 +0800 Subject: [PATCH 4/9] commit --- src/pages/localTool/standardRecognition/index.vue | 8 +++++++- .../workingGroup/components/workingGroup1/index.vue | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index a7cdcad16..656a7b7f0 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -1357,7 +1357,13 @@ export default { this.$http.get('lawss/sarStandAttrDetails/getListData', '', { _this: this }, res => { - this.options = res.data + let option = [] + res.data.map(item => { + if (item.sarType === 'STAND' || item.sarType === 'INLAND_STAND') { + option.push(item) + } + }) + this.options = option }) this.getTableData(); }, diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 8683ac293..3d2e79b8e 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -173,7 +173,7 @@ align="center" width="150"> @@ -262,7 +262,7 @@ align="center" width="150"> Date: Tue, 7 Dec 2021 16:38:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfz/step1.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index fce97e9d6..de65846c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -556,6 +556,9 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.standardSearch.standId = this.selectList[0].id + this.standardSearch.standtextStatus = "3lqnlgmgcn" + this.standardSearch.textStatusBuss = this.selectList[0].textStatusBuss || '--' this.standardSearch.standCode = this.selectList[0].standCode || '--' this.standardSearch.standName = this.selectList[0].standName || '--' this.standardSearch.enName = this.selectList[0].standEnName || '--' @@ -620,6 +623,8 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) + console.log(json); + return this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { From 1b209c7f2b54350cedd50162fd4eb2ab363a89b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 7 Dec 2021 17:07:50 +0800 Subject: [PATCH 6/9] commit --- src/pages/processCenter/pages/creatProcess/qbfz/step1.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index de65846c1..8c8eee2a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -623,8 +623,6 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) - console.log(json); - return this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { From 15b612b970c9abd74fda0758c367401046af21f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 7 Dec 2021 17:12:14 +0800 Subject: [PATCH 7/9] commit --- src/pages/processCenter/pages/creatProcess/qbfs/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 21a407305..a3cdcc630 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -516,6 +516,9 @@ export default { this.fileList = res.data }) }) + this.qbfsForm.standId = this.selectList[0].id + this.qbfsForm.standtextStatus = "3lqnlgmgcn" + this.qbfsForm.textStatusBuss = this.selectList[0].textStatusBuss || '--' this.qbfsForm.entNumber = this.selectList[0].standCode || '--' this.qbfsForm.cnName = this.selectList[0].standName || '--' this.qbfsForm.enName = this.selectList[0].standEnName || '--' From 74576533b2dd6f8a4d4dc86547b5cb688e5e5683 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 7 Dec 2021 17:18:33 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A1.=E6=96=87=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=9C=AC=E2=80=9D=202.=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A6=81=E4=BC=9A=E7=AD=BE=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=94=B9=E4=B8=BA=E2=80=9C=E5=90=A6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 文本信息添加修订本之后需要后端配合才能使功能完善 --- .../pages/creatProcess/bzrk/step1.vue | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index dac43943f..827627e05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -372,6 +372,29 @@ + + +
+
+
{{ item.name }}
+
+
+ + + +
+
+ Date: Tue, 7 Dec 2021 17:24:39 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A1.=E6=96=87=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=9C=AC=E2=80=9D=202.=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A6=81=E4=BC=9A=E7=AD=BE=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=94=B9=E4=B8=BA=E2=80=9C=E5=90=A6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 827627e05..d83c27eb1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -381,7 +381,7 @@ >
-
{{ item.name }}
+
{{ item.name }}
item.response.data.id).join(",") this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") + this.form.xdb=this.xdbFileList.map(item => item.response.data.id).join(",") + this.form.xdbName=this.xdbFileList.map(item => item.name).join(",") + this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") this.form.caName=this.caFileList.map(item => item.name).join(",")