From bd42b949807795c581e9193d92834a6187fc10d2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 18:42:59 +0800
Subject: [PATCH] 销售管理模块联调

---
 src/views/service/serviceContract/DetailServiceContract.vue    |    4 
 src/components/makepager/SearchCommonView.vue                  |    2 
 src/views/client/followupRecords/AddFollowupRecordsDialog.vue  |   32 +
 src/views/sales/masterOrder/index.vue                          |    8 
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue         |  138 ++++---
 src/views/sales/salesDetails/DetailSpecification.vue           |   72 ++--
 src/views/sales/salesReturn/index.vue                          |   44 +
 src/views/client/followupRecords/index.vue                     |   16 
 src/views/sales/salesReturn/DetailReturn.vue                   |   38 +-
 src/api/common/other.js                                        |    7 
 src/views/sales/subOrder/DetailSubOrder.vue                    |   49 +-
 src/views/service/serviceContract/index.vue                    |    5 
 src/views/sales/contractManage/index.vue                       |   26 +
 src/views/sales/salesDetails/index.vue                         |   39 +
 src/views/client/client/index.vue                              |    1 
 src/views/client/contacts/AddContactsDialog.vue                |   18 
 src/views/sales/subOrder/index.vue                             |    4 
 src/views/sales/refundForm/DetailRefundForm.vue                |   48 +-
 src/views/client/client/DetailClientManage.vue                 |   21 
 src/views/sales/masterOrder/DetailMasterOrder.vue              |    8 
 src/views/sales/contractManage/DetailContractManage.vue        |   76 ++--
 src/views/sales/salesReturn/AddSalesReturnDialog.vue           |   82 ++--
 src/views/sales/refundForm/AddRefundFormDialog.vue             |   99 ++---
 src/views/sales/refundForm/index.vue                           |   43 +
 src/views/client/client/AddClientManageDialog.vue              |    2 
 src/views/service/serviceFollowup/DetailServiceFollowup.vue    |    2 
 src/views/client/contacts/index.vue                            |    5 
 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue |   20 
 src/views/sales/salesOpportunity/DetailOpportunity.vue         |    2 
 src/views/sales/quotation/DetailQuotation.vue                  |    4 
 src/views/sales/salesOpportunity/index.vue                     |    5 
 src/views/sales/subOrder/AddSubOrderDialog.vue                 |   60 +--
 src/views/sales/contractManage/AddContractManageDialog.vue     |   10 
 src/views/sales/quotation/index.vue                            |    8 
 34 files changed, 539 insertions(+), 459 deletions(-)

diff --git a/src/api/common/other.js b/src/api/common/other.js
index 237b1b0..282149f 100644
--- a/src/api/common/other.js
+++ b/src/api/common/other.js
@@ -1,4 +1,5 @@
 import request from "@/common/untils/request.js"
+import axios from "axios"
 
 // 鑾峰彇鏁呴殰绫诲埆
 export function getFaultTypeList() {
@@ -47,3 +48,9 @@
     method: "get"
   })
 }
+// 鑾峰彇浜у搧鍒楄〃
+export const getProductList = async (data) => {
+  return await axios.get(`/api/product/list`, {
+    params: data
+  })
+}
diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index 5976c3b..03e2916 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -305,7 +305,7 @@
   }
   .search {
     .el-select .el-input {
-      width: 115px;
+      width: 130px;
     }
     .input-with-select .el-input-group__prepend {
       background-color: #fff;
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 628f4c3..fd10291 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -28,7 +28,7 @@
                   <div class="custom-name">
                     <el-input v-model="editConfig.infomation.name"></el-input>
                     <!-- <div class="common-select-btn"><i class="el-icon-house" title="宸ュ晢鏌ヨ"></i></div> -->
-                    <div class="common-select-btn"><i class="el-icon-search" title="鏌ラ噸"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-search" title="鏌ラ噸"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 7d9a0fb..8c968bb 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -180,25 +180,25 @@
           </div> -->
         </div>
         <div v-if="activeName === 'contact'" class="second">
-          <Contacts :isDetail="true" :add-config="addContactsConfig" />
+          <Contacts :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'second'" class="second">
           <FollowupRecords :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'salesOpportunity'" class="second">
-          <SalesOpportunity :isDetail="true" :add-config="addContactsConfig" />
+          <SalesOpportunity :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'quotation'" class="second">
-          <Quotation :isDetail="true" :add-config="addContactsConfig" />
+          <Quotation :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'master'" class="second">
-          <MasterOrder :isDetail="true" :add-config="addContactsConfig" />
+          <MasterOrder :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'sub'" class="second">
-          <SubOrder :isDetail="true" :add-config="addContactsConfig" />
+          <SubOrder :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'detail'" class="second">
-          <SalesDetails :isDetail="true" :add-config="addContactsConfig" />
+          <SalesDetails :isDetail="true" :add-config="addConfig" />
         </div>
       </div>
     </el-drawer>
@@ -244,16 +244,15 @@
       addressInfoList: [],
       isRemarkExpand: true, // 澶囨敞淇℃伅
       isAnnexExpand: true, // 闄勪欢淇℃伅
-      addConfig: {},
-      addContactsConfig: {
-        client_name: this.clientManageDetail.infomation.name
-      }
+      addConfig: {}
     }
   },
   created() {
     this.setData(this.detailConfig.infomation)
     this.addConfig = {
-      id_name: "client_id",
+      id_name: "client_name",
+      keywordType: "瀹㈡埛鍚嶇О",
+      keyword: this.detailConfig.infomation.name,
       id: this.detailConfig.infomation.id,
       client_name: this.detailConfig.infomation.name,
       contact_name: this.detailConfig.infomation.contact_name,
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index dfc5187..2b858d5 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -28,7 +28,6 @@
       />
       <div class="btn-pager">
         <PublicFunctionBtnView
-          :duplicate-check="true"
           :list-button="true"
           :map-button="true"
           :statistics="true"
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 134b98d..3e45c21 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -87,7 +87,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="isUnflod" label="鐢熸棩" prop="birthday">
-                  <el-date-picker v-model="editConfig.infomation.birthday" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.birthday"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -312,7 +317,8 @@
         editVisible: false,
         title: "",
         infomation: {}
-      }
+      },
+      clientId: this.editContactsConfig.infomation.client_id
     }
   },
   created() {
@@ -397,7 +403,7 @@
         id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
         birthday: data.birthday || "",
         city_id: data.city_id || 0,
-        client_id: parseInt(data.client_id) || 0,
+        client_id: this.clientId || 0,
         country_id: data.country_id || 0,
         desc: data.desc || "",
         email: data.email || "",
@@ -425,7 +431,7 @@
       }
     },
     handleSelectClient(item) {
-      this.editConfig.infomation.client_id = item.id
+      this.clientId = item.id
     },
     selClientClick() {
       this.editSelectClientConfig.editVisible = true
@@ -433,12 +439,12 @@
     selClient(row) {
       console.log(row)
       this.editConfig.infomation.client_name = row.name
-      this.editConfig.infomation.client_id = row.id
+      this.clientId = row.id
     },
     // 娓呴櫎宸查�夋嫨鐢ㄦ埛
     clearupClient() {
       this.editConfig.infomation.client_name = ""
-      this.editConfig.infomation.client_id = 0
+      this.clientId = 0
     },
     // 娣诲姞闄勪欢
     addAnnexClick() {},
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index 279ab6b..4d2f0d0 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -122,7 +122,9 @@
     if (!this.isDetail) {
       this.search_map = {}
     } else {
-      this.search_map = { ...this.addConfig }
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
     }
     this.getData(this.search_map)
   },
