From 19c517afd6080773ba263fde73f9e2ae682bebd1 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 23 十月 2023 19:42:20 +0800
Subject: [PATCH] 销售机会 添加,编辑参数修改

---
 src/views/service/serviceContract/AddServiceContractDialog.vue      |    1 -
 src/views/client/contacts/AddContactsDialog.vue                     |    1 -
 src/views/service/serviceFollowup/AddServiceFollowupDialog.vue      |    1 -
 src/views/client/followupRecords/AddFollowupRecordsDialog.vue       |    1 -
 src/views/client/salesLead/AddSalesLeadDialog.vue                   |    1 -
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue              |    1 -
 src/views/sales/masterOrder/AddMasterOrderDialog.vue                |    1 -
 src/views/sales/salesReturn/AddSalesReturnDialog.vue                |    1 -
 src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue |    1 -
 src/views/sales/refundForm/AddRefundFormDialog.vue                  |    1 -
 src/views/service/clientServiceOrder/mixin/codeMixin.js             |   12 ++++++------
 src/views/client/client/AddClientManageDialog.vue                   |    1 -
 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue      |    1 -
 src/views/sales/quotation/AddQuotationDialog.vue                    |    1 -
 src/views/sales/subOrder/AddSubOrderDialog.vue                      |    1 -
 src/views/sales/contractManage/AddContractManageDialog.vue          |    1 -
 16 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index a8298dd..feaebc0 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -747,7 +747,6 @@
         sales_leads_id: data.sales_leads_id || 0,
         contact_id: data.contact_id || 0,
         codeStandID:data.ID,
-        codeRule:this.codeRule,
       }
       return params
     },
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 244a842..415489f 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -454,7 +454,6 @@
         region_id: data.region_id || 0,
         wechat: data.wechat || "",
         // codeStandID: data.ID,
-        // codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 02375c7..2e258f2 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -635,7 +635,6 @@
           sales_leads_id: this.saleLeadId || 0,
           topic: data.topic || "",
           codeStandID: data.ID,
-          codeRule: this.codeRule,
         },
       };
       let params = {};
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 9adb39c..546a1b2 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -384,7 +384,6 @@
             sales_sources_id: this.editConfig.infomation.sales_sources_id || 0,
             detail_address: this.editConfig.infomation.detail_address || "",
             codeStandID:this.editConfig.infomation.ID,
-            codeRule:this.codeRule,
           }
           console.log(params)
           if (this.editConfig.title === "鏂板缓") {
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index f69532c..bb7474c 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -390,7 +390,6 @@
         quotation_id: this.quotationId || 0,
         status_id: data.statusId || 0,
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index c1c7cb6..035a628 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -318,7 +318,6 @@
         number: data.number || "",
         start_time: data.start_time || "",
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 8dcc294..7a5a2ab 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -521,7 +521,6 @@
         validity_date: data.validity_date || "",
         products: this.tableData,
         codeStandID: data.ID,
-        codeRule: this.codeRule,
         client_id: this.clientId || 0
       }
       return params
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 03ebc79..d18d9a2 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -510,7 +510,6 @@
           refundDate: data.refundDate || "",
           sourceId: this.sourceId || 0,
           sourceType: 1,
-          codeRule: this.codeRule
         }
       }
       return params
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 5b93d74..90c8e7f 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -646,7 +646,6 @@
         logisticCompany: data.logisticCompany || "",
         logisticCost: data.logisticCost || 0,
         logisticNumber: data.logisticNumber || "",
-        codeRule: this.codeRule
       }
       let params = {}
       if (this.editConfig.title === "鏂板缓") {
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index fa9fffd..ac82902 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -795,7 +795,6 @@
         detail_address: data.detail_address || "",
 
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 084fad5..bf86fea 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -444,7 +444,6 @@
           salesReturnStatusId: data.salesReturnStatusId || 0,
           sourceId: this.SalesDetailsId,
           sourceType: 1,
-          codeRule: this.codeRule
         }
       }
       return params
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 4d319d2..de9232b 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -391,7 +391,6 @@
         number: data.number || "",
         product: this.tableData,
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index f112c20..a33549e 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -897,7 +897,6 @@
         subject: data.subject || "",
         timeSpentId: data.timeSpentId || 0,
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/service/clientServiceOrder/mixin/codeMixin.js b/src/views/service/clientServiceOrder/mixin/codeMixin.js
index 9c1637b..3271e1f 100644
--- a/src/views/service/clientServiceOrder/mixin/codeMixin.js
+++ b/src/views/service/clientServiceOrder/mixin/codeMixin.js
@@ -18,7 +18,6 @@
       objCode: { name: "", page: 0, pageSize: 0, type: "瀹㈡埛鏈嶅姟缂栫爜", codeStandID: "" },
       codeRule: {},
       codeLength: 0,
-      autoCodeObj: {}
     }
   },
 
@@ -73,7 +72,6 @@
                   //     ? this.editConfig.infomation.serviceNumber
                   //     : autoRule.PrefixValue
                   // )
-                  return true
                 }
               }
             }
@@ -81,6 +79,7 @@
           } else {
             this.$message.error(res.data.msg ? res.data.msg : "鑾峰彇缂栫爜瑙勮寖澶辫触锛岃閲嶈瘯锛�")
           }
+          this.getAutoCodeValue()
         } else {
           this.codeList(this.editConfig.infomation.serviceNumber)
         }
@@ -89,10 +88,11 @@
       }
     },
     async getAutoCodeValue() {
-      const res = await getAutoCode({ codeType: this.objCode.type, autoIncr: this.autoIncr });
-      if (res.code == 200) {
-        this.autoCodeObj = res.data;
-        this.$set(this.editConfig.infomation, 'number', this.autoCodeObj.id)
+      if(Object.keys(this.codeRule).length>0){
+        const res = await getAutoCode(this.codeRule);
+        if (res.code == 200) {
+          this.$set(this.editConfig.infomation, 'serviceNumber', res.data?res.data:'')
+        }
       }
     },
     codeList(val) {
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 6cd3dee..7b62b47 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -661,7 +661,6 @@
         serviceContractTypeId: data.serviceContractTypeId || 0,
         serviceContractStatusId: data.serviceContractStatusId || 0,
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 7a4172e..b4b5d89 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -461,7 +461,6 @@
         solveRate: data.solveRateId || 0,
         timelyRate: data.timelyRateId || 0,
         codeStandID: data.ID,
-        codeRule: this.codeRule
       }
       return params
     },

--
Gitblit v1.8.0