diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 3228a68df..c03f72ed7 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -32,10 +32,9 @@ checkable :loading="loading" :tree-data="gData" - v-model:checkedKeys="selectedKey" - @select="onSelect" @check="onCheck" @expand="onExpand" + v-model:checkedKeys="defaultCheckedKeys" :defaultCheckedKeys="defaultCheckedKeys" :defaultExpandedKeys="defaultExpandedKeys" > @@ -86,9 +85,10 @@ this.queryDepartUserTreeList() this.visible = true }, - onSelect(selectedKeys, info) { - this.selectedKey = selectedKeys - }, + // onSelect(selectedKeys, info) { + // console.log(selectedKeys) + // this.selectedKey = selectedKeys + // }, onCheck(checkedKeys, info) { this.userIds = [] @@ -167,30 +167,25 @@ if (res.success) { this.gData = res.result this.defaultExpandedKeys = [this.departId] - if (this.personneQuery[this.query.db_field_name + '_id']) { - this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name + '_id'].split(',') - this.selectedKey = this.personneQuery[this.query.db_field_name + '_id'].split(',') - } else if (this.personneQuery[this.query.db_field_name]) { - this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name].split(',') - this.selectedKey = this.personneQuery[this.query.db_field_name].split(',') - } else { - this.defaultCheckedKeys = [] - this.selectedKey = [] + if (this.userName && this.userName.length == 0) { + if (this.personneQuery[this.query.db_field_name + 'Name']) { + this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + this.userName = this.personneQuery[this.query.db_field_name].split(',') + } else { + this.userName = [] + } } - if (this.personneQuery[this.query.db_field_name + 'Name']) { - this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',') - } else if (this.personneQuery[this.query.db_field_name]) { - this.userName = this.personneQuery[this.query.db_field_name].split(',') - } else { - this.userName = [] - } - if (this.personneQuery[this.query.db_field_name + '_id']) { - this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',') - } else if (this.personneQuery[this.query.db_field_name]) { - this.userIds = this.personneQuery[this.query.db_field_name].split(',') - } else { - this.userIds = [] + if (this.userIds && this.userIds.length == 0) { + if (this.personneQuery[this.query.db_field_name + '_id']) { + this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + this.userIds = this.personneQuery[this.query.db_field_name].split(',') + } else { + this.userIds = [] + } } + this.defaultCheckedKeys = this.userIds this.treeVisible = true } else { this.gData = [] diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 062459ea3..d6c41ada0 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -129,7 +129,7 @@ @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})" format="YYYY-MM-DD" v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1" - :disabled="true" + :disabled="false" style="width: 100%"/> @@ -148,7 +148,7 @@ @change="dateChange({db_field_name:'implementTime'})" format="YYYY-MM-DD" v-model="formInline.implementTime" - :disabled="true" + :disabled="false" style="width: 100%"/> diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index e483e773b..5f50148c6 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -56,15 +56,15 @@ {{text}} - {{$t('edit')}} + {{$t('edit')}} {{record.state == 2 ? $t('release') : $t('withdraw')}} - {{$t('maintenanceList')}} + {{$t('maintenanceList')}} {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} - {{$t('deleteLib')}} + {{$t('deleteLib')}} diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 4cabb8809..6ed2adc1b 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -1,221 +1,219 @@