From 6857572e3d303daaf3c28e639aad91c0bdf2fc42 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 14:30:10 +0800
Subject: [PATCH] bug修复及对应参数联调

---
 src/views/sales/masterOrder/index.vue |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index d279298..a6159f7 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -11,6 +11,7 @@
         :search-options="searchOptions"
         @searchClick="searchClick"
         @resetClick="resetClick"
+        :search-sel="searchSel"
       />
       <div class="btn-pager">
         <PublicFunctionBtnView :operates-list="operatesList" @batchDelete="delClick" />
@@ -56,6 +57,12 @@
     isDetail: {
       type: Boolean,
       default: false
+    },
+    addConfig: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   mixins: [pageMixin],
@@ -106,12 +113,21 @@
         infomation: {}
       },
       selValueList: [],
-      search_map: {}
+      search_map: {},
+      searchSel: {
+        value: "number",
+        label: "鍗曟嵁缂栧彿"
+      }
     }
   },
   created() {
     this.setTable()
-    this.getData()
+    if (!this.isDetail) {
+      this.search_map = {}
+    } else {
+      this.search_map = { ...this.addConfig }
+    }
+    this.getData(this.search_map)
   },
   methods: {
     setTable() {
@@ -123,14 +139,15 @@
           { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time", isTime: true }, // 鏈嶅姟寮�濮嬫椂闂�
           { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time", isTime: true }, // 鏈嶅姟鎴鏃堕棿
           { label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
-          { label: "璐熻矗浜�", prop: "member_id" } // 璐熻矗浜�
+          { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
           // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" } // 瀹℃壒鐘舵��
         ]
       }
       this.searchOptions = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         const label = this.tableList.tableColumn[i].label
-        this.searchOptions.push({ value: (i + 1).toString(), label: label })
+        const value = this.tableList.tableColumn[i].prop
+        this.searchOptions.push({ value: value, label: label })
       }
     },
     // 璇锋眰鏁版嵁
@@ -148,7 +165,8 @@
               const list = res.data.list.map((item) => {
                 return {
                   ...item,
-                  client_name: item.client.name
+                  client_name: item.client.name,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -183,7 +201,7 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = {}
+      this.editConfig.infomation = { ...this.addConfig }
     },
     // 缂栬緫
     handleClick(row) {
@@ -227,7 +245,13 @@
     selClientClick(row) {
       console.log(row)
       this.clientDeail.visible = true
-      this.clientDeail.infomation = { ...row }
+      this.clientDeail.infomation = {
+        ...row.client,
+        client_name: row.client.name,
+        client_level: row.client.client_level.name,
+        client_status: row.client.client_status.name,
+        contact_name: row.name
+      }
     },
     // 鏈轰細鍚嶇О璇︽儏
     selCommonClick(row) {

--
Gitblit v1.8.0