diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 6d892b758..ade7948c6 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -106,7 +106,7 @@ export default { allowType: { type: Array, default: () => { - return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX'] + return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG'] } }, // 栅格比例 diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 035e015d2..1fa58e39b 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -69,7 +69,7 @@ {{ child.attrName }} - + 上传时间:{{ dateFormat(file.modifyTime) }}--> 标准分解单 @@ -613,12 +612,11 @@ 标准分解单 - @@ -864,16 +862,21 @@ > - - {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }} - + + + + + + + {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + + { this.sarStandardsInfoEO = res.data || {} - this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList; + this.itemExistList = new Set(this.sarStandardsInfoEO.attrInfoMap.itemExistList) if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') { this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0] } @@ -3697,7 +3700,7 @@ export default { }) },*/ async mounted() { - this.sarStandardsInfoEO.id = this.$route.params.id + this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() this.standItemEO.standId = this.$route.params.id // 从数据库中查询各下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 4c4177c58..b467c212d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -3,7 +3,7 @@ 标准调研流程 - + 批准 基础信息 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 8b1a950c3..9eae4e0a0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -56,19 +56,13 @@ > - + - - + -