From 90943dd32237e9e1c9f0cd66e33b2145c26883ff Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 25 九月 2023 14:14:47 +0800
Subject: [PATCH] feat: 侧边栏样式调整; 表格组件样式调整; 新增搜索组件; 销售线索模块布局样式调整

---
 src/views/sales/subOrder/index.vue |   69 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index 6e647bd..1a0baab 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/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" />
@@ -19,8 +20,8 @@
     </div>
     <TableCommonView
       ref="tableListRef"
-      :show-summary="showSummary"
       :table-list="tableList"
+      :show-summary="showSummary"
       :select-box="!isDetail"
       @selClientClick="selClientClick"
       @selMasterClick="selMasterClick"
@@ -59,6 +60,12 @@
     isDetail: {
       type: Boolean,
       default: false
+    },
+    addConfig: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   mixins: [pageMixin],
@@ -102,8 +109,8 @@
       },
       showSummary: {
         show: true,
-        sumProp: ["number"],
-        mergeNumber: 7
+        sumProp: ["productAmount"],
+        mergeNumber: 6
       },
       subOrderDeail: {
         visible: false,
@@ -118,12 +125,23 @@
         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.id_name]: this.addConfig.common_name
+      }
+    }
+    this.getData(this.search_map)
   },
   methods: {
     setTable() {
@@ -132,17 +150,18 @@
         tableColumn: [
           { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true }, // 鍗曟嵁缂栧彿
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
-          { label: "閿�鍞�诲崟", prop: "masterOrderId", min: 90, isMasterClick: true }, // 閿�鍞�诲崟
-          { label: "璐熻矗浜�", prop: "memberId" }, // 璐熻矗浜�
-          { label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
-          { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
-          { label: "鏁伴噺", prop: "number1", min: 100 } // 鏁伴噺
+          { label: "閿�鍞�诲崟", prop: "master_order_number", min: 90, isMasterClick: true }, // 閿�鍞�诲崟
+          { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
+          // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
+          { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, // 浜у搧鍚嶇О
+          { label: "鏁伴噺", prop: "productAmount", isProductAmount: true } // 鏁伴噺
         ]
       }
       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 })
       }
     },
     // 璇锋眰鏁版嵁
@@ -160,7 +179,9 @@
               const list = res.data.list.map((item) => {
                 return {
                   ...item,
-                  client_name: item.client.name
+                  client_name: item.client.name,
+                  master_order_number: item.masterOrder.number,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -195,14 +216,14 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = {}
+      this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
     },
     // 缂栬緫
     handleClick(row) {
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row, masterOrderNumber: "" }
+      this.editConfig.infomation = { ...row, masterOrderNumber: "", currency: "浜烘皯甯�" }
     },
     // 鍒犻櫎
     delClick() {
@@ -239,7 +260,13 @@
     selClientClick(row) {
       console.log(row)
       this.clientDeail.visible = true
-      this.clientDeail.infomation = { ...row, client_name: row.name }
+      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
+      }
     },
     // 閿�鍞�诲崟璇︽儏
     selMasterClick(row) {
@@ -276,4 +303,16 @@
     }
   }
 }
+::v-deep {
+  .el-table .el-table__cell {
+    padding: 0;
+  }
+  .el-table__header tr,
+  .el-table__header th {
+    height: 48px;
+  }
+  .el-table__footer-wrapper tbody td.el-table__cell {
+    height: 48px;
+  }
+}
 </style>

--
Gitblit v1.8.0