From 1249ca8ff44f8de7992fdb5866eae19613d606c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 19:37:49 +0800
Subject: [PATCH] 详情页联调

---
 src/views/sales/subOrder/DetailSubOrder.vue |   63 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 4fd0fbe..5e47425 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -37,18 +37,18 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -64,7 +64,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠$悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -83,7 +83,7 @@
           </div>
         </div>
         <div v-if="activeName === 'detail'" class="second">
-          <SalesDetails :isDetail="true" />
+          <SalesDetails :isDetail="true" :add-config="addConfig" />
         </div>
       </div>
     </el-drawer>
@@ -93,6 +93,7 @@
 <script>
 import SalesDetails from "@/views/sales/salesDetails"
 import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+
 export default {
   name: "DetailSubOrder",
   props: {
@@ -122,28 +123,38 @@
         sumProp: ["other1", "other2", "other3", "other4"],
         mergeNumber: 3
       },
-      productTableList: {}
+      productTableList: {},
+      addConfig: {}
     }
   },
   created() {
-    this.setData()
+    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() {},
   methods: {
-    setData() {
+    setData(item) {
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "鍗曟嵁缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "閿�鍞�诲崟",
-          leftValue: "",
+          leftValue: item.masterOrder.number,
           rightStr: "璐熻矗浜�",
-          rightValue: ""
+          rightValue: item.member.username
         },
         {
           leftStr: "鍒涘缓浜�",
@@ -156,19 +167,19 @@
           leftValue: "",
           rightStr: "鏇存柊鏃堕棿",
           rightValue: ""
-        },
-        {
-          leftStr: "瀹℃壒鐘舵��",
-          leftValue: "",
-          rightStr: "鏈�鏂板鎵规椂闂�",
-          rightValue: ""
-        },
-        {
-          leftStr: "涓婁竴姝ュ鎵逛汉",
-          leftValue: "",
-          rightStr: "褰撳墠瀹℃壒浜�",
-          rightValue: ""
         }
+        // {
+        //   leftStr: "瀹℃壒鐘舵��",
+        //   leftValue: "",
+        //   rightStr: "鏈�鏂板鎵规椂闂�",
+        //   rightValue: ""
+        // },
+        // {
+        //   leftStr: "涓婁竴姝ュ鎵逛汉",
+        //   leftValue: "",
+        //   rightStr: "褰撳墠瀹℃壒浜�",
+        //   rightValue: ""
+        // }
       ]
     },
     handleClose() {

--
Gitblit v1.8.0