From 3ff220d73b548dd7ca88b7cc32b79d3b3112788d Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 15 八月 2025 18:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue |   66 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
index 4bd13f5..4cb5738 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
@@ -148,6 +148,9 @@
 } from "@/api/cwgl/estimatedReceivableBill";
 import useCurrentInstance from "@/utils/useCurrentInstance";
 import { computed, reactive, ref, toRefs } from "vue";
+import {
+  getSelectCustomNam,
+} from "@/api/cwgl/pendingSettlementBusiness";
 import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
 import { usePagePlus } from "@/hooks/usePagePlus";
 import { hasPermission } from "@/utils/permissionUtils";
@@ -232,15 +235,15 @@
         }
       ],
     },
+
     customerName: {
       label: '瀹㈡埛鍚嶇О',
-      rules: [
-        {
-          required: true,
-          message: "瀹㈡埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
       search: true,
+      minWidth: 220,
+      search: true,
+      type: 'select',           // 璁剧疆涓轰笅鎷夋绫诲瀷
+      dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
+      disabled: false  // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
     },
 
     dispatchCount: {
@@ -350,9 +353,9 @@
     },
     handleSelectionChangeFunc: (selection: any) => {
       selectionList.value = selection;
-    }, 
-    
-    
+    },
+
+
   })
 const dialog = reactive({
   visible: false,
@@ -424,11 +427,27 @@
 }
 const newFormRef = ref();
 const submitForm = () => {
-  if(newTableData.value.length == 0) {
+  if (newTableData.value.length == 0) {
     proxy.$message.error('鏃犲叧鑱旀槑缁嗭紝鏃犳硶缁撶畻');
-  }else {
+    return; // 娣诲姞 return 涓柇鎵ц
+  } else {
     newFormRef.value!.validate(valid => {
       if (valid) {
+        // 娣诲姞鏍￠獙閫昏緫锛氭湰娆＄粨绠楅噾棰濅笉鑳藉ぇ浜庡簲缁撶畻閲戦
+        const settlementAmount = parseFloat(newForm.value.settlementAmount);
+        const totalAmount = parseFloat(importForm.value.totalAmount);
+
+        // 妫�鏌ヨ緭鍏ユ槸鍚︿负鏈夋晥鏁板瓧
+        if (isNaN(settlementAmount) || isNaN(totalAmount)) {
+          proxy.$message.error('閲戦鏍煎紡涓嶆纭�');
+          return;
+        }
+
+        if (settlementAmount > totalAmount) {
+          proxy.$message.error('鏈缁撶畻閲戦涓嶈兘澶т簬搴旂粨绠楅噾棰�');
+          return; // 鍏抽敭锛氬湪杩欓噷娣诲姞 return 涓柇鍚庣画鎵ц
+        }
+
         let data = {
           billId: newForm.value.id,
           fileName: newForm.value.attachment
@@ -441,24 +460,22 @@
                 proxy.$message.success('鎿嶄綔鎴愬姛');
                 dialog.visible = false;
                 newForm.value = {};
-  
               }
             })
           }
         })
+      } else {
+        // 琛ㄥ崟楠岃瘉澶辫触
+        return false;
       }
     });
   }
-
-
-
 }
-
 const submitFormTow = () => {
   proxy.$modal.confirm(`鏄惁纭淇敼璐﹀崟鍚嶇О?`).then(function () {
     return updateEstimatedReceivableBillNmae(importForm.value);
   }).then((res) => {
-     onLoad(page.value);
+    onLoad(page.value);
     proxy.$modal.msgSuccess(res.msg);
   })
 
@@ -540,6 +557,21 @@
 
   })
 }
+
+const selectCustomName = ref([]);
+const getSelectCustomName = () => {
+  getSelectCustomNam().then((res) => {
+    if (res.code === 200) {
+      // selectCustomName.value = res.data;
+      selectCustomName.value = res.data.map(item => ({
+        dictLabel: item,
+        dictValue: item
+      }));
+      option.value.column.customerName.dicData = selectCustomName.value || [];
+    }
+  })
+}
+getSelectCustomName()
 </script>
 <style scoped>
 ::v-deep .el-descriptions__body .el-descriptions__table.is-bordered .el-descriptions__cell {

--
Gitblit v1.8.0