diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue index bc012a93b..d43bfe37b 100644 --- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue +++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue @@ -56,8 +56,8 @@ -
- + +
@@ -110,8 +110,8 @@ - -
+
+ diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index b842f62d6..25d27956b 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -846,7 +846,7 @@ 取 消 - 提 交 + 提 交 @@ -1253,6 +1253,7 @@ export default { }, data(){ return{ + submitBtnLoading: false, aiKey:1, qiiKey:1, institutionId: this.$store.getters.userInfo.institutionId, @@ -1881,10 +1882,12 @@ export default { this.questionForm.fileList = this.fileList this.$refs['queForm'].validate((valid) => { if(valid){ + this.submitBtnLoading = true this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm }, { _this: this }, res => { + this.submitBtnLoading = false this.dialogVisible = false this.activeName = "myQue" this.activeType = this.standType @@ -1901,7 +1904,7 @@ export default { this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' }, e => { - + this.submitBtnLoading = false }) }else{ return this.$message.warning('请输入问题') 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/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index f522eb2fc..4afc9a301 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -427,6 +427,7 @@ export default { this.active = name; }, toggleComName(name) { + this.qbfsForm = {} this.comName = name; if(this.comName === 'merge'){ this.toggleType = '1' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index eb149c751..385e9fd5f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -35,12 +35,6 @@ class="icon-download" v-btn-permission="''" /> -

- diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 624b7616d..a7fd987fc 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -511,7 +511,7 @@ export default { update(data) { this.modalType = 2 this.productModal = true - this.productModelAdd = data + this.productModelAdd = JSON.parse(JSON.stringify(data)); // 取消所有的选中效果 this.productTitle = '编辑目录' // const newChild = { id: this.id++, label: 'testtest', children: [] }; diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d1b8e888e..ffd993cd8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1743,8 +1743,8 @@ - - + + @@ -2477,7 +2477,6 @@ export default { GKDW: '', //归口管理部门 SSRQ: '',//实施日期 XCXSSRQ: ''//新车型实施日期 - , ZCCSSRQ: ''//在产车实施日期 , QCDW: ''//起草单位 , NYLX: ''//能源类型 @@ -3845,12 +3844,17 @@ export default { this.sarStandardsSearch.replacedPartStandNum = '' this.sarStandardsSearch.synopsis = '' this.sarStandardsSearch.category = '' + this.sarStandardsSearch.standYear = '' + this.sarStandardsSearch.standEnName = '' this.isAdvancedSearch = false // } else if (flag === 'standCommonlySearch') { this.sarStandardsSearch.standName = '' this.sarStandardsSearch.standNumber = '' this.pageChange(1) this.getDomesticStandardTable(this.sarStandardsSearch) + for (let key in this.advanceSearchMapping) { + this.advanceSearchMapping[key] = '' + } } else if (flag === 2) { // 标准条目搜索 this.standItemSearch.responsibleUnit = '' diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 577591917..8fc0aa784 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -25,7 +25,7 @@ {{ node.label }} - + - + - + @@ -3095,9 +3095,14 @@ export default { this.$set(data, 'show', false) this.$set(data, 'showDel', false) }else { - this.$set(data, 'show', true) - if (data.parentId !== null) { - this.$set(data, 'showDel', true) + if(data.id !== 'qbwdsc'){ + this.$set(data, 'show', true) + if (data.parentId !== null) { + this.$set(data, 'showDel', true) + } + }else{ + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) } } }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index c07a26c1b..c13e6e906 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -841,8 +841,10 @@ const filterList = list.filter(s => s !== 'null'); this.addForm.esMatingRelations = filterList.join(","); }else if(val === 'null'){ - this.addForm.esMatingRelations = ""; + this.addForm.esMatingRelations = null; } + }else { + this.addForm.esMatingRelations = null } } }, diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 8b0537d45..727e5b383 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -577,8 +577,8 @@ - - + + 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..34ea19738 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -883,7 +883,8 @@ export default { }else{ this.addForm.standId = this.standList[0].id this.addForm.standName = this.standList[0].standName - this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear + this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + this.addForm.standSerialNumber += this.standList[0].standYear ? '-' + this.standList[0].standYear : '' this.dialogTableVisible = false if(this.addForm.standName){ this.$refs.addForm.validateField('standName'); @@ -1387,7 +1388,7 @@ export default { }, //获取产品线数据 getProductData() { - this.$http.get("sarStandProjectLibrary/queryProjectManager", { + this.$http.get("sarStandProjectLibrary/queryProjectManagerXL", { current: 1, PageSize:100, }, { diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index fca85967f..2c970c7ba 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -132,7 +132,7 @@ 取 消 - 提 交 + 提 交 @@ -586,6 +586,7 @@ export default { activeName: 'INLAND', activeType: 'INLAND', activestand: '', + isSubmit: false, activeQue: '', standType: 'INLAND', dialogVisible: false, @@ -1035,6 +1036,7 @@ export default { }, //提交问题 queSubmit(){ + this.isSubmit = true if(this.standType === 'OTHER'){ this.questionForm.standardId = this.questionForm.pubQue this.questionForm.standardName = this.questionForm.pubQue @@ -1049,6 +1051,7 @@ export default { _this: this }, res => { this.dialogVisible = false + this.isSubmit = false this.searchBtn() }, e => { diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue index 1c0fe93f9..98105726e 100644 --- a/src/pages/regulatoryRepository/standQA/index2.vue +++ b/src/pages/regulatoryRepository/standQA/index2.vue @@ -320,7 +320,7 @@ 取 消 - 提 交 + 提 交 @@ -766,6 +766,7 @@ export default { {required: true, message: '请输入问题', trigger: 'blur'}, ], }, + queSubmitLading: false, questionSerach:{ classification: 'INLAND', standardName: '', //标准名称 @@ -1226,6 +1227,7 @@ export default { }, //提交问题 queSubmit(){ + this.queSubmitLading = true if(this.standType === 'OTHER'){ this.questionForm.standardId = this.questionForm.pubQue this.questionForm.standardName = this.questionForm.pubQue @@ -1260,15 +1262,18 @@ export default { this.standSearch2() break } + this.queSubmitLading = false this.queSearch() }, e => { }) }else{ + this.queSubmitLading = false return this.$message.warning('请输入问题') } }) }else{ + this.queSubmitLading = false this.$message.warning('请选择至少一条标准') } },