diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6d9bbbb10..3def79693 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,7 +161,7 @@ ...{{ $t('more') }} - + -
+
{{ $t('customize') }}
@@ -868,6 +869,7 @@ isDisplay: true, selectedRowKeys: [], visible: false, + customizevisible: false, formInline: {}, rules: { inventoryAffirmDueDate: [ @@ -1976,9 +1978,16 @@ }) } }) - this.columnsAll.forEach(item => { - this.checkedList.push(item.dataIndex) + this.columnsAll.forEach((item) => { + if(item.children){ + item.children.forEach((val) => { + this.checkedList.push(item.dataIndex,val.dataIndex) + }) + }else { + this.checkedList.push(item.dataIndex) + } }) + console.log(this.checkedList) this.loading = false this.JLoading = false } else { @@ -2061,6 +2070,13 @@ console.log(this.selectedValue,'console.log(this.selectedValue)') this.selectedValue = this.checkedList }, + getcustomize(){ + console.log(11111) + this.customizevisible = true + }, + cancel(){ + this.customizevisible = false + }, handleSubmit(){ let list = [] let uniqueArray = this.selectedValue.filter((item, index, array) => { @@ -2083,10 +2099,12 @@ if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false this.getHeader() } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false + this.customizevisible = false } }) }, @@ -2948,6 +2966,7 @@ align-items: flex-start; } .customize-text-title{ + margin-left: 0; font-size: 14px; font-weight: 400; color: #040B29;