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/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/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index dac43943f..d83c27eb1 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 }}
+
+
+ + + +
+
+
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(",") 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 || '--' diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index fce97e9d6..8c8eee2a6 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 || '--' 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") : "" }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - + {{ item.name }} {{ ';' }} - + 计划内 计划外 - + - - - + + + @@ -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/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"> 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',