From d435f4951d7c3362fe500ccdb19c2776b6879035 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 23 十月 2023 19:29:12 +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/salesLead/AddSalesLeadDialog.vue | 1 -
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 1 -
src/components/makepager/mixin/codeMixin.js | 16 ++++++----------
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 1 -
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 1 -
src/views/sales/refundForm/AddRefundFormDialog.vue | 1 -
src/views/client/client/AddClientManageDialog.vue | 1 -
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 1 -
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 1 -
src/api/common/standard.js | 11 +++++++++--
src/views/sales/quotation/AddQuotationDialog.vue | 1 -
src/views/sales/subOrder/AddSubOrderDialog.vue | 1 -
src/views/sales/contractManage/AddContractManageDialog.vue | 1 -
16 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/api/common/standard.js b/src/api/common/standard.js
index 2dc9003..57f78df 100644
--- a/src/api/common/standard.js
+++ b/src/api/common/standard.js
@@ -1,6 +1,5 @@
-// import request from "@/common/untils/request.js"
import axios from "axios"
-import request from "@/common/untils/request";
+import request from "@/common/untils/request.js"
//缂栫爜瑙勮寖鍒楄〃
// export function getCodeStandardList (data) {
// return request({
@@ -20,3 +19,11 @@
params: data
})
}
+// 鑾峰彇鑷姩缂栫爜
+export function getAutoCode(data) {
+ return request({
+ url: "/api/code/getAutoCode",
+ method: "post",
+ data
+ })
+}
diff --git a/src/components/makepager/mixin/codeMixin.js b/src/components/makepager/mixin/codeMixin.js
index 515cf09..799d1f7 100644
--- a/src/components/makepager/mixin/codeMixin.js
+++ b/src/components/makepager/mixin/codeMixin.js
@@ -18,7 +18,6 @@
objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜", codeStandID: "" },
codeRule: {},
codeLength: 0,
- autoCodeObj: {}
}
},
@@ -73,7 +72,6 @@
// this.codeList(
// this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
// )
- return true
}
}
}
@@ -91,11 +89,13 @@
}
},
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, 'number', res.data?res.data:'')
+ }
}
+
},
codeList(val) {
this.inputValue = val
@@ -103,10 +103,6 @@
this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
console.log(this.codenumberList.replace(/,/g, ""))
},
- // validateFormNumber() {
- // this.$set(this.editConfig.infomation, 'number', this.editConfig.infomation.number)
- // this.$refs.form.validateField('number')
- // },
// 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
validateCheckCode(rule, value, callback) {
if (value && value.length > 0) {
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 90c0146..a8298dd 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -662,7 +662,6 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 150be49..244a842 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -391,7 +391,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 20d5445..9adb39c 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -366,7 +366,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
let params = {
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 818aed8..3ad8f2c 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -539,7 +539,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 44fb9eb..f69532c 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -348,7 +348,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index f6864bc..c1c7cb6 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -268,7 +268,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index b1b446e..8dcc294 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -458,7 +458,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].name.length === 0) {
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index d474b22..03ebc79 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -453,7 +453,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 582f244..5b93d74 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -579,7 +579,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 7f8d5fe..fa9fffd 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -726,7 +726,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index b3f101c..084fad5 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -388,7 +388,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
// for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index f82945a..4d319d2 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -340,7 +340,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 361b2c6..6cd3dee 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -597,7 +597,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 747457d..7a4172e 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -414,7 +414,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
--
Gitblit v1.8.0