@@ -200,6 +202,7 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
+      console.log(this.addIdConfig)
       this.editConfig.infomation = { ...this.addConfig }
     },
     // 缂栬緫
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 8cd65b5..a26cc11 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -61,7 +61,7 @@
                       <el-option v-for="item in clientStatusOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -110,13 +110,22 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
-                  <el-input
+                <el-form-item label="鑱旂郴鏂瑰紡" prop="contactInfo">
+                  <!-- <el-input
                     v-model="editConfig.infomation.phoneNumber"
                     maxlength="11"
                     show-word-limit
                     oninput="value=value.replace(/[^\d]/g,'')"
-                  ></el-input>
+                  ></el-input> -->
+                  <el-select v-model="editConfig.infomation.contactInfo" placeholder="璇烽�夋嫨" size="mini">
+                    <el-option
+                      v-for="item in contactInfoOptions"
+                      :key="item.id"
+                      :label="item.username"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col v-if="isUnflod" :span="12">
@@ -166,13 +175,23 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="鑱旂郴鏃ユ湡" prop="follow_time">
-                  <el-date-picker v-model="editConfig.infomation.follow_time" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.follow_time"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="涓嬫鍥炶鏃ユ湡" prop="next_follow_time">
-                  <el-date-picker v-model="editConfig.infomation.next_follow_time" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.next_follow_time"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -328,6 +347,7 @@
         ]
       },
       clientStatusOptions: [], // 瀹㈡埛鐘舵��
+      contactInfoOptions: [], // 鑱旂郴鏂瑰紡
       memberOptions: [],
       unflodCollapseStr: "鏀惰捣",
       isUnflod: true,
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 7b0ea5b..605f11a 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -60,9 +60,13 @@
     addConfig: {
       type: Object,
       default: () => {
-        return {
-          sales_leads_name: ""
-        }
+        return {}
+      }
+    },
+    addIdConfig: {
+      type: Object,
+      default: () => {
+        return {}
       }
     }
   },
@@ -128,7 +132,7 @@
       this.search_map = {}
     } else {
       this.search_map = {
-        [this.addConfig.id_name]: this.addConfig.id
+        [this.addConfig.id_name]: this.addConfig.client_name
       }
     }
     this.getData(this.search_map)
@@ -141,7 +145,7 @@
           { label: "涓婚", prop: "topic", min: 120 }, // 涓婚
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 190, isClientClick: true }, // 瀹㈡埛鍚嶇О
           { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚�
-          { label: "瀹㈡埛鐘舵��", prop: "client_status_id", min: 100 }, // 瀹㈡埛鐘舵��
+          { label: "瀹㈡埛鐘舵��", prop: "client_status", min: 100 }, // 瀹㈡埛鐘舵��
           { label: "鑱旂郴鏂瑰紡", prop: "phone", min: 100 }, // 鑱旂郴鏂瑰紡
           { label: "鑱旂郴浜烘棩鏈�", prop: "follow_time", isTime: true, min: 130 }, // 鑱旂郴浜烘棩鏈�
           { label: "涓嬫鍥炶鏃ユ湡", prop: "next_follow_time", isTime: true, min: 130 }, // 涓嬫鍥炶鏃ユ湡
@@ -173,7 +177,7 @@
                   ...item,
                   client_name: item.client.name,
                   contact_name: item.contact.name,
-                  client_status_id: item.client.client_status_id,
+                  client_status: item.client_status.name,
                   phone: item.contact.phone,
                   member_name: item.member.username
                 }
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index c6926a3..31dfc60 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -44,9 +44,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="璐熻矗浜�" prop="member_id">
+                <el-form-item label="璐熻矗浜�" prop="memberId">
                   <el-select
-                    v-model="editConfig.infomation.member_id"
+                    v-model="editConfig.infomation.memberId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
                     style="width: 63%"
@@ -68,7 +68,7 @@
                       <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -84,7 +84,7 @@
             </el-row>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div>
+          <!-- <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
@@ -109,7 +109,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <!-- 灞曞紑鏀惰捣 -->
           <div v-if="editConfig.title === '鏂板缓'" class="unflod-collapse" @click="unflodCollapseClick">
             <div>{{ unflodCollapseStr }}</div>
diff --git a/src/views/sales/contractManage/DetailContractManage.vue b/src/views/sales/contractManage/DetailContractManage.vue
index 9e9b700..7937296 100644
--- a/src/views/sales/contractManage/DetailContractManage.vue
+++ b/src/views/sales/contractManage/DetailContractManage.vue
@@ -14,7 +14,7 @@
         </div>
       </template>
       <div class="content">
-        <div class="top">
+        <!-- <div class="top">
           <ul>
             <li v-for="(item, i) in topList" :key="i">
               <div class="left1">
@@ -35,7 +35,7 @@
               </div>
             </li>
           </ul>
-        </div>
+        </div> -->
         <div class="tab-view">
           <el-tabs v-model="activeName" @tab-click="tabsClick">
             <el-tab-pane label="璇︽儏" name="first"></el-tab-pane>
@@ -82,18 +82,18 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -109,7 +109,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
         </div>
         <div v-if="activeName === 'annex'" class="second">
           <!-- <FollowupRecords :isDetail="true" /> -->
