From 0f43183f986f0ed314647687c73da5a4493d2611 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 16 十月 2023 20:36:15 +0800
Subject: [PATCH] bug修复（5219 5233）

---
 src/views/other/payment/receipt/addReceipt.vue       |    9 +++++----
 src/views/other/payment/receipt/index.vue            |   13 ++++++-------
 src/views/other/commonDialog/SelectCommonDialog.vue  |    3 +++
 src/views/sales/salesReturn/AddSalesReturnDialog.vue |    5 +++++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 3df5f0c..e829aa8 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -68,6 +68,7 @@
           editVisible: false,
           title: "",
           clientId: 0,
+          client_name: "",
           tableInfomation: []
         }
       }
@@ -98,6 +99,8 @@
     this.search_map = {
       client_id: this.editConfig.clientId
     }
+    this.keyword = this.editConfig.client_name
+    this.keywordType = "瀹㈡埛鍚嶇О"
     this.setTable()
     this.getData()
   },
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index da78aa7..ed5daa4 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -87,10 +87,10 @@
                 </el-form-item>
               </el-col>
               <el-col v-else :span="12">
-                <el-form-item label="鍚堝悓璁㈠崟">
+                <el-form-item label="閿�鍞槑缁嗗崟" prop="saleDetailNumber">
                   <div class="custom-name">
                     <el-autocomplete
-                      v-model="editConfig.infomation.number"
+                      v-model="editConfig.infomation.saleDetailNumber"
                       :fetch-suggestions="
                         (queryString, callback) => {
                           querySearchAsync(queryString, callback, 'contract')
@@ -104,7 +104,7 @@
                       <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
                     </div>
                     <div
-                      v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
+                      v-if="editConfig.infomation.saleDetailNumber && editConfig.infomation.saleDetailNumber.length > 0"
                       class="common-select-btn"
                       @click="clearupClient('contract')"
                     >
@@ -359,7 +359,8 @@
       rules: {
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
         signTime: [{ required: true, message: "璇烽�夋嫨鏀舵鏃ユ湡", trigger: "change" }],
-        memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+        memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+        saleDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
         // approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
       },
       memberOptions: [],
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index 3e8365e..3270ab7 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -146,8 +146,7 @@
     }
     this.getData()
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     setTable() {
       this.tableList = {
@@ -188,7 +187,7 @@
           sourceType: sourceTyle,
           page: this.pagerOptions.currPage,
           pageSize: this.pagerOptions.pageSize,
-          client_id:this.addConfig.client_id,
+          client_id: this.addConfig.client_id
         }
       } else {
         params = {
@@ -196,13 +195,13 @@
           keywordType: this.keywordType,
           page: this.pagerOptions.currPage,
           pageSize: this.pagerOptions.pageSize,
-          client_id:this.addConfig.client_id,
+          client_id: this.addConfig.client_id
         }
       }
       await getReceiptList(params)
         .then((res) => {
-          if (res.data.code === 200) {
-            const resList = res?.data?.data?.data ?? []
+          if (res.code === 200) {
+            const resList = res?.data?.data ?? []
             if (resList.length > 0) {
               const list = resList.map((item) => {
                 return {
@@ -213,7 +212,7 @@
                 }
               })
               this.tableList.tableInfomation = list || []
-              this.pagerOptions.totalCount = res.data.data.count
+              this.pagerOptions.totalCount = res.data.count
             } else {
               this.tableList.tableInfomation = []
             }
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index c59f472..c09db0d 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -478,6 +478,7 @@
       } else if (value === "contract") {
         this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
         this.editSelCommonConfig.editVisible = true
+        this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
       }
     },
     selClient(row, value) {
@@ -488,6 +489,8 @@
       } else if (value === "contract") {
         this.editConfig.infomation.salesDetailNumber = row.number
         this.SalesDetailsId = row.id
+        this.productTableList.tableData = row.products
+        this.tableData = row.products
       }
     },
     // 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -497,6 +500,8 @@
         this.clientId = 0
       } else if (value === "contract") {
         this.editConfig.infomation.salesDetailNumber = ""
+        this.productTableList.tableData = []
+        this.tableData = []
         this.SalesDetailsId = 0
       }
     },

--
Gitblit v1.8.0