diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 02ab1fba8..9ee43b9b3 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -542,6 +542,7 @@ // this.gData[0].isLeaf = false this.defaultExpandedKeys = [this.departId] if (num == 1) { + console.log(this.personneQuery) 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(',') diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 9cad696d6..a61672efa 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -448,6 +448,7 @@ :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}" :personneQuery="formInline" :isSingleChoice="true" + v-if="visible" @change="PersonnelSelectionChange" :disabled="disabled" v-model="formInline.dutyPersonName"/> @@ -644,7 +645,6 @@ this.title = this.$t('edit') this.$nextTick(() => { this.formInline = {...this.formInline} - console.log(this.formInline) this.$refs.ruleForm.clearValidate() }) }, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 8b6819668..7cb70fb38 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -280,7 +280,9 @@ - + @@ -291,10 +293,12 @@ {{$t('yes')}} @@ -312,7 +316,7 @@ v-if="record.deliveryResult && record.valueType == 'file'"> {{$t('viewFile')}} - + {{record.deliveryResult}} @@ -658,7 +662,7 @@ align: 'left', dataIndex: 'deliveryResult', width: 180, - // ellipsis: true, + ellipsis: true, scopedSlots: { customRender: 'DeliverablesResult' } }, { @@ -720,13 +724,15 @@ isDisplayNum: 2, long: '', toDoIds: [], - toDoNotConditions: [] + toDoNotConditions: [], + userInfoQuery: {} } }, mounted() { // this.getList() this.long = localStorage.getItem('language') || 'zh-cn' this.loading = true + this.userInfoQuery = this.userInfo() this.getProcessStatus() this.getRoleByUserId(() => { this.getAndUserId() @@ -1444,6 +1450,12 @@ this.dataSource = [...this.dataSource] this.preservationClick() }, + deliveryBlur() { + this.preservationClick() + }, + deliveryChange() { + this.preservationClick() + }, CertificationProgressClick(val) { let item = JSON.parse(JSON.stringify(val)) item.roleCode = this.roleSwitchingCode