From af5c40f25047ed8db1b9195c94bde37437d2cbec Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 10:30:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B--=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E6=B2=A1=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step2.vue | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index c75b9ef5a..9121f3ef6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -113,22 +113,22 @@ { + this.energyKindOptions = res.data.ENERGYTYPES; //适用车型 + this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别 + this.setMap(res.data.WBZTCLASS);// 文本状态 + this.setMap(this.zrbmMap, res.data.ZRBMCLASS); + this.showLocalProductData(this.getLocalPro); + }, e => { + }); + }, methods: { + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -659,35 +681,13 @@ export default { this.total = res.data.total; }); }, - // 将文本状态的id与name对应 - setMap(data) { - data.forEach(item => { - this.$set(this.textStatusMap, item.value, item.label); - }); - }, }, computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, - mounted() { - this.processTable(); - this.getData(); - // 查询各下拉框数据 - this.$http.get("sys/dictype/getDicTypeListCode", "", { - _this: this, - loading: "loading" - }, res => { - this.energyKindOptions = res.data.ENERGYTYPES; //适用车型 - this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别 - this.standStateOptions = res.data.WBZTCLASS; // 文本状态 - this.setMap(this.zrbmMap, res.data.ZRBMCLASS); - this.setMap(this.standStateOptions); - this.showLocalProductData(this.getLocalPro); - }, e => { - }); - } + }; From 8fb8546e18a96f63153923772d4bc0ff0bdcc238 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 10:31:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B--=E9=80=89=E6=8B=A9=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=B5=B7=E5=A4=96=E7=9A=84=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E5=92=8C=E7=AC=AC=E5=9B=9B=E6=AD=A5=E7=9A=84?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E7=9A=84=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E6=98=BE=E4=B8=8D=E5=AF=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E6=8A=8A=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=94=B9?= =?UTF-8?q?=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 7 +++++-- .../pages/creatProcess/bzrk/step4.vue | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 7a3180554..80759332a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1017,9 +1017,12 @@ + {{$t('m.dataAcquisition')}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 1e730c950..81ad48785 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1020,9 +1020,12 @@ + {{$t('m.dataAcquisition')}} @@ -1061,6 +1064,8 @@ export default { }, data () { return { + textStatus:'',//文本状态 + textStatusMap: {}, // 文本状态id与name对应 countryArr:'', activeName:'1', // 当前流程类型(1待办/2已办) @@ -1765,6 +1770,12 @@ export default { } }) }, +// 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, }, created(){ this.getData() @@ -1794,6 +1805,7 @@ export default { this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.treeStatus = true this.key++ + this.setMap(this.standStateOptions); }) this.busVsFunc() this.modelFunc() From 0f4c0c3fab85b0fe544895076a54c52f8bb2157f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 14:23:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=9A=84=E6=A8=A1=E6=80=81=E6=A1=86=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=8F=98=E7=AA=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/nonConfomity/pages/historicalData.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index db8ee5016..6b4009dc0 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -190,7 +190,7 @@ destroy-on-close :wrapperClosable="false" class="seeHisToryDraw" - size="1000px" + size="600px" >
From c0a0c591ae6bb5de69e8f40ba5e65af9883127a8 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 1 Sep 2021 15:31:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step4.vue | 9 +- .../localProductsOrProjectLibrary/index.vue | 4 +- .../pages/details.vue | 232 +++++++++--------- 3 files changed, 131 insertions(+), 114 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 58698f842..27137d828 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -312,8 +312,13 @@ export default { let listJSON = JSON.parse(JSON.stringify(item.responUserList)) this.dataList = [listJSON][0].standardInfoList } else { - let listJSONInfo = item.info - this.dataList = [listJSONInfo] + if (item.dockUserList !== undefined) { + let listJSON = JSON.parse(JSON.stringify(item.dockUserList)) + this.dataList = listJSON[0].standardInfoList + }else { + let listJSONInfo = item.info + this.dataList = [listJSONInfo] + } } this.dataList.forEach(item => { if (item.fileText.length !== 0) { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 1552eadb4..f5c7c0a1d 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -398,7 +398,7 @@ export default { // 相关人员姓名 }, // 新增编辑弹窗里的数据 - localProEODefault: { + /* localProEODefault: { // 项目相关人员 userEOList: [], // 产品代码 @@ -460,7 +460,7 @@ export default { // 相关人员信息 relatePersonShow: "" // 相关人员姓名 - }, + },*/ //查询3类 projectLibrarySearch: { // 项目名称 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 0256f9035..c5ea2c3d1 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -14,10 +14,16 @@ 项目编号: {{ localProEO.projectNumber }} -
{{ localProEO.projectName }}
+
+ {{ localProEO.projectName }} +
-
项目名称: {{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}
-
项目名称: {{localProEO.projectName}}
+
+ 项目名称: {{ + localProEO.projectName && localProEO.projectName.substring(0, 15) + "..." + }}
+
项目名称: {{ localProEO.projectName }} +
项目分类:{{ localProEO.projectClassification }} @@ -32,52 +38,56 @@ 项目经理: {{ localProEO.uname }} 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} + class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} + class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
- - - - 导出 - -
- - + + + 清单版本: {{ }} + + + 导出 + + + +
+ type="selection" + width="55" + align="center">