From 533cdc5d40a9bc24f0f10618508a1fe944d4e014 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 09 一月 2024 17:01:16 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   65 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 4e6e01e..2a0acf5 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -29,11 +29,13 @@
           </div>
         </div>
         <TableCommonView
+        class="bg-list"
           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 +44,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,13 +72,20 @@
       default: () => {
         return {
           editVisible: false,
+          isSelectBox:false,
           title: "",
           clientId: 0,
+          isRequest:true,
           client_name: "",
           tableInfomation: []
         }
       }
-    }
+    },
+    // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+    quotationNumber:{
+      type:[String,Number],
+      default:''
+    },
   },
   components: {},
   computed: {},
@@ -92,7 +105,8 @@
       keyword: "",
       keywordType: "",
       tableColumn: [],
-      showCol: []
+      showCol: [],
+      selectArray:[],
     }
   },
   created() {
@@ -163,6 +177,7 @@
         this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
         this.tableList = {
           selectIndex: true,
+
           tableInfomation: [],
           allcol: [],
           showcol: this.showCol,
@@ -190,7 +205,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 = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
@@ -252,6 +267,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() {
@@ -327,6 +350,16 @@
     },
     // 鎶ヤ环鍗�
     async getQuotationList() {
+      if(!this.editConfig.isRequest){
+        this.tableList.tableInfomation =this.editConfig.tableInfomation.map((item) => {
+              return {
+                ...item,
+                member_name: item.member.username
+              }
+            })
+        this.pagerOptions.totalCount =this.editConfig.count?this.editConfig.count:0
+        return true;
+      }
       await getQuotationList({
         search_map: this.search_map,
         page: this.pagerOptions.currPage,
@@ -352,9 +385,7 @@
     // 閿�鍞槑缁嗗崟
     async getSalesDetailsList() {
       await getSalesDetailsList({
-        // keyword: this.keyword,
-        // keywordType: this.keywordType,
-        clientId:this.editCommonConfig.clientId,
+        clientId:Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -409,12 +440,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) {
@@ -434,9 +470,7 @@
     },
     async getSalesReturnList() {
       await getSalesReturnList({
-        // keyword: this.keyword,
-        // keywordType: this.keywordType,
-        clientId:this.editCommonConfig.clientId,
+        clientId:Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -485,6 +519,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")
@@ -528,6 +565,9 @@
 <style lang="scss" scoped>
 .bg-view {
   margin: 10px;
+  .bg-list{
+    min-height:370px;
+    }
   .query-bg {
     margin-left: -20px;
     margin-bottom: 10px;
@@ -539,6 +579,7 @@
         width: 100px;
       }
     }
+   
     .btn {
       float: right;
     }

--
Gitblit v1.8.0