From b4fffb6670099841c59bc22e8703e96badcf5614 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 15:13:01 +0800
Subject: [PATCH] 报价单，销售明细单页面必填参数修改
---
src/views/sales/quotation/AddQuotationDialog.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index d272c43..13d58bf 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -166,7 +166,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
- :rules="[{ required: autoCodeHeadersObj.xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
+ :rules="[{ required: autoCodeHeadersObj.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.sale_chance_name"
@@ -433,6 +433,7 @@
this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
this.getRCodeStandardList()
+ this.getUseSystemSet({modeType:'bjd'})
},
getCommonData() {
getAllData()
@@ -477,8 +478,16 @@
if (this.isNoProduct) {
this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].cost||Number(this.tableData[i].cost)==0) {
+ let reg = /^\+?[1-9]\d*$/;
+ if(!reg.test(this.tableData[i].cost)){
+ this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+ return true;
+ }
+ }
+ }
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddQuotation(params).then((res) => {
console.log(res)
@@ -615,6 +624,9 @@
name: "",
number: "",
price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
total: 0,
unit: ""
}
@@ -633,9 +645,9 @@
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true, isRequird: true },
- { label: "鎴愭湰鍗曚环", prop: "cost",inputFloat: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost",input: true },
{ label: "姣涘埄", prop: "profit" },
- { label: "姣涘埄鐜�", prop: "margin",min:90},
+ { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -661,6 +673,9 @@
name: "",
number: "",
price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
total: 0,
unit: ""
})
@@ -678,6 +693,9 @@
name: "",
number: "",
price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
total: 0,
unit: ""
}
@@ -695,7 +713,7 @@
if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
callback()
} else {
- if(this.autoCodeHeadersObj.xsjh=='yes'){
+ if(this.autoCodeHeadersObj.Xsjh=='yes'){
callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
}else{
callback()
--
Gitblit v1.8.0