From 7ea4c47deb352bc1fcc84c842616a7ef4217fcea Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 29 九月 2026 17:45:06 +0800
Subject: [PATCH] 新疆-融邦 销售台账、采购台账新增付款类别字段(授信账期/先款后货):列表、新增/编辑/详情弹框、审批详情展示

---
 src/views/procurementManagement/procurementLedger/index.vue |  483 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 324 insertions(+), 159 deletions(-)

diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index dad6a26..17b2b1b 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -19,13 +19,6 @@
                       clearable
                       :prefix-icon="Search" />
           </el-form-item>
-          <el-form-item label="閿�鍞悎鍚屽彿锛�">
-            <el-input v-model="searchForm.salesContractNo"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      prefix-icon="Search"
-                      @change="handleQuery" />
-          </el-form-item>
           <el-form-item label="椤圭洰鍚嶇О锛�">
             <el-input v-model="searchForm.projectName"
                       placeholder="璇疯緭鍏�"
@@ -106,22 +99,12 @@
                                prop="specificationModel" />
               <el-table-column label="鍗曚綅"
                                prop="unit" />
-                               <el-table-column label="鍏ュ簱瀹℃牳鐘舵��"
-                               prop="stockInApprovalStatus"
-                               width="120">
-                <template #default="scope">
-                  <el-tag :type="getStockInApprovalStatusType(scope.row.stockInApprovalStatus)"
-                          size="small">
-                    {{ scope.row.stockInApprovalStatus || '--' }}
-                  </el-tag>
-                </template>
-              </el-table-column>
               <el-table-column label="鏁伴噺"
                                prop="quantity" />
               <el-table-column label="鍙敤鏁伴噺"
                                prop="availableQuality" />
               <el-table-column label="閫�璐ф暟閲�"
-                               prop="returnQuality" />
+                               prop="returnQuantity" />
               <el-table-column label="绋庣巼(%)"
                                prop="taxRate" />
               <el-table-column label="鍚◣鍗曚环(鍏�)"
@@ -144,10 +127,6 @@
                          prop="purchaseContractNumber"
                          width="160"
                          show-overflow-tooltip />
-        <el-table-column label="閿�鍞悎鍚屽彿"
-                         prop="salesContractNo"
-                         width="160"
-                         show-overflow-tooltip />
         <el-table-column label="渚涘簲鍟嗗悕绉�"
                          prop="supplierName"
                          width="160"
@@ -155,6 +134,42 @@
         <el-table-column label="椤圭洰鍚嶇О"
                          prop="projectName"
                          width="320"
+                         show-overflow-tooltip />
+        <el-table-column label="閲囪喘绫诲埆"
+                         prop="purchaseCategory"
+                         width="100"
+                         show-overflow-tooltip />
+        <el-table-column label="鎻愯揣鏂瑰紡"
+                         prop="pickupMethod"
+                         width="100"
+                         show-overflow-tooltip />
+        <el-table-column label="閲囪喘娌瑰搧"
+                         prop="purchaseOilProduct"
+                         width="100"
+                         show-overflow-tooltip />
+        <el-table-column label="鐗╂祦鏂瑰紡"
+                         prop="logisticsMethod"
+                         width="100"
+                         show-overflow-tooltip />
+        <el-table-column label="閲囪喘娌瑰簱"
+                         prop="oilDepotName"
+                         width="150"
+                         show-overflow-tooltip />
+        <el-table-column label="瀹㈡埛鍚嶇О"
+                         prop="customerName"
+                         width="150"
+                         show-overflow-tooltip />
+        <el-table-column label="鏈�浣冲埌绔欐棩鏈�"
+                         prop="bestArrivalDate"
+                         width="120"
+                         show-overflow-tooltip />
+        <el-table-column label="閲囪喘鏁伴噺锛堝惃锛�"
+                         prop="purchaseQuantity"
+                         width="120"
+                         align="center" />
+        <el-table-column label="閲囪喘鐢宠璁㈠崟鐘舵��"
+                         prop="purchaseOrderStatus"
+                         width="140"
                          show-overflow-tooltip />
         <el-table-column label="瀹℃壒鐘舵��"
                          prop="approvalStatus"
