From 870920f3b46eb80be7e1c99d0019b36f6e055a81 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 28 Mar 2025 18:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking1.vue   | 32 +++++++++----------
 .../picking/apply/component/home1.vue         |  4 +--
 .../picking/auditing/component/home1.vue      |  4 +--
 .../claimAndreturn/picking/outbound/index.vue |  4 +--
 .../component/finishAndDetails.vue            | 13 ++++++--
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 5651a44..4fe79fe 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -58,20 +58,6 @@
       <el-form-item label="协议号" prop="agreementCode">
         <el-input maxlength="50" v-model="queryParams.agreementCode" disabled style="width: 240px"></el-input>
       </el-form-item>
-      <el-form-item label="成套设备" prop="agreementCode">
-        <el-select
-          clearable
-          style="width: 240px"
-          placeholder="请选择成套设备"
-          @change="onChangeWholeTypeName"
-          @remove-tag="onRemoveTag"
-          v-model="queryParams.wholeTypeName"
-          multiple
-          :disabled="isEdit"
-        >
-          <el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="类型名称" prop="status">
         <el-cascader
           filterable
@@ -79,7 +65,7 @@
           :key="propsKey"
           style="width: 240px"
           v-model="deviceType"
-          :show-all-levels="false"
+          :show-all-levels="true"
           ref="deviceTypeCascader"
           :options="deviceTypeTree"
           @change="deviceTypeChange"
@@ -100,6 +86,20 @@
           <el-option v-for="item in typeListDev" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="成套设备" prop="agreementCode">
+        <el-select
+          clearable
+          style="width: 240px"
+          placeholder="请选择成套设备"
+          @change="onChangeWholeTypeName"
+          @remove-tag="onRemoveTag"
+          v-model="queryParams.wholeTypeName"
+          multiple
+          :disabled="isEdit"
+        >
+          <el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="预计领料时间" prop="estimateLeaseTime">
         <el-date-picker
           v-model="queryParams.estimateLeaseTime"
@@ -1174,7 +1174,7 @@ export default {
         this.$message.error('当前设备已添加，不可重复添加！')
         return
       }
-      this.leaseApplyDetails.push({ ...this.selectParams })
+      this.leaseApplyDetails.unshift({ ...this.selectParams })
       console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
     },
   },
diff --git a/src/views/claimAndreturn/picking/apply/component/home1.vue b/src/views/claimAndreturn/picking/apply/component/home1.vue
index d07c58d..87ca225 100644
--- a/src/views/claimAndreturn/picking/apply/component/home1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/home1.vue
@@ -172,14 +172,14 @@
                 align="center"
                 prop="unitName"
                 :show-overflow-tooltip="true"
-                width="150"
+                width="220"
             />
             <el-table-column
                 label="领料工程"
                 align="center"
                 prop="proName"
                 :show-overflow-tooltip="true"
-                width="150"
+                width="220"
             />
             <el-table-column
                 label="协议号"
diff --git a/src/views/claimAndreturn/picking/auditing/component/home1.vue b/src/views/claimAndreturn/picking/auditing/component/home1.vue
index 53865e9..7b21200 100644
--- a/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -114,8 +114,8 @@
                     <span v-if="scope.row.leaseType == 1">长期领用</span>
                 </template>
             </el-table-column>
-            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="130"/>
-            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="130"/>
+            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
+            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
             <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" width="100"/>
             <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" width="120"/>
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index b7e67ea..085a348 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -63,8 +63,8 @@
         :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
       />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
+      <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
+      <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
       <el-table-column
         label="申请数量"
         align="center"
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index b3b965f..bdb7fdb 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -94,7 +94,7 @@
                 size="mini"
                 type="primary"
                 @click="submitComSett"
-                v-if="currRowInfo[0].isSlt == 0"
+                v-if="currRowInfo[0].isSlt == 0 || currRowInfo[0].isSlt == 2"
                 >确认完工结算</el-button
             >
         </el-row>
@@ -268,7 +268,13 @@ export default {
         },
         /** 确认结算 01或03 */
         async submitSell(type) {
-            const agreementIds = [...new Set(this.settleTableData_01.map(item => item.agreementId))];
+            let agreementIds = []
+            if(type == "01"){
+                agreementIds = [...new Set(this.settleTableData_01.map(item => item.agreementId))];
+            }else if(type == "03"){
+                agreementIds = [...new Set(this.settleTableData_03.map(item => item.agreementId))]; 
+            }
+            
             const sellParams = {
                 agreementIds: agreementIds,
                 costBearingParty: type,
@@ -336,7 +342,8 @@ export default {
                     // 3. 组装请求参数
                     const params = {
                         repairIds: repairIds.join(','),
-                        agreementId: this.currRowInfo.agreementId,
+                        agreementIds:[...new Set(this.currRowInfo.map(item => item.agreementId))],
+                        // agreementId: this.currRowInfo[0].agreementId,
                         relation: {
                             leaseCostOne: this.settleTotalPrice_01, // 01承担方费用
                             leaseCostThree: this.settleTotalPrice_03, // 0.承担方