From 83fe183a48dd08242d61788fa982e36d81b97727 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 18:53:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev

---
 src/views/sales/salesDetails/index.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index ccf54eb..bc8ae32 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -308,9 +308,10 @@
       this.editConfig.infomation = {
         ...this.addConfig,
         currency: "浜烘皯甯�",
-        sale_chance_name:"",
-        subbill_name:"",
-        client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
+        sale_chance_name: "",
+        subbill_name: "",
+        client_name: this.addConfig?.client_name ?? "",
+        quotation_number: ""
       }
     },
     // 缂栬緫
@@ -318,7 +319,13 @@
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�",sale_chance_name:row.saleChance.name,}
+      this.editConfig.infomation = {
+        ...row,
+        currency: "浜烘皯甯�",
+        sale_chance_name: row.saleChance.name,
+        deliverType: row.deliverType === 0 ? "" : row.deliverType,
+        quotation_number: row.quotation.number
+      }
     },
     // 鍒犻櫎
     delClick(rowID) {

--
Gitblit v1.8.0