From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue |   52 +++++++++++++++++++++++++---------------------------
 1 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue b/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
index b1e380a..078d375 100644
--- a/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
+++ b/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
@@ -55,7 +55,7 @@
             :data="form.items" ref="itemsCrudRef"
         >
           <template #unit="{row}">
-            <el-select  v-model="row.unit" :disabled="scope.disabled" placeholder="璇烽�夋嫨璁¤垂鍗曚綅">
+            <el-select  v-model="row.unit" :disabled="scope.disabled || !rowKeys.includes(row.rowKey)" placeholder="璇烽�夋嫨璁¤垂鍗曚綅">
               <el-option
                   v-for="dict in sys_unit"
                   :key="dict.value"
@@ -65,10 +65,10 @@
             </el-select>
           </template>
           <template #price="{row}">
-            <el-input v-model="row.price" :min="1" :disabled="scope.disabled" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
+            <el-input v-model="row.price" :min="1" :disabled="scope.disabled || !rowKeys.includes(row.rowKey)" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
           </template>
           <template #currency="{row}">
-            <el-radio-group v-model="row.currency"  :disabled="scope.disabled">
+            <el-radio-group v-model="row.currency"  :disabled="scope.disabled || !rowKeys.includes(row.rowKey)">
               <el-radio
                   v-for="dict in sys_currency"
                   :key="dict.value"
@@ -173,7 +173,7 @@
               });
             }
           },
-          type: 'table',suffixIcon:'search',
+          type: 'table',suffixIcon:'search',dataType: 'string',
           children:{
             border: true,
             searchMenuSpan: 5,
@@ -456,39 +456,34 @@
     }
   },
   rowSaveBegin:(row:any,loading:any)=>{
-      if (selectionList2.value.length == 0){
-        proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
-        loading();
-        throw new Error("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
+      if (selectionList2.value.length > 0){
+        let filter = selectionList2.value.filter((item:any)=>{
+          return !item.price || !item.currency
+        });
+        if (filter.length > 0){
+          proxy.$modal.msgError("璇峰～鍐欐墍鏈夊繀濉」");
+          loading();
+          throw new Error("璇峰～鍐欐墍鏈夊繀濉」")
+        }
+        row.quoteItems = selectionList2.value;
 
       }
+
+
+  },
+  rowUpdateBegin(row:any,loading:any){
+    if (selectionList2.value.length > 0){
       let filter = selectionList2.value.filter((item:any)=>{
-         return !item.price || !item.currency
-       });
+        return !item.price || !item.currency
+      });
       if (filter.length > 0){
         proxy.$modal.msgError("璇峰～鍐欐墍鏈夊繀濉」");
         loading();
         throw new Error("璇峰～鍐欐墍鏈夊繀濉」")
       }
       row.quoteItems = selectionList2.value;
-
-  },
-  rowUpdateBegin(row:any,loading:any){
-    if (selectionList2.value.length == 0){
-      proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
-      loading();
-      throw new Error("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
-
     }
-    let filter = selectionList2.value.filter((item:any)=>{
-      return !item.price || !item.currency
-    });
-    if (filter.length > 0){
-      proxy.$modal.msgError("璇峰～鍐欐墍鏈夊繀濉」");
-      loading();
-      throw new Error("璇峰～鍐欐墍鏈夊繀濉」")
-    }
-    row.quoteItems = selectionList2.value;
+
   },
   handleEndOpenFunc:(type:string,res:any)=>{
     if (type === 'edit'){
@@ -521,8 +516,11 @@
 const goToDetail = (row?:any) => {
   router.push("/collectionTmsQuotePlan/collectionTmsQuotePlanItem?quotePlanType=0&quotePlanId=" + row.id);
 }
+
+const rowKeys = ref<any>([]);
 const selectionChange2 = (selection?: any[]) => {
   selectionList2.value = selection;
+  rowKeys.value = selection?.map((item:any)=>item.rowKey);
 }
 
 

--
Gitblit v1.8.0