From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/quotation/AddQuotationDialog.vue | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index d186f73..3909be1 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -40,8 +40,14 @@
<span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
</el-form-item>
</el-col>
-
<el-col :span="12">
+ <el-form-item label="鎶ヤ环鍚嶇О" prop="quotationName">
+ <div class="custom-name">
+ <el-input v-model="editConfig.infomation.quotationName"></el-input>
+ </div>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
<el-autocomplete
@@ -66,7 +72,7 @@
</div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="鎶ヤ环缂栧彿" prop="number">-->
<!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
@@ -106,7 +112,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="contact_id">
<div class="custom-name">
<el-autocomplete
@@ -131,7 +137,7 @@
</div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="member_id">
<el-select
@@ -349,14 +355,14 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- client_id: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "blur" }],
+ sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
memberOptions: [],
- quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
+ quotationStatusOptions: [], // 鎶ヤ环鍗曠姸鎬�
currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
@@ -437,6 +443,7 @@
// 淇濆瓨
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) {
@@ -490,9 +497,8 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- client_id: this.clientId || 0,
+ quotationName: data.quotationName || "",
conditions: data.conditions || "",
- contact_id: this.contactId || 0,
file: data.file || "",
member_id: data.member_id || 0,
number: data.number || "",
@@ -501,7 +507,8 @@
validity_date: data.validity_date || "",
products: this.tableData,
codeStandID: data.ID,
- codeRule: this.codeRule
+ codeRule: this.codeRule,
+ client_id: this.clientId || 0
}
return params
},
@@ -655,6 +662,14 @@
clearupProduct(data) {
this.tableData = data
this.productTableList.tableData = this.tableData
+ },
+ // 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
+ checkChance(rule, value, callback) {
+ if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+ }
}
}
}
--
Gitblit v1.8.0