From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 3df5f0c..4da1e9c 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -31,9 +31,10 @@
         <TableCommonView
           ref="tableListRef"
           :table-list="tableList"
-          :select-box="false"
+          :select-box="editCommonConfig.isSelectBox"
           @selCommonClick="selNameClick"
           @selTableCol="selTableCol"
+          @getSelectArray="getSelectArray"
         >
         </TableCommonView>
         <div slot="footer" class="dialog-footer">
@@ -42,6 +43,10 @@
             <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
           </div>
         </div>
+      </div>
+      <div slot="footer" class="dialog-footer" v-if="editCommonConfig.isSelectBox">
+        <el-button type="primary" size="small" @click="saveClick()">纭畾</el-button>
+        <el-button size="small" @click="editConfig.editVisible = false">鍙栨秷</el-button>
       </div>
     </el-dialog>
   </div>
@@ -66,12 +71,19 @@
       default: () => {
         return {
           editVisible: false,
+          isSelectBox:false,
           title: "",
           clientId: 0,
+          client_name: "",
           tableInfomation: []
         }
       }
-    }
+    },
+    // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+    quotationNumber:{
+      type:[String,Number],
+      default:''
+    },
   },
   components: {},
   computed: {},
@@ -91,13 +103,16 @@
       keyword: "",
       keywordType: "",
       tableColumn: [],
-      showCol: []
+      showCol: [],
+      selectArray:[],
     }
   },
   created() {
     this.search_map = {
       client_id: this.editConfig.clientId
     }
+    this.keyword = this.editConfig.client_name
+    this.keywordType = "瀹㈡埛鍚嶇О"
     this.setTable()
     this.getData()
   },
@@ -187,7 +202,7 @@
         this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
       } else if (this.editConfig.title === "浜у搧鍚嶇О") {
         this.tableColumn = [
-          { label: "浜у搧鍚嶇О", prop: "name", isClick: true, default: true }, // 浜у搧鍚嶇О
+          { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox?false:true, default: true }, // 浜у搧鍚嶇О
           { label: "浜у搧缂栧彿", prop: "number" }
         ]
         this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
@@ -249,6 +264,14 @@
     selTableCol(val) {
       this.showcol = val
       this.tableList.tableColumn = this.setColumnVisible(val)
+    },
+    // 鍒楄〃澶氶��
+    getSelectArray(val){
+      this.selectArray=val;
+    },
+    saveClick(){
+      this.$emit('getSelectArray',this.selectArray)
+      this.editConfig.editVisible = false
     },
     // 璇锋眰鏁版嵁
     async getData() {
@@ -349,8 +372,7 @@
     // 閿�鍞槑缁嗗崟
     async getSalesDetailsList() {
       await getSalesDetailsList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        clientId:Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -405,12 +427,17 @@
     },
     // 浜у搧鍚嶇О
     async getProductList() {
-      await getProductList({
+      let params={
         productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
         productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
-      }).then((res) => {
+      }
+       // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+      if(this.quotationNumber){
+        params.quotationNumber=this.quotationNumber
+      }
+      await getProductList(params).then((res) => {
         console.log(res.data)
         if (res.code === 200) {
           if (res.data.data && res.data.data.length > 0) {
@@ -430,8 +457,7 @@
     },
     async getSalesReturnList() {
       await getSalesReturnList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        clientId:Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -480,6 +506,9 @@
       this.editConfig.editVisible = false
     },
     selNameClick(row) {
+      if(this.editCommonConfig.isSelectBox){
+        return true;
+      }
       this.editConfig.editVisible = false
       if (this.editConfig.title === "閿�鍞�诲崟") {
         this.$emit("selClient", row, "master")

--
Gitblit v1.8.0