From 5e796658635bdfcb7806a49fd424ce08c7f8c4a3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 13 十月 2023 15:41:56 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/views/service/serviceContract/DetailServiceContract.vue         |    8 
 src/views/service/serviceFollowup/AddServiceFollowupDialog.vue      |    3 
 src/views/client/followupRecords/AddFollowupRecordsDialog.vue       |   18 
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue              |  115 ++--
 src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue |    3 
 src/views/sales/salesOpportunity/DetailAdvanceDialog.vue            |    4 
 src/views/client/salesLead/index.vue                                |    4 
 src/views/sales/salesDetails/DetailSpecification.vue                |    2 
 src/views/sales/salesReturn/index.vue                               |  109 ++--
 src/views/other/payment/receipt/index.vue                           |   29 
 src/views/client/followupRecords/index.vue                          |    5 
 src/views/service/serviceContract/index.vue                         |   36 +
 src/views/sales/salesDetails/index.vue                              |  126 +++--
 src/views/service/serviceContract/AddServiceContractDialog.vue      |    3 
 src/store/modules/getClientName.js                                  |    3 
 src/views/client/contacts/AddContactsDialog.vue                     |    2 
 src/api/common/payment.js                                           |   19 
 src/components/makepager/CommonFormTableView.vue                    |    6 
 src/views/client/salesLead/AddSalesLeadDialog.vue                   |    8 
 src/views/other/payment/saleInvoice/index.vue                       |   25 
 src/views/sales/masterOrder/AddMasterOrderDialog.vue                |   72 +-
 src/views/sales/salesReturn/AddSalesReturnDialog.vue                |   77 +-
 src/views/sales/refundForm/AddRefundFormDialog.vue                  |   85 +-
 src/views/sales/refundForm/index.vue                                |  104 ++-
 src/views/service/clientServiceOrder/mixin/codeMixin.js             |    2 
 src/views/client/client/AddClientManageDialog.vue                   |    2 
 src/views/client/contacts/index.vue                                 |    4 
 src/views/client/salesLead/DetailSalesLead.vue                      |   32 
 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue      |  122 ++--
 src/views/sales/salesOpportunity/DetailOpportunity.vue              |   41 +
 src/views/sales/quotation/AddQuotationDialog.vue                    |   70 +-
 src/views/sales/quotation/DetailQuotation.vue                       |    2 
 src/views/sales/subOrder/AddSubOrderDialog.vue                      |   71 +-
 src/views/service/clientServiceOrder/index.vue                      |    4 
 src/views/sales/contractManage/AddContractManageDialog.vue          |   12 
 src/views/client/followupRecords/mixin/codeMixin.js                 |  108 ++--
 src/views/sales/quotation/index.vue                                 |   87 +-
 37 files changed, 784 insertions(+), 639 deletions(-)

diff --git a/src/api/common/payment.js b/src/api/common/payment.js
index d0da76d..0988731 100644
--- a/src/api/common/payment.js
+++ b/src/api/common/payment.js
@@ -1,12 +1,16 @@
 import request from "@/common/untils/request.js"
 import axios from "axios"
 
+
 // 鑾峰彇鏀舵璁″垝
