diff --git a/src/views/projectFront/firstModelManage/firstModelLedger.vue b/src/views/projectFront/firstModelManage/firstModelLedger.vue index aad80fd0..04a1198c 100644 --- a/src/views/projectFront/firstModelManage/firstModelLedger.vue +++ b/src/views/projectFront/firstModelManage/firstModelLedger.vue @@ -57,12 +57,16 @@ @@ -1072,6 +1076,9 @@ export default { .download { color: #1684fc; cursor: pointer; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .backText { padding: 8px 0; diff --git a/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue b/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue index 4b024795..5fe2c7d9 100644 --- a/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue +++ b/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue @@ -252,7 +252,15 @@ > - + + @@ -1297,7 +1305,12 @@ export default { }; getWorkerInfoList(data).then(res => { if (res.code == 200) { - this.workerListOptions = res.result.records; + this.workerListOptions = res.result.records.map(item => { + return { + ...item, + label: item.workerName + '-' + item.enterpriseName, + } + }); console.log('获取施工人员下拉', this.workerListOptions); } else { this.$message.error(res.message); diff --git a/src/views/projectFront/hazardManage/weekMonthRiskIdentification.vue b/src/views/projectFront/hazardManage/weekMonthRiskIdentification.vue index b5827efd..393497dd 100644 --- a/src/views/projectFront/hazardManage/weekMonthRiskIdentification.vue +++ b/src/views/projectFront/hazardManage/weekMonthRiskIdentification.vue @@ -1167,6 +1167,10 @@ export default { };