From d5586314922d63117a391f031a5013a7b82fab4a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 15:56:19 +0800 Subject: [PATCH 1/6] =?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/pages/processCenter/pages/phone/bzhHd-ch/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue | 2 +- src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue | 6 +++--- src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 3b738d887..cacd45882 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -60,7 +60,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -415,7 +415,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 135vh; + min-width: 90vh!important; padding-top: 15px; padding-left: 30px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue index 0a7418d9c..770ea59ad 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -60,7 +60,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -415,7 +415,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding-top: 15px; padding-left: 30px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue index 9c5498e11..be4341f0c 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -62,7 +62,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -478,7 +478,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding-top: 15px; padding-left: 30px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue index 5527083c6..e303ba5c6 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -456,7 +456,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding-top: 15px; padding-left: 30px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index 7cbbefc03..3c97c30ac 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -67,7 +67,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -422,7 +422,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding: 15px; .comityTel_btn { diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index 2de460504..44117ee36 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -67,7 +67,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -110,7 +110,7 @@ @@ -457,7 +457,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding: 15px; .comityTel_btn { diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index 015ec1db8..2e51410a7 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -69,7 +69,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -114,7 +114,7 @@ @@ -470,7 +470,7 @@ export default { padding: 10px 0px 10px 10px; } .content_form { - min-width: 90vh; + min-width: 90vh!important; padding: 15px; .comityTel_btn { From a5cf672a7c5413c022b9d6e4fb6ba4d184fcf77e 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 16:17:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step7.vue | 42 -- .../processCenter/pages/phone/xmpg/step2.vue | 2 +- .../processCenter/pages/phone/xmpg2/step2.vue | 499 +++++++++++++++ .../processCenter/pages/phone/xmpg2/step7.vue | 580 ++++++++++++++++++ src/router/index.js | 20 + 5 files changed, 1100 insertions(+), 43 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step2.vue create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step7.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 9d55151cc..8f1018e18 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -113,10 +113,6 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + +
+ + + + + + + + + + +
+
+ 隐藏基础信息 + 展开基础信息 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + 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 3/6] 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 4/6] =?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 5/6] 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 6/6] 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 || '--'