From b16910e260c804585f2812db6b2da2ad520478c1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 20 四月 2026 11:20:11 +0800
Subject: [PATCH] 湟水峡 1.销售、采购模块不要客户合同号、项目名称

---
 src/views/procurementManagement/procurementLedger/index.vue |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index befc5f7..3b9dc67 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -26,13 +26,6 @@
                       prefix-icon="Search"
                       @change="handleQuery" />
           </el-form-item>
-          <el-form-item label="椤圭洰鍚嶇О锛�">
-            <el-input v-model="searchForm.projectName"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      prefix-icon="Search"
-                      @change="handleQuery" />
-          </el-form-item>
           <el-form-item label="褰曞叆鏃ユ湡锛�">
             <el-date-picker v-model="searchForm.entryDate"
                             value-format="YYYY-MM-DD"
@@ -90,6 +83,11 @@
                                prop="unit" />
               <el-table-column label="鏁伴噺"
                                prop="quantity" />
+              <el-table-column label="鍙敤鏁伴噺"
+                               prop="availableQuality" />
+              <el-table-column label="閫�璐ф暟閲�"
+                               prop="returnQuality" />
+                               
               <el-table-column label="绋庣巼(%)"
                                prop="taxRate" />
               <el-table-column label="鍚◣鍗曚环(鍏�)"
@@ -119,10 +117,6 @@
         <el-table-column label="渚涘簲鍟嗗悕绉�"
                          prop="supplierName"
                           width="160"
-                         show-overflow-tooltip />
-        <el-table-column label="椤圭洰鍚嶇О"
-                         prop="projectName"
-                         width="320"
                          show-overflow-tooltip />
         <el-table-column label="瀹℃壒鐘舵��"
                          prop="approvalStatus"
@@ -233,14 +227,6 @@
                            :label="item.supplierName"
 													 :value="item.id" >{{item.supplierName + '---' + item.supplierType}}</el-option>
               </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="椤圭洰鍚嶇О"
-                          prop="projectName">
-              <el-input v-model="form.projectName"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -541,6 +527,7 @@
               <el-tree-select v-model="productForm.productId"
                               placeholder="璇烽�夋嫨"
                               clearable
+                              filterable
                               check-strictly
                               @change="getModels"
                               :data="productOptions"
@@ -555,6 +542,7 @@
                           prop="productModelId">
               <el-select v-model="productForm.productModelId"
                          placeholder="璇烽�夋嫨"
+                         filterable
                          clearable
                          @change="getProductModel">
                 <el-option v-for="item in modelOptions"
@@ -854,9 +842,6 @@
       if (matchedTemplate.supplierName) {
         form.value.supplierName = matchedTemplate.supplierName;
       }
-      if (matchedTemplate.projectName) {
-        form.value.projectName = matchedTemplate.projectName;
-      }
       if (matchedTemplate.paymentMethod) {
         form.value.paymentMethod = matchedTemplate.paymentMethod;
       }
@@ -893,7 +878,6 @@
       supplierName: "", // 渚涘簲鍟嗗悕绉�
       purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
       salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
-      projectName: "", // 椤圭洰鍚嶇О
       entryDate: null, // 褰曞叆鏃ユ湡
       entryDateStart: undefined,
       entryDateEnd: undefined,
@@ -901,7 +885,6 @@
     form: {
       purchaseContractNumber: "",
       salesLedgerId: "",
-      projectName: "",
       recorderId: "",
       entryDate: "",
       productData: [],
@@ -917,9 +900,6 @@
       ],
       approverId: [
         { required: true, message: "璇烽�夋嫨瀹℃壒浜�", trigger: "change" },
-      ],
-      projectName: [
-        { required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" },
       ],
       supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -1127,7 +1107,6 @@
         supplierId: form.value.supplierId,
         paymentMethod: form.value.paymentMethod,
         recorderId: form.value.recorderId,
-        projectName: form.value.projectName,
         approveUserIds: approveUserIds,
         templateName: templateName.value.trim(),
       };
@@ -1680,12 +1659,12 @@
   const handleDelete = () => {
     let ids = [];
     if (selectedRows.value.length > 0) {
-      ids = selectedRows.value.map(item => item.id);
+      ids = selectedRows.value.filter(item => item.salesLedgerId === null).map(item => item.id);
     } else {
       proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
       return;
     }
-    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
       confirmButtonText: "纭",
       cancelButtonText: "鍙栨秷",
       type: "warning",

--
Gitblit v1.9.3