diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1866f0943..f29da4ab8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1287,35 +1287,66 @@ export default { this.fileInfoList = [] } this.ListModel = false; - - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", - { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, { - _this: this - }, res => { - if (res.data === null) { - this.dataList = []; - } - this.dataList = res.data.records; - this.dataList.forEach(item => { - if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ - item.xcxssrqgj = '' - }else{ - this.$set(item, "XCXSSRQ", item.xcxssrqgj) - } - if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ - item.zccssrqgj = '' - }else{ - this.$set(item, "ZCCSSRQ", item.zccssrqgj) - } - }) - this.listForm.dataList = this.dataList; - let formId = []; - this.dataList.map(item => { - formId.push(item.id); + //如果是国家地区清单传入types字段对日期进行区分 + if(this.listType === 'country'){ + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", + { id: this.selectedList[0].id, types: '1', page: this.page, Size: this.pageSize }, { + _this: this + }, res => { + if (res.data === null) { + this.dataList = []; + } + this.dataList = res.data.records; + this.dataList.forEach(item => { + if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ + item.xcxssrqgj = '' + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj) + } + if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ + item.zccssrqgj = '' + }else{ + this.$set(item, "ZCCSSRQ", item.zccssrqgj) + } + }) + this.listForm.dataList = this.dataList; + let formId = []; + this.dataList.map(item => { + formId.push(item.id); + }); + this.listForm.inforlist = formId.join(","); + }, e => { }); - this.listForm.inforlist = formId.join(","); - }, e => { - }); + }else{ + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", + { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, { + _this: this + }, res => { + if (res.data === null) { + this.dataList = []; + } + this.dataList = res.data.records; + this.dataList.forEach(item => { + if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ + item.xcxssrqgj = '' + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj) + } + if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ + item.zccssrqgj = '' + }else{ + this.$set(item, "ZCCSSRQ", item.zccssrqgj) + } + }) + this.listForm.dataList = this.dataList; + let formId = []; + this.dataList.map(item => { + formId.push(item.id); + }); + this.listForm.inforlist = formId.join(","); + }, e => { + }); + } this.$refs.detailedSelection.clearSelection() } else { this.$message.warning("请选择一条数据进行带入"); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 3462d36d7..6488e245c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -40,7 +40,7 @@

{{ item.name }} + :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }} { }); }, + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 79cdea8a9..f8ad130b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -40,7 +40,7 @@

{{ item.name }} + :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }} { }); }, + //点击预览 + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index a29b3fab2..c3d7e0ab6 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -40,7 +40,8 @@

{{ item.name }} + :key="item.id" @click="clickButtonToUpload2(item.id)"> + {{ item.name }} { }); }, + //点击预览 + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 99cae6987..edc19d107 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -197,7 +197,7 @@ label="标准名称" > - + - + @@ -503,31 +503,30 @@