From f84dc68a19c58fb24b46abdd170c57ab003c4884 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 16 Sep 2021 18:45:32 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=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=B8=80=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8E=E9=82=A3=E4=B8=AA=E5=90=8C=E4=B8=80=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1.vue | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 82865c0aa..2f3c48612 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -23,11 +23,11 @@
- - 选择项目 - - - + + + + + + 选择项目 + - - 选择清单 - - + + + + + 选择清单
From bfae837b4fbf4770a9b87f545999523f01b52e1f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 16 Sep 2021 18:50:02 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=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=B8=80=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8E=E9=82=A3=E4=B8=AA=E5=90=8C=E4=B8=80=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-1.vue | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0a6ea27a5..8a5caf37c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -24,11 +24,11 @@
- - 选择项目 - - - + + + + + + 选择项目 + - - 选择清单 - - + + + + + 选择清单
From 77f068cbd55dde40440e57bac2f7dfaa9dae2673 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Sep 2021 19:26:13 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/release/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index 872f0da42..c955ab610 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -67,7 +67,8 @@ this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, { _this: this }, res => { - this.standardReleaseList = res.data + //与下文的循环重复, 会出现重复数据 + // this.standardReleaseList = res.data let arr = res.data arr.forEach(item => { if(item.standName !== ""){ From dcf1f3174dd06f7c5b17b624f9acb9341aa5d2d3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 16 Sep 2021 20:00:22 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E5=BC=80/=E6=94=B6=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 58 +++++++++++++++++++ .../pages/creatProcess/xmpg/step1-2.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step1-7.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step1.vue | 58 +++++++++++++++++++ .../pages/creatProcess/xmpg/step2.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step3.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step4.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step5.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step6.vue | 51 ++++++++++++++++ .../pages/creatProcess/xmpg/step7.vue | 51 ++++++++++++++++ 10 files changed, 524 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 572a56578..a7391f3a1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -401,6 +453,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, //用来判断提交事件条件是否满足 satisfyFlag: true, active: "1", @@ -532,6 +586,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getData() { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue index 3a02b3ed5..6b31ed8fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -191,6 +236,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, detailData: [], // 当前流程类型(1待办/2已办) processType: 1, @@ -266,6 +313,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 06374bbb5..3072c9fe7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -314,6 +359,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -388,6 +435,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 61a3c3345..6d39cf48d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -389,6 +441,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, //用来判断提交事件条件是否满足 satisfyFlag: true, active: "1", @@ -523,6 +577,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, checkedRole(data) { if (this.type === "dockUser") { this.roleForm.dockUser = data[0].id; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5c67efa1b..4e8eba0f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -213,6 +258,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], isTransfer: false, drawerTitle:'', @@ -293,6 +340,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1d3755fc8..5418943f7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -248,6 +293,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, @@ -343,6 +390,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedTransferRole(data) { this.assigneeNewLoading = true; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index f929be1c4..47d7edcca 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -372,6 +417,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], drawerTitle:'', isTransfer: false, @@ -436,6 +483,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 26b190f2d..009fe5701 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -336,6 +381,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], drawerTitle:'', isTransfer: false, @@ -415,6 +462,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index b84dcec69..dba40b6f4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -335,6 +380,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], drawerTitle:'', isTransfer: false, @@ -414,6 +461,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 300c8af2a..0e7ab0fd5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -335,6 +380,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], drawerTitle:'', isTransfer: false, @@ -414,6 +461,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true From 151f67386228c2b0fe24cf88eaae869a7a571433 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 16 Sep 2021 20:24:40 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 9198a2f34..5d1e0cb47 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -154,6 +154,10 @@ prop="productType" width="180" label="产品类型"> + Date: Thu, 16 Sep 2021 20:31:52 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 678e004a8..5e8784304 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -533,15 +533,18 @@ @selection-change="selectAllStand"> + align="center" + width="60" + > - + + + width="170"> @@ -589,6 +600,7 @@ show-overflow-tooltip prop="applyArctic" label="适用车型" + width="90" > - - Date: Thu, 16 Sep 2021 21:29:54 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 856d00ba2..aa2fd3ee6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -89,7 +89,7 @@ tooltip-effect="dark" style="width: 100%" border - :height="tableHeight" + :height="400" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px', fontWeight: 'normal', height: '48px'}" @selection-change="handleSelectionChange"> @@ -102,7 +102,7 @@ show-overflow-tooltip prop="projectPlatfor" align="center" - label="产品平台"> + label="产品平台789"> Date: Thu, 16 Sep 2021 22:13:27 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-7.vue | 12 ++++++++++++ .../pages/creatProcess/xmpg/step1.vue | 3 +++ .../pages/creatProcess/xmpg/step3.vue | 13 +++++++++++++ .../pages/creatProcess/xmpg/step4.vue | 12 ++++++++++++ .../pages/creatProcess/xmpg/step5.vue | 12 ++++++++++++ .../pages/creatProcess/xmpg/step6.vue | 15 ++++++++++++++- .../pages/creatProcess/xmpg/step7.vue | 12 ++++++++++++ 7 files changed, 78 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 3072c9fe7..5b2b323fb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -149,6 +149,18 @@ align="center" label="条款名称"> + + + + = 1) { this.dataList.forEach(item => { @@ -747,6 +749,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); + // localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 5418943f7..a09538cc5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -148,6 +148,16 @@ align="center" label="条款名称"> + + + + + + + + + + + + + + + + { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName - this.dataList = item.dataList + this.dataList = item.step3DTOS this.listForm.id = item.step3DTOS[0].id this.listForm.standName = item.step3DTOS[0].standName this.listForm.standNumber = item.step3DTOS[0].standNumber diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 0e7ab0fd5..3d8169ec3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -149,6 +149,18 @@ align="center" label="条款名称"> + + + + Date: Fri, 17 Sep 2021 13:46:44 +0800 Subject: [PATCH 09/20] commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index ccc396254..cd1fe0fc7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -457,7 +457,7 @@ export default { if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { - unique: data.uniques + unique: data.unique }, {}, res => { res.data.forEach(item => { item.chapterNumber = item.partCode; From f8d975cbaf603b5056f26f88490dfeabf3bebdfb Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 17 Sep 2021 13:56:00 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index aa2fd3ee6..04e9ca393 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -102,7 +102,7 @@ show-overflow-tooltip prop="projectPlatfor" align="center" - label="产品平台789"> + label="产品平台"> Date: Fri, 17 Sep 2021 14:15:41 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E8=AE=B0=E5=BD=95=E4=B8=8A=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=88=86=E5=8F=91=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 15 +++++++++++++-- .../pages/creatProcess/xmpg/step1.vue | 12 ++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index a7391f3a1..baee348f1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -153,8 +153,8 @@ placeholder="请选择分发负责人" readonly @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" - v-if="!scope.row.distributePerson"> - {{ scope.row.distributePerson }} + > + @@ -563,6 +563,7 @@ export default { distributePerson: "", //分发责任人 distributePersonId: "", //分发责任人id id: "", + pastProject: [], //用来存放上次选中的产品线信息 sarStandProjectLibraries: [{ projectManager: "", projectLevel: "", @@ -710,6 +711,7 @@ export default { }, //确认添加事件 okStand() { + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -727,6 +729,14 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; this.listForm.dataList = this.standList; @@ -774,6 +784,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7dde63dce..35783abf5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -686,7 +686,7 @@ export default { }, //确认添加事件 okStand() { - // this.pastProject = JSON.parse(localStorage.getItem('projectList')) + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -704,6 +704,14 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; this.listForm.dataList = this.standList; @@ -749,7 +757,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); - // localStorage.setItem('projectList', JSON.stringify(this.dataList)) + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { From b39f08060aa2ced4f7d250bdaa6af66668ad6616 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 17 Sep 2021 15:18:38 +0800 Subject: [PATCH 12/20] =?UTF-8?q?.=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=EF=BC=9A=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E5=A4=9A=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E2=80=94=E2=80=94.=E4=B8=BA=E5=BE=85=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=84=8F=E6=80=9D=EF=BC=8C=E6=A0=87=E6=B3=A8=E4=B8=BA?= =?UTF-8?q?=E8=93=9D=E8=89=B2=EF=BC=9B=E7=BA=A2=E8=89=B2=E4=B8=BA=E5=BA=9F?= =?UTF-8?q?=E6=AD=A2=EF=BC=9B=E5=85=B6=E4=BB=96=E7=9A=84=E4=B8=BA=E9=BB=91?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 34713ec09..6c452efc7 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -184,10 +184,13 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} - {{ + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} - {{ scope.row.standSortShow }} + {{ + scope.row.standSortShow + }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + {{ scope.row.standSortShow }} {{ scope.row.standNumber }} @@ -198,7 +201,8 @@ > {{ formatIssueDate(scope.row.issueTime) }} -
+
+ {{ formatIssueDate(scope.row.issueTime) }} +
+
{{ formatIssueDate(scope.row.issueTime) }}
@@ -223,7 +230,8 @@ @@ -234,7 +242,8 @@ label="新车型实施日期"> --> From 78879a6f7fc15f4271c2c85f4c56f388fdbc8fa0 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 17 Sep 2021 15:32:25 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E3=80=81=E4=BC=81=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E6=B3=A8=E6=8E=89=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 12 ++++++------ .../components/EnterpriseStandardDatabase.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 3a1df2faf..3df255a30 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -138,11 +138,16 @@ v-btn-permission="'b17f1d035219c47344032e261342d87d'" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项">导出 - 批量删除 + --> + 配置标准 - 配置标准 -
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6d304d8dd..53b162030 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -242,12 +242,12 @@ - 批量删除 + >批量删除--> 导出 - 批量删除 + --> + 配置标准 移除标准 - 模板下载 - - 配置标准 - + v-btn-permission="'4mFaJU3fTS'">模板下载–> + -->
From 41bd922a15e3452ffa8a1447a813d41f8d75c55e Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 17 Sep 2021 16:05:10 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d760a1bce..0eaf5161c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -62,12 +62,12 @@ 导出汇总单 + size="mini">生成汇总单 导出征求意见稿 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见 Date: Fri, 17 Sep 2021 16:11:19 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=9A=E9=99=84=E4=BB=B6=E5=90=8D=E5=AD=97=E6=94=B9=E6=88=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=99=84=E4=BB=B6=EF=BC=9B=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A=E6=A1=86=E5=AD=90=E6=94=BE=E5=A4=A7?= =?UTF-8?q?=E4=B8=80=E7=82=B9=EF=BC=8C=E7=84=B6=E5=90=8E=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=81=9A=E6=88=90=E5=BF=85=E9=80=89=EF=BC=9B=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 +- .../processCenter/pages/creatProcess/bzdy/step1.vue | 2 +- .../processCenter/pages/creatProcess/bzdy/step2.vue | 2 +- .../processCenter/pages/creatProcess/bzdy/step3.vue | 11 +++++++++-- .../processCenter/pages/creatProcess/bzdy/step4.vue | 5 ++++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index eb7cec8e9..085615618 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -60,7 +60,7 @@ - + - + - +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 573bbe5b5..39a96db42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,12 +91,16 @@
- + + @@ -249,6 +253,9 @@ formRules: { fileName: [ { required: true, message: '请上传调研结果', trigger: 'change' }, + ], + dyhz: [ + { required: true, message: '请输入回执说明', trigger: 'change' }, ] }, json: {}, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 330f6ecde..6d2708a05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,6 +91,9 @@ From 1ab7728f77e8d6ef4c1b74d0985e7aa4cf6e6e80 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 17 Sep 2021 16:49:13 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=9A=E9=99=84=E4=BB=B6=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B8=85=E5=8D=95=E8=AF=B4=E6=98=8E=E9=99=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=9B=E4=B8=8B=E9=9D=A2=E7=9A=84=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8A=A0=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 12 ++++++++++-- .../accessStandardsAndRegulations/pages/details.vue | 12 ++++++++++-- .../pages/otherAddEit.vue | 12 ++++++++++-- .../pages/projectAddEit.vue | 12 ++++++++++-- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5a62053a6..03e821061 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -7,7 +7,7 @@
+ label-width="100px"> @@ -42,7 +42,7 @@ >

- + + + {{ sarAccessEO.remark || "-" }}

- +

{{ item.name }} @@ -109,6 +109,14 @@ width="55" align="center"> + + 基础信息

- + @@ -26,7 +26,7 @@ >

- + + +
+ label-width="100px"> @@ -39,7 +39,7 @@ >

- + + + Date: Fri, 17 Sep 2021 17:04:53 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 4 +++- .../components/EnterpriseStandardDatabase.vue | 4 +++- .../foreignStandardsAndRegulations/index.vue | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 3df255a30..62aa53e56 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -182,6 +182,7 @@