@@ -167,17 +182,6 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="鍏ュ簱鐘舵��"
-                         prop="stockInStatus"
-                         width="100"
-                         show-overflow-tooltip>
-          <template #default="scope">
-            <el-tag :type="getStockInStatusType(scope.row.stockInStatus)"
-                    size="small">
-              {{ scope.row.stockInStatus || '--' }}
-            </el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="绛捐鏃ユ湡"
                          prop="executionDate"
                          width="100"
@@ -186,11 +190,20 @@
                          width="100"
                          prop="paymentMethod"
                          show-overflow-tooltip />
+        <el-table-column label="浠樻绫诲埆"
+                         width="100"
+                         prop="paymentCategory"
+                         show-overflow-tooltip />
         <el-table-column label="鍚堝悓閲戦(鍏�)"
                          prop="contractAmount"
                          width="200"
                          show-overflow-tooltip
                          :formatter="formattedNumber" />
+        <el-table-column label="瀹為檯鍚堝悓閲戦(鍏�)"
+                         prop="netContractAmount"
+                         width="200"
+                         show-overflow-tooltip
+                         :formatter="(_, __, cellValue) => formatMoney(cellValue)" />
         <el-table-column label="褰曞叆浜�"
                          prop="recorderName"
                          width="120"
@@ -211,7 +224,7 @@
             <el-button link
                        type="primary"
                        @click="openForm('edit', scope.row)"
-                       :disabled="scope.row.stockInStatus === '瀹屽叏鍏ュ簱'">缂栬緫
+                       :disabled="scope.row.approvalStatus === 3">缂栬緫
             </el-button>
             <el-button link
                        type="primary"
@@ -247,21 +260,6 @@
                         clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="閿�鍞悎鍚屽彿锛�"
-                          prop="salesLedgerId">
-              <el-select v-model="form.salesLedgerId"
-                         placeholder="璇烽�夋嫨"
-                         filterable
-                         clearable
-                         @change="salesLedgerChange">
-                <el-option v-for="item in salesContractList"
-                           :key="item.id"
-                           :label="item.salesContractNo"
-                           :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
@@ -290,17 +288,10 @@
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="浠樻鏂瑰紡">
-              <el-input v-model="form.paymentMethod"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="绛捐鏃ユ湡锛�"
-                          prop="executionDate">
+            <el-form-item label="鏈�浣冲埌绔欐棩鏈燂細"
+                          prop="bestArrivalDate">
               <el-date-picker style="width: 100%"
-                              v-model="form.executionDate"
+                              v-model="form.bestArrivalDate"
                               value-format="YYYY-MM-DD"
                               format="YYYY-MM-DD"
                               type="date"
@@ -308,9 +299,32 @@
                               clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="浠樻鏂瑰紡">
+              <el-input v-model="form.paymentMethod"
+                        placeholder="璇疯緭鍏�"
+                        clearable />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
+            <el-form-item label="浠樻绫诲埆锛�"
+                          prop="paymentCategory">
+              <el-select v-model="form.paymentCategory"
+                         placeholder="璇烽�夋嫨"
+                         clearable
+                         style="width: 100%">
+                <el-option label="鎺堜俊璐︽湡"
+                           value="鎺堜俊璐︽湡" />
+                <el-option label="鍏堟鍚庤揣"
+                           value="鍏堟鍚庤揣" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="8">
             <el-form-item label="褰曞叆浜猴細"
                           prop="recorderId">
               <el-select v-model="form.recorderId"
@@ -324,7 +338,19 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="绛捐鏃ユ湡锛�"
+                          prop="executionDate">
+              <el-date-picker style="width: 100%"
+                              v-model="form.executionDate"
+                              value-format="YYYY-MM-DD"
+                              format="YYYY-MM-DD"
+                              type="date"
+                              placeholder="璇烽�夋嫨"
+                              clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="褰曞叆鏃ユ湡锛�"
                           prop="entryDate">
               <el-date-picker style="width: 100%"
