From a4049c3e38fb32249c1eb9e83c0fd270ded1ad9a Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 15:58:58 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 1 + .../pages/technologyInvolveProject.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 887a57d07..38125f7aa 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -293,6 +293,7 @@ export default { this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index daf87f17a..cbdf615b8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -264,6 +264,7 @@ name: "technologyInvolveProject", this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { From b4581b973392bfc9dc11c44e82f6ba48c280401d Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 16:34:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=B0=E9=87=8F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index a5be0b950..beb4d7667 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -264,6 +264,7 @@ export default { item.NameList = NameList }) this.data = res.data + this.total = res.data.length }) }, pageChange (page) { From a76a1ab869d5af8554ca3c97a5d2ae60b0ce029c Mon Sep 17 00:00:00 2001 From: fanlin Date: Mon, 19 Jul 2021 17:15:28 +0800 Subject: [PATCH 3/9] bug --- .../details/otherStandardDetails/index.vue | 20 ++++++- .../pages/creatProcess/bzrk/step1.vue | 57 ++++++++++++------- .../domesticStandardsAndRegulations/index.vue | 46 +++++++++++---- .../foreignStandardsAndRegulations/index.vue | 43 +++++++++----- 4 files changed, 119 insertions(+), 47 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index c82632dd1..97452ae8a 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -52,7 +52,7 @@ - {{ sarStandardsInfoEO.textStatus || '-' }} + {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}

@@ -136,6 +136,13 @@ {{ '-' }} + + {{ child.value ? child.value.substring(0,10) : '-' }} + { + this.$set(this.textStatusMap, item.value, item.label) + }) + console.log(this.textStatusMap, '文本状态的值') + }, statusClick () { let routeUrl = this.$router.resolve({ name: 'standInvolveProjectTwo', @@ -2614,6 +2629,7 @@ export default { this.emergyKindOptions = res.data.ENERGYTYPES this.requestOptions = res.data.REQUESTTYPE this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系 + this.setMap(res.data.WBZTCLASS) // 文本状态 }, e => { }) Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 72064daeb..bbf7f36b9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -532,11 +532,15 @@ > - + + + @@ -1244,15 +1248,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1334,6 +1338,7 @@ sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 + qcdwOption: [], // 起草单位 txlbOptions: [], // 体系类别 data: [], // 标准列表数据 ListForm: {}, // 新增数据 @@ -1446,15 +1451,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1491,6 +1496,14 @@ console.log(bringData) const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw.split(',') + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr.split(',') + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs.split(',') + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm.split(',') + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz.split(',') + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx.split(',') + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx.split(',') + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx.split(',') this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; @@ -2014,7 +2027,7 @@ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 }) this.busVsFunc() this.modelFunc() diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 9b46f8ae4..8f86564ea 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -206,10 +206,13 @@ sortable="custom" width="120px" label="文本状态"> - - + @@ -1094,6 +1102,7 @@ export default { }, data () { return { + textStatusMap: {}, // 文本状态id与name对应 treeList: [], props: { label: 'menuName', @@ -1713,6 +1722,13 @@ export default { watch: { }, methods: { + // 将文本状态的id与name对应 + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + console.log(this.textStatusMap, '文本状态的值') + }, popoverHideBusVs (checkedIds, checkedData) { if(checkedData){ this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code @@ -3944,6 +3960,7 @@ export default { this.categoryConfigOptions = res.data.CATEGORY this.standAttributeList = res.data.RULETYPE this.getGzzOption() + this.setMap(this.standStateOptions) }, e => { }) this.getDomesticStandardTable() From 945f73bbe254ad7b50cd0f80cbc132446d40b216 Mon Sep 17 00:00:00 2001 From: yangzijiao Date: Mon, 19 Jul 2021 17:40:52 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=AD=97?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 31d926fe8..b077e7fbe 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -552,6 +552,9 @@ export default { detailedListName: [ {required: true, message: '清单名称不能为空', trigger: 'blur'}, {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'} + ], + remark: [ + {required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'} ] }, disabledFlag: false, From 7a7dbc1149ca470b55a15b7700825ad4d22e6658 Mon Sep 17 00:00:00 2001 From: yangzijiao Date: Mon, 19 Jul 2021 17:47:06 +0800 Subject: [PATCH 5/9] =?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=BC=96=E8=BE=91=E5=AD=97=E6=95=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index ebe26cb48..567cf4556 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -532,7 +532,8 @@ export default { {required: true, message: '国内/海外不能为空', trigger: 'change'} ], projectName: [ - {required: true, message: '项目名称不能为空', trigger: 'change'} + {required: true, message: '项目名称不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'} ], detailedListName: [ {required: true, message: '清单名称不能为空', trigger: 'blur'}, From 6f391017fef231eb344903486eb211201e0b826a Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 20 Jul 2021 09:19:08 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/page/listOfCountries.vue | 6 +----- .../accessStandardsAndRegulations/page/listOther.vue | 1 - .../accessStandardsAndRegulations/page/listProject.vue | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index cb381e056..901e6f816 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -130,7 +130,6 @@