@@ -161,11 +161,11 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.topList = [
         {
           left1Str: "鍗曟嵁缂栧彿",
@@ -201,43 +201,43 @@
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "鍗曟嵁缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "璐熻矗浜�",
-          leftValue: "",
-          rightStr: "鍒涘缓浜�",
-          rightValue: ""
-        },
-        {
-          leftStr: "鍒涘缓鏃堕棿",
-          leftValue: "",
-          rightStr: "鏈�鏂版洿鏂颁汉",
-          rightValue: ""
-        },
-        {
-          leftStr: "鏇存柊鏃堕棿",
-          leftValue: "",
-          rightStr: "瀹℃壒鐘舵��",
-          rightValue: ""
-        },
-        {
-          leftStr: "鏈�鏂板鎵规椂闂�",
-          leftValue: "",
-          rightStr: "涓婁竴姝ュ鎵逛汉",
-          rightValue: ""
-        },
-        {
-          leftStr: "褰撳墠瀹℃壒浜�",
-          leftValue: "",
+          leftValue: item.member.username,
           rightStr: "鍚堝悓鐘舵��",
+          rightValue: item.statusId
+        },
+        {
+          leftStr: "鍒涘缓浜�",
+          leftValue: "",
+          rightStr: "鍒涘缓鏃堕棿",
           rightValue: ""
         },
+        {
+          leftStr: "鏈�鏂版洿鏂颁汉",
+          leftValue: "",
+          rightStr: "鏇存柊鏃堕棿",
+          rightValue: ""
+        },
+        // {
+        //   leftStr: "瀹℃壒鐘舵��",
+        //   leftValue: "",
+        //   rightStr: "鏈�鏂板鎵规椂闂�",
+        //   rightValue: ""
+        // },
+        // {
+        //   leftStr: "涓婁竴姝ュ鎵逛汉",
+        //   leftValue: "",
+        //   rightStr: "褰撳墠瀹℃壒浜�",
+        //   rightValue: ""
+        // },
         {
           leftStr: "閿�鍞姤浠峰崟",
-          leftValue: "",
+          leftValue: item.quotation.number,
           rightStr: "",
           rightValue: ""
         }
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index 4b4bf52..28a94ea 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -8,6 +8,7 @@
         :search-options="searchOptions"
         @searchClick="searchClick"
         @resetClick="resetClick"
+        :search-sel="searchSel"
       />
       <div class="btn-pager">
         <PublicFunctionBtnView
@@ -93,11 +94,22 @@
         infomation: {}
       },
       selValueList: [],
-      search_map: {}
+      search_map: {},
+      searchSel: {
+        value: "number",
+        label: "鍗曟嵁缂栧彿"
+      }
     }
   },
   created() {
     this.setTable()
+    if (!this.isDetail) {
+      this.search_map = {}
+    } else {
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
+    }
     this.getData()
   },
   methods: {
@@ -106,16 +118,17 @@
         tableInfomation: [],
         tableColumn: [
           { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true },
-          { label: "璐熻矗浜�", prop: "memberId", min: 90 },
-          { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
+          { label: "璐熻矗浜�", prop: "member_name", min: 90 },
+          // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
           { label: "鍒涘缓浜�", prop: "creator", min: 100 },
-          { label: "鍒涘缓鏃堕棿", prop: "createTime" }
+          { label: "鍒涘缓鏃堕棿", prop: "created_at" }
         ]
       }
       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 })
       }
     },
     // 璇锋眰鏁版嵁
