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() 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, 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, }, {