-export const getCollectionPlanList = async (data) => {
-  return await axios.get(`/api/serviceCollectionPlan/list`, {
-    params: data
+export function getCollectionPlanList(data) {
+  return request({
+    url: "/api/serviceCollectionPlan/list",
+    method: "post",
+    data
   })
 }
+
 // 娣诲姞鏀舵璁″垝
 export function addCollectionPlan(data) {
   return request({
@@ -62,11 +66,14 @@
 }
 
 // 鑾峰彇閿�鍞彂绁�
-export const getInvoiceList = async (data) => {
-  return await axios.get(`/api/invoice/list`, {
-    params: data
+export function getInvoiceList(data) {
+  return request({
+    url: "/api/invoice/list",
+    method: "post",
+    data
   })
 }
+
 // 娣诲姞閿�鍞彂绁�
 export function addInvoice(data) {
   return request({
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 80520cc..35e69fb 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -138,13 +138,13 @@
         >閲嶇畻</el-button
       >
     </div>
-    <div v-if="showSummary.total || showSummary.refundable" style="height: 42px; line-height: 42px">
+    <div v-if="false && (showSummary.total || showSummary.refundable)" style="height: 42px; line-height: 42px" >
       <el-row :gutter="10">
-        <el-col v-if="showSummary.total" :span="2" :offset="22">
+        <el-col v-if="showSummary.total" :span="3" :offset="21">
           <span style="font-weight: bold">鍚堣</span>
           <span style="margin-left: 10px">{{ total }}</span>
         </el-col>
-        <el-col v-if="showSummary.refundable" :span="2" :offset="22">
+        <el-col v-if="showSummary.refundable" :span="3" :offset="21">
           <span style="font-weight: bold">搴旈��娆�</span>
           <span style="margin-left: 10px">0.00</span>
         </el-col>
diff --git a/src/store/modules/getClientName.js b/src/store/modules/getClientName.js
index f24918d..c53f358 100644
--- a/src/store/modules/getClientName.js
+++ b/src/store/modules/getClientName.js
@@ -84,6 +84,9 @@
         }
       })
     },
+    getContactFilter({commit},newData){
+      commit("contactNameList", newData)
+    },
     geChance(context) {
       getSaleChanceList().then((res) => {
         if (res.code == 200) {
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 594b776..e4ee9b8 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -29,7 +29,7 @@
                     v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="this.editConfig.title !== '鏂板缓'|| isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 155b037..42ca99a 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -29,7 +29,7 @@
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index b00fe4d..562033e 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -34,10 +34,10 @@
               @selTableCol="selTableCol"
           >
             <template slot="tableButton">
-              <el-table-column label="鎿嶄綔" width="130" fixed="right">
+              <el-table-column label="鎿嶄綔" width="120" fixed="right">
                 <template slot-scope="scope">
                   <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
-                  <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
+                  <!-- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button> -->
                   <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 1320e66..3ee7e0d 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -28,7 +28,7 @@
                     v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="this.editConfig.title !== '鏂板缓'  || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
@@ -340,6 +340,9 @@
 import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
 import SelectLeadDialog from "@/views/other/commonDialog/SelectLeadDialog"
 import codeMixin from "./mixin/codeMixin";
+import { getContactList } from "@/api/client/contacts"
+import { mapActions  } from 'vuex';
+
 export default {
   name: "AddFollowupRecordsDialog",
   mixins: [codeMixin],
@@ -450,6 +453,7 @@
     }
   },
   methods: {
+    ...mapActions (['getContactFilter']),
     formInfo(){
       this.objCode.type='璺熻繘璁板綍缂栫爜'
       this.objCode.codeStandID = ''
@@ -521,9 +525,9 @@
       let follow_record = {
         follow_record: {
           client_id: this.clientId || 0,
-          client_status_id: data.client_status_id || 0,
+          client_status_id: data.client_status_id || null,
           contact_id: this.contactId || 0,
-          contact_information_id: data.contact_information_id || 0,
+          contact_information_id: data.contact_information_id || null,
           content: data.content || "",
           follow_time: data.follow_time || "",
           member_id: data.member_id || 0,
@@ -566,10 +570,16 @@
         return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
       }
     },
-    handleSelectClient(value, item) {
+    async handleSelectClient(value, item) {
       if (value === "client") {
         this.clientId = item.id
         this.editConfig.infomation.client_name = item.name
+        await getContactList({
+          clientId:this.clientId
+        }).then((res)=>{
+          this.getContactFilter(res.data.list)
+        })
+        // console.log("clientId",this.clientId,this.editConfig.infomation.client_name)
       } else if (value === "contact") {
         this.contactId = item.id
         this.editConfig.infomation.contact_name = item.name
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 592b2bb..0e14e4a 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -263,7 +263,10 @@
     handleClick(row) {
       console.log(row)
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row, sale_chance_name: "", sales_leads_name: "" }
+      let config=JSON.parse(JSON.stringify(row));
+      config.client_status_id=config.client_status_id?config.client_status_id:null
+      config.contact_information_id=config.contact_information_id?config.contact_information_id:null
+      this.editConfig.infomation = { ...config, sale_chance_name: "", sales_leads_name: "" }
       this.editConfig.visible = true
     },
     // 鍒犻櫎
diff --git a/src/views/client/followupRecords/mixin/codeMixin.js b/src/views/client/followupRecords/mixin/codeMixin.js
index 8523a34..70bac5d 100644
--- a/src/views/client/followupRecords/mixin/codeMixin.js
+++ b/src/views/client/followupRecords/mixin/codeMixin.js
@@ -1,8 +1,8 @@
-import WordInput from "@/components/wordInput";
-import { getCodeStandardList } from "@/api/common/standard";
+import WordInput from "@/components/wordInput"
+import { getCodeStandardList } from "@/api/common/standard"
 export default {
   components: {
-    WordInput,
+    WordInput
   },
   data() {
     return {
@@ -14,90 +14,88 @@
       codenumer: 0, //姣忔杈撳叆鐨勭紪鐮�
       codenumberList: [], //鏁存潯缂栫爜
       sum: 0,
-      method:0,
-      objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜",codeStandID:'' },
-      codeRule:{},
-    };
+      method: 0,
+      objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜", codeStandID: "" },
+      codeRule: {}
+    }
   },
-  
+
   methods: {
     async getRCodeStandardList() {
       try {
-        const res = await getCodeStandardList(this.objCode);
-        this.codenumer = [];
-        this.sum = 0;
-        this.explain = "";
-        if(res.data.code==200){
+        const res = await getCodeStandardList(this.objCode)
+        this.codenumer = []
+        this.sum = 0
+        this.explain = ""
+        if (res.data.code == 200) {
           const {
             List = [],
             ID,
             AutoRule = {},
-            Method,
-          } = (res.data.data&&res.data.data.data) ? res.data.data.data[0] : [];
-          this.codeRule= (res.data.data&&res.data.data.data) ? res.data.data.data[0]:{}
-          let autoRule=AutoRule
-          let method=Method?Method:0
-          this.method=method
-          let rules=List
-          this.editConfig.infomation.ID=ID
+            Method
+          } = res.data.data && res.data.data.data ? res.data.data.data[0] : []
+          this.codeRule = res.data.data && res.data.data.data ? res.data.data.data[0] : {}
+          let autoRule = AutoRule
+          let method = Method ? Method : 0
+          this.method = method
+          let rules = List
+          this.editConfig.infomation.ID = ID
           if (method == 0 && res.data.data.data.length > 0) {
+            console.log("sss")
             rules.forEach((item, index) => {
               // setTimeout(() => {
               //   this.codenumer = item.length;
               //   this.sum++;
               // }, 200);
-              this.codenumer.push(item.Length);
-              this.sum++;
-              this.explain += item.Name + (index === rules.Length - 1 ? "" : "/");
-            });
+              this.codenumer.push(item.Length)
+              this.sum++
+              this.explain += item.Name + (index === rules.Length - 1 ? "" : "/")
+            })
           }
+          console.log(method)
           if (method == 1) {
             if (Object.keys(autoRule).length > 0) {
-              this.isIdDisabled = true;
+              this.isIdDisabled = true
               if (autoRule.PrefixMethod == 1) {
-                let prefix = autoRule.PrefixValue.split("").length;
-  
-                this.codenumer.push(prefix);
+                let prefix = autoRule.PrefixValue.split("").length
+
+                this.codenumer.push(prefix)
                 if (autoRule.SuffixMethod == 2) {
-                  this.codenumer.push(8);
+                  this.codenumer.push(8)
                 }
                 if (autoRule.AutoLength) {
-                  this.codenumer.push(autoRule.AutoLength);
+                  this.codenumer.push(autoRule.AutoLength)
                 }
-                this.sum = prefix + Number(autoRule.AutoLength);
+                this.sum = prefix + Number(autoRule.AutoLength)
                 this.codeList(
                   this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
-                );
-                return true;
+                )
+                return true
               }
             }
           }
-          if(this.editConfig.infomation.id){
-            this.codeList( this.editConfig.infomation.number);
+          if (this.editConfig.title !== "鏂板缓") {
+            this.codeList(this.editConfig.infomation.number)
           }
-          
-          this.$forceUpdate();
-        }else{
-          this.$message.error(res.data.msg?res.data.msg:'鑾峰彇缂栫爜瑙勮寖澶辫触锛岃閲嶈瘯锛�')
+
+          this.$forceUpdate()
+        } else {
+          this.$message.error(res.data.msg ? res.data.msg : "鑾峰彇缂栫爜瑙勮寖澶辫触锛岃閲嶈瘯锛�")
         }
-       
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     codeList(val) {
-      console.log(val,'===val  codelist')
-      this.inputValue = val;
-      this.codenumberList = val.toString();
-      this.editConfig.infomation.number =
-        this.codenumberList.length > 0
-          ? this.codenumberList.replace(/,/g, "")
-          : "";
-      console.log(this.codenumberList.replace(/,/g, ""));
+      console.log(val, "===val  codelist")
+      this.inputValue = val
+      this.codenumberList = val.toString()
+      this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
+      console.log(this.codenumberList.replace(/,/g, ""))
     },
     // 閰嶇疆缂栫爜瑙勮寖鐨勮烦杞�
-    numberClick(){
-      window.open('http://www.fai365.com:9080/facilty','_blank')
-    },
-  },
-};
+    numberClick() {
+      window.open("http://www.fai365.com:9080/facilty", "_blank")
+    }
+  }
+}
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 9e18e09..e61ba56 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -26,7 +26,7 @@
                     v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
@@ -41,7 +41,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+                <el-form-item label="鎰忓悜瀹㈡埛鍚嶇О" prop="name">
                   <el-input v-model="editConfig.infomation.name" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
@@ -70,14 +70,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="鍟嗘満鐘舵��" prop="businessStatus">
+                <el-form-item label="绾跨储鐘舵��" prop="businessStatus">
                   <span>{{ editConfig.infomation.businessStatus }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="鍟嗘満鏉ユ簮" prop="sales_sources_id">
+                <el-form-item label="绾跨储鏉ユ簮" prop="sales_sources_id">
                   <div class="common-select">
                     <el-select
                       v-model="editConfig.infomation.sales_sources_id"
diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue
index 0fd12d9..ac32fcb 100644
--- a/src/views/client/salesLead/DetailSalesLead.vue
+++ b/src/views/client/salesLead/DetailSalesLead.vue
@@ -3,7 +3,7 @@
     <el-drawer :visible.sync="detailConfig.visible" size="80%" :before-close="handleClose" :wrapperClosable="false">
       <template slot="title">
         <div class="header">
-          <span class="header-label">瀹㈡埛鍚嶇О</span>
+          <span class="header-label">閿�鍞嚎绱�</span>
           <span class="header-title">{{ detailConfig.infomation.name }}</span>
         </div>
       </template>
@@ -179,7 +179,7 @@
       }
       this.basicInfoList = [
         {
-          leftStr: "瀹㈡埛鍚嶇О",
+          leftStr: "鎰忓悜瀹㈡埛鍚嶇О",
           leftValue: item.name,
           rightStr: "閿�鍞嚎绱㈢紪鍙�",
           rightValue: item.number
@@ -193,11 +193,11 @@
         {
           leftStr: "鎵嬫満鍙风爜",
           leftValue: item.contact_phone,
-          rightStr: "鍟嗘満鐘舵��",
+          rightStr: "绾跨储鐘舵��",
           rightValue: "鏂板缓"
         },
         {
-          leftStr: "鍟嗘満鏉ユ簮",
+          leftStr: "绾跨储鏉ユ簮",
           leftValue: item.sales_resources,
           rightStr: "璐熻矗浜�",
           rightValue: item.member_name
@@ -205,21 +205,27 @@
         {
           leftStr: "鍒嗛厤鏃ユ湡",
           leftValue: "",
-          rightStr: "鍏捣鐘舵��",
+          // rightStr: "鍏捣鐘舵��",
+          // rightValue: ""
+          rightStr: "鍒涘缓鏃堕棿",
           rightValue: ""
         },
         {
-          leftStr: "鍒涘缓鏃堕棿",
-          leftValue: "",
-          rightStr: "鍒涘缓浜�",
-          rightValue: ""
-        },
-        {
-          leftStr: "鍏抽棴鍘熷洜",
+          // leftStr: "鍒涘缓鏃堕棿",
+          // leftValue: "",
+          // rightStr: "鍒涘缓浜�",
+          // rightValue: ""
+          leftStr: "鍒涘缓浜�",
           leftValue: "",
           rightStr: "",
           rightValue: ""
-        }
+        },
+        // {
+        //   leftStr: "鍏抽棴鍘熷洜",
+        //   leftValue: "",
+        //   rightStr: "",
+        //   rightValue: ""
+        // }
       ]
       this.dynamicInfoList = [
         {
diff --git a/src/views/client/salesLead/index.vue b/src/views/client/salesLead/index.vue
index 3d952f0..4bc7b1f 100644
--- a/src/views/client/salesLead/index.vue
+++ b/src/views/client/salesLead/index.vue
@@ -31,10 +31,10 @@
               @selTableCol="selTableCol"
           >
             <template slot="tableButton">
-              <el-table-column label="鎿嶄綔" width="160">
+              <el-table-column label="鎿嶄綔" width="150">
                 <template slot-scope="scope">
                   <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
-                  <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
+                  <!-- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button> -->
                   <el-button @click="advanceClick(scope.row)" type="text" size="small">鎺ㄨ繘</el-button>
                   <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
                 </template>
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index ff6411b..3e8365e 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -146,6 +146,8 @@
     }
     this.getData()
   },
+  mounted() {
+  },
   methods: {
     setTable() {
       this.tableList = {
@@ -176,13 +178,28 @@
     },
     // 璇锋眰鏁版嵁
     async getData() {
+      // console.log()
       this.loading = true
-      await getReceiptList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      let params = {}
+      let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+      if (this.addConfig.id) {
+        params = {
+          sourceID: this.addConfig.id,
+          sourceType: sourceTyle,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize,
+          client_id:this.addConfig.client_id,
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize,
+          client_id:this.addConfig.client_id,
+        }
+      }
+      await getReceiptList(params)
         .then((res) => {
           if (res.data.code === 200) {
             const resList = res?.data?.data?.data ?? []
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index a65c286..b430c93 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -169,12 +169,25 @@
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
-      await getInvoiceList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      console.log(this.addConfig)
+      let params = {}
+      let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+      if (this.addConfig.id) {
+        params = {
+          sourceID: this.addConfig.id,
+          sourceType: sourceTyle,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      }
+      await getInvoiceList(params)
         .then((res) => {
           if (res.data.code === 200) {
             if (res.data.data.data && res.data.data.data.length > 0) {
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 8c670d2..712268d 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -27,7 +27,7 @@
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
@@ -35,6 +35,15 @@
                     >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
                   <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="鍚堝悓鍚嶇О" prop="name">
+                  <div class="custom-name">
+                    <el-input v-model="editConfig.infomation.name"></el-input>
+                    <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
+                    <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
+                  </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -348,6 +357,7 @@
       console.log(data)
       let params = {
         id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+        name: data.name || "",
         client_id: this.clientId || 0,
         file: "",
         member_id: data.memberId || 0,
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index a4b6c1f..156330a 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -23,29 +23,25 @@
           <div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
-<!--              <el-col v-if="isUnflod" :span="12">-->
-<!--                <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
-<!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+              <!--              <el-col v-if="isUnflod" :span="12">-->
+              <!--                <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
+              <!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
               <el-col v-if="isUnflod" :span="12">
                 <el-form-item label="鍗曟嵁缂栧彿" prop="number">
                   <WordInput
-                      v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                      :codenumer="codenumer"
-                      :sum="sum"
-                      :disabled="editConfig.infomation.id || isIdDisabled"
-                      :inputValue="inputValue"
-                      @codeList="codeList"
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
                   />
                   <span v-else-if="method == 0" style="color: #f56c6c"
-                  >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                      ></span
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -178,11 +174,11 @@
 import { getAllData } from "@/api/client/client"
 import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
-import WordInput from "@/components/wordInput.vue";
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "QuotationDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -195,7 +191,7 @@
       }
     }
   },
-  components: {WordInput, SelectClientDialog },
+  components: { WordInput, SelectClientDialog },
   computed: {
     clientList() {
       return this.$store.state.getClientName.clientList
@@ -220,7 +216,7 @@
         infomation: {}
       },
       clientId: this.editCommonConfig.infomation.client_id,
-      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜",codeStandID:'' },
+      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜", codeStandID: "" }
     }
   },
   created() {
@@ -228,23 +224,23 @@
     this.getCommonData()
     this.formInfo()
   },
-  watch:{
-    'editCommonConfig.visible'(val){
-      if(val){
+  watch: {
+    "editCommonConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editCommonConfig.infomation.codeStandID'(val){
+    "editCommonConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
+      this.getRCodeStandardList()
     },
     getCommonData() {
       getAllData()
@@ -291,10 +287,10 @@
      * 寮哄埗鍒锋柊form缁勪欢
      * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
      */
-    refresh(){
-      this.refreshFlag=false
-      requestAnimationFrame(()=>{
-        this.refreshFlag=true
+    refresh() {
+      this.refreshFlag = false
+      requestAnimationFrame(() => {
+        this.refreshFlag = true
       })
     },
     saveParams() {
@@ -307,8 +303,8 @@
         money: data.money || 0,
         number: data.number || "",
         start_time: data.start_time || "",
-        codeStandID:data.ID,
-        codeRule:this.codeRule,
+        codeStandID: data.ID,
+        codeRule: this.codeRule
       }
       return params
     },
@@ -399,7 +395,7 @@
             font-size: 18px;
             cursor: pointer;
           }
-          .el-autocomplete{
+          .el-autocomplete {
             flex: 1;
           }
         }
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 66eebb6..d186f73 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -27,21 +27,17 @@
               <el-col :span="12">
                 <el-form-item label="鎶ヤ环缂栧彿" prop="number">
                   <WordInput
-                      v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                      :codenumer="codenumer"
-                      :sum="sum"
-                      :disabled="editConfig.infomation.id || isIdDisabled"
-                      :inputValue="inputValue"
-                      @codeList="codeList"
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
                   />
                   <span v-else-if="method == 0" style="color: #f56c6c"
-                  >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                      ></span
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
                 </el-form-item>
               </el-col>
 
@@ -71,11 +67,11 @@
                   </div>
                 </el-form-item>
               </el-col>
-<!--              <el-col :span="12">-->
-<!--                <el-form-item label="鎶ヤ环缂栧彿" prop="number">-->
-<!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+              <!--              <el-col :span="12">-->
+              <!--                <el-form-item label="鎶ヤ环缂栧彿" prop="number">-->
+              <!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="鎶ヤ环鍗曠姸鎬�" prop="quotation_status_id">
                   <div class="common-select">
@@ -316,10 +312,10 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
 import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "QuotationDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -391,7 +387,7 @@
       tableData: [],
       productId: 1,
       isNoProduct: true,
-      objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜",codeStandID:'' },
+      objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" }
     }
   },
   created() {
@@ -402,23 +398,23 @@
     this.getCommonData()
     this.formInfo()
   },
-  watch:{
-    'editConfig.visible'(val){
-      if(val){
+  watch: {
+    "editConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editConfig.infomation.codeStandID'(){
+    "editConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
+      this.getRCodeStandardList()
     },
     getCommonData() {
       getAllData()
@@ -484,10 +480,10 @@
      * 寮哄埗鍒锋柊form缁勪欢
      * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
      */
-    refresh(){
-      this.refreshFlag=false
-      requestAnimationFrame(()=>{
-        this.refreshFlag=true
+    refresh() {
+      this.refreshFlag = false
+      requestAnimationFrame(() => {
+        this.refreshFlag = true
       })
     },
     saveParams() {
@@ -504,8 +500,8 @@
         sale_chance_id: this.saleChanceId || 0,
         validity_date: data.validity_date || "",
         products: this.tableData,
-        codeStandID:data.ID,
-        codeRule:this.codeRule,
+        codeStandID: data.ID,
+        codeRule: this.codeRule
       }
       return params
     },
@@ -693,8 +689,8 @@
             cursor: pointer;
           }
         }
-        .custom-name{
-          .el-autocomplete{
+        .custom-name {
+          .el-autocomplete {
             flex: 1;
           }
         }
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index 0a5c3e5..5e294ec 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -23,7 +23,7 @@
                 <div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
               </template> -->
             <!-- </el-tab-pane> -->
-            <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
+            <!-- <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane> -->
             <el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
           </el-tabs>
         </div>
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index c27ae12..508e0c1 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -6,15 +6,10 @@
 
     <div class="filter" v-else>
       <div class="filter-card">
-        <CommonSearch
-            :show-add="false"
-            :amount-view="false"
-            placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
-            @searchClick="onFilterSearch"
-        >
+        <CommonSearch :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ユ姤浠峰崟鍙�" @searchClick="onFilterSearch">
           <template slot="leftButton">
-            <el-button size="small" type="primary"  @click="addBtnClick">鏂板缓</el-button>
-<!--            <el-button size="small"  @click="delClick">鍒犻櫎</el-button>-->
+            <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+            <!--            <el-button size="small"  @click="delClick">鍒犻櫎</el-button>-->
           </template>
         </CommonSearch>
       </div>
@@ -24,19 +19,19 @@
       <div class="body-card">
         <div class="list-view">
           <TableCommonView
-              ref="tableListRef"
-              :table-list="tableList"
-              @selClientClick="selClientClick"
-              @selContactsClick="selContactsClick"
-              @selCommonClick="selCommonClick"
-              @getSelectArray="getSelectArray"
-              @selTableCol="selTableCol"
+            ref="tableListRef"
+            :table-list="tableList"
+            @selClientClick="selClientClick"
+            @selContactsClick="selContactsClick"
+            @selCommonClick="selCommonClick"
+            @getSelectArray="getSelectArray"
+            @selTableCol="selTableCol"
           >
             <template slot="tableButton">
               <el-table-column label="鎿嶄綔" width="90">
                 <template slot-scope="scope">
                   <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
-                   <el-button @click="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+                  <el-button @click="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
             </template>
@@ -131,7 +126,7 @@
         label: "鎶ヤ环鍗曞彿"
       },
       tableColumn: [
-        { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true ,default:true}, // 鎶ヤ环鍗曞彿
+        { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true, default: true }, // 鎶ヤ环鍗曞彿
         { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
         { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 90, isContactClick: true }, // 鑱旂郴浜哄鍚�
         { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
@@ -142,7 +137,7 @@
         { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
         { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
       ],
-      showCol:["鎶ヤ环鍗曞彿", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
+      showCol: ["鎶ヤ环鍗曞彿", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
     }
   },
   created() {
@@ -151,7 +146,7 @@
       this.search_map = {}
     } else {
       this.search_map = {
-        [this.addConfig.id_name]: this.addConfig.client_name
+        [this.addConfig.id_name]: this.addConfig.id
       }
     }
     this.getData(this.search_map)
@@ -159,13 +154,13 @@
   methods: {
     setTable() {
       this.tableList = {
-        selectIndex:true,
+        selectIndex: true,
         tableInfomation: [],
         allcol: [],
         showcol: this.showCol,
-        tableColumn:this.setColumnVisible(this.showCol)
+        tableColumn: this.setColumnVisible(this.showCol)
       }
-      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
       this.searchOptions = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         const label = this.tableList.tableColumn[i].label
@@ -173,17 +168,17 @@
         this.searchOptions.push({ value: value, label: label })
       }
     },
-    setColumnVisible(showCol){
-      return  this.tableColumn.map(ele=>{
+    setColumnVisible(showCol) {
+      return this.tableColumn.map((ele) => {
         return {
           ...ele,
-          isShowColumn:showCol.includes(ele.label)
+          isShowColumn: showCol.includes(ele.label)
         }
       })
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setColumnVisible(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val)
     },
     // 璇锋眰鏁版嵁
     async getData() {
@@ -222,8 +217,8 @@
         })
     },
     // 鎼滅储
-    onFilterSearch(searchText){
-      this.search_map.number = searchText ?? ''
+    onFilterSearch(searchText) {
+      this.search_map.number = searchText ?? ""
       this.pagerOptions.currPage = 1
       this.getData()
     },
@@ -273,22 +268,22 @@
         cancelButtonText: "鍙栨秷",
         type: "warning"
       })
-          .then(() => {
-            getDelQuotation({ids: [id]}).then((response) => {
-              if (response.code === 200) {
-                this.$message.success("鍒犻櫎鎴愬姛")
-                this.getData()
-              } else {
-                this.$message.warning("鍒犻櫎澶辫触")
-              }
-            })
-          })
-          .catch((err) => {
-            if (err !== 'cancel') {
-              console.error(err)
+        .then(() => {
+          getDelQuotation({ ids: [id] }).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("鍒犻櫎鎴愬姛")
+              this.getData()
+            } else {
               this.$message.warning("鍒犻櫎澶辫触")
             }
           })
+        })
+        .catch((err) => {
+          if (err !== "cancel") {
+            console.error(err)
+            this.$message.warning("鍒犻櫎澶辫触")
+          }
+        })
     },
     getSelectArray(val) {
       console.log(val)
@@ -327,15 +322,15 @@
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-.quotation{
+.quotation {
   height: 100%;
   overflow: hidden;
-  .filter{
+  .filter {
     height: 80px;
     display: flex;
     align-items: center;
     padding: 12px 20px 0 20px;
-    &-card{
+    &-card {
       height: 80px;
       display: flex;
       align-items: center;
@@ -346,7 +341,7 @@
       background-color: #fff;
     }
   }
-  .body{
+  .body {
     box-sizing: border-box;
     padding: 10px 20px;
     border-radius: 12px;
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 91c3ed7..4a7f564 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -24,10 +24,26 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
+                <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
+                  <WordInput
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
+                  />
+                  <span v-else-if="method == 0" style="color: #f56c6c"
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+                  >
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
                   <div class="custom-name">
                     <el-autocomplete
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.client_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -50,32 +66,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
-                  <WordInput
-                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                    :codenumer="codenumer"
-                    :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
-                    :inputValue="inputValue"
-                    @codeList="codeList"
-                  />
-                  <span v-else-if="method == 0" style="color: #f56c6c"
-                    >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                    ></span
-                  >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="12">
                 <el-form-item label="閿�鍞��璐у崟" prop="sale_return_nunber">
                   <div class="custom-name">
                     <el-autocomplete
-                    
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.sale_return_nunber"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -103,7 +99,7 @@
               <el-col :span="12">
                 <el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
                   <el-select
-                  style="width:100%"
+                    style="width: 100%"
                     v-model="editConfig.infomation.memberId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
@@ -116,7 +112,7 @@
               <el-col :span="12">
                 <el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
                   <el-date-picker
-                  style="width:100%"
+                    style="width: 100%"
                     v-model="editConfig.infomation.refundDate"
                     value-format="yyyy-MM-dd"
                     type="date"
@@ -129,7 +125,7 @@
                 <el-form-item label="浠樻鏂瑰紡" prop="paymentTypeId">
                   <div class="common-select">
                     <el-select
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.paymentTypeId"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
@@ -151,7 +147,7 @@
                 <el-form-item label="璐︽埛" prop="bankAccountId">
                   <div class="common-select">
                     <el-select
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.bankAccountId"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
@@ -168,7 +164,7 @@
                 <el-form-item label="鏄惁寮�绁�" prop="isInvoice">
                   <div class="common-select">
                     <el-select
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.isInvoice"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
@@ -189,7 +185,7 @@
               <el-col :span="24">
                 <el-form-item label="閫�娆惧師鍥�" prop="reason" label-width="15%">
                   <el-input
-                  style="width:100%"
+                    style="width: 100%"
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.reason"
@@ -317,10 +313,10 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
 import { getPaymentTypeList } from "@/api/common/payment"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "AddRefundFormDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -389,27 +385,27 @@
     this.$store.dispatch("geReturnList")
     this.setTableForm()
     this.getCommonData()
-    this.formInfo();
+    this.formInfo()
   },
-  watch:{
-    'editClientManageConfig.visible'(val){
-      if(val){
+  watch: {
+    "editClientManageConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editClientManageConfig.infomation.codeStandID'(){
+    "editClientManageConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.type='閿�鍞��娆剧紪鐮�'
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.type = "閿�鍞��娆剧紪鐮�"
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
-    }, 
+      this.getRCodeStandardList()
+    },
     getCommonData() {
       getAllData().then((res) => {
         this.memberOptions = res.data.member
@@ -485,8 +481,7 @@
           sourceId: this.sourceId || 0,
           sourceType: 1
         },
-        codeRule:this.codeRule,
-
+        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index c91d629..51638cf 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -7,15 +7,15 @@
     <div v-else class="filter">
       <div class="filter-card">
         <CommonSearch
-            :show-add="false"
-            :show-download="false"
-            :amount-view="false"
-            :show-action-btn="false"
-            placeholder="璇疯緭鍏ラ��娆惧崟缂栧彿"
-            @searchClick="onFilterSearch"
+          :show-add="false"
+          :show-download="false"
+          :amount-view="false"
+          :show-action-btn="false"
+          placeholder="璇疯緭鍏ラ��娆惧崟缂栧彿"
+          @searchClick="onFilterSearch"
         >
           <template slot="leftButton">
-            <el-button size="small" type="primary"  @click="addBtnClick">鏂板缓</el-button>
+            <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
             <!-- <el-button size="small"  @click="delClick">鍒犻櫎</el-button> -->
           </template>
         </CommonSearch>
@@ -26,12 +26,12 @@
       <div class="body-card">
         <div class="list-view">
           <TableCommonView
-              ref="tableListRef"
-              :table-list="tableList"
-              @selClientClick="selClientClick"
-              @selCommonClick="selCommonClick"
-              @getSelectArray="getSelectArray"
-              @selTableCol="selTableCol"
+            ref="tableListRef"
+            :table-list="tableList"
+            @selClientClick="selClientClick"
+            @selCommonClick="selCommonClick"
+            @getSelectArray="getSelectArray"
+            @selTableCol="selTableCol"
           >
             <template slot="tableButton">
               <el-table-column label="鎿嶄綔" width="100">
@@ -136,7 +136,7 @@
         // { label: "淇敼鏃堕棿", prop: "modifyTime" },
         { label: "浠风◣鍚堣", prop: "amountTotal" }
       ],
-      showCol:["閫�娆惧崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�娆炬棩鏈�", "璐︽埛", "鏄惁寮�绁�", "浠樻鏂瑰紡", "閿�鍞礋璐ｄ汉", "浠风◣鍚堣"]
+      showCol: ["閫�娆惧崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�娆炬棩鏈�", "璐︽埛", "鏄惁寮�绁�", "浠樻鏂瑰紡", "閿�鍞礋璐ｄ汉", "浠风◣鍚堣"]
     }
   },
   created() {
@@ -157,9 +157,9 @@
         tableInfomation: [],
         allcol: [],
         showcol: this.showCol,
-        tableColumn:this.setColumnVisible(this.showCol)
+        tableColumn: this.setColumnVisible(this.showCol)
       }
-      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
       this.searchOptions = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         const label = this.tableList.tableColumn[i].label
@@ -167,27 +167,37 @@
         this.searchOptions.push({ value: value, label: label })
       }
     },
-    setColumnVisible(showCol){
-      return  this.tableColumn.map(ele=>{
+    setColumnVisible(showCol) {
+      return this.tableColumn.map((ele) => {
         return {
           ...ele,
-          isShowColumn:showCol.includes(ele.label)
+          isShowColumn: showCol.includes(ele.label)
         }
       })
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setColumnVisible(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val)
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
-      await getSalesRefundList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      let params = {}
+      if (this.addConfig.id) {
+        params = {
+          sourceID: this.addConfig.id,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      }
+      await getSalesRefundList(params)
         .then((res) => {
           console.log(res)
           if (res.code === 200) {
@@ -218,9 +228,9 @@
         })
     },
     // 鎼滅储
-    onFilterSearch(searchText){
+    onFilterSearch(searchText) {
       this.keyword = searchText ?? ""
-      this.keywordType = '閫�娆惧崟缂栧彿'
+      this.keywordType = "閫�娆惧崟缂栧彿"
       this.getData()
     },
     // 鏂板缓
@@ -239,22 +249,22 @@
     // 鍒犻櫎
     delClick(rowID) {
       // if (this.selValueList && this.selValueList.length > 0) {
-        this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        })
-          .then(() => {
-            getDelSalesRefund({ ids: [rowID] }).then((response) => {
-              if (response.code === 200) {
-                this.$message.success("鍒犻櫎鎴愬姛")
-                this.getData()
-              } else {
-                this.$message.warning("鍒犻櫎澶辫触")
-              }
-            })
+      this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning"
+      })
+        .then(() => {
+          getDelSalesRefund({ ids: [rowID] }).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("鍒犻櫎鎴愬姛")
+              this.getData()
+            } else {
+              this.$message.warning("鍒犻櫎澶辫触")
+            }
           })
-          .catch(() => {})
+        })
+        .catch(() => {})
       // } else {
       //   this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
       // }
@@ -293,12 +303,12 @@
 .refund-form {
   height: 100%;
   overflow: hidden;
-  .filter{
+  .filter {
     height: 80px;
     display: flex;
     align-items: center;
     padding: 12px 20px 0 20px;
-    &-card{
+    &-card {
       height: 80px;
       display: flex;
       align-items: center;
@@ -309,7 +319,7 @@
       background-color: #fff;
     }
   }
-  .body{
+  .body {
     box-sizing: border-box;
     padding: 10px 20px;
     border-radius: 12px;
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index ddf96d5..e487891 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -24,10 +24,26 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
+                <el-form-item label="璁㈠崟缂栧彿" prop="number">
+                  <WordInput
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
+                  />
+                  <span v-else-if="method == 0" style="color: #f56c6c"
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+                  >
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
                   <div class="custom-name">
                     <el-autocomplete
-                      style="width:100%;"
+                      style="width: 100%"
                       v-model="editConfig.infomation.client_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -36,12 +52,17 @@
                       "
                       value-key="name"
                       @select="handleSelectClient('client', $event)"
+                      :disabled="isNameChanceEdit"
                     ></el-autocomplete>
-                    <div class="common-select-btn" @click="selClientClick('client')">
+                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
                       <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
                     </div>
                     <div
-                      v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+                      v-if="
+                        editConfig.infomation.client_name &&
+                        editConfig.infomation.client_name.length > 0 &&
+                        !isNameChanceEdit
+                      "
                       class="common-select-btn"
                       @click="clearupClient('client')"
                     >
@@ -50,31 +71,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="璁㈠崟缂栧彿" prop="number">
-                  <WordInput
-                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                    :codenumer="codenumer"
-                    :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
-                    :inputValue="inputValue"
-                    @codeList="codeList"
-                  />
-                  <span v-else-if="method == 0" style="color: #f56c6c"
-                    >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                    ></span
-                  >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="12">
                 <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
                   <div class="custom-name">
                     <el-autocomplete
-                      style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.sale_chance_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -83,12 +85,17 @@
                       "
                       value-key="name"
                       @select="handleSelectClient('chance', $event)"
+                      :disabled="isNameChanceEdit"
                     ></el-autocomplete>
-                    <div class="common-select-btn" @click="selClientClick('chance')">
+                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
                       <i class="el-icon-circle-plus-outline"></i>
                     </div>
                     <div
-                      v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+                      v-if="
+                        editConfig.infomation.sale_chance_name &&
+                        editConfig.infomation.sale_chance_name.length > 0 &&
+                        !isNameChanceEdit
+                      "
                       class="common-select-btn"
                       @click="clearupClient('chance')"
                     >
@@ -117,7 +124,7 @@
                     value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
-                    style="width:100%"
+                    style="width: 100%"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -125,7 +132,6 @@
               <el-col :span="12">
                 <el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
                   <el-select
-                  
                     v-model="editConfig.infomation.memberId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
@@ -143,7 +149,7 @@
                     value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
-                    style="width:100%"
+                    style="width: 100%"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -190,7 +196,7 @@
               <el-col :span="12">
                 <el-form-item label="鏀惰揣鍦板潃" prop="address">
                   <el-input
-                    style="width:100%"
+                    style="width: 100%"
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.address"
@@ -228,7 +234,7 @@
               <el-col :span="24">
                 <el-form-item label="鏉℃涓庢潯浠�" prop="conditions" label-width="15%">
                   <el-input
-                    style="width:100%;"
+                    style="width: 100%"
                     type="textarea"
                     :autosize="{ minRows: 4 }"
                     v-model="editConfig.infomation.conditions"
@@ -378,10 +384,10 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
 import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "AddSalesDetailsDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -405,7 +411,7 @@
   },
   data() {
     return {
-      dialogWidth: "60%",
+      dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -445,7 +451,8 @@
         title: "鏂板缓",
         infomation: {}
       },
-      amountTotal: 0
+      amountTotal: 0,
+      isNameChanceEdit: false
     }
   },
   created() {
@@ -453,27 +460,33 @@
     this.$store.dispatch("geChance")
     this.setTableForm()
     this.getCommonData()
-    this.formInfo();
+    this.formInfo()
+    if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) {
+      this.isNameChanceEdit = true
+    }
+    // else {
+
+    // }
   },
-  watch:{
-    'editClientManageConfig.visible'(val){
-      if(val){
+  watch: {
+    "editClientManageConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editClientManageConfig.infomation.codeStandID'(){
+    "editClientManageConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.type='閿�鍞槑缁嗙紪鐮�'
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.type = "閿�鍞槑缁嗙紪鐮�"
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
-    }, 
+      this.getRCodeStandardList()
+    },
     getCommonData() {
       getAllData()
         .then((res) => {
@@ -561,7 +574,7 @@
         logisticCompany: data.logisticCompany || "",
         logisticCost: data.logisticCost || 0,
         logisticNumber: data.logisticNumber || "",
-        codeRule:this.codeRule,
+        codeRule: this.codeRule
       }
       let params = {}
       if (this.editConfig.title === "鏂板缓") {
@@ -662,7 +675,7 @@
           { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
           { label: "浜у搧缂栧彿", prop: "number" },
           { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
-          { label: "閿�鍞崟浠�", prop: "price",inputFloat: true  },
+          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
@@ -722,8 +735,8 @@
 <style lang="scss" scoped>
 ::v-deep {
   .iframe-dialog .el-dialog__body {
-    .el-form{
-      .el-form-item{
+    .el-form {
+      .el-form-item {
         width: 100%;
       }
     }
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 4deabf7..23a9264 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -48,7 +48,7 @@
             <el-tab-pane label="閿�鍞彂绁�" name="invoice"></el-tab-pane>
             <el-tab-pane label="閿�鍞��璐у崟" name="return"> </el-tab-pane>
             <el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
-            <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane>
+            <!-- <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane> -->
           </el-tabs>
         </div>
         <div v-if="activeName === 'first'" class="detail">
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 7dd5807..1bf349f 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -7,15 +7,15 @@
     <div v-else class="filter">
       <div class="filter-card">
         <CommonSearch
-            :show-add="false"
-            :show-download="false"
-            :amount-view="false"
-            :show-action-btn="false"
-            placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
-            @searchClick="onFilterSearch"
+          :show-add="false"
+          :show-download="false"
+          :amount-view="false"
+          :show-action-btn="false"
+          placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
+          @searchClick="onFilterSearch"
         >
           <template slot="leftButton">
-            <el-button size="small" type="primary"  @click="addBtnClick">鏂板缓</el-button>
+            <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
             <!-- <el-button size="small"  @click="delClick">鍒犻櫎</el-button> -->
           </template>
         </CommonSearch>
@@ -26,13 +26,13 @@
       <div class="body-card">
         <div class="list-view">
           <TableCommonView
-              ref="tableListRef"
-              :show-summary="showSummary"
-              :table-list="tableList"
-              @selClientClick="selClientClick"
-              @selCommonClick="selCommonClick"
-              @getSelectArray="getSelectArray"
-              @selTableCol="selTableCol"
+            ref="tableListRef"
+            :show-summary="showSummary"
+            :table-list="tableList"
+            @selClientClick="selClientClick"
+            @selCommonClick="selCommonClick"
+            @getSelectArray="getSelectArray"
+            @selTableCol="selTableCol"
           >
             <template slot="tableButton">
               <el-table-column label="鎿嶄綔" width="90">
@@ -125,7 +125,7 @@
         infomation: {}
       },
       showSummary: {
-        show: true,
+        show: false,
         sumProp: [
           "receiveTotalAmount",
           "total",
@@ -161,7 +161,7 @@
         infomation: {}
       },
       tableColumn: [
-        { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true ,default: true},
+        { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true, default: true },
         { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
         { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
         { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
@@ -176,7 +176,21 @@
         { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
         { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
       ],
-      showCol:["璁㈠崟缂栧彿", "瀹㈡埛鍚嶇О", "绛剧害鏃ユ湡", "閿�鍞礋璐ｄ汉", "宸叉敹鎬婚", "鍚堣", "搴旀敹浣欓", "宸插紑绁ㄩ噾棰�", "鏈紑绁ㄩ噾棰�", "浜у搧鍚嶇О", "鏁伴噺", "閿�鍞崟浠�", "浠风◣鍚堣"]
+      showCol: [
+        "璁㈠崟缂栧彿",
+        "瀹㈡埛鍚嶇О",
+        "绛剧害鏃ユ湡",
+        "閿�鍞礋璐ｄ汉",
+        "宸叉敹鎬婚",
+        "鍚堣",
+        "搴旀敹浣欓",
+        "宸插紑绁ㄩ噾棰�",
+        "鏈紑绁ㄩ噾棰�",
+        "浜у搧鍚嶇О",
+        "鏁伴噺",
+        "閿�鍞崟浠�",
+        "浠风◣鍚堣"
+      ]
     }
   },
   created() {
@@ -197,9 +211,9 @@
         tableInfomation: [],
         allcol: [],
         showcol: this.showCol,
-        tableColumn:this.setColumnVisible(this.showCol)
+        tableColumn: this.setColumnVisible(this.showCol)
       }
-      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
       this.searchOptions = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         const label = this.tableList.tableColumn[i].label
@@ -207,27 +221,37 @@
         this.searchOptions.push({ value: value, label: label })
       }
     },
-    setColumnVisible(showCol){
-      return  this.tableColumn.map(ele=>{
+    setColumnVisible(showCol) {
+      return this.tableColumn.map((ele) => {
         return {
           ...ele,
-          isShowColumn:showCol.includes(ele.label)
+          isShowColumn: showCol.includes(ele.label)
         }
       })
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setColumnVisible(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val)
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
-      await getSalesDetailsList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      let params = {}
+      if (this.addConfig.id) {
+        params = {
+          saleChanceId: this.addConfig.id,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      }
+      await getSalesDetailsList(params)
         .then((res) => {
           console.log(res)
           if (res.code === 200) {
@@ -256,8 +280,8 @@
         })
     },
     // 鎼滅储
-    onFilterSearch(searchText){
-      this.keyword = searchText ?? ''
+    onFilterSearch(searchText) {
+      this.keyword = searchText ?? ""
       this.keywordType = "璁㈠崟缂栧彿"
       this.pagerOptions.currPage = 1
       this.getData()
@@ -277,24 +301,24 @@
     },
     // 鍒犻櫎
     delClick(rowID) {
-      console.log(rowID,"xxxxshanchu")
+      console.log(rowID, "xxxxshanchu")
       // if (this.selValueList && this.selValueList.length > 0) {
-        this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        })
-          .then(() => {
-            getDelSalesDetails({ ids: [rowID] }).then((response) => {
-              if (response.code === 200) {
-                this.$message.success("鍒犻櫎鎴愬姛")
-                this.getData()
-              } else {
-                this.$message.warning("鍒犻櫎澶辫触")
-              }
-            })
+      this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning"
+      })
+        .then(() => {
+          getDelSalesDetails({ ids: [rowID] }).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("鍒犻櫎鎴愬姛")
+              this.getData()
+            } else {
+              this.$message.warning("鍒犻櫎澶辫触")
+            }
           })
-          .catch(() => {})
+        })
+        .catch(() => {})
       // } else {
       //   this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
       // }
@@ -349,12 +373,12 @@
 .sales-details {
   height: 100%;
   overflow: hidden;
-  .filter{
+  .filter {
     height: 80px;
     display: flex;
     align-items: center;
     padding: 12px 20px 0 20px;
-    &-card{
+    &-card {
       height: 80px;
       display: flex;
       align-items: center;
@@ -365,7 +389,7 @@
       background-color: #fff;
     }
   }
-  .body{
+  .body {
     box-sizing: border-box;
     padding: 10px 20px;
     border-radius: 12px;
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index ccd73d5..5e5f9aa 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -8,7 +8,8 @@
       append-to-body
       custom-class="iframe-dialog"
     >
-      <el-form v-if="refreshFlag"
+      <el-form
+        v-if="refreshFlag"
         ref="form"
         :model="editConfig.infomation"
         :rules="rules"
@@ -23,31 +24,36 @@
           <div class="basic-info-title">鏈轰細鍩烘湰淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
-<!--              <el-col :span="12">-->
-<!--                <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">-->
-<!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-             <el-col :span="12">
-               <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">
-                 <WordInput
-                     v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                     :codenumer="codenumer"
-                     :sum="sum"
-                     :disabled="editConfig.infomation.id || isIdDisabled"
-                     :inputValue="inputValue"
-                     @codeList="codeList"
-                 />
-                 <span v-else-if="method == 0" style="color: #f56c6c"
-                 >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                      ></span
-                 >
-                 <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
-               </el-form-item>
-             </el-col>
+              <!--              <el-col :span="12">-->
+              <!--                <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">-->
+              <!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
+              <el-col :span="12">
+                <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">
+                  <WordInput
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
+                  />
+                  <span v-else-if="method == 0" style="color: #f56c6c"
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+                  >
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="鏈轰細鍚嶇О" prop="name">
+                  <div class="custom-name">
+                    <el-input v-model="editConfig.infomation.name"></el-input>
+                    <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
+                    <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
+                  </div>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name" ref="clientName">
                   <div class="custom-name">
@@ -74,15 +80,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="鏈轰細鍚嶇О" prop="name">
-                  <div class="custom-name">
-                    <el-input v-model="editConfig.infomation.name"></el-input>
-                    <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
-                    <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
-                  </div>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="12">
                 <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name">
                   <div class="custom-name">
@@ -110,7 +108,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="鍟嗘満鏉ユ簮" prop="sales_sources_id">
+                <el-form-item label="鏈轰細鏉ユ簮" prop="sales_sources_id">
                   <div class="common-select">
                     <el-select
                       v-model="editConfig.infomation.sales_sources_id"
@@ -132,7 +130,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="鍟嗘満绫诲瀷" prop="sale_type_id">
+                <el-form-item label="鏈轰細绫诲瀷" prop="sale_type_id">
                   <div class="common-select">
                     <el-select
                       v-model="editConfig.infomation.sale_type_id"
@@ -572,11 +570,11 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
 import { getCityList } from "@/api/common/address"
-import WordInput from "@/components/wordInput.vue";
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "AddSalesOpportunityDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -589,7 +587,7 @@
       }
     }
   },
-  components: {WordInput, SelectClientDialog, SelectContactDialog },
+  components: { WordInput, SelectClientDialog, SelectContactDialog },
   computed: {
     searchCommonHeight() {
       return this.$refs.searchCommonView.offsetHeight
@@ -603,7 +601,7 @@
   },
   data() {
     return {
-      refreshFlag:true,
+      refreshFlag: true,
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
@@ -615,7 +613,7 @@
         currency: [{ required: true, message: "璇烽�夋嫨甯佺", trigger: "change" }],
         expected_time: [{ required: true, message: "璇烽�夋嫨棰勮鎴愪氦鏃ユ湡", trigger: "change" }],
         projected_amount: [{ required: true, message: "璇疯緭鍏ラ璁″悎鍚岄噾棰�", trigger: "blur" }],
-        client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" }],
+        client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" }]
       },
       businessSourceOptions: [],
       memberOptions: [],
@@ -642,7 +640,7 @@
       restaurants: [],
       clientId: this.editCommonConfig.infomation.client_id,
       contactId: this.editCommonConfig.infomation.contact_id,
-      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�",codeStandID:'' },
+      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�", codeStandID: "" }
     }
   },
   created() {
@@ -652,25 +650,25 @@
       this.getCityList(this.editConfig.infomation.province_id, "edit")
     }
     this.getCommonData()
-    this.formInfo();
+    this.formInfo()
   },
-  watch:{
-    'editConfig.visible'(val){
-      if(val){
+  watch: {
+    "editConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editConfig.infomation.codeStandID'(){
+    "editConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
+      this.getRCodeStandardList()
     },
     getCommonData() {
       this.editConfig.infomation.country_id = 1
@@ -774,8 +772,8 @@
         remark: data.remark || "",
         detail_address: data.detail_address || "",
 
-        codeStandID:data.ID,
-        codeRule:this.codeRule,
+        codeStandID: data.ID,
+        codeRule: this.codeRule
       }
       return params
     },
@@ -823,10 +821,10 @@
      * 寮哄埗鍒锋柊form缁勪欢
      * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
      */
-    refresh(){
-      this.refreshFlag=false
-      requestAnimationFrame(()=>{
-        this.refreshFlag=true
+    refresh() {
+      this.refreshFlag = false
+      requestAnimationFrame(() => {
+        this.refreshFlag = true
       })
     },
     // 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -894,8 +892,8 @@
             flex: 1;
           }
         }
-        .custom-name{
-          .el-autocomplete{
+        .custom-name {
+          .el-autocomplete {
             flex: 1;
           }
         }
diff --git a/src/views/sales/salesOpportunity/DetailAdvanceDialog.vue b/src/views/sales/salesOpportunity/DetailAdvanceDialog.vue
index eb8fcde..97134af 100644
--- a/src/views/sales/salesOpportunity/DetailAdvanceDialog.vue
+++ b/src/views/sales/salesOpportunity/DetailAdvanceDialog.vue
@@ -108,6 +108,10 @@
       }).then((res) => {
         if (res.code === 200) {
           this.handleClose()
+          this.$emit('pushed',{
+            id: this.commonConfig.id,
+            step: stepId
+          })
         }
       })
     }
diff --git a/src/views/sales/salesOpportunity/DetailOpportunity.vue b/src/views/sales/salesOpportunity/DetailOpportunity.vue
index f4ef747..48b87cf 100644
--- a/src/views/sales/salesOpportunity/DetailOpportunity.vue
+++ b/src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -256,7 +256,7 @@
         </div>
       </div>
       <!-- 鎺ㄨ繘 -->
-      <DetailAdvanceDialog v-if="advanceConfig.visible" :advance-config="advanceConfig" />
+      <DetailAdvanceDialog v-if="advanceConfig.visible" :advance-config="advanceConfig" @pushed="updatePushData" />
     </el-drawer>
   </div>
 </template>
@@ -268,6 +268,7 @@
 import ServiceContract from "@/views/service/serviceContract"
 import DetailAdvanceDialog from "@/views/sales/salesOpportunity/DetailAdvanceDialog"
 import { getSaleStageList } from "@/api/sales/salesOpportunity"
+import {getAllData} from "@/api/client/client";
 export default {
   name: "DetailClientManage",
   props: {
@@ -285,6 +286,7 @@
   computed: {},
   data() {
     return {
+      statusList: [],
       detailConfig: this.opportunityDetail,
       activeName: "first",
       isSchduleExpand: true, // 杩涘害杩借釜
@@ -330,11 +332,24 @@
       sale_chance_name: this.detailConfig.infomation.name,
       sale_chance_id: this.detailConfig.infomation.id
     }
-    this.getSaleStageList()
-    this.setData(this.detailConfig.infomation)
+    this.getSaleStageList().then(()=>{
+      return  this.getAllData()
+    }).then((statusList)=>{
+      this.statusList =statusList
+
+      this.setData(this.detailConfig.infomation)
+
+    })
+    console.log('this.detailConfig.infomation',this.detailConfig.infomation)
   },
   mounted() {},
   methods: {
+    /**
+     * 鏇存柊鎺ㄨ繘璁板綍
+     */
+    updatePushData(e){
+      this.sale_active = e.step - 1
+    },
     async getSaleStageList() {
       await getSaleStageList().then((res) => {
         this.stepsList = res.data.list
@@ -363,7 +378,7 @@
           leftStr: "鍟嗘満鏉ユ簮",
           leftValue: item.sales_sources.name,
           rightStr: "鍟嗘満绫诲瀷",
-          rightValue: "" // item.SaleType.name
+          rightValue: item.sale_type.name
         },
         {
           leftStr: "閿�鍞樁娈�",
@@ -373,13 +388,13 @@
         },
         {
           leftStr: "鑰佸鎴疯惀閿�",
-          leftValue: item.regular_customers_id,
+          leftValue: item.regular_customers.name,
           rightStr: "瀹℃壒鐘舵��",
           rightValue: ""
         },
         {
           leftStr: "绔炰簤瀵规墜",
-          leftValue: "",
+          leftValue: item.competitors,
           rightStr: "鍒涘缓浜�",
           rightValue: ""
         },
@@ -407,7 +422,7 @@
           leftStr: "棰勮鍚堝悓閲戦",
           leftValue: item.projected_amount,
           rightStr: "褰撳墠鐘舵��",
-          rightValue: item.status_id
+          rightValue: this.statusList.find(ele=>ele.id === item.status_id)?.name ?? ''
         }
       ]
       this.dynamicInfoList = [
@@ -489,7 +504,7 @@
         },
         {
           leftStr: "璇︾粏鍦板潃",
-          leftValue: "",
+          leftValue: item.detail_address,
           rightStr: "",
           rightValue: ""
         }
@@ -553,6 +568,16 @@
         options: options,
         id: this.detailConfig.infomation.id
       }
+    },
+
+    getAllData(){
+     return getAllData()
+          .then((res) => {
+            return res.data.status
+          })
+          .catch((err) => {
+            console.log(err)
+          })
     }
   }
 }
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 566997b..0b271ca 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -24,10 +24,26 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="12">
+                <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
+                  <WordInput
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
+                  />
+                  <span v-else-if="method == 0" style="color: #f56c6c"
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+                  >
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
                   <div class="custom-name">
                     <el-autocomplete
-                      style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.client_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -50,31 +66,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
-                  <WordInput
-                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                    :codenumer="codenumer"
-                    :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
-                    :inputValue="inputValue"
-                    @codeList="codeList"
-                  />
-                  <span v-else-if="method == 0" style="color: #f56c6c"
-                    >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                    ></span
-                  >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="12">
                 <el-form-item label="鍚堝悓璁㈠崟">
                   <div class="custom-name">
                     <el-autocomplete
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.salesDetailNumber"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -125,7 +122,7 @@
                     value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
-                    style="width:100%"
+                    style="width: 100%"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -140,7 +137,7 @@
                 <el-form-item label="鐘舵��" prop="salesReturnStatusId">
                   <div class="common-select">
                     <el-select
-                    style="width:100%"
+                      style="width: 100%"
                       v-model="editConfig.infomation.salesReturnStatusId"
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
@@ -162,7 +159,7 @@
               <el-col :span="24">
                 <el-form-item label="閫�璐у師鍥�" prop="reason" label-width="15%">
                   <el-input
-                  style="width:100%"
+                    style="width: 100%"
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.reason"
@@ -249,10 +246,10 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import { getProductList } from "@/api/common/other"
 import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 export default {
   name: "AddSalesReturnDialog",
-  mixins:[codeMixin],
+  mixins: [codeMixin],
   props: {
     editCommonConfig: {
       type: Object,
@@ -317,27 +314,27 @@
     this.setTableForm()
     this.getCommonData()
     this.getProductList()
-    this.formInfo();
+    this.formInfo()
   },
-  watch:{
-    'editClientManageConfig.visible'(val){
-      if(val){
+  watch: {
+    "editClientManageConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editClientManageConfig.infomation.codeStandID'(){
+    "editClientManageConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.type='閿�鍞��璐х紪鐮�'
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.type = "閿�鍞��璐х紪鐮�"
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
-    }, 
+      this.getRCodeStandardList()
+    },
     getCommonData() {
       getAllData()
         .then((res) => {
@@ -420,7 +417,7 @@
           sourceId: this.SalesDetailsId,
           sourceType: 1
         },
-        codeRule:this.codeRule,
+        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index f3c5546..a9e77b7 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -7,15 +7,15 @@
     <div v-else class="filter">
       <div class="filter-card">
         <CommonSearch
-            :show-add="false"
-            :show-download="false"
-            :amount-view="false"
-            :show-action-btn="false"
-            placeholder="璇疯緭鍏ラ攢鍞��璐у崟缂栧彿"
-            @searchClick="onFilterSearch"
+          :show-add="false"
+          :show-download="false"
+          :amount-view="false"
+          :show-action-btn="false"
+          placeholder="璇疯緭鍏ラ攢鍞��璐у崟缂栧彿"
+          @searchClick="onFilterSearch"
         >
           <template slot="leftButton">
-            <el-button size="small" type="primary"  @click="addBtnClick">鏂板缓</el-button>
+            <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
             <!-- <el-button size="small"  @click="delClick">鍒犻櫎</el-button> -->
           </template>
         </CommonSearch>
@@ -26,12 +26,12 @@
       <div class="body-card">
         <div class="list-view">
           <TableCommonView
-              ref="tableListRef"
-              :table-list="tableList"
-              @selClientClick="selClientClick"
-              @selCommonClick="selCommonClick"
-              @getSelectArray="getSelectArray"
-              @selTableCol="selTableCol"
+            ref="tableListRef"
+            :table-list="tableList"
+            @selClientClick="selClientClick"
+            @selCommonClick="selCommonClick"
+            @getSelectArray="getSelectArray"
+            @selTableCol="selTableCol"
           >
             <template slot="tableButton">
               <el-table-column label="鎿嶄綔" width="90">
@@ -131,7 +131,7 @@
       keyword: "",
       keywordType: "",
       tableColumn: [
-        { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true ,default:true },
+        { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true, default: true },
         { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true },
         { label: "閫�璐ф棩鏈�", prop: "returnDate", min: 130 },
         { label: "鐘舵��", prop: "salesReturnStatus_name" },
@@ -141,7 +141,7 @@
         { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
         // { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
       ],
-      showCol:["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
+      showCol: ["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
     }
   },
   created() {
@@ -162,9 +162,9 @@
         tableInfomation: [],
         allcol: [],
         showcol: this.showCol,
-        tableColumn:this.setColumnVisible(this.showCol)
+        tableColumn: this.setColumnVisible(this.showCol)
       }
-      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
       this.searchOptions = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         const label = this.tableList.tableColumn[i].label
@@ -172,27 +172,38 @@
         this.searchOptions.push({ value: value, label: label })
       }
     },
-    setColumnVisible(showCol){
-      return  this.tableColumn.map(ele=>{
+    setColumnVisible(showCol) {
+      return this.tableColumn.map((ele) => {
         return {
           ...ele,
-          isShowColumn:showCol.includes(ele.label)
+          isShowColumn: showCol.includes(ele.label)
         }
       })
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setColumnVisible(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val)
     },
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
-      await getSalesReturnList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      let params = {}
+      if (this.addConfig.id) {
+        params = {
+          sourceID: this.addConfig.id,
+          sourceType: 1,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      }
+      await getSalesReturnList(params)
         .then((res) => {
           console.log(res)
           if (res.code === 200) {
@@ -222,8 +233,8 @@
         })
     },
     // 鎼滅储
-    onFilterSearch(searchText){
-      this.keyword = searchText ?? ''
+    onFilterSearch(searchText) {
+      this.keyword = searchText ?? ""
       this.keywordType = "閿�鍞��璐у崟缂栧彿"
       this.pagerOptions.currPage = 1
       this.getData()
@@ -239,27 +250,27 @@
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row, currency: "浜烘皯甯�"}
+      this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
     },
     // 鍒犻櫎
     delClick(rowID) {
       // if (this.selValueList && this.selValueList.length > 0) {
-        this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        })
-          .then(() => {
-            getDelSalesReturn({ ids:[rowID] }).then((response) => {
-              if (response.code === 200) {
-                this.$message.success("鍒犻櫎鎴愬姛")
-                this.getData()
-              } else {
-                this.$message.warning("鍒犻櫎澶辫触")
-              }
-            })
+      this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning"
+      })
+        .then(() => {
+          getDelSalesReturn({ ids: [rowID] }).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("鍒犻櫎鎴愬姛")
+              this.getData()
+            } else {
+              this.$message.warning("鍒犻櫎澶辫触")
+            }
           })
-          .catch(() => {})
+        })
+        .catch(() => {})
       // } else {
       //   this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
       // }
@@ -299,12 +310,12 @@
 .sales-return {
   height: 100%;
   overflow: hidden;
-  .filter{
+  .filter {
     height: 80px;
     display: flex;
     align-items: center;
     padding: 12px 20px 0 20px;
-    &-card{
+    &-card {
       height: 80px;
       display: flex;
       align-items: center;
@@ -315,7 +326,7 @@
       background-color: #fff;
     }
   }
-  .body{
+  .body {
     box-sizing: border-box;
     padding: 10px 20px;
     border-radius: 12px;
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 50f52d0..3acc1ed 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -9,7 +9,7 @@
       custom-class="iframe-dialog"
     >
       <el-form
-          v-if="refreshFlag"
+        v-if="refreshFlag"
         ref="form"
         :model="editConfig.infomation"
         :rules="rules"
@@ -23,29 +23,20 @@
           <div class="basic-info-title">鍩烘湰淇℃伅</div>
           <div class="basic-info-view">
             <el-row>
-<!--              <el-col :span="12">-->
-<!--                <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
-<!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="鍗曟嵁缂栧彿" prop="number">
                   <WordInput
-                      v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
-                      :codenumer="codenumer"
-                      :sum="sum"
-                      :disabled="editConfig.infomation.id || isIdDisabled"
-                      :inputValue="inputValue"
-                      @codeList="codeList"
+                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+                    :codenumer="codenumer"
+                    :sum="sum"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+                    :inputValue="inputValue"
+                    @codeList="codeList"
                   />
                   <span v-else-if="method == 0" style="color: #f56c6c"
-                  >璇蜂紭鍏堥厤缃紪鐮佽鑼�
-                    <el-button type="text"  @click="numberClick">
-                        閰嶇疆瑙勮寖
-                      </el-button
-                      ></span
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
-                  <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -196,13 +187,13 @@
 import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder"
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import WordInput from "@/components/wordInput.vue";
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
 
 export default {
   name: "SubOrderDialog",
-  mixins:[codeMixin],
-  components: {WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog },
+  mixins: [codeMixin],
+  components: { WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog },
   props: {
     editCommonConfig: {
       type: Object,
@@ -267,7 +258,7 @@
       tableData: [],
       productId: 1,
       addProductArr: [],
-      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�",codeStandID:'' },
+      objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�", codeStandID: "" }
     }
   },
   created() {
@@ -275,25 +266,25 @@
     this.$store.dispatch("geMaster")
     this.setTableForm()
     this.getCommonData()
-    this.formInfo();
+    this.formInfo()
   },
-  watch:{
-    'editConfig.visible'(val){
-      if(val){
+  watch: {
+    "editConfig.visible"(val) {
+      if (val) {
         this.formInfo()
       }
     },
-    'editConfig.infomation.codeStandID'(){
+    "editConfig.infomation.codeStandID"() {
       this.formInfo()
     }
   },
   methods: {
-    formInfo(){
-      this.objCode.codeStandID = ''
-      if(this.editConfig.infomation.codeStandID){
-        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+    formInfo() {
+      this.objCode.codeStandID = ""
+      if (this.editConfig.infomation.codeStandID) {
+        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
-      this.getRCodeStandardList();
+      this.getRCodeStandardList()
     },
     getCommonData() {
       getAllData()
@@ -319,10 +310,10 @@
      * 寮哄埗鍒锋柊form缁勪欢
      * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
      */
-    refresh(){
-      this.refreshFlag=false
-      requestAnimationFrame(()=>{
-        this.refreshFlag=true
+    refresh() {
+      this.refreshFlag = false
+      requestAnimationFrame(() => {
+        this.refreshFlag = true
       })
     },
     // 淇濆瓨
@@ -378,8 +369,8 @@
         memberId: data.memberId || 0,
         number: data.number || "",
         product: this.tableData,
-        codeStandID:data.ID,
-        codeRule:this.codeRule,
+        codeStandID: data.ID,
+        codeRule: this.codeRule
       }
       return params
     },
@@ -558,7 +549,7 @@
             font-size: 18px;
             cursor: pointer;
           }
-          .el-autocomplete{
+          .el-autocomplete {
             flex: 1;
           }
         }
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index cde48e1..05298a4 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -25,12 +25,11 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="鏈嶅姟鍗曠紪鍙�" prop="serviceNumber">
-                  <!-- <el-input v-model="editConfig.infomation.serviceNumber" style="width: 100%"></el-input> -->
                   <WordInput
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
diff --git a/src/views/service/clientServiceOrder/index.vue b/src/views/service/clientServiceOrder/index.vue
index d1e9ff2..53a79ca 100644
--- a/src/views/service/clientServiceOrder/index.vue
+++ b/src/views/service/clientServiceOrder/index.vue
@@ -184,8 +184,8 @@
         keywordType: this.keywordType,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
-        salesDetailsId: 0,
-        serviceContractId: 0
+        
+        sourceId:this.addConfig.salesDetailsId
       })
         .then((res) => {
           console.log(res)
diff --git a/src/views/service/clientServiceOrder/mixin/codeMixin.js b/src/views/service/clientServiceOrder/mixin/codeMixin.js
index 07a2455..b0f9b5e 100644
--- a/src/views/service/clientServiceOrder/mixin/codeMixin.js
+++ b/src/views/service/clientServiceOrder/mixin/codeMixin.js
@@ -74,7 +74,7 @@
               }
             }
           }
-          if (this.editConfig.infomation.id) {
+          if (this.editConfig.title !== "鏂板缓") {
             this.codeList(this.editConfig.infomation.serviceNumber)
           }
 
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 43d019c..b8a514b 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -25,12 +25,11 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="number">
-                  <!-- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> -->
                   <WordInput
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index d8bf606..4ad6ce6 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -17,11 +17,11 @@
         <div class="tab-view">
           <el-tabs v-model="activeName" @tab-click="tabsClick">
             <el-tab-pane label="璇︽儏" name="first"></el-tab-pane>
-            <el-tab-pane label="鏀舵璁″垝" name="collection">
+            <!-- <el-tab-pane label="鏀舵璁″垝" name="collection"> -->
               <!-- <template slot="label">
                 <div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
               </template> -->
-            </el-tab-pane>
+            <!-- </el-tab-pane> -->
             <el-tab-pane label="鏀舵鍗�" name="receipt"></el-tab-pane>
             <el-tab-pane label="瀹㈡埛鏈嶅姟鍗�" name="clientService"> </el-tab-pane>
             <el-tab-pane label="閿�鍞彂绁�" name="invoice"></el-tab-pane>
@@ -217,7 +217,9 @@
       contact_name: this.detailConfig.infomation.contact_name,
       client_id: this.detailConfig.infomation.client_id,
       contact_id: this.detailConfig.infomation.contact_id,
-      amountTotal: this.detailConfig.infomation.amountTotal
+      amountTotal: this.detailConfig.infomation.amountTotal,
+      salesDetailsId:this.serviceContractDetail.infomation.salesDetailsId,
+      serviceContractId:this.serviceContractDetail.infomation.id
     }
     this.setTableForm()
   },
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 633af84..5e1974b 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -198,12 +198,36 @@
     // 璇锋眰鏁版嵁
     async getData() {
       this.loading = true
-      await getServiceContractList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      })
+      let params = {}
+      console.log(this.addConfig)
+      if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞満浼�") {
+        params = {
+          saleChanceId: this.addConfig.id,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞槑缁嗗崟") {
+        params = {
+          salesDetailsId: this.addConfig.id,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else if (this.addConfig.id && this.addConfig.keywordType === "鎶ヤ环鍗�") {
+        params = {
+          quotationId: this.addConfig.id,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize
+        }
+      } else {
+        params = {
+          keyword: this.keyword,
+          keywordType: this.keywordType,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize,
+          contactId: this.addConfig.client_id
+        }
+      }
+      await getServiceContractList(params)
         .then((res) => {
           console.log(res)
           if (res.code === 200) {
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 590ab2d..229809f 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -25,12 +25,11 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="鍥炶鍗曠紪鍙�" prop="number">
-                  <!-- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> -->
                   <WordInput
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
-                    :disabled="editConfig.infomation.id || isIdDisabled"
+                    :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
                     :inputValue="inputValue"
                     @codeList="codeList"
                   />

--
Gitblit v1.8.0