@@ -334,6 +360,126 @@
                               type="date"
                               placeholder="璇烽�夋嫨"
                               clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="form-section-title">閲囪喘鍏ュ簱鎻愪氦</div>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鐢宠鎻愪氦鏃堕棿锛�"
+                          prop="applicationSubmitTime">
+              <el-date-picker style="width: 100%"
+                              v-model="form.applicationSubmitTime"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              format="YYYY-MM-DD HH:mm:ss"
+                              type="datetime"
+                              placeholder="璇烽�夋嫨"
+                              clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="閲囪喘绫诲埆锛�"
+                          prop="purchaseCategory">
+              <el-radio-group v-model="form.purchaseCategory"
+                              @change="purchaseCategoryChange">
+                <el-radio value="瀹㈠瓨">瀹㈠瓨</el-radio>
+                <el-radio value="浠e偍">浠e偍</el-radio>
+                <el-radio value="閲囪喘鍏ュ簱">閲囪喘鍏ュ簱</el-radio>
+                <el-radio value="閲囪喘鐩撮攢">閲囪喘鐩撮攢</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鐗╂祦鏂瑰紡锛�"
+                          prop="logisticsMethod">
+              <el-select v-model="form.logisticsMethod"
+                         placeholder="璇烽�夋嫨"
+                         clearable
+                         style="width: 100%">
+                <el-option label="鍘傚閰嶉��"
+                           value="鍘傚閰嶉��" />
+                <el-option label="濮斿鐗╂祦"
+                           value="濮斿鐗╂祦" />
+                <el-option label="瀹㈡埛鑷彁"
+                           value="瀹㈡埛鑷彁" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鎻愯揣鏂瑰紡锛�"
+                          prop="pickupMethod">
+              <el-radio-group v-model="form.pickupMethod">
+                <el-radio value="鏆備笉鎻愯揣">鏆備笉鎻愯揣</el-radio>
+                <el-radio value="鎻愯揣">鎻愯揣</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="閲囪喘娌瑰簱锛�"
+                          prop="oilDepotId">
+              <el-select v-model="form.oilDepotId"
+                         placeholder="璇烽�夋嫨"
+                         clearable
+                         popper-class="oil-depot-select-popper"
+                         style="width: 100%">
+                <el-option v-for="item in oilDepotList"
+                           :key="item.id"
+                           :label="item.depotName"
+                           :value="item.id">
+                  <div class="oil-depot-option">
+                    <div class="oil-depot-option-title">{{ item.depotName }}</div>
+                    <div class="oil-depot-option-line">璐熻矗浜猴細{{ item.chargePerson }}</div>
+                    <div class="oil-depot-option-line">鑱旂郴鐢佃瘽锛歿{ item.phone }}</div>
+                    <div class="oil-depot-option-line">鎵�灞炲叕鍙革細{{ item.company }}</div>
+                    <div class="oil-depot-option-line">鍚敤鏃ユ湡锛歿{ item.enableDate }}</div>
+                  </div>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="瀹㈡埛鍚嶇О锛�"
+                          prop="customerName">
+              <el-input v-model="form.customerName"
+                        placeholder="浠呴噰璐被鍒负浠e偍/閲囪喘鐩撮攢鏃跺彲濉啓"
+                        clearable
+                        :disabled="!['浠e偍', '閲囪喘鐩撮攢'].includes(form.purchaseCategory)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="閲囪喘鏁伴噺锛堝惃锛夛細"
+                          prop="purchaseQuantity">
+              <el-input-number v-model="form.purchaseQuantity"
+                               :precision="0"
+                               :step="1"
+                               :min="0"
+                               placeholder="璇疯緭鍏�"
+                               style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="form-section-title">绯荤粺淇℃伅</div>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="閲囪喘鐢宠璁㈠崟鐘舵�侊細"
+                          prop="purchaseOrderStatus">
+              <el-select v-model="form.purchaseOrderStatus"
+                         placeholder="璇烽�夋嫨"
+                         clearable
+                         style="width: 100%">
+                <el-option label="宸茬敵璇凤紝鏈杞�"
+                           value="宸茬敵璇凤紝鏈杞�" />
+                <el-option label="浠ュ嚭鍘傦紝鏈叆搴�"
+                           value="浠ュ嚭鍘傦紝鏈叆搴�" />
+                <el-option label="宸插叆搴�"
+                           value="宸插叆搴�" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -438,16 +584,6 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="鍏ュ簱瀹℃牳鐘舵��"
-                           prop="stockInApprovalStatus"
-                           width="120">
-            <template #default="scope">
-              <el-tag :type="getStockInApprovalStatusType(scope.row.stockInApprovalStatus)"
-                      size="small">
-                {{ scope.row.stockInApprovalStatus || '--' }}
-              </el-tag>
-            </template>
-          </el-table-column>
           <el-table-column fixed="right"
                            label="鎿嶄綔"
                            min-width="60"
