From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index d224472..55628d2 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -225,6 +225,7 @@
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ master_order_number: [{ required: true, message: "璇烽�夋嫨鎴栧垱寤洪攢鍞�诲崟", trigger: "blur" }],
client_name: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
@@ -325,6 +326,7 @@
// 淇濆瓨
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++) {
@@ -423,9 +425,13 @@
this.clientId = item.id
this.isAddMaster = false
this.getMasterList(item.id)
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
} else if (value === "master") {
+ this.editConfig.infomation.master_order_number = item.number
this.masterId = item.id
}
+ this.refresh()
},
selClientClick(value) {
if (value == "client") {
@@ -438,13 +444,14 @@
}
},
selClient(row, value) {
- console.log(row)
if (value == "client") {
this.editConfig.infomation.client_name = row.name
this.editConfig.infomation.client_id = row.id
this.clientId = row.id
this.isAddMaster = false
this.getMasterList(row.id)
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
} else if (value == "master") {
this.editConfig.infomation.master_order_number = row.number
this.masterId = row.id
--
Gitblit v1.8.0