@@ -132,7 +145,8 @@
             if (res.data.list && res.data.list.length > 0) {
               const list = res.data.list.map((item) => {
                 return {
-                  ...item
+                  ...item,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/masterOrder/DetailMasterOrder.vue b/src/views/sales/masterOrder/DetailMasterOrder.vue
index 9f11216..1e243d8 100644
--- a/src/views/sales/masterOrder/DetailMasterOrder.vue
+++ b/src/views/sales/masterOrder/DetailMasterOrder.vue
@@ -67,7 +67,7 @@
           </div> -->
         </div>
         <div v-if="activeName === 'sub'" class="second">
-          <SubOrder :isDetail="true" />
+          <SubOrder :isDetail="true" :add-config="addCommonConfig" />
         </div>
       </div>
     </el-drawer>
@@ -97,7 +97,11 @@
       activeName: "first",
       isBasicExpand: true, // 鍩烘湰淇℃伅
       basicInfoList: [],
-      isAnnexExpand: true // 闄勪欢淇℃伅
+      isAnnexExpand: true, // 闄勪欢淇℃伅
+      addCommonConfig: {
+        master_order_number: this.masterOrderDetail.infomation.number,
+        masterOrderId: this.masterOrderDetail.infomation.id
+      }
     }
   },
   created() {
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index a6159f7..31a4af2 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -125,7 +125,9 @@
     if (!this.isDetail) {
       this.search_map = {}
     } else {
-      this.search_map = { ...this.addConfig }
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
     }
     this.getData(this.search_map)
   },
@@ -136,8 +138,8 @@
         tableColumn: [
           { label: "鍗曟嵁缂栧彿", prop: "number", min: 100, isCommonClick: true }, // 鍗曟嵁缂栧彿
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
-          { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time", isTime: true }, // 鏈嶅姟寮�濮嬫椂闂�
-          { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time", isTime: true }, // 鏈嶅姟鎴鏃堕棿
+          { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time" }, // 鏈嶅姟寮�濮嬫椂闂�
+          { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time" }, // 鏈嶅姟鎴鏃堕棿
           { label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
           { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
           // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" } // 瀹℃壒鐘舵��
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index 9ff8004..6499e00 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -193,7 +193,7 @@
         },
         {
           leftStr: "鎶ヤ环鍗曠姸鎬�",
-          leftValue: item.quotation_status_id,
+          leftValue: item.quotation_status.name,
           rightStr: "鑱旂郴浜哄鍚�",
           rightValue: item.contact_name
         },
@@ -201,7 +201,7 @@
           leftStr: "鏈夋晥鏈熻嚦",
           leftValue: item.validity_date,
           rightStr: "閿�鍞礋璐ｄ汉",
-          rightValue: item.member_id
+          rightValue: item.member.username
         },
         {
           leftStr: "閿�鍞満浼�",
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 2d5df54..4eff953 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -126,7 +126,9 @@
     if (!this.isDetail) {
       this.search_map = {}
     } else {
-      this.search_map = { ...this.addConfig }
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
     }
     this.getData(this.search_map)
   },
@@ -170,8 +172,8 @@
                 return {
                   ...item,
                   client_name: item.client.name,
-                  contact_name: item.contact.name
-                  // member_name: item.member.username
+                  contact_name: item.contact.name,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 082208a..2d4e02b 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -74,15 +74,20 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
-                  <el-date-picker v-model="editConfig.infomation.refundDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.refundDate"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="浠樻鏂瑰紡" prop="refundMethod">
+                <el-form-item label="浠樻鏂瑰紡" prop="paymentTypeId">
                   <div class="common-select">
                     <el-select
-                      v-model="editConfig.infomation.refundMethod"
+                      v-model="editConfig.infomation.paymentTypeId"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
                       size="mini"
@@ -90,7 +95,7 @@
                       <el-option v-for="item in refundMethodOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -106,7 +111,7 @@
                       <el-option v-for="item in accountOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -119,10 +124,9 @@
                       class="common-select-sel"
                       size="mini"
                     >
-                      <el-option v-for="item in isInvoiceOptions" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
+                      <el-option v-for="item in isInvoiceOptions" :key="item" :label="item" :value="item"> </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -144,7 +148,7 @@
             </el-row>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info-title">闄勪欢淇℃伅</div>
+          <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
@@ -169,7 +173,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info-title" style="display: flex">
             浜у搧绠＄悊
@@ -286,7 +290,7 @@
       // selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
       refundMethodOptions: [], // 浠樻鏂瑰紡
       accountOptions: [], // 璐︽埛
-      isInvoiceOptions: [], // 鏄惁寮�绁�
+      isInvoiceOptions: ["鏄�", "鍚�"], // 鏄惁寮�绁�
       currencyOptions: [], // 甯佺
       approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
       productTableList: {},
@@ -300,7 +304,8 @@
         editVisible: false,
         title: "",
         infomation: {}
-      }
+      },
+      clientId: this.editCommonConfig.infomation.client_id
     }
   },
   created() {
@@ -315,7 +320,7 @@
           this.memberOptions = res.data.member
           this.refundMethodOptions = res.data.refundMethod
           this.accountOptions = res.data.accountId
-          this.isInvoiceOptions = res.data.isInvoice
+          // this.isInvoiceOptions = res.data.isInvoice
           this.currencyOptions = res.data.currency
         })
         .catch((err) => {
@@ -330,37 +335,23 @@
           const params = this.saveParams()
           console.log(params)
           if (this.editConfig.title === "鏂板缓") {
-            getAddSalesRefund(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "娣诲姞鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getAddSalesRefund(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("娣诲姞鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           } else {
-            getUpdateSalesRefund(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "缂栬緫鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getUpdateSalesRefund(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("缂栬緫鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           }
         } else {
           console.log("error submit")
@@ -374,21 +365,11 @@
         id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
         salesRefund: {
           accountId: data.accountId || 0,
-          clientId: parseInt(data.clientId) || 0,
-          isInvoice: data.isInvoice || 0,
+          clientId: this.clientId || 0,
+          isInvoice: data.isInvoice || "",
           memberId: data.memberId || 0,
           number: data.number || "",
-          products: [
-            {
-              amount: 0,
-              desc: "",
-              id: 0,
-              name: "",
-              number: "",
-              price: 0,
-              total: 0
-            }
-          ],
+          products: data.products || [],
           reason: data.reason || "",
           refundDate: data.refundDate || "",
           refundMethod: data.refundMethod || ""
@@ -411,7 +392,7 @@
       }
     },
     handleSelectClient(item) {
-      this.editConfig.infomation.client_id = item.id
+      this.clientId = item.id
     },
     selClientClick() {
       this.editSelectClientConfig.editVisible = true
@@ -419,12 +400,12 @@
     selClient(row) {
       console.log(row)
       this.editConfig.infomation.client_name = row.name
-      this.editConfig.infomation.client_id = row.id
+      this.clientId = row.id
     },
     // 娓呴櫎宸查�夋嫨鐢ㄦ埛
     clearupClient() {
       this.editConfig.infomation.client_name = ""
-      this.editConfig.infomation.client_id = 0
+      this.clientId = 0
     },
     // 娣诲姞闄勪欢
     addAnnexClick() {},
diff --git a/src/views/sales/refundForm/DetailRefundForm.vue b/src/views/sales/refundForm/DetailRefundForm.vue
index 786ae99..1353ee3 100644
--- a/src/views/sales/refundForm/DetailRefundForm.vue
+++ b/src/views/sales/refundForm/DetailRefundForm.vue
@@ -37,11 +37,11 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -58,15 +58,15 @@
               <ul>
                 <li>
                   <div class="left remark">
-                    <div class="content-title">{{ "閫�璐у師鍥狅細" }}</div>
-                    <div class="content-data">{{ "" }}</div>
+                    <div class="content-title">{{ "閫�娆惧師鍥狅細" }}</div>
+                    <div class="content-data">{{ detailConfig.infomation.reason }}</div>
                   </div>
                 </li>
               </ul>
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -82,7 +82,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -144,34 +144,34 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
     this.setTableForm()
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
-          rightStr: "閿�鍞��璐у崟缂栧彿",
-          rightValue: ""
-        },
-        {
-          leftStr: "閫夋嫨婧愬崟",
-          leftValue: "",
-          rightStr: "閫�鍏ヤ粨搴�",
-          rightValue: ""
+          leftValue: item.client.name,
+          rightStr: "閫�娆惧崟缂栧彿",
+          rightValue: item.number
         },
         {
           leftStr: "閿�鍞礋璐ｄ汉",
-          leftValue: "",
-          rightStr: "瀹℃壒鐘舵��",
-          rightValue: ""
+          leftValue: item.member.username,
+          rightStr: "閫�娆炬棩鏈�",
+          rightValue: item.refundDate
         },
         {
-          leftStr: "閫�璐ф棩鏈�",
-          leftValue: "",
+          leftStr: "浠樻鏂瑰紡",
+          leftValue: item.paymentType.name,
+          rightStr: "璐︽埛",
+          rightValue: item.bankAccount.name
+        },
+        {
+          leftStr: "鏄惁寮�绁�",
+          leftValue: item.isInvoice,
           rightStr: "鍒涘缓鏃堕棿",
           rightValue: ""
         },
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index dca05e4..a61c1e6 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -107,11 +107,20 @@
         infomation: {}
       },
       selValueList: [],
-      search_map: {}
+      search_map: {},
+      keyword: "",
+      keywordType: ""
     }
   },
   created() {
     this.setTable()
+    if (!this.isDetail) {
+      this.keyword = ""
+      this.keywordType = ""
+    } else {
+      this.keyword = this.addConfig.keyword
+      this.keywordType = this.addConfig.keywordType
+    }
     this.getData()
   },
   methods: {
@@ -120,27 +129,29 @@
         tableInfomation: [],
         tableColumn: [
           { label: "閫�娆惧崟缂栧彿", prop: "number", isCommonClick: true },
-          { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 120, isClientClick: true },
-          { label: "閫�娆炬棩鏈�", prop: "refundDate", isTime: true, min: 130 },
-          { label: "璐︽埛", prop: "accountId" },
+          { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true },
+          { label: "閫�娆炬棩鏈�", prop: "refundDate", min: 130 },
+          { label: "璐︽埛", prop: "bankAccount_name" },
           { label: "鏄惁寮�绁�", prop: "isInvoice", min: 100 },
-          { label: "浠樻鏂瑰紡", prop: "refundMethod" },
-          { label: "閿�鍞礋璐ｄ汉", prop: "memberId" },
+          { label: "浠樻鏂瑰紡", prop: "paymentType_name" },
+          { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
           // { label: "淇敼鏃堕棿", prop: "modifyTime" },
-          { label: "浠风◣鍚堣", prop: "priceTax" }
+          { label: "浠风◣鍚堣", prop: "amountTotal" }
         ]
       }
       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 })
       }
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
       await getSalesRefundList({
-        search_map: this.search_map,
+        keyword: this.keyword,
+        keywordType: this.keywordType,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
@@ -150,7 +161,11 @@
             if (res.data.list && res.data.list.length > 0) {
               const list = res.data.list.map((item) => {
                 return {
-                  ...item
+                  ...item,
+                  client_name: item.client.name,
+                  member_name: item.member.username,
+                  paymentType_name: item.paymentType.name,
+                  bankAccount_name: item.bankAccount.name
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -172,13 +187,13 @@
     // 鎼滅储
     searchClick(val, content) {
       console.log(val, content)
-      this.search_map = {
-        [val.value]: content
-      }
+      this.keyword = content
+      this.keywordType = val.label
       this.getData()
     },
     resetClick() {
-      this.search_map = {}
+      this.keyword = ""
+      this.keywordType = ""
       this.getData()
     },
     // 鏂板缓
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index c5e2e49..df5a517 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -87,7 +87,12 @@
               </el-col> -->
               <el-col :span="12">
                 <el-form-item label="绛剧害鏃ユ湡" prop="signTime">
-                  <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.signTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -106,7 +111,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="浜や粯鏃ユ湡" prop="deliveryDate">
-                  <el-date-picker v-model="editConfig.infomation.deliveryDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.deliveryDate"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -180,11 +190,11 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="24">
-                <el-form-item label="鏉℃涓庢潯浠�" prop="termsTreaty">
+                <el-form-item label="鏉℃涓庢潯浠�" prop="conditions">
                   <el-input
                     type="textarea"
                     :autosize="{ minRows: 4 }"
-                    v-model="editConfig.infomation.termsTreaty"
+                    v-model="editConfig.infomation.conditions"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -202,7 +212,7 @@
             </el-row>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info-title">闄勪欢淇℃伅</div>
+          <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
@@ -227,7 +237,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info-title" style="display: flex">
             浜у搧绠＄悊
@@ -382,7 +392,7 @@
         title: "",
         infomation: {}
       },
-      clientId: this.editCommonConfig.infomation.clientId,
+      clientId: this.editCommonConfig.infomation.client_id,
       saleChanceId: this.editCommonConfig.infomation.saleChanceId
     }
   },
@@ -418,37 +428,23 @@
           const params = this.saveParams()
           console.log(params)
           if (this.editConfig.title === "鏂板缓") {
-            getAddSalesDetails(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "娣诲姞鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getAddSalesDetails(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("娣诲姞鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           } else {
-            getUpdateSalesDetails(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "缂栬緫鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getUpdateSalesDetails(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("缂栬緫鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           }
         } else {
           console.log("error submit")
@@ -458,36 +454,44 @@
     },
     saveParams() {
       let data = this.editConfig.infomation
-      let params = {
-        id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
-        salesDetails: {
-          address: data.address || "",
-          addressee: data.addressee || "",
-          clientId: parseInt(this.clientId),
-          conditions: data.conditions || "",
-          deliveryDate: data.deliveryDate || "",
-          memberId: data.memberId || 0,
-          number: data.number || "",
-          phone: data.phone || "",
-          products: [
-            {
-              amount: 0,
-              desc: "",
-              id: 0,
-              name: "",
-              number: "",
-              price: 0,
-              total: 0
-            }
-          ],
-          remark: data.remark || "",
-          saleChanceId: parseInt(this.saleChanceId),
-          saleType: data.saleType || 0,
-          signTime: data.signTime || "",
-          wechatOrderStatus: data.wechatOrderStatus || 0,
-          logisticCompany: data.logisticCompany || "",
-          logisticCost: parseInt(data.logisticCost) || 0,
-          logisticNumber: data.logisticNumber || ""
+      let commonParam = {
+        address: data.address || "",
+        addressee: data.addressee || "",
+        clientId: this.clientId || 0,
+        conditions: data.conditions || "",
+        deliveryDate: data.deliveryDate || "",
+        memberId: data.memberId || 0,
+        number: data.number || "",
+        phone: data.phone || "",
+        products: [
+          {
+            amount: 0,
+            desc: "",
+            id: 0,
+            name: "",
+            number: "",
+            price: 0,
+            total: 0
+          }
+        ],
+        remark: data.remark || "",
+        saleChanceId: this.saleChanceId || 0,
+        saleType: data.saleType || 0,
+        signTime: data.signTime || "",
+        wechatOrderStatus: data.wechatOrderStatus || 0,
+        logisticCompany: data.logisticCompany || "",
+        logisticCost: parseInt(data.logisticCost) || 0,
+        logisticNumber: data.logisticNumber || ""
+      }
+      let params = {}
+      if (this.editConfig.title === "鏂板缓") {
+        params = { ...commonParam }
+      } else {
+        params = {
+          id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+          salesDetails: {
+            ...commonParam
+          }
         }
       }
       return params
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 1ed67b2..0e4cddf 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -19,19 +19,19 @@
             <li v-for="(item, i) in topList" :key="i">
               <div class="left1">
                 <div class="content-title">{{ item.left1Str + "锛�" }}</div>
-                <div class="content-data">{{ item.left1Value }}</div>
+                <div class="content-data">{{ item.left1Value ? item.left1Value : "--" }}</div>
               </div>
               <div class="left2">
                 <div class="content-title">{{ item.left2Str + "锛�" }}</div>
-                <div class="content-data">{{ item.left2Value }}</div>
+                <div class="content-data">{{ item.left2Value ? item.left2Value : "--" }}</div>
               </div>
               <div class="right1">
                 <div class="content-title">{{ item.right1Str + "锛�" }}</div>
-                <div class="content-data">{{ item.right1Value }}</div>
+                <div class="content-data">{{ item.right1Value ? item.right1Value : "--" }}</div>
               </div>
               <div class="right2">
                 <div class="content-title">{{ item.right2Str + "锛�" }}</div>
-                <div class="content-data">{{ item.right2Value }}</div>
+                <div class="content-data">{{ item.right2Value ? item.right2Value : "--" }}</div>
               </div>
             </li>
           </ul>
@@ -64,11 +64,11 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -86,11 +86,11 @@
                 <li v-for="(item, i) in dynamicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -108,11 +108,11 @@
                 <li v-for="(item, i) in deliveryInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -129,9 +129,10 @@
               <div class="termsConditions">
                 <div class="content-title">{{ "鏉′欢涓庢潯娆�" + "锛�" }}</div>
                 <div class="content-termsConditions">
-                  <ul>
+                  {{ "\n" + detailConfig.infomation.conditions }}
+                  <!-- <ul>
                     <li v-for="(item, index) in Status.termsConditions" :key="index">{{ item }}</li>
-                  </ul>
+                  </ul> -->
                 </div>
               </div>
             </div>
@@ -260,18 +261,18 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
     this.setTableForm()
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.topList = [
         {
           left1Str: "瀹㈡埛鍚嶇О",
-          left1Value: "",
+          left1Value: item.client.name,
           left2Str: "鍚堣",
-          left2Value: "",
+          left2Value: item.amountTotal,
           right1Str: "宸叉敹閲戦",
           right1Value: "0.00",
           right2Str: "宸插紑绁ㄩ噾棰�",
@@ -281,7 +282,7 @@
           left1Str: "绛剧害鏃ユ湡",
           left1Value: "",
           left2Str: "閿�鍞礋璐ｄ汉",
-          left2Value: "",
+          left2Value: item.Member.username,
           right1Str: "搴旀敹閲戦",
           right1Value: "0.00",
           right2Str: "鏈紑绁ㄩ噾棰�",
@@ -291,25 +292,25 @@
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "璁㈠崟缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "閿�鍞満浼�",
-          leftValue: "",
+          leftValue: item.saleChance.name,
           rightStr: "閫夋嫨婧愬崟",
           rightValue: ""
         },
         {
           leftStr: "绛剧害鏃ユ湡",
-          leftValue: "",
+          leftValue: item.signTime,
           rightStr: "閿�鍞礋璐ｄ汉",
-          rightValue: ""
+          rightValue: item.Member.username
         },
         {
           leftStr: "浜や粯鏃ユ湡",
-          leftValue: "",
+          leftValue: item.deliveryDate,
           rightStr: "璁㈠崟鏉ユ簮",
           rightValue: ""
         },
@@ -329,13 +330,13 @@
       this.deliveryInfoList = [
         {
           leftStr: "鏀惰揣浜�",
-          leftValue: "",
+          leftValue: item.addressee,
           rightStr: "鏀惰揣鑱旂郴鏂瑰紡",
-          rightValue: ""
+          rightValue: item.phone
         },
         {
           leftStr: "鏀惰揣鍦板潃",
-          leftValue: "",
+          leftValue: item.address,
           rightStr: "",
           rightValue: ""
         }
@@ -611,13 +612,10 @@
                 color: #555;
               }
               .content-termsConditions {
-                margin-left: 25px;
+                margin: 0px 25px 15px;
                 font-size: 13px;
                 color: #333;
-                li {
-                  margin: 5px 0;
-                  border-bottom: 0px solid #f9f9fb;
-                }
+                white-space: pre-wrap;
               }
             }
           }
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index cc02192..560a58d 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -11,6 +11,7 @@
         :search-options="searchOptions"
         @searchClick="searchClick"
         @resetClick="resetClick"
+        :search-sel="searchSel"
       />
       <div class="btn-pager">
         <PublicFunctionBtnView :submit-approval="true" :operates-list="operatesList" @batchDelete="delClick" />
@@ -124,17 +125,25 @@
         infomation: {}
       },
       selValueList: [],
-      search_map: {}
+      search_map: {},
+      searchSel: {
+        value: "number",
+        label: "璁㈠崟缂栧彿"
+      },
+      keyword: "",
+      keywordType: ""
     }
   },
   created() {
     this.setTable()
     if (!this.isDetail) {
-      this.search_map = {}
+      this.keyword = ""
+      this.keywordType = ""
     } else {
-      this.search_map = { ...this.addConfig }
+      this.keyword = this.addConfig.keyword
+      this.keywordType = this.addConfig.keywordType
     }
-    this.getData(this.search_map)
+    this.getData()
   },
   methods: {
     setTable() {
@@ -143,8 +152,8 @@
         tableColumn: [
           { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true },
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
-          { label: "绛剧害鏃ユ湡", prop: "signTime", isTime: true, width: 150 },
-          { label: "閿�鍞礋璐ｄ汉", prop: "memberId" },
+          { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
+          { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
           { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
           { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
           { label: "鍚堣", prop: "total", price: true },
@@ -161,14 +170,16 @@
       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 })
       }
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
       await getSalesDetailsList({
-        search_map: this.search_map,
+        keyword: this.keyword,
+        keywordType: this.keywordType,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
@@ -179,7 +190,8 @@
               const list = res.data.list.map((item) => {
                 return {
                   ...item,
-                  client_name: item.client.name
+                  client_name: item.client.name,
+                  member_name: item.Member.username
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -200,14 +212,13 @@
     },
     // 鎼滅储
     searchClick(val, content) {
-      console.log(val, content)
-      this.search_map = {
-        [val.value]: content
-      }
+      this.keyword = content
+      this.keywordType = val.label
       this.getData()
     },
     resetClick() {
-      this.search_map = {}
+      this.keyword = ""
+      this.keywordType = ""
       this.getData()
     },
     // 鏂板缓
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 2db4a3e..05bef45 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -652,15 +652,12 @@
               console.log(res)
               this.editConfig.visible = false
               if (res.code === 200) {
-                this.$message({
-                  message: "娣诲姞鎴愬姛",
-                  type: "success"
-                })
-                if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name) {
-                  this.$parent.handleClose()
-                } else {
-                  this.$parent.getData()
-                }
+                this.$message.success("娣诲姞鎴愬姛")
+                // if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name) {
+                //   this.$parent.handleClose()
+                // } else {
+                this.$parent.getData()
+                // }
               }
             })
           } else {
@@ -668,10 +665,7 @@
               console.log(res)
               this.editConfig.visible = false
               if (res.code === 200) {
-                this.$message({
-                  message: "缂栬緫鎴愬姛",
-                  type: "success"
-                })
+                this.$message.success("缂栬緫鎴愬姛")
                 this.$parent.getData()
               }
             })
diff --git a/src/views/sales/salesOpportunity/DetailOpportunity.vue b/src/views/sales/salesOpportunity/DetailOpportunity.vue
index 52c94cd..34f0131 100644
--- a/src/views/sales/salesOpportunity/DetailOpportunity.vue
+++ b/src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -346,7 +346,7 @@
         },
         {
           leftStr: "鍟嗘満鏉ユ簮",
-          leftValue: item.SalesSources.name,
+          leftValue: item.sales_sources.name,
           rightStr: "鍟嗘満绫诲瀷",
           rightValue: "" // item.SaleType.name
         },
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 69511cd..ea1c62a 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -14,7 +14,6 @@
       />
       <div class="btn-pager">
         <PublicFunctionBtnView
-          :duplicate-check="true"
           :statistics="true"
           :custom-funnel="true"
           :operates-list="operatesList"
@@ -135,7 +134,9 @@
     if (!this.isDetail) {
       this.search_map = {}
     } else {
-      this.search_map = { ...this.addConfig }
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
     }
     this.getData(this.search_map)
   },
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index ae404d0..9341924 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -87,7 +87,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="閫�璐ф棩鏈�" prop="returnDate">
-                  <el-date-picker v-model="editConfig.infomation.returnDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+                  <el-date-picker
+                    v-model="editConfig.infomation.returnDate"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -98,10 +103,10 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="鐘舵��" prop="status">
+                <el-form-item label="鐘舵��" prop="salesReturnStatusId">
                   <div class="common-select">
                     <el-select
-                      v-model="editConfig.infomation.status"
+                      v-model="editConfig.infomation.salesReturnStatusId"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
                       size="mini"
@@ -109,7 +114,7 @@
                       <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -131,7 +136,7 @@
             </el-row>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info-title">闄勪欢淇℃伅</div>
+          <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
@@ -156,7 +161,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info-title" style="display: flex">
             浜у搧绠＄悊
@@ -192,6 +197,7 @@
 import { getAllData } from "@/api/client/client"
 import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import { getProductList } from "@/api/common/other"
 export default {
   name: "AddSalesReturnDialog",
   props: {
@@ -245,6 +251,7 @@
     this.$store.dispatch("geClient")
     this.setTableForm()
     this.getCommonData()
+    this.getProductList()
   },
   methods: {
     getCommonData() {
@@ -253,11 +260,22 @@
           this.memberOptions = res.data.member
           this.repositoryOptions = res.data.repository
           this.currencyOptions = res.data.currency
-          this.statusOptions = res.data.status
+          this.statusOptions = res.data.salesReturnStatus
         })
         .catch((err) => {
           console.log(err)
         })
+    },
+    // 鑾峰彇浜у搧鍒楄〃
+    async getProductList() {
+      await getProductList({
+        page: 0,
+        pageSize: 0,
+        productName: "",
+        productNumber: ""
+      }).then((res) => {
+        console.log(res)
+      })
     },
     // 淇濆瓨
     saveClick(formName) {
@@ -267,37 +285,27 @@
           const params = this.saveParams()
           console.log(params)
           if (this.editConfig.title === "鏂板缓") {
-            getAddSalesReturn(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "娣诲姞鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getAddSalesReturn(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("娣诲姞鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           } else {
-            getUpdateSalesReturn(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "缂栬緫鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getUpdateSalesReturn(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("缂栬緫鎴愬姛")
+                this.$message({
+                  message: "缂栬緫鎴愬姛",
+                  type: "success"
+                })
+                this.$parent.getData()
+              }
+            })
           }
         } else {
           console.log("error submit")
diff --git a/src/views/sales/salesReturn/DetailReturn.vue b/src/views/sales/salesReturn/DetailReturn.vue
index a678fda..9cd2e7e 100644
--- a/src/views/sales/salesReturn/DetailReturn.vue
+++ b/src/views/sales/salesReturn/DetailReturn.vue
@@ -37,11 +37,11 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -59,11 +59,11 @@
                 <li v-for="(item, i) in dynamicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -81,14 +81,14 @@
                 <li>
                   <div class="left remark">
                     <div class="content-title">{{ "閫�璐у師鍥狅細" }}</div>
-                    <div class="content-data">{{ "" }}</div>
+                    <div class="content-data">{{ detailConfig.infomation.reason }}</div>
                   </div>
                 </li>
               </ul>
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -104,7 +104,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -169,34 +169,34 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
     this.setTableForm()
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "閿�鍞��璐у崟缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "閫夋嫨婧愬崟",
           leftValue: "",
           rightStr: "閫�鍏ヤ粨搴�",
-          rightValue: ""
+          rightValue: item.repository
         },
         {
           leftStr: "閿�鍞礋璐ｄ汉",
-          leftValue: "",
+          leftValue: item.Member.username,
           rightStr: "瀹℃壒鐘舵��",
           rightValue: ""
         },
         {
           leftStr: "閫�璐ф棩鏈�",
-          leftValue: "",
+          leftValue: item.returnDate,
           rightStr: "鍒涘缓鏃堕棿",
           rightValue: ""
         },
@@ -216,7 +216,7 @@
         },
         {
           leftStr: "鐘舵��",
-          leftValue: "",
+          leftValue: item.SalesReturnStatus.name,
           rightStr: "宸查��娆�",
           rightValue: ""
         }
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 9654087..88d5af4 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -11,6 +11,7 @@
         :search-options="searchOptions"
         @searchClick="searchClick"
         @resetClick="resetClick"
+        :search-sel="searchSel"
       />
       <div class="btn-pager">
         <PublicFunctionBtnView
@@ -108,11 +109,24 @@
         infomation: {}
       },
       selValueList: [],
-      search_map: {}
+      search_map: {},
+      searchSel: {
+        value: "number",
+        label: "閿�鍞��璐у崟缂栧彿"
+      },
+      keyword: "",
+      keywordType: ""
     }
   },
   created() {
     this.setTable()
+    if (!this.isDetail) {
+      this.keyword = ""
+      this.keywordType = ""
+    } else {
+      this.keyword = this.addConfig.keyword
+      this.keywordType = this.addConfig.keywordType
+    }
     this.getData()
   },
   methods: {
@@ -121,27 +135,29 @@
         tableInfomation: [],
         tableColumn: [
           { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true },
-          { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 90, isClientClick: true },
-          { label: "閫�璐ф棩鏈�", prop: "returnDate", isTime: true, min: 130 },
-          { label: "鐘舵��", prop: "status" },
+          { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true },
+          { label: "閫�璐ф棩鏈�", prop: "returnDate", min: 130 },
+          { label: "鐘舵��", prop: "salesReturnStatus_name" },
           { label: "閫�鍏ヤ粨搴�", prop: "repository" },
           { label: "搴旈��娆�", prop: "refundabe" },
           { label: "宸查��娆�", prop: "refunded" },
-          { label: "閿�鍞礋璐ｄ汉", prop: "memberId" }
+          { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
           // { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
         ]
       }
       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 })
       }
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
       await getSalesReturnList({
-        search_map: this.search_map,
+        keyword: this.keyword,
+        keywordType: this.keywordType,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
@@ -151,7 +167,10 @@
             if (res.data.list && res.data.list.length > 0) {
               const list = res.data.list.map((item) => {
                 return {
-                  ...item
+                  ...item,
+                  member_name: item.Member.username,
+                  salesReturnStatus_name: item.SalesReturnStatus.name,
+                  client_name: item.client.name
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -172,14 +191,13 @@
     },
     // 鎼滅储
     searchClick(val, content) {
-      console.log(val, content)
-      this.search_map = {
-        [val.value]: content
-      }
+      this.keyword = content
+      this.keywordType = val.label
       this.getData()
     },
     resetClick() {
-      this.search_map = {}
+      this.keyword = ""
+      this.keywordType = ""
       this.getData()
     },
     // 鏂板缓
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 3439df7..9c5c59c 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -50,10 +50,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="閿�鍞�诲崟" prop="masterOrderNumber">
+                <el-form-item label="閿�鍞�诲崟" prop="master_order_number">
                   <div class="custom-name">
                     <el-autocomplete
-                      v-model="editConfig.infomation.masterOrderNumber"
+                      v-model="editConfig.infomation.master_order_number"
                       :fetch-suggestions="
                         (queryString, callback) => {
                           querySearchAsync(queryString, callback, 'master')
@@ -307,7 +307,7 @@
     dataProcess() {
       this.masterOrderList.map((item) => {
         if (this.masterId === item.id) {
-          this.editConfig.infomation.masterOrderNumber = item.number
+          this.editConfig.infomation.master_order_number = item.number
         }
       })
     },
@@ -319,37 +319,23 @@
           const params = this.saveParams()
           console.log(params)
           if (this.editConfig.title === "鏂板缓") {
-            getAddSubOrder(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "娣诲姞鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getAddSubOrder(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("娣诲姞鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           } else {
-            getUpdateSubOrder(params)
-              .then((res) => {
-                console.log(res)
-                this.editConfig.visible = false
-                if (res.code === 200) {
-                  this.$message({
-                    message: "缂栬緫鎴愬姛",
-                    type: "success"
-                  })
-                  this.$parent.getData()
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
+            getUpdateSubOrder(params).then((res) => {
+              console.log(res)
+              this.editConfig.visible = false
+              if (res.code === 200) {
+                this.$message.success("缂栬緫鎴愬姛")
+                this.$parent.getData()
+              }
+            })
           }
         } else {
           console.log("error submit")
@@ -361,8 +347,8 @@
       let data = this.editConfig.infomation
       let params = {
         id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
-        clientId: parseInt(this.clientId) || 0,
-        masterOrderId: parseInt(this.masterId) || 0,
+        clientId: this.clientId || 0,
+        masterOrderId: this.masterId || 0,
         memberId: data.memberId || 0,
         number: data.number || "",
         product: [
@@ -431,7 +417,7 @@
         this.editConfig.infomation.client_id = row.id
         this.clientId = row.id
       } else if (value == "master") {
-        this.editConfig.infomation.masterOrderNumber = row.number
+        this.editConfig.infomation.master_order_number = row.number
         this.masterId = row.id
       }
     },
@@ -442,7 +428,7 @@
         this.editConfig.infomation.client_id = 0
         this.clientId = 0
       } else if (value == "master") {
-        this.editConfig.infomation.masterOrderNumber = ""
+        this.editConfig.infomation.master_order_number = ""
         this.masterId = 0
       }
     },
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 4fd0fbe..fa66982 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -37,18 +37,18 @@
                 <li v-for="(item, i) in basicInfoList" :key="i">
                   <div class="left">
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
-                    <div class="content-data">{{ item.leftValue }}</div>
+                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -64,7 +64,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -93,6 +93,7 @@
 <script>
 import SalesDetails from "@/views/sales/salesDetails"
 import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+
 export default {
   name: "DetailSubOrder",
   props: {
@@ -126,24 +127,24 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
     this.setTableForm()
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "鍗曟嵁缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "閿�鍞�诲崟",
-          leftValue: "",
+          leftValue: item.masterOrder.number,
           rightStr: "璐熻矗浜�",
-          rightValue: ""
+          rightValue: item.member.username
         },
         {
           leftStr: "鍒涘缓浜�",
@@ -156,19 +157,19 @@
           leftValue: "",
           rightStr: "鏇存柊鏃堕棿",
           rightValue: ""
-        },
-        {
-          leftStr: "瀹℃壒鐘舵��",
-          leftValue: "",
-          rightStr: "鏈�鏂板鎵规椂闂�",
-          rightValue: ""
-        },
-        {
-          leftStr: "涓婁竴姝ュ鎵逛汉",
-          leftValue: "",
-          rightStr: "褰撳墠瀹℃壒浜�",
-          rightValue: ""
         }
+        // {
+        //   leftStr: "瀹℃壒鐘舵��",
+        //   leftValue: "",
+        //   rightStr: "鏈�鏂板鎵规椂闂�",
+        //   rightValue: ""
+        // },
+        // {
+        //   leftStr: "涓婁竴姝ュ鎵逛汉",
+        //   leftValue: "",
+        //   rightStr: "褰撳墠瀹℃壒浜�",
+        //   rightValue: ""
+        // }
       ]
     },
     handleClose() {
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index 726f005..b5369b2 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -137,7 +137,9 @@
     if (!this.isDetail) {
       this.search_map = {}
     } else {
-      this.search_map = { ...this.addConfig }
+      this.search_map = {
+        [this.addConfig.id_name]: this.addConfig.client_name
+      }
     }
     this.getData(this.search_map)
   },
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index b417634..677c90d 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -219,9 +219,9 @@
         },
         {
           leftStr: "璐熻矗浜�",
-          leftValue: item.memberId,
+          leftValue: item.member.username,
           rightStr: "鑱旂郴浜哄鍚�",
-          rightValue: item.contactId
+          rightValue: item.contact.name
         },
         {
           leftStr: "閿�鍞満浼�",
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 9c32304..072f64e 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -125,7 +125,7 @@
           { label: "绛剧害鏃ユ湡", prop: "signTime" }, // 绛剧害鏃ユ湡
           { label: "鍚堝悓绫诲瀷", prop: "serviceContractType" }, // 鍚堝悓绫诲瀷
           { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus" }, // 鍚堝悓鐘舵��
-          { label: "璐熻矗浜�", prop: "memberId" }, // 璐熻矗浜�
+          { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
           { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
           { label: "鏈嶅姟寮�濮嬫棩", prop: "startTime" }, // 鏈嶅姟寮�濮嬫棩
           { label: "鏈嶅姟鍒版湡鏃�", prop: "endTime" }, // 鏈嶅姟鍒版湡鏃�
@@ -157,7 +157,8 @@
                   ...item,
                   client_name: item.client.name,
                   serviceContractStatus: item.serviceContractStatus.name,
-                  serviceContractType: item.serviceContractType.name
+                  serviceContractType: item.serviceContractType.name,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
diff --git a/src/views/service/serviceFollowup/DetailServiceFollowup.vue b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
index 84c8410..0891623 100644
--- a/src/views/service/serviceFollowup/DetailServiceFollowup.vue
+++ b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
@@ -59,7 +59,7 @@
                 <li>
                   <div class="left remark">
                     <div class="content-title">{{ "澶囨敞锛�" }}</div>
-                    <div class="content-data">{{ "澶囨敞鍐呭" }}</div>
+                    <div class="content-data">{{ detailConfig.infomation.remark }}</div>
                   </div>
                 </li>
               </ul>

--
Gitblit v1.8.0