@@ -455,8 +591,7 @@
             <template #default="scope">
               <el-button link
                          type="primary"
-                         @click="openProductForm('edit', scope.row, scope.$index)"
-                         :disabled="scope.row.stockInApprovalStatus === '瀹屽叏鍏ュ簱'">缂栬緫
+                         @click="openProductForm('edit', scope.row, scope.$index)">缂栬緫
               </el-button>
             </template>
           </el-table-column>
@@ -706,7 +841,6 @@
     addOrUpdateSalesLedgerProduct,
     delProduct,
     delLedgerFile,
-    getProductInfoByContractNo,
   } from "@/api/salesManagement/salesLedger.js";
   import {
     addOrEditPurchase,
@@ -714,7 +848,6 @@
     updatePurchaseTemplate,
     createPurchaseNo,
     delPurchase,
-    getSalesNo,
     purchaseListPage,
     productList,
     getPurchaseById,
@@ -722,6 +855,7 @@
     getPurchaseTemplateList,
     delPurchaseTemplate,
   } from "@/api/procurementManagement/procurementLedger.js";
+  import { allOilDepot } from "@/api/basicData/oilDepot.js";
   import useFormData from "@/hooks/useFormData.js";
   const FileList = defineAsyncComponent(() =>
     import("@/components/Dialog/FileList.vue")
@@ -736,8 +870,8 @@
   const modelOptions = ref([]);
   const userList = ref([]);
   const productOptions = ref([]);
-  const salesContractList = ref([]);
   const supplierList = ref([]);
+  const oilDepotList = ref([]);
   const tableLoading = ref(false);
   const recordId = ref();
   const fileListDialogVisible = ref(false);
@@ -769,26 +903,6 @@
       2: "warning", // 瀹℃壒涓� - 姗欒壊
       3: "success", // 瀹℃壒閫氳繃 - 缁胯壊
       4: "danger", // 瀹℃壒澶辫触 - 绾㈣壊
-    };
-    return typeMap[status] || "";
-  };
-
-  // 鑾峰彇鍏ュ簱鐘舵�佹爣绛剧被鍨�
-  const getStockInStatusType = status => {
-    const typeMap = {
-      "寰呭叆搴�": "info", // 寰呭叆搴� - 鐏拌壊
-      "鍏ュ簱涓�": "warning", // 鍏ュ簱涓� - 姗欒壊
-      "瀹屽叏鍏ュ簱": "success", // 瀹屽叏鍏ュ簱 - 缁胯壊
-    };
-    return typeMap[status] || "";
-  };
-
-  // 鑾峰彇鍏ュ簱瀹℃牳鐘舵�佹爣绛剧被鍨�
-  const getStockInApprovalStatusType = status => {
-    const typeMap = {
-      "寰呭叆搴�": "info", // 寰呭叆搴� - 鐏拌壊
-      "鍏ュ簱涓�": "warning", // 鍏ュ簱涓� - 姗欒壊
-      "瀹屽叏鍏ュ簱": "success", // 瀹屽叏鍏ュ簱 - 缁胯壊
     };
     return typeMap[status] || "";
   };
