From 7ecd00f8044e2fd5f23c4cc26bd613935e9f48df Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 20:50:03 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 89ce967..2661ea9 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -309,7 +309,7 @@
editVisible: false,
title: "閿�鍞槑缁嗗崟",
infomation: {},
- clientId:""
+ clientId: ""
},
productId: 1,
isNoProduct: true,
@@ -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++) {
@@ -428,9 +429,9 @@
returnDate: data.returnDate || "",
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
- sourceType: 1
- },
- codeRule: this.codeRule
+ sourceType: 1,
+ codeRule: this.codeRule
+ }
}
return params
},
@@ -460,7 +461,7 @@
async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
- this.editSelCommonConfig.clientId=item.id
+ this.editSelCommonConfig.clientId = item.id
await getSalesDetailsList({
clientId: this.clientId
}).then((res) => {
@@ -479,7 +480,7 @@
} 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) {
@@ -487,7 +488,7 @@
if (value === "client") {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
- this.editSelCommonConfig.clientId=row.id
+ this.editSelCommonConfig.clientId = row.id
await getSalesDetailsList({
clientId: row.id
}).then((res) => {
@@ -503,15 +504,14 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation={}
- // this.editConfig.infomation.client_name = ""
- // this.clientId = 0
-
+ // this.editConfig.infomation = {}
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
} else if (value === "contract") {
- this.editConfig.infomation.salesDetailNumber=""
- this.productTableList.tableData = []
- this.tableData = []
- this.SalesDetailsId = 0
+ this.editConfig.infomation.salesDetailNumber = ""
+ // this.productTableList.tableData = []
+ // this.tableData = []
+ // this.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0