From 1464889b1eaab139e7bf85b0d4a46ce7364a0e6e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 20 四月 2026 10:49:11 +0800
Subject: [PATCH] Merge branch 'dev_New' into dev_西宁_湟水峡

---
 src/views/procurementManagement/procurementLedger/index.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 858b633..0543286 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -90,6 +90,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="鍚◣鍗曚环(鍏�)"
@@ -157,6 +162,10 @@
                          prop="entryDate"
                          width="100"
                          show-overflow-tooltip />
+        <el-table-column label="澶囨敞"
+                         prop="remarks"
+                         width="200"
+                         show-overflow-tooltip />
         <el-table-column fixed="right"
                          label="鎿嶄綔"
                          width="120"
@@ -164,12 +173,10 @@
           <template #default="scope">
             <el-button link
                        type="primary"
-                       size="small"
                        @click="openForm('edit', scope.row)"
                        :disabled="scope.row.approvalStatus !== 1 && scope.row.approvalStatus !== 4">缂栬緫</el-button>
             <el-button link
                        type="primary"
-                       size="small"
                        @click="downLoadFile(scope.row)">闄勪欢</el-button>
           </template>
         </el-table-column>
@@ -229,7 +236,7 @@
                 <el-option v-for="item in supplierList"
                            :key="item.id"
                            :label="item.supplierName"
-                           :value="item.id" />
+													 :value="item.id" >{{item.supplierName + '---' + item.supplierType}}</el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -442,7 +449,6 @@
             <template #default="scope">
               <el-button link
                          type="primary"
-                         size="small"
                          @click="openProductForm('edit', scope.row, scope.$index)">缂栬緫</el-button>
             </template>
           </el-table-column>
@@ -450,8 +456,8 @@
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="澶囨敞路锛�"
-                          prop="remark">
-              <el-input v-model="form.remark"
+                          prop="remarks">
+              <el-input v-model="form.remarks"
                         placeholder="璇疯緭鍏�"
                         clearable
                         type="textarea"
@@ -462,7 +468,7 @@
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="闄勪欢鏉愭枡锛�"
-                          prop="remark">
+                          prop="purchaseLedgerFiles">
               <el-upload v-model:file-list="fileList"
                          :action="upload.url"
                          multiple
@@ -540,6 +546,7 @@
               <el-tree-select v-model="productForm.productId"
                               placeholder="璇烽�夋嫨"
                               clearable
+                              filterable
                               check-strictly
                               @change="getModels"
                               :data="productOptions"
@@ -554,6 +561,7 @@
                           prop="productModelId">
               <el-select v-model="productForm.productModelId"
                          placeholder="璇烽�夋嫨"
+                         filterable
                          clearable
                          @change="getProductModel">
                 <el-option v-for="item in modelOptions"
@@ -1644,7 +1652,7 @@
           delProduct(ids).then(res => {
             proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
             closeProductDia();
-            getSalesLedgerWithProducts({ id: currentId.value, type: 2 }).then(
+            getPurchaseById({ id: currentId.value, type: 2 }).then(
               res => {
                 productData.value = res.productData;
               }
@@ -1679,20 +1687,12 @@
   const handleDelete = () => {
     let ids = [];
     if (selectedRows.value.length > 0) {
-      // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-      const unauthorizedData = selectedRows.value.filter(
-        item => item.recorderName !== userStore.nickName
-      );
-      if (unauthorizedData.length > 0) {
-        proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-        return;
-      }
-      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