From 1b9d4bd906b9d625fe98acf95625aad271543c5d Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 11 Apr 2025 17:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=EF=BC=8C=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=88=90=E5=A5=97=E6=98=8E=E7=BB=86=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=BB=93=E7=AE=97=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/claimAndRefund/receive.js | 9 ++++ .../picking/auditing/component/home1.vue | 45 +++++++++++++++++-- .../claimAndreturn/picking/outbound/index.vue | 27 +++++++++-- .../component/finishAndDetails.vue | 2 +- .../csotSettlement/component/finishTable.vue | 11 +++-- 5 files changed, 83 insertions(+), 11 deletions(-) diff --git a/src/api/claimAndRefund/receive.js b/src/api/claimAndRefund/receive.js index 700a18f..154e2ca 100644 --- a/src/api/claimAndRefund/receive.js +++ b/src/api/claimAndRefund/receive.js @@ -182,6 +182,15 @@ export function getLeaseListAllCq(params = {}) { }) } + +export function getLeaseListAllCqTwo(params = {}) { + return request({ + url: '/material/base/tm_task/getLeaseListAllCqTwo', + method: 'get', + params: params, + }) +} + // 领料审核 同意 export function auditLeaseByCompany(params = {}) { return request({ diff --git a/src/views/claimAndreturn/picking/auditing/component/home1.vue b/src/views/claimAndreturn/picking/auditing/component/home1.vue index 7b21200..d128cfc 100644 --- a/src/views/claimAndreturn/picking/auditing/component/home1.vue +++ b/src/views/claimAndreturn/picking/auditing/component/home1.vue @@ -237,9 +237,33 @@ {{ leaseApplyData.code }} - + + + + @@ -288,7 +312,7 @@ import { getLeaseManageListAllCq, getUnitData, getProData, - getLeaseListAllCq, + getLeaseListAllCqTwo, getMaTypeKeepList, } from '@/api/claimAndRefund/receive' import { getInfo } from '@/api/login' @@ -399,6 +423,13 @@ export default { }, components: { vueEasyPrint }, methods: { + setRowClassName({ row }) { + // 如果 maWholeVos 为空，则添加一个 class 来隐藏展开箭头 + if (!row.ctList) { + return "no-expand-row"; + } + return ""; + }, // 获取用户信息 async GetUserInfo() { const res = await getInfo() @@ -538,9 +569,13 @@ export default { this.getMaTypeList(row) }, async getLeaseListAllCq() { - const res = await getLeaseListAllCq({ taskId: this.taskId, maTypeUserId: this.maTypeUserId }) + const res = await getLeaseListAllCqTwo({ taskId: this.taskId, maTypeUserId: this.maTypeUserId }) this.leaseApplyDetails = res.rows[0].leaseApplyDetails + console.log("yyyyyyyyyyyyyy") + if(res.rows[0].ctList){ + this.leaseApplyDetails = this.leaseApplyDetails.concat(res.rows[0].ctList) + } this.leaseApplyData = res.rows[0] console.log('this.leaseApplyData ============', this.leaseApplyData) @@ -673,4 +708,8 @@ export default { width: 60px !important; margin-bottom: 10px; } +/* 隐藏不可展开行的箭头 */ +::v-deep .no-expand-row .el-table__expand-icon { + visibility: hidden; +} diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue index 5b7ddb3..96dd3ff 100644 --- a/src/views/claimAndreturn/picking/outbound/index.vue +++ b/src/views/claimAndreturn/picking/outbound/index.vue @@ -460,9 +460,20 @@ 编号：{{ leaseOutData.code }} --> - - + + + + @@ -644,6 +655,13 @@ export default { this.getList() }, methods: { + setRowClassName({ row }) { + // 如果 maWholeVos 为空，则添加一个 class 来隐藏展开箭头 + if (!row.maWholeVos) { + return "no-expand-row"; + } + return ""; + }, //获取单位 getUnitList() { getUnitData().then((response) => { @@ -899,7 +917,6 @@ export default { this.leaseOutDetailRecord = res.data.leaseOutDetailRecord this.leaseOutData = res.data this.leaseOutData.outTime = res.data.outTime ? new Date(res.data.outTime) : '' - console.log('this.leaseApplyData ============', this.leaseApplyData) }, // 领料单 打印 print() { @@ -1047,4 +1064,8 @@ export default { color: #02a7f0; cursor: pointer; } +/* 隐藏不可展开行的箭头 */ +::v-deep .no-expand-row .el-table__expand-icon { + visibility: hidden; +} diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue index bdb7fdb..4d1519f 100644 --- a/src/views/cost/csotSettlement/component/finishAndDetails.vue +++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue @@ -157,7 +157,7 @@ export default { { t_prop: 'nuitName', t_label: '计量单位' }, { t_prop: 'num', t_label: '数量' }, { t_prop: 'leasePrice', t_label: '台班费单价（元/天）' }, - { t_prop: 'startTime', t_label: '起租日期',t_slot: 't_date' }, + { t_prop: 'startTime', t_label: '起租日期',t_slot: 't_date_start' }, { t_prop: 'endTime', t_label: '终止日期', t_slot: 't_date' }, { t_prop: 'leaseDays', t_label: '应结算天数' }, { t_prop: 'costs', t_label: '应结算金额（元）' }, diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue index c03a391..54d79d9 100644 --- a/src/views/cost/csotSettlement/component/finishTable.vue +++ b/src/views/cost/csotSettlement/component/finishTable.vue @@ -92,11 +92,11 @@ v-for="(t, index) in tableColumns" :key="index" :label="t.t_label" - :width="t.t_slot === 't_date' ? '130' : ''" + :width="t.t_slot === 't_date' || t.t_slot === 't_date_start' ? '130' : ''" show-overflow-tooltip >