From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index fb9d398..396ee9a 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -373,6 +373,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++) {
@@ -459,6 +460,7 @@
},
async handleSelectClient(value, item) {
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
this.editSelCommonConfig.clientId = item.id
await getSalesDetailsList({
@@ -479,12 +481,13 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
+ // this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
}
},
async selClient(row, value) {
console.log(row, value)
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.editSelCommonConfig.clientId = row.id
@@ -503,14 +506,11 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation = {}
- // this.editConfig.infomation.client_name = ""
- // this.clientId = 0
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
- this.productTableList.tableData = []
- this.tableData = []
- this.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0