diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 7e6982512..7a7ca0779 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -23,7 +23,8 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
0) { info.checkedNodes.forEach(res => { - this.userIds.push(res.data.props.id) + this.userIds.push(res.data.props.id || res.data.props.dataRef.key) this.userName.push(res.data.props.title) }) } @@ -120,15 +123,30 @@ indexclick(event) { this.$emit('input', event.target.value) }, - onChange() { - + onSearch(e) { + this.gData = [] + this.departId = '' + this.visibleTree = false + if (e) { + this.getUserAndDepart() + } else { + this.queryDepartUserTreeList() + } + }, + getUserAndDepart() { + getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => { + this.gData = res || [] + this.visibleTree = true + }) }, onExpand(selectedKeys, val) { - if (val.expanded) { - if (this.departId == val.node.value) { - } else { - this.departId = val.node.value - this.queryDepartUserTreeList() + if (this.searchModel == '' || !this.searchModel) { + if (val.expanded) { + if (this.departId == val.node.value) { + } else { + this.departId = val.node.value + this.queryDepartUserTreeList() + } } } }, diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 825014bf5..a49787aee 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -210,19 +210,19 @@ title: this.$t('scopeOfApplication'), align: 'center', ellipsis: true, - dataIndex: 'shi4Yong4Fan4Wei2' + dataIndex: 'shi4Yong4Fan4Wei2_dictText' }, { title: this.$t('status'), align: 'center', ellipsis: true, - dataIndex: 'state' + dataIndex: 'state_dictText' }, { title: this.$t('correspondingStandard'), align: 'center', ellipsis: true, - dataIndex: 'correspondingStandard' + dataIndex: 'correspondingStandard_dictText' }, { title: this.$t('zoneOfApplication'), @@ -234,7 +234,7 @@ title: this.$t('implementationCategory'), align: 'center', ellipsis: true, - dataIndex: 'implementType' + dataIndex: 'implementType_dictText' }, { title: this.$t('ImplementationDate'), diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4423148ce..1f7c5bbbf 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -40,7 +40,7 @@
-
+
@@ -88,7 +88,12 @@ {{$t('BatchDelete')}}
- +
+
+
+ + {{$t('batSetting')}} +
{{$t('edit')}} {{$t('deleteLib')}} - {{$t('see')}} +