From 7efa110ee1989287f8033b57d18c3635e1da2229 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 25 Mar 2025 16:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/finishAndDetails.vue            |  2 +-
 .../csotSettlement/component/finishTable.vue  |  2 +-
 .../cost/csotSettlement/costApplyList.vue     | 54 ++++++++++---------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index 6783c43..fe8e3ee 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_prop: 'startTime', t_label: '起租日期',t_slot: 't_date' },
                 { 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 18c6b87..c03a391 100644
--- a/src/views/cost/csotSettlement/component/finishTable.vue
+++ b/src/views/cost/csotSettlement/component/finishTable.vue
@@ -92,7 +92,7 @@
                 v-for="(t, index) in tableColumns"
                 :key="index"
                 :label="t.t_label"
-                :width="t.t_slot === 't_date' ? '180' : ''"
+                :width="t.t_slot === 't_date' ? '130' : ''"
                 show-overflow-tooltip
             >
                 <template slot-scope="scope">
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index 8ffb8c2..0178e3d 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -12,12 +12,10 @@
             >
                 <el-form-item label="结算单位"  prop="unitId">
                     <el-select
-                        v-model="unitIds"
+                        v-model="queryParams.unitId"
                         placeholder="请选择往来单位"
                         clearable
                         filterable
-                        multiple
-                        collapse-tags
                         @change="unitChange"
                     >
                         <el-option
@@ -29,11 +27,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="结算工程" prop="projectIds">
-                    <!-- <el-select
-                        v-model="queryParams.projectId"
+                    <el-select
+                        v-model="projectIds"
                         placeholder="请选择工程名称"
                         clearable
                         filterable
+                        multiple
+                        collapse-tags
                         @change="proChange"
                     >
                         <el-option
@@ -42,14 +42,7 @@
                             :label="item.projectName"
                             :value="item.projectId"
                         />
-                    </el-select> -->
-                    <el-cascader
-                        v-model="queryParams.projectIds"
-                        :options="projectList"
-                        :props="{ checkStrictly: true, multiple: true, label: 'projectName', value: 'projectId' }"
-                        clearable
-                        filterable
-                    ></el-cascader>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="结算状态" prop="sltStatus">
                     <el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态" clearable filterable>
@@ -209,6 +202,11 @@ export default {
             },
             // 结算单位ids
             unitIds: [],
+            // 结算工程ids
+            projectIds: [],
+            //判断结算工程是否是数组样式
+            isArray:false,
+            
             // 批量导出月结明细弹框
             exportDialogVisible: false,
             // 月结记录弹框
@@ -234,21 +232,24 @@ export default {
         //获取结算单位下的结算工程
         unitChange(val){
             console.log("xxxxxxxxxx",val)
-            if(val.length==0){
-                setTimeout(()=>{
-                    this.getProjectList()
-                },500) 
+            if(!val){
+                console.log("yyyyyyyy")
+                this.projectIds = [];
+                this.queryParams.unitId=null
+                this.getUnitList()
+                this.getProjectList()
+                // this.GetProData()
                 return
             }
             setTimeout(()=>{
-                this.queryParams.projectId=null
+                
                 this.GetProData()
             },500)  
         }, 
         //获取结算工程下的结算单位
         proChange(val){
             console.log("xxxxxxxxxx",val)
-            if(!val){
+            if(val.length==0){
                 setTimeout(()=>{
                     this.getUnitList()
                 },500) 
@@ -261,9 +262,8 @@ export default {
 
         // 获取 工程名称 列表数据
         async GetProData() {
-                const unitIdsAsNumbers = this.unitIds.map(id => Number(id));
                 const params = {
-                    unitIds: unitIdsAsNumbers,
+                    unitId: this.queryParams.unitId,
                 }
                 const res = await getProjectListByUnitIds(params)
                 this.projectList = res.data;
@@ -271,9 +271,8 @@ export default {
         },
         // 获取 单位名称 列表数据
         async GetUnitData() {
-
                 const params = {
-                    projectId: this.queryParams.projectId,
+                    projectIds: this.projectIds,
                 }
                 const res = await getUnitListByProjetctIds(params)
                 this.unitList = res.data;
@@ -297,6 +296,7 @@ export default {
             getProjectList().then((response) => {
                 this.projectList = response.data
             })
+            console.log("uuuuuuuuuu",this.projectList)
         },
 
         /** 查询字典类型列表 */
@@ -304,8 +304,8 @@ export default {
             console.log('🚀 ~ getList ~ :', this.queryParams)
             this.loading = true
             const params = {
-                unitIds: this.unitIds,
-                projectId: this.queryParams.projectId,
+                projectIds: this.projectIds,
+                unitId: this.queryParams.unitId,
                 sltStatus: this.queryParams.sltStatus, 
                 pageNum: this.queryParams.pageNum,
                 pageSize: this.queryParams.pageSize,
@@ -328,8 +328,10 @@ export default {
         /** 重置按钮操作 */
         resetQuery() {
             this.dateRange = []
-            this.unitIds = []
+            this.projectIds = []
             this.resetForm('queryForm')
+            this.getUnitList()
+            this.getProjectList()
             this.handleQuery()
         },
         //结算申请