From 0e5fbe824f2cc0991465a74a2838ff2ee4c21d81 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:29:16 +0800
Subject: [PATCH] 销售明细单待确认状态时 发货信息为空
---
src/views/sales/quotation/AddQuotationDialog.vue | 90 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 849b37d..cf978a6 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -165,7 +165,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
+ :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"
@@ -237,20 +238,23 @@
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
- <div style="margin-left: 400px">
+ <!-- <div style="margin-left: 400px">
甯佺
<el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
<el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- </div>
+ </div> -->
</div>
<div class="product-view">
<CommonFormTableView
:show-summary="showSummary"
+ pageName="quotation"
+ :addTypeIdMultiple="true"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
@clearupProduct="clearupProduct"
@@ -371,7 +375,7 @@
number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
+ // sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
},
memberOptions: [],
@@ -383,7 +387,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -416,13 +420,14 @@
this.setTableForm()
this.getCommonData()
this.formInfo()
+ this.getUseSystemSet({modeType:'bjd'})
},
watch: {
"editConfig.visible"(val) {
if (val) {
this.formInfo()
}
- }
+ },
},
methods: {
formInfo() {
@@ -436,6 +441,7 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
if (this.editConfig.title === "鏂板缓") {
let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
this.memberOptions.map((item) => {
@@ -443,8 +449,9 @@
this.$set(this.editConfig.infomation, "member_id", item.id)
}
})
+ this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
}
- this.quotationStatusOptions = res.data.quotationStatus
+
this.dataProcess()
})
.catch((err) => {
@@ -473,8 +480,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)
@@ -611,6 +626,9 @@
name: "",
number: "",
price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
total: 0,
unit: ""
}
@@ -625,11 +643,14 @@
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true,min:110, },
{ label: "浜у搧缂栧彿", prop: "number" },
- { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "鍗曚綅", prop: "unit" },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true, isRequird: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost",input: true },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
@@ -645,18 +666,32 @@
},
// 浜у搧鏂板
addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0,
- unit: ""
- })
+ // this.productId++
+ // this.tableData.push({
+ // productId: this.productId,
+ // id: 0,
+ // amount: 0,
+ // desc: "",
+ // name: "",
+ // number: "",
+ // price: 0,
+ // cost:'',
+ // profit:'',
+ // margin:'',
+ // total: 0,
+ // unit: ""
+ // })
+ // this.showSummary.show = true
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val){
+ if(val.length>0){
+ val.map((item, index) => {
+ item.productId = this.tableData.length + index+1
+ })
+ }
+ this.tableData=this.tableData.concat(val);
+ this.productTableList.tableData=this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
@@ -671,6 +706,9 @@
name: "",
number: "",
price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
total: 0,
unit: ""
}
@@ -688,7 +726,11 @@
if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
callback()
} else {
- callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+ if(this.autoCodeHeadersObj.Xsjh=='yes'){
+ callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+ }else{
+ callback()
+ }
}
},
// 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
--
Gitblit v1.8.0