From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/views/customerService/feedbackRegistration/components/formDia.vue |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index 790ddbe..e606107 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -63,10 +63,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="闂鎻忚堪锛�"
+              <el-form-item label="瀹㈡埛璇夋眰锛�"
                             prop="proDesc">
                 <el-input v-model="form.proDesc"
-                          placeholder="璇疯緭鍏ラ棶棰樻弿杩�" />
+                          placeholder="璇疯緭鍏ュ鎴疯瘔姹�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -96,6 +96,9 @@
                       size="small">
                 {{ getShippingStatusText(row) }}
               </el-tag>
+            </template>
+            <template #quantity="{ row }">
+              <el-input-number v-model="row.quantity" :min="0" size="small" />
             </template>
           </PIMTable>
         </div>
@@ -147,6 +150,7 @@
       salesContractNo: "",
       proDesc: "",
       customerName: "",
+      productModelQuantities: "",
     },
     rules: {
       customerName: [
@@ -240,25 +244,12 @@
       align: "center",
     },
     { label: "鍙戣揣鏃ユ湡", prop: "shippingDate", minWidth: 100, align: "center" },
-    { label: "鏁伴噺", prop: "quantity", width: 100 },
-    { label: "绋庣巼(%)", prop: "taxRate", width: 100 },
     {
-      label: "鍚◣鍗曚环(鍏�)",
-      prop: "taxInclusiveUnitPrice",
-      width: 160,
-      formatData: formatCurrency,
-    },
-    {
-      label: "鍚◣鎬讳环(鍏�)",
-      prop: "taxInclusiveTotalPrice",
-      width: 160,
-      formatData: formatCurrency,
-    },
-    {
-      label: "涓嶅惈绋庢�讳环(鍏�)",
-      prop: "taxExclusiveTotalPrice",
-      width: 160,
-      formatData: formatCurrency,
+      label: "鏁伴噺",
+      prop: "quantity",
+      width: 140,
+      dataType: "slot",
+      slot: "quantity",
     },
     {
       dataType: "action",
@@ -326,7 +317,7 @@
       form.value.customerId = null;
     }
     getSalesLedger({
-      customerName: form.value.customerName,
+      customerId: form.value.customerId,
     }).then(res => {
       if (res.code === 200) {
         associatedSalesOrderNumberOptions.value = res.data.records.map(item => ({
@@ -434,7 +425,7 @@
       form.value = { ...row };
       if (form.value.customerName) {
         const res = await getSalesLedger({
-          customerName: form.value.customerName,
+          customerId: form.value.customerId,
         });
         if (res?.code === 200) {
           console.log(res);
@@ -446,6 +437,21 @@
               id: item.id,
             })
           );
+          const opt = associatedSalesOrderNumberOptions.value.find(
+            item => item.value === form.value.salesContractNo
+          );
+          if (opt) {
+            let restoredData = (opt.productData || []).map(normalizeProductRow);
+            const selectedIds = form.value.productModelIds ? String(form.value.productModelIds).split(",") : [];
+            const quantities = form.value.productModelQuantities ? String(form.value.productModelQuantities).split(",") : [];
+            tableData.value = restoredData.filter(item => selectedIds.includes(String(item.id))).map(item => {
+              let qIndex = selectedIds.indexOf(String(item.id));
+              if (qIndex !== -1 && qIndex < quantities.length && quantities[qIndex] !== "") {
+                 item.quantity = Number(quantities[qIndex]);
+              }
+              return item;
+            });
+          }
         }
       }
       console.log(form.value);
@@ -458,6 +464,9 @@
         form.value.productModelIds = tableData.value
           .map(item => item.id)
           .join(",");
+        form.value.productModelQuantities = tableData.value
+          .map(item => item.quantity || 0)
+          .join(",");
         if (operationType.value === "add") {
           afterSalesServiceAdd(form.value).then(response => {
             proxy.$modal.msgSuccess("鏂板鎴愬姛");

--
Gitblit v1.9.3