@@ -902,7 +1016,6 @@
     searchForm: {
       supplierName: "", // 渚涘簲鍟嗗悕绉�
       purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
-      salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
       projectName: "", // 椤圭洰鍚嶇О
       entryDate: null, // 褰曞叆鏃ユ湡
       entryDateStart: undefined,
@@ -910,7 +1023,6 @@
     },
     form: {
       purchaseContractNumber: "",
-      salesLedgerId: "",
       projectName: "",
       recorderId: "",
       entryDate: "",
@@ -918,12 +1030,23 @@
       supplierName: "",
       supplierId: "",
       paymentMethod: "",
+      paymentCategory: "",
       executionDate: "",
       isChecked: false,
+      purchaseCategory: "",
+      purchaseOilProduct: "",
+      logisticsMethod: "",
+      pickupMethod: "",
+      oilDepotId: "",
+      customerName: "",
+      bestArrivalDate: "",
+      purchaseQuantity: "",
+      purchaseOrderStatus: "",
+      applicationSubmitTime: "",
     },
     rules: {
       purchaseContractNumber: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+        { required: false, message: "璇疯緭鍏�", trigger: "blur" },
       ],
       projectName: [
         { required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" },
@@ -931,6 +1054,18 @@
       supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
       executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      purchaseCategory: [
+        { required: true, message: "璇烽�夋嫨閲囪喘绫诲埆", trigger: "change" },
+      ],
+      purchaseOilProduct: [
+        { required: true, message: "璇烽�夋嫨閲囪喘娌瑰搧", trigger: "change" },
+      ],
+      oilDepotId: [
+        { required: true, message: "璇烽�夋嫨閲囪喘娌瑰簱", trigger: "change" },
+      ],
+      purchaseQuantity: [
+        { required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "change" },
+      ],
     },
   });
   const { form, rules } = toRefs(data);
