diff --git a/src/common/preview/index.js b/src/common/preview/index.js index f0982ca45..ba2aaf535 100644 --- a/src/common/preview/index.js +++ b/src/common/preview/index.js @@ -13,7 +13,7 @@ export default attId => { if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){ window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){ - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) + window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) }else { const nowTime = new Date().getTime() // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index 4cf465f31..d21d8e051 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -36,22 +36,22 @@
+ + + + + + + - - - - - - - {{ getPrcNameFilter(item) }} {{ getPrcNameFilter(item).substring(0, 24) + '...' }} + style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 17785de35..83e34a0ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1031,6 +1031,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.dataList = this.dataList this.listForm.fileName = this.fileInfoList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index efa751b11..4b32a2bf2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -368,6 +368,7 @@ export default { }, e => { }); }, + //预览 clickButtonToUpload2(file) { const attId = file this.$preview(attId) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 47d288c5e..61ad3c71c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -559,9 +559,14 @@ export default { }, res => { this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 + res.data.BUSSSTANDCLASS.forEach(item => { + if(item.label){ + this.standSortOptions.push(item) //企标类别 + } + }) }) if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){ this.$http.get('/lawss/activiti/saveEditFile', { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 9396af382..315f128cc 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -404,12 +404,6 @@ export default { addList() { this.loading = true dicTypeData().then(res => { - if (this.pageNo !== undefined) { - this.queryUnqualidiedData.current = this.pageNo - } - if (this.size !== undefined) { - this.queryUnqualidiedData.size = this.size - } this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records @@ -631,6 +625,7 @@ export default { }, //未整改项抽屉中的查询按钮 getTableByPage() { + this.queryUnqualidiedData.current = 1 this.addList() }, // 清空 查询条件 @@ -642,12 +637,12 @@ export default { }, // 分页事件 pageChange(page) { - this.pageNo = page - this.getTableByPage() + this.queryUnqualidiedData.current = page + this.addList() }, pageSizeChange(pageSize) { - this.size = pageSize - this.getTableByPage(pageSize) + this.queryUnqualidiedData.size = pageSize + this.addList() }, } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index d5a8ab8c0..9965a63e3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -740,7 +740,7 @@ export default { this.standInfoTableLoading = true if(this.sarAccessEO.sortKey === '1'){ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, ...this.standardForm, id: this.pageId, types: '1', @@ -762,13 +762,13 @@ export default { item.zrbm = null } if (item.zccssrqgj === "undefined") { - item.zccssrqgj = '-' + item.zccssrqgj = '' } if (item.xcxssrqgj === "undefined") { - item.xcxssrqgj = '-' + item.xcxssrqgj = '' } - if (item.ssrq === "undefined") { - item.ssrq = '-' + if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) { + item.ssrq = '' } }); this.standinfoList = res.data.records; @@ -791,7 +791,7 @@ export default { }); }else{ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, ...this.standardForm, id: this.pageId }, { @@ -833,7 +833,7 @@ export default { }, selectInfoMore() { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, id: this.pageId }, { _this: this @@ -1077,7 +1077,7 @@ export default { this.showQueryMore = true; this.page = 1; this.standardForm.page = 1; - this.selectInfoMore(); + // this.selectInfoMore(); }, queryInfo() { this.page = 1; @@ -1086,11 +1086,11 @@ export default { this.isAdvancedSearch = false; }, backInfo() { - this.standardFormList.standName = ""; - this.standardFormList.typeApplicable = ""; - this.standardFormList.nylx = ""; - this.standardFormList.zrbm = ""; - this.standardFormList.sycpx = ""; + this.sarAccessInfo.standName = ""; + this.sarAccessInfo.typeApplicable = ""; + this.sarAccessInfo.nylx = ""; + this.sarAccessInfo.zrbm = ""; + this.sarAccessInfo.sycpx = ""; this.isAdvancedSearch = false; }, // 获取工作组信息下拉框信息