From b76f9d153dd40cef8864cecd168242850679047d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 20:29:36 +0800
Subject: [PATCH] bug修复

---
 src/views/sales/salesReturn/DetailReturn.vue |   46 ++++++++++++++++++----------------------------
 1 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/views/sales/salesReturn/DetailReturn.vue b/src/views/sales/salesReturn/DetailReturn.vue
index 9cd2e7e..24b03ca 100644
--- a/src/views/sales/salesReturn/DetailReturn.vue
+++ b/src/views/sales/salesReturn/DetailReturn.vue
@@ -123,7 +123,7 @@
           </div>
         </div>
         <div v-if="activeName === 'refundForm'" class="second">
-          <RefundForm :isDetail="true" />
+          <RefundForm :isDetail="true" :add-config="addConfig" />
         </div>
       </div>
     </el-drawer>
@@ -165,11 +165,21 @@
         sumProp: ["other1", "other2", "other3", "other4"],
         mergeNumber: 3
       },
-      productTableList: {}
+      productTableList: {},
+      addConfig: {}
     }
   },
   created() {
     this.setData(this.detailConfig.infomation)
+    this.addConfig = {
+      keywordType: "閿�鍞��璐у崟",
+      keyword: this.detailConfig.infomation.number,
+      id: this.detailConfig.infomation.id,
+      client_name: this.detailConfig.infomation.client.name,
+      contact_name: this.detailConfig.infomation.contact_name,
+      client_id: this.detailConfig.infomation.client_id,
+      contact_id: this.detailConfig.infomation.contact_id
+    }
     this.setTableForm()
   },
   mounted() {},
@@ -246,33 +256,13 @@
     },
     setTableForm() {
       this.productTableList = {
-        tableData: [
-          {
-            id: "1",
-            productName: "涓婃捣鏈夐檺鍏徃",
-            other0: "ZDYBD03-1",
-            other1: "12",
-            other2: "5.00",
-            other4: "3.00",
-            other3: "2.00"
-          }
-        ],
+        tableData: this.detailConfig.infomation.products,
         tableColumn: [
-          { label: "#", prop: "id", width: 40 },
-          { label: "鍚◣鍗曚环", prop: "other9", input: true },
-          { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
-          { label: "浜у搧缂栧彿", prop: "other0" },
-          { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
-          { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
-          { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
-          { label: "鎶樻墸棰�", prop: "other2" },
-          { label: "绋�(閿�鍞�)", prop: "other7", input: true },
-          { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
-          { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
-          { label: "浠风◣鍚堣", prop: "other3", input: true },
-          { label: "鎻忚堪", prop: "other8" },
-          { label: "婧愬崟绫诲瀷", prop: "other5" },
-          { label: "婧愬崟", prop: "other6" }
+          { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+          { label: "浜у搧缂栧彿", prop: "number" },
+          { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+          { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
     }

--
Gitblit v1.8.0