From eb4d3e64b100298b59a9f6657b19ec4ef2150bda Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:17:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056644=20=E3=80=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E5=BA=94=E8=AF=A5=E4=B8=8E=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=90=8C=20=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 315 +++++++++++++++--- 1 file changed, 268 insertions(+), 47 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 35d6483b3..47e71cef2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -178,58 +178,113 @@ fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> - - - - - - - - + fixed="left" + width="60" + > + width="90" + label="条款号" + > - - - - - - - - + show-overflow-tooltip + prop="itemName" + min-width="300" + label="条款名称" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + 关闭 + + +
+
+ + {{ + standShowItemEO.itemsNum + }} +
+
+ + {{ + standShowItemEO.itemsName + }} +
+
+ + {{ + standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' + }} +
+
+ + + {{ + standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : '' + }} +
+ +
+ + {{ + standShowItemEO.xccssrq + }} +
+
+ + {{ + standShowItemEO.zccssrq + }} +
+
+ + {{ + standShowItemEO.applyArctic + }} +
+
+ + {{ + standShowItemEO.responsibleUnit + }} +
+
+ + + {{ standShowItemEO.dutyEngineer }} +
+
+ + + {{ standShowItemEO.comparedWithPrevious }} +
+ +
+ + + {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }} + + +
+ +
+ + + {{ standShowItemEO.complianceState }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @@ -296,9 +465,61 @@ sarProStateListDatas: [], // 符合性项目列表数据 sarProStateTableHeight: null, standId: '', // 符合性项目id + showItemInfoModal: false, + standShowItemEO: {}, } }, methods: { + // ... + handleCommand(command) { + switch (command[1]) { + case '查看': + this.handlePreview(command[0]) + break + } + }, + // 分解单-查看 + handlePreview(item) { + this.standShowItemEO = item + this.showItemInfoModal = true + let fileList = [] + item.defaultFileList = [] + + + if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') { + this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0] + } + this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow + // 请求文件信息 + if (item.relevanceFile != null && item.relevanceFile !== '') { + let paramefile = item.relevanceFile + if (paramefile.charAt(paramefile.length - 1) === ',') { + paramefile = paramefile.substring(0, paramefile.length - 1) + } + this.$http.get('att/attFile/getMultiFileInfos', { + fileIds: paramefile + }, { + _this: this + }, res => { + fileList = res.data + if (fileList != null && fileList.length > 0) { + for (let i = 0; i < fileList.length; i++) { + let obj = {name: '', response: {}} + obj.name = fileList[i].oldFileName + obj.response.data = fileList[i] + item.defaultFileList.push(obj) + } + } + this.standShowItemEO = JSON.parse(JSON.stringify(item)) + if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') { + this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0] + } + // let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit) + this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow + }, e => { + }) + } + }, risSubmit () { this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', { standNumber: this.editData.standNumber, From d4f47dbe945eb519cb487632d2dc48403e47f5d6 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:38:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056641=20=E3=80=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=20=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=80=81=E5=BA=93=E4=BB=80=E4=B9=88=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E8=BF=99=E5=B0=B1=E6=98=AF=E4=BB=80=E4=B9=88=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 | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 48c7cac8e..bafe63da6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -181,13 +181,24 @@ - + + @@ -1731,7 +1742,8 @@ export default { countryOptions: [],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 - standStateOptions: [], // 文本状态 + standStateOptions0: [], // 文本状态 - 国内 + standStateOptions1: [], // 文本状态 - 海外 standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 busVppsChildOptions: [], // 车系体系架构子集合 @@ -3482,7 +3494,8 @@ export default { standOptions.push(item) } }) - this.standStateOptions = standOptions // 文本状态 + this.standStateOptions0 = standOptions // 文本状态 + this.standStateOptions1 = res.data.WBZTCLASS this.standSystemOptions = res.data.BZTXCLASS // 标准体系 this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 @@ -3497,7 +3510,8 @@ export default { this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.setMap(this.standStateOptions) + this.setMap(this.standStateOptions0) + this.setMap(this.standStateOptions1) this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { this.getTaskId() From c01d8d3d7078e02bb018322c10a8e85f678f8e9d Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:42:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056634=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BA=A7=E5=93=81=E7=BA=BF=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E9=80=89=E9=A1=B9=E6=9C=89=E5=BE=88=E5=A4=9A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 0797554c9..9ec8c786a 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1387,7 +1387,7 @@ export default { }, //获取产品线数据 getProductData() { - this.$http.get("sarStandProjectLibrary/queryProjectManager", { + this.$http.get("sarStandProjectLibrary/queryProjectManagerXL", { current: 1, PageSize:100, }, {