diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 95cfd3f19..8053df156 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -761,14 +761,14 @@ scopedSlots: { customRender: 'verifyDeliverableTemplateName' } } ] - }, - { - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 260, - scopedSlots: { customRender: 'operation' } } + // { + // title: this.$t('operation'), + // align: 'left', + // fixed: 'right', + // width: 260, + // scopedSlots: { customRender: 'operation' } + // } ], columnsAll: [], columnsFileAll: [ @@ -1998,39 +1998,43 @@ moduleFlag: '法规清单' }).then((res) => { if (res.success) { - this.columnsAll = res.result - for (let j = 0; j < this.columnsAll.length; j++) { - for (let i = 0; i < this.column.length; i++) { - if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { - if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + if (res.result && res.result.length > 0) { + this.columnsAll = res.result + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { - if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else { - if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { - this.columnsAll[j] = this.column[i] + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] + } } } } + } else { + this.columnsAll = this.column } this.columnsAll.push({ title: this.$t('operation'),