From 62bab81cb2c6b6406969bf71a3dd2800f66d540e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 21:46:21 +0800 Subject: [PATCH 01/20] xmqdqr --- src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 26c2a7824..028182e51 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -430,6 +430,7 @@ export default { }, qdform: { + projectId:"", projectNumber: "", projectName: "", detailedListName: "", @@ -528,6 +529,7 @@ export default { } else { this.qdform.projectNumber = this.selectProject[0].projectNumber; this.qdform.projectName = this.selectProject[0].projectName; + this.qdform.projectId = this.selectProject[0].id; this.projectModel = false; } From e1208e97acd945a4d43f7ac8d21c352cc6fc3ece Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 6 Dec 2021 06:41:36 +0800 Subject: [PATCH 02/20] feat:FOTON rest --- src/components/CustomFormComponents/File.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 674502230..8cda1ed67 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -356,6 +356,8 @@ export default { console.log(editFileInfo) if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) + }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){ + window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); From 6273e81fa06751caa0b6ee79f03425ddd6e50a91 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 6 Dec 2021 09:23:32 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E5=8F=82=E4=BC=9A=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step3.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step4.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step5.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step6-1.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step6.vue | 2 +- .../pages/creatProcess/bzhHy-ch/step1.vue | 10 ++++++++++ .../pages/creatProcess/bzhHy-ch/step2.vue | 12 +----------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 797572dab..ba81edcbf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -409,8 +409,8 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.fillLeader = '' this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.fillFileList = this.rh_pageData.fillFile this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index a14e003f4..593e411dc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -107,7 +107,7 @@ - + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 12cd6fc57..4169ed788 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -270,6 +270,15 @@ export default { } else if(prcType === '21') { // 参会流程 this.toProcessDetail('bzchStep6-1',row) + } else if(prcType === '23'){ + //企标复审 + this.toProcessDetail('qbzxdjhgkStep1-5',row) + }else if(prcType === '24'){ + //企标废止 + this.toProcessDetail('qbfzStep1-7',row) + }else if(prcType === '25'){ + //企标制修订计划管控 + this.toProcessDetail('qbzxdjhgkStep1-5',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index 1ce65e1db..66643815c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1589,6 +1589,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/qbfsStep1-4', + name: 'qbfsStep1-4', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, //企标废止流程 { path: '/qbfzStep1', @@ -1653,6 +1662,15 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep1-7', + name: 'qbfzStep1-7', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, //企标制修订计划管控流程 { path: '/qbzxdjhgkStep1', @@ -1699,6 +1717,15 @@ const routes = [ title: '企标制修订计划管控流程' } }, + { + path: '/qbzxdjhgkStep1-5', + name: 'qbzxdjhgkStep1-5', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue'), + meta: { + requireAuth: true, + title: '企标制修订计划管控流程' + } + }, // 外部标准化协会入会流程 { path: '/bzrhStep1', From ac36dbfcc4e64f42cca3e233448723ec9458b5a1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 6 Dec 2021 11:05:19 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=A4=9A=E4=B8=AA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 2eeed91c5..8c96408b6 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -270,8 +270,8 @@ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} + style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} + {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} Date: Mon, 6 Dec 2021 13:52:15 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step1.vue | 30 ++++++++++++++-- .../pages/creatProcess/qbfz/step1.vue | 34 ++++++++++++++++--- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 965223069..952d7543c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -207,7 +207,7 @@ type="primary" class="common-button-primary" size="small" - @click="getStandDataBtn"> + @click="getStandDataBtns"> 查询 @@ -225,7 +225,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" @@ -461,6 +461,20 @@ export default { this.getStandDataBtn() this.ListModel = true; }, + getStandDataBtns(){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ + standCode: this.standardSearch.standCode, + standName: this.standardSearch.standName, + page: 1, + pageSize: this.pageSize, + }, { + _this: this, + }, res => { + this.page = 1 + this.standinfoList = res.data.list + this.total = res.data.count + }) + }, //企业标准查询this.standardSearch, getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ @@ -478,6 +492,7 @@ export default { }, //企业标准清空 clearSearch(){ + this.page = 1 this.standardSearch = { standCode: '', standName: '' @@ -792,7 +807,16 @@ export default { width: 210px; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } + .el-table::before { + content: ''; + position: absolute; + background-color: #EBEEF5; + z-index: 0; + } .demo-drawer-content { margin-top: 10px; } diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 3df3dc672..dc828cc1e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -30,7 +30,8 @@ @@ -38,6 +39,7 @@ v-model="standardSearch.standName" placeholder="请输入中文名称" clearable + readonly > @@ -225,7 +227,7 @@ type="primary" class="common-button-primary" size="small" - @click="getStandDataBtn"> + @click="getStandDataBtns"> 查询 @@ -243,7 +245,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" @@ -498,6 +500,20 @@ export default { this.getStandDataBtn() this.ListModel = true; }, + getStandDataBtns(){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ + standCode: this.standardSearch.standCode, + standName: this.standardSearch.standName, + page: 1, + pageSize: this.pageSize, + }, { + _this: this, + }, res => { + this.page = 1 + this.standinfoList = res.data.list + this.total = res.data.count + }) + }, //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ @@ -515,6 +531,7 @@ export default { }, //企业标准清空 clearSearch(){ + this.page = 1 this.standardSearch = { standCode: '', standName: '' @@ -857,7 +874,16 @@ export default { width: 210px; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } + .el-table::before { + content: ''; + position: absolute; + background-color: #EBEEF5; + z-index: 0; + } .demo-drawer-content { margin-top: 10px; } From bc4059dee7d34b33c87a72a687e2f898a094320c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 6 Dec 2021 14:09:01 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=88=86=E9=9A=94=E4=BA=A4=E7=BB=99=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=81=9A=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 6eccce155..70920b1d3 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -439,8 +439,6 @@ export default { }, { _this: this, }, res => { - console.log('608',res) - // console.log('608',res.data.records[0].zccssrq.replace(' 00:00:00','')) // 适用车型转换 for (let a = 0; a < res.data.records.length; a++) { if (res.data.records[a].applyType !== null) { @@ -455,26 +453,6 @@ export default { } } } - for (let i = 0; i < res.data.records.length; i++) { - let putTimeReplaceTimes = res.data.records[i].putTime.length/19 - let ssrqReplaceTimes = res.data.records[i].ssrq.length/19 - let xcxssrqReplaceTimes = res.data.records[i].xcxssrq.length/19 - let zccssrqReplaceTimes = res.data.records[i].zccssrq.length/19 - - for (let j = 0; j < putTimeReplaceTimes; j++) { - res.data.records[i].putTime = res.data.records[i].putTime.replace(' 00:00:00','') - } - for (let j = 0; j < ssrqReplaceTimes; j++) { - res.data.records[i].ssrq = res.data.records[i].ssrq.replace(' 00:00:00','') - } - for (let j = 0; j < xcxssrqReplaceTimes; j++) { - res.data.records[i].xcxssrq = res.data.records[i].xcxssrq.replace(' 00:00:00','') - } - for (let j = 0; j < zccssrqReplaceTimes; j++) { - res.data.records[i].zccssrq = res.data.records[i].zccssrq.replace(' 00:00:00','') - } - - } this.warningTableDatas = res.data.records this.pageConfig.page = res.data.current if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) { From fb6469879661d6073db572508d76c1c5f5d75c0a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Dec 2021 14:14:10 +0800 Subject: [PATCH 13/20] commit --- .../processCenter/pages/phone/bzdy/step7.vue | 442 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 4 +- src/router/index.js | 11 + 3 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzdy/step7.vue diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue new file mode 100644 index 000000000..622d08ba1 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -0,0 +1,442 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 11f67461c..cbc99289a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -547,7 +547,7 @@ export default { }) } else if (row.taskInfo === '部长+对接人审核') { this.$router.push({ - name: 'bzdyStep7', + name: 'phoneBzdyStep7', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -980,7 +980,7 @@ export default { }) } else if (row.taskInfo === '责任人审核') { this.$router.push({ - name: 'phoneBzjdStep4', + name: 'bzjdStep4', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/router/index.js b/src/router/index.js index 1ce65e1db..3c33531e2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1237,6 +1237,17 @@ const routes = [ title: '标准调研流程' } }, + + { + path: '/phoneBzdyStep7', + name: 'phoneBzdyStep7', + component: () => import('@/pages/processCenter/pages/phone/bzdy/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep1-9', name: 'bzdyStep1-9', From e87863fbd2ee41c8418ae8d0ec37faafaa96e98d Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 6 Dec 2021 15:13:43 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/index.vue | 5 +- .../page/listOfCountries.vue | 180 +++++++++-------- .../page/listOther.vue | 186 +++++++++--------- .../page/listProject.vue | 166 ++++++++-------- .../page/listTracking.vue | 127 ++++++------ .../localProductsOrProjectLibrary/index.vue | 24 ++- 6 files changed, 367 insertions(+), 321 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index dee7151d1..ab065ceaf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -124,7 +124,8 @@ export default { @import '~@/assets/styles/mixins'; #accessStandardsAndRegulations { - height: 100%; + //min-height: calc(100% - 20px); + height: inherit; padding: 0 10px; background: #fff; display: flex; @@ -147,7 +148,7 @@ export default { flex-direction: column; .el-tab-pane { - height: 100%; + height: 10px; flex: auto; display: flex; flex-direction: column; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 49b0ddd9d..5f82860d2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -67,95 +67,97 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -394,9 +396,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -404,10 +408,14 @@ export default { position: relative; flex: auto; width: 100%; - height: calc(100% - 110px) !important; + //height: calc(100% - 110px) !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 3faec3093..26a325bda 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -58,98 +58,100 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + + +
数据获取中 @@ -374,9 +376,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -385,8 +389,12 @@ export default { flex: auto; width: 100%; //height: calc(~'100% - 105px - 56px') !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 032525351..2cdd5f528 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -68,88 +68,90 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -427,9 +429,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -438,8 +442,12 @@ export default { flex: auto; width: 100%; //height: calc(~'100% - 105px - 56px') !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 734d5021f..5d8122512 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -57,65 +57,67 @@
数据获取中 - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
数据获取中 @@ -1370,9 +1372,11 @@ export default { @import '~@/assets/styles/style'; @import '~@/assets/styles/mixins'; #listTracking { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; /deep/.el-form-item__label{ color: #333333; } @@ -1382,9 +1386,12 @@ export default { position: relative; flex: auto; width: 100%; - height: calc(100% - 110px) !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index b100be5e9..cfe589da2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -83,13 +83,14 @@ - + @@ -208,6 +209,7 @@ + Date: Mon, 6 Dec 2021 15:19:03 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 6 ++-- .../qbzxdjhgk/component/delay.vue | 10 ++++--- .../qbzxdjhgk/component/establish.vue | 4 +-- .../qbzxdjhgk/component/merge.vue | 14 +++++---- .../qbzxdjhgk/component/rename.vue | 8 +++-- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 12 ++++---- .../pages/creatProcess/qbzxdjhgk/step1.vue | 29 +++++++++++++++++-- .../pages/creatProcess/qbzxdjhgk/step2.vue | 6 ++-- .../pages/creatProcess/qbzxdjhgk/step3.vue | 12 ++++---- .../pages/creatProcess/qbzxdjhgk/step4.vue | 12 ++++---- .../pages/creatProcess/qbzxdjhgk/step5.vue | 12 ++++---- 11 files changed, 80 insertions(+), 45 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 9c254a3a2..6eda29949 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -31,7 +31,7 @@ > - + @@ -47,6 +47,7 @@ - + @@ -88,6 +89,7 @@ - + @@ -47,6 +47,7 @@ - - + + @@ -96,6 +97,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index bf18da11c..f5edd9808 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -191,10 +191,10 @@ export default { {required: true, message: '请输入企标名称', trigger: 'blur'}, ], planStatus: [ - {required: true, message: '请选择计划状态', trigger: 'change'}, + {required: true, message: '请选择计划状态', trigger: 'blur'}, ], reviseStatus: [ - {required: true, message: '请选择制修订状态', trigger: 'change'}, + {required: true, message: '请选择制修订状态', trigger: 'blur'}, ], resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index c22a3a49c..168e4d9bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -532,11 +532,15 @@ export default { this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--' this.standShow = true }else{ - this.qbfsForm.esId2 = this.selectList[0].id || '--' - this.qbfsForm.esName2 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' - this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' - this.standShow2 = true + if(this.qbfsForm.esName1 === this.selectList[0].esName ){ + this.$message.warning('您选择的合并企标已经存在,请更改!') + }else{ + this.qbfsForm.esId2 = this.selectList[0].id || '--' + this.qbfsForm.esName2 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' + this.standShow2 = true + } } this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index f26e7448b..923dfb9f3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -31,7 +31,7 @@ > - + @@ -47,6 +47,7 @@ - + @@ -87,6 +88,7 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 413010df3..167f1f909 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -12,10 +12,11 @@
- + @@ -54,6 +55,7 @@
+ 数据加载中...
@@ -273,7 +275,9 @@ export default { commentText: "", comName: "merge", qbfsForm: {}, + formLoading: false, approvalFlag: false, + showFlag: true, taskId: '', bpnId: '', drawerTitle: "", @@ -316,8 +320,8 @@ export default { if(this.taskId){ this.approvalFlag = true this.processTable() + this.getData(); } - this.getData(); }, methods: { processTable() { @@ -344,6 +348,8 @@ export default { }); }, getData() { + this.formLoading = true + this.showFlag = false return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.$route.query.taskIds, @@ -362,7 +368,25 @@ export default { */ getFormFieldList(item) { this.$nextTick(() => { + switch (item.type){ + case '1': + this.comName = "merge" + break + case '2': + this.comName = "delay" + break + case '3': + this.comName = "cancel" + break + case '4': + this.comName = "rename" + break + case '5': + this.comName = "establish" + break + } this.qbfsForm = item; + this.formLoading = false; this.roleForm.dockUser = item.dockUser; this.roleForm.dockUserName = item.dockUserName; this.roleForm.countersigner = item.countersigner; @@ -446,6 +470,7 @@ export default { if (valid) { this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); + console.log(json); this.$http.get("lawss/activiti/startProcess", { type: "25" }, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index e479a69a8..0026498a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -39,21 +39,21 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 57e57c3f0..de246c9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -36,24 +36,24 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 7fd695344..af33fe90f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -36,24 +36,24 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 903dbd509..cd20356b2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -36,24 +36,24 @@ - + - + - + From 2ebdb180f11bb7bfaa261d386eccca6bf46c0f1e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 6 Dec 2021 15:19:45 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=BC=A0=E6=A0=87=E5=8F=98=E5=B0=8F=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/empennage/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 7463fc5a6..8404410b8 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -13,7 +13,7 @@ style="height: 10px;width: 10px;margin-bottom: 3px" :src="item.icon" v-if="index < 5"> - + {{ item.name.slice(0, 8) + '...' }} {{ item.name }} @@ -33,7 +33,7 @@ style="height: 10px;width: 10px;margin-bottom: 3px" :src="item.icon" v-if="index < 5"> - + {{ item.name.slice(0, 8) + '...' }} {{ item.name }} From f5ab31bdcba38b31cf4553f59a1f74cabe6a03b9 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Dec 2021 15:43:37 +0800 Subject: [PATCH 17/20] commit --- package-lock.json | 327 ++++-------------- package.json | 2 + src/main.js | 6 + .../processCenter/pages/phone/bzjd/step4.vue | 15 +- .../tabComponents/processCenter/index.vue | 2 +- 5 files changed, 85 insertions(+), 267 deletions(-) diff --git a/package-lock.json b/package-lock.json index c672b1df7..197836537 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2663,6 +2663,11 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, + "@popperjs/core": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", + "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==" + }, "@probe.gl/stats": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz", @@ -2940,11 +2945,23 @@ } } }, + "@vant/icons": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.7.1.tgz", + "integrity": "sha512-66LPEq89w4kl258nALZcRNd14eUJC8VajvTJwvZKOaZawz6CUeVZ6ybhedTUhQhRjeA8SyWD7dFt4ALf33Sabw==" + }, + "@vant/popperjs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.1.0.tgz", + "integrity": "sha512-8MD1gz146awV/uPxYjz4pet22f7a9YVKqk7T+gFkWFwT9mEcrIUEg/xPrdOnWKLP9puXyYtm7oVfSDSefZ/p/w==", + "requires": { + "@popperjs/core": "^2.9.2" + } + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", - "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==", - "dev": true + "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==" }, "@vue/babel-helper-vue-transform-on": { "version": "1.0.2", @@ -3596,6 +3613,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4629,182 +4663,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.3.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", - "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -5667,6 +5525,16 @@ "object.assign": "^4.1.0" } }, + "babel-plugin-import": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz", + "integrity": "sha512-1qCWdljJOrDRH/ybaCZuDgySii4yYrtQ8OJQwrcDqdt0y67N30ng3X3nABg6j7gR7qUJgcMa9OMhc4AGViDwWw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.0.0", + "@babel/runtime": "^7.0.0" + } + }, "babel-polyfill": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", @@ -13709,6 +13577,18 @@ "spdx-expression-parse": "^3.0.0" } }, + "vant": { + "version": "2.12.36", + "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.36.tgz", + "integrity": "sha512-+/XRx0MC/fHK2gskC7BMI00Ubrh+C46HtlyBzFGYIauzbQy9IotiuBkBZh+ep15ygXxIpozmudsLlGtX1cfexw==", + "requires": { + "@babel/runtime": "7.x", + "@vant/icons": "^1.7.1", + "@vant/popperjs": "^1.1.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", + "vue-lazyload": "1.2.3" + } + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -13767,93 +13647,10 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz", - "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", - "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", - "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952028&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz", - "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } + "vue-lazyload": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz", + "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==" }, "vue-router": { "version": "3.4.0", diff --git a/package.json b/package.json index c2aab178e..fd13ad923 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "moment": "^2.29.1", "sortablejs": "^1.14.0", "v-charts": "^1.19.0", + "vant": "^2.12.36", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", "vue-contextmenujs": "^1.3.13", @@ -33,6 +34,7 @@ "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", + "babel-plugin-import": "^1.13.3", "less": "^3.13.1", "less-loader": "^5.0.0", "popper.js": "^1.16.1", diff --git a/src/main.js b/src/main.js index e9c9da873..5b6945484 100644 --- a/src/main.js +++ b/src/main.js @@ -39,6 +39,11 @@ moment.suppressDeprecationWarnings = true; // 右键菜单 import Contextmenu from 'vue-contextmenujs' +// vant +import vant from 'vant'; +import 'vant/lib/index.css'; +//vant + import animate from 'animate.css' // 引入路由器 @@ -263,6 +268,7 @@ Vue.use(VueI18n) Vue.use(VueClipboard) Vue.use(Contextmenu) Vue.use(animate) +Vue.use(vant) // Vue.prototype.$echarts = echarts // 原生axios diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index 002c2edbe..d1054735c 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -323,10 +323,14 @@ submitBTNText="同意" > + +
+