From 7924087566a4cbfc942b1d636b590edf4874efb0 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 17:38:08 +0800
Subject: [PATCH] 库存信息请求接口增加限制条件
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 104 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 38 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 6aabb56..cc89b4a 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -92,7 +92,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
- :rules="[{ required: autoCodeHeadersObj.ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
+ :rules="[{ required: autoCodeHeadersObj.Ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -162,7 +162,7 @@
</el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number"
- :rules="[{ required: autoCodeHeadersObj.bjd=='yes'?true:false, message: '璇烽�夋嫨閿�鍞姤浠峰崟', trigger: 'change' }]">
+ :rules="[{ required: autoCodeHeadersObj.Bjd=='yes'?true:false, message: '璇烽�夋嫨閿�鍞姤浠峰崟', trigger: 'change' }]">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -405,13 +405,17 @@
<!-- :detail-enter="true" -->
<CommonFormTableView
ref="commonFormTableView"
+ :detail-enter="isView?true:false"
+ :selectBox="false"
+ :addTypeIdMultiple="true"
:show-summary="showSummary"
pageName="quotation"
- :isOperate="((autoCodeHeadersObj.bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.bjd!='yes')?true:false"
- :quotationNumber="editConfig.infomation.quotation_number"
+ :isOperate="((autoCodeHeadersObj.Bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.Bjd!='yes')?true:false"
+ :quotationNumber="autoCodeHeadersObj.Bjd=='yes'?editConfig.infomation.quotation_number:''"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@clearupProduct="clearupProduct"
></CommonFormTableView>
@@ -597,7 +601,6 @@
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
- selectBox: this.editCommonConfig.title !== "鏌ョ湅",
thatMember: {}
}
},
@@ -609,6 +612,7 @@
this.setTableForm()
this.getCommonData()
this.formInfo()
+ this.getUseSystemSet({modeType:'xsmx'})
if (this.editConfig.title === "缂栬緫") {
this.productTableList.tableData = this.editConfig.infomation.products
}
@@ -674,6 +678,16 @@
if (this.isNoProduct) {
this.$message.error("璇烽�夋嫨浜у搧")
} else {
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].cost) {
+ let reg =
+ /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+ if(!reg.test(this.tableData[i].cost)){
+ this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+ return true;
+ }
+ }
+ }
const params = this.saveParams()
if (this.editConfig.title === "鏂板缓") {
getAddSalesDetails(params).then((res) => {
@@ -762,21 +776,21 @@
console.log(res)
this.quotationList = res.data.list
if (value === "鍏ㄩ儴浜у搧") {
- this.quotationList.map((item) => {
- if (item.id === this.editConfig.infomation.quotationId) {
- this.tableData = item.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- this.tableData.forEach((key) => {
- if (item.number === key.number) {
- item.amount = key.amount
- item.id = key.id
- }
- })
- })
- this.productTableList.tableData = this.tableData
- }
- })
+ // this.quotationList.map((item) => {
+ // if (item.id === this.editConfig.infomation.quotationId) {
+
+ // this.tableData.map((item, index) => {
+ // item.productId = index + 1
+ // this.tableData.forEach((key) => {
+ // if (item.number === key.number) {
+ // item.amount = key.amount
+ // item.id = key.id
+ // }
+ // })
+ // })
+
+ // }
+ // })
}
}
})
@@ -946,11 +960,14 @@
]
} else {
this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
// let productData = this.quotationList.products
let isBjdRequird=false
- if(this.autoCodeHeadersObj.bjd=='yes'){
+ if(this.autoCodeHeadersObj.Bjd=='yes'){
isBjdRequird=true
}
this.productTableList = {
@@ -961,9 +978,9 @@
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price",inputFloat: !isBjdRequird, isRequird: true },
- { label: "鎴愭湰鍗曚环", prop: "cost",inputFloat: !isBjdRequird},
+ { label: "鎴愭湰鍗曚环", prop: "cost",input: !isBjdRequird},
{ label: "姣涘埄", prop: "profit" },
- { label: "姣涘埄鐜�", prop: "margin",min:90},
+ { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "浠风◣鍚堣", prop: "total" }
]
@@ -980,21 +997,32 @@
},
// 浜у搧鏂板
addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- cost:'',
- profit:'',
- margin:'',
- 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
},
// 浜у搧娓呯┖
--
Gitblit v1.8.0