From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   64 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index cb6563e..4e6e01e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -55,6 +55,7 @@
 import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder"
 import { getProductList } from "@/api/common/other"
 import { getSalesReturnList } from "@/api/sales/salesReturn"
+import { getSubOrderList } from "@/api/sales/subOrder"
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 export default {
   name: "EditSelCommonDialog",
@@ -67,6 +68,7 @@
           editVisible: false,
           title: "",
           clientId: 0,
+          client_name: "",
           tableInfomation: []
         }
       }
@@ -97,6 +99,8 @@
     this.search_map = {
       client_id: this.editConfig.clientId
     }
+    this.keyword = this.editConfig.client_name
+    this.keywordType = "瀹㈡埛鍚嶇О"
     this.setTable()
     this.getData()
   },
@@ -214,6 +218,20 @@
           tableColumn: this.setColumnVisible(this.showCol)
         }
         this.searchSel = { value: "number", label: "閿�鍞��璐у崟缂栧彿" }
+      } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+        this.tableColumn = [
+          { label: "鍗曟嵁缂栧彿", prop: "number", isClick: true, default: true }, // 鍗曟嵁缂栧彿
+          { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
+        ]
+        this.showCol = ["鍗曟嵁缂栧彿", "璐熻矗浜�"]
+        this.tableList = {
+          selectIndex: true,
+          tableInfomation: [],
+          allcol: [],
+          showcol: this.showCol,
+          tableColumn: this.setColumnVisible(this.showCol)
+        }
+        this.searchSel = { value: "number", label: "鍗曟嵁缂栧彿" }
       }
       this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
       this.searchOptions = []
@@ -252,6 +270,8 @@
         this.getProductList()
       } else if (this.editConfig.title === "閿�鍞��璐у崟") {
         this.getSalesReturnList()
+      } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+        this.getSubOrderList()
       }
     },
     // 閿�鍞�诲崟
@@ -332,8 +352,9 @@
     // 閿�鍞槑缁嗗崟
     async getSalesDetailsList() {
       await getSalesDetailsList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        // keyword: this.keyword,
+        // keywordType: this.keywordType,
+        clientId:this.editCommonConfig.clientId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -395,15 +416,15 @@
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
         console.log(res.data)
-        if (res.data.code === 200) {
-          if (res.data.data.data && res.data.data.data.length > 0) {
-            const list = res.data.data.data.map((item) => {
+        if (res.code === 200) {
+          if (res.data.data && res.data.data.length > 0) {
+            const list = res.data.data.map((item) => {
               return {
                 ...item
               }
             })
             this.tableList.tableInfomation = list || []
-            this.pagerOptions.totalCount = res.data.data.count
+            this.pagerOptions.totalCount = res.data.count
           } else {
             this.tableList.tableInfomation = []
           }
@@ -413,8 +434,9 @@
     },
     async getSalesReturnList() {
       await getSalesReturnList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        // keyword: this.keyword,
+        // keywordType: this.keywordType,
+        clientId:this.editCommonConfig.clientId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -424,6 +446,30 @@
               return {
                 ...item,
                 salesReturnStatus_name: item.SalesReturnStatus.name
+              }
+            })
+            this.tableList.tableInfomation = list || []
+            this.pagerOptions.totalCount = res.data.count
+          } else {
+            this.tableList.tableInfomation = []
+          }
+        }
+        this.loading = false
+      })
+    },
+    // 閿�鍞瓙鍗�
+    async getSubOrderList() {
+      await getSubOrderList({
+        search_map: this.search_map,
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize
+      }).then((res) => {
+        if (res.code === 200) {
+          if (res.data.list && res.data.list.length > 0) {
+            const list = res.data.list.map((item) => {
+              return {
+                ...item,
+                member_name: item.member.username
               }
             })
             this.tableList.tableInfomation = list || []
@@ -454,6 +500,8 @@
         this.$emit("selClient", row, "productName")
       } else if (this.editConfig.title === "閿�鍞��璐у崟") {
         this.$emit("selClient", row, "salesReturn")
+      } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+        this.$emit("selClient", row, "subbill")
       }
     },
     // 鎼滅储

--
Gitblit v1.8.0