@@ -1260,7 +1395,14 @@
   };
   // 涓昏〃鍚堣鏂规硶
   const summarizeMainTable = param => {
-    return proxy.summarizeTable(param, ["contractAmount"]);
+    return proxy.summarizeTable(param, ["contractAmount", "netContractAmount"]);
+  };
+  const formatMoney = value => {
+    if (value === null || value === undefined || value === "") {
+      return "--";
+    }
+    const num = Number(value);
+    return Number.isFinite(num) ? num.toFixed(2) : "--";
   };
   // 瀛愯〃鍚堣鏂规硶
   const summarizeProTable = param => {
@@ -1272,14 +1414,6 @@
   };
   // 鎵撳紑寮规
   const openForm = async (type, row) => {
-    // 缂栬緫鏃舵鏌ュ叆搴撶姸鎬侊紝瀹屽叏鍏ュ簱鏃朵笉鑳界紪杈�
-    if (type === "edit" && row) {
-      if (row.stockInStatus === '瀹屽叏鍏ュ簱') {
-        proxy.$modal.msgWarning("瀹屽叏鍏ュ簱鐘舵�佺殑璁板綍涓嶈兘缂栬緫");
-        return;
-      }
-    }
-
     await getTemplateList();
     await userListNoPage().then(res => {
       userList.value = res.data;
@@ -1293,31 +1427,20 @@
     isTemplateNameDuplicate.value = false;
     try {
       // 骞惰鍔犺浇鍩虹鏁版嵁
-      const [salesRes, supplierRes] = await Promise.all([
-        getSalesNo(),
+      const [supplierRes, oilDepotRes] = await Promise.all([
         getOptions(),
+        allOilDepot(),
       ]);
 
-      salesContractList.value = salesRes || [];
       // 渚涘簲鍟嗚繃婊ゅ嚭isWhite=0 鐨勬暟鎹�
       supplierList.value = (supplierRes.data || []).filter(
         item => item.isWhite === 0
       );
+      oilDepotList.value = oilDepotRes?.data || [];
 
       form.value.entryDate = getCurrentDate();
 
-      if (type === "add") {
-        // 鏂板鏃剁敓鎴愰噰璐悎鍚屽彿
-        try {
-          const purchaseNoRes = await createPurchaseNo();
-          if (purchaseNoRes?.data) {
-            form.value.purchaseContractNumber = purchaseNoRes.data;
-          }
-        } catch (error) {
-          console.error("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�:", error);
-          proxy.$modal.msgWarning("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�");
-        }
-      } else if (type === "edit" && row?.id) {
+      if (type === "edit" && row?.id) {
         // 缂栬緫鏃跺姞杞芥暟鎹�
         currentId.value = row.id;
         try {
@@ -1325,7 +1448,10 @@
           form.value = { ...purchaseRes, stockInStatus: row.stockInStatus };
           fileList.value = purchaseRes.storageBlobVOS || [];
           // 浣跨敤 productList 鎺ュ彛鑾峰彇浜у搧鍒楄〃锛屼互鑾峰彇鍏ュ簱瀹℃牳鐘舵��
-          const productRes = await productList({ salesLedgerId: row.id, type: 2 });
+          const productRes = await productList({
+            salesLedgerId: row.id,
+            type: 2,
+          });
           productData.value = productRes.data || [];
         } catch (error) {
           console.error("鍔犺浇閲囪喘鍙拌处鏁版嵁澶辫触:", error);
@@ -1398,7 +1524,7 @@
 
   // 鎻愪氦琛ㄥ崟
   const submitForm = () => {
-    proxy.$refs["formRef"].validate(valid => {
+    proxy.$refs["formRef"].validate(async valid => {
       if (valid) {
         if (productData.value.length > 0) {
           // 鏂板鏃讹紝闇�瑕佷粠姣忎釜浜у搧瀵硅薄涓垹闄� id 瀛楁
@@ -1417,15 +1543,24 @@
         form.value.storageBlobDTOS = fileList.value;
         form.value.type = 2;
 
-        // 濡傛灉salesLedgerId涓虹┖锛屽垯涓嶄紶閫抯alesContractNo
-        if (!form.value.salesLedgerId) {
-          form.value.salesContractNo = "";
-        }
-
         // 鏂板鏃朵笉浼犻�抜d
         const submitData = { ...form.value };
         if (operationType.value === "add") {
           delete submitData.id;
+        }
+
+        // 濡傛灉閲囪喘鍚堝悓鍙蜂负绌猴紝鍒欐牴鎹綍鍏ユ棩鏈熻嚜鍔ㄧ敓鎴�
+        if (!submitData.purchaseContractNumber) {
+          try {
+            const purchaseNoRes = await createPurchaseNo(submitData.entryDate);
+            if (purchaseNoRes?.data) {
+              submitData.purchaseContractNumber = purchaseNoRes.data;
+            }
+          } catch (error) {
+            console.error("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�:", error);
+            proxy.$modal.msgWarning("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�");
+            return;
+          }
         }
 
         addOrEditPurchase(submitData).then(res => {
@@ -1443,12 +1578,6 @@
   };
   // 鎵撳紑浜у搧寮规
   const openProductForm = async (type, row, index) => {
-    // 缂栬緫鏃舵鏌ヤ骇鍝佸叆搴撳鏍哥姸鎬侊紝瀹屽叏鍏ュ簱鏃朵笉鑳界紪杈�
-    if (type === "edit" && row && row.stockInApprovalStatus === '瀹屽叏鍏ュ簱') {
-      proxy.$modal.msgWarning("瀹屽叏鍏ュ簱鐘舵�佺殑浜у搧涓嶈兘缂栬緫");
-      return;
-    }
-
     productOperationType.value = type;
     productOperationIndex.value = index;
     productForm.value = {};
@@ -1627,16 +1756,12 @@
   };
   // 鍒犻櫎浜у搧
   const deleteProduct = () => {
-    if (productSelectedRows.value.length === 0) {
-      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    if (productData.value.length <= 1) {
+      proxy.$modal.msgWarning("閲囪喘鍙拌处鑷冲皯闇�瑕佷繚鐣欎竴鏉′骇鍝佹暟鎹�");
       return;
     }
-    // 妫�鏌ラ�変腑鐨勪骇鍝佷腑鏄惁鏈夊畬鍏ㄥ叆搴撶殑
-    const hasFullyStocked = productSelectedRows.value.some(
-      row => row.stockInApprovalStatus === '瀹屽叏鍏ュ簱'
-    );
-    if (hasFullyStocked) {
-      proxy.$modal.msgWarning("閫変腑鐨勪骇鍝佷腑鍖呭惈瀹屽叏鍏ュ簱鐨勪骇鍝侊紝鏃犳硶鍒犻櫎");
+    if (productSelectedRows.value.length === 0) {
+      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
       return;
     }
     if (operationType.value === "add") {
@@ -1837,22 +1962,10 @@
       }
     }
   };
-  // 閿�鍞悎鍚岄�夋嫨鏀瑰彉鏂规硶
-  const salesLedgerChange = async row => {
-    console.log("row", row);
-    var index = salesContractList.value.findIndex(item => item.id == row);
-    console.log("index", index);
-    if (index > -1) {
-      await querygProductInfoByContractNo();
-    }
-  };
-
-  const querygProductInfoByContractNo = async () => {
-    const { code, data } = await getProductInfoByContractNo({
-      contractNo: form.value.salesLedgerId,
-    });
-    if (code == 200) {
-      productData.value = data;
+  // 閲囪喘绫诲埆鏀瑰彉锛氫粎浠e偍/閲囪喘鐩撮攢鏃跺鎴峰悕绉板彲鐢紝鍒囨崲鍚庢竻绌�
+  const purchaseCategoryChange = val => {
+    if (!["浠e偍", "閲囪喘鐩撮攢"].includes(val)) {
+      form.value.customerName = "";
     }
   };
 
@@ -1925,6 +2038,18 @@
 </script>
 
 <style scoped lang="scss">
+  // 琛ㄥ崟鍒嗘爮鏍囬锛氳摑鑹茬珫鏉� + 娴呰摑搴曡壊锛岀獊鍑哄垎鍖�
+  .form-section-title {
+    margin: 18px 0 14px;
+    padding: 8px 14px;
+    font-size: 15px;
+    font-weight: 600;
+    color: #1d6fd8;
+    background: linear-gradient(90deg, rgba(64, 158, 255, 0.14), rgba(64, 158, 255, 0.02));
+    border-left: 4px solid #409eff;
+    border-radius: 3px;
+  }
+
   .invalid-row {
     opacity: 0.6;
     background-color: #f5f7fa;
@@ -1942,6 +2067,24 @@
   .select-button-group {
     display: flex;
     align-items: center;
+  }
+
+  // 閲囪喘娌瑰簱涓嬫媺閫夐」锛氬皬鍗$墖鏍峰紡
+  .oil-depot-option {
+    padding: 8px 10px;
+
+    .oil-depot-option-title {
+      font-size: 14px;
+      font-weight: 600;
+      color: #303133;
+      margin-bottom: 4px;
+    }
+
+    .oil-depot-option-line {
+      font-size: 12px;
+      color: #909399;
+      line-height: 1.8;
+    }
   }
 
   // 瀹℃壒浜鸿妭鐐瑰鍣ㄦ牱寮�
@@ -2005,3 +2148,25 @@
     }
   }
 </style>
+
+<style lang="scss">
+  // 涓嬫媺闈㈡澘娓叉煋鍦� body 涓嬶紝闇�鍏ㄥ眬鏍峰紡
+  .oil-depot-select-popper {
+    .el-select-dropdown__item {
+      height: auto;
+      line-height: normal;
+      padding: 4px 0;
+    }
+
+    .oil-depot-option {
+      border: 1px solid #e4e7ed;
+      border-radius: 6px;
+      background-color: #fafbfc;
+
+      &:hover {
+        border-color: #409eff;
+        background-color: #f0f7ff;
+      }
+    }
+  }
+</style>

--
Gitblit v1.9.3