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 1/5] =?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 2/5] =?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">