From b4fffb6670099841c59bc22e8703e96badcf5614 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 15:13:01 +0800
Subject: [PATCH] 报价单，销售明细单页面必填参数修改
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 0477013..42e0793 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,10 +405,12 @@
<!-- :detail-enter="true" -->
<CommonFormTableView
ref="commonFormTableView"
+ :detail-enter="isView?true:false"
+ :selectBox="false"
:show-summary="showSummary"
pageName="quotation"
- :isOperate="((autoCodeHeadersObj.bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.bjd!='yes')?true:false"
- :quotationNumber="autoCodeHeadersObj.bjd=='yes'?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"
@@ -597,7 +599,6 @@
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
- selectBox: this.editCommonConfig.title !== "鏌ョ湅",
thatMember: {}
}
},
@@ -633,6 +634,7 @@
this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
this.getRCodeStandardList()
+ this.getUseSystemSet({modeType:'xsmx'})
},
getCommonData() {
getAllData()
@@ -675,8 +677,9 @@
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 (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;
@@ -771,21 +774,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
+ // }
+ // })
+ // })
+
+ // }
+ // })
}
}
})
@@ -955,11 +958,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 = {
--
Gitblit v1.8.0