From 3e84b4cd3fa5499d4ce46e0d2cae96be0f952fbd Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 05 二月 2024 16:57:17 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 118 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 70 insertions(+), 48 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index e4e0366..c8fcea5 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -91,8 +91,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
- :rules="[{ required: autoCodeHeadersObj.Ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
+ <el-form-item
+ label="閿�鍞満浼�"
+ prop="sale_chance_name"
+ :rules="[
+ {
+ required: autoCodeHeadersObj.Ywjh == 'yes' ? true : false,
+ message: '璇烽�夋嫨閿�鍞満浼�',
+ trigger: 'change'
+ }
+ ]"
+ >
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -161,8 +170,17 @@
</el-form-item>
</el-col> -->
<el-col :span="12">
- <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number"
- :rules="[{ required: autoCodeHeadersObj.Bjd=='yes'?true:false, message: '璇烽�夋嫨閿�鍞姤浠峰崟', trigger: 'change' }]">
+ <el-form-item
+ label="閿�鍞姤浠峰崟"
+ prop="quotation_number"
+ :rules="[
+ {
+ required: autoCodeHeadersObj.Bjd == 'yes' ? true : false,
+ message: '璇烽�夋嫨閿�鍞姤浠峰崟',
+ trigger: 'change'
+ }
+ ]"
+ >
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -407,13 +425,18 @@
<!-- :detail-enter="true" -->
<CommonFormTableView
ref="commonFormTableView"
- :detail-enter="isView?true:false"
+ :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="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"
@@ -606,13 +629,13 @@
thatMember: {},
pickerOptions: {
disabledDate(time) {
- return time.getTime() < Date.now() - 8.64e7;
- },
+ return time.getTime() < Date.now() - 8.64e7
+ }
},
- pickerOptionsBefore:{
+ pickerOptionsBefore: {
disabledDate(time) {
- return time.getTime() > Date.now();
- },
+ return time.getTime() > Date.now()
+ }
}
}
},
@@ -624,7 +647,7 @@
this.setTableForm()
this.getCommonData()
this.formInfo()
- this.getUseSystemSet({modeType:'xsmx'})
+ this.getUseSystemSet({ modeType: "xsmx" })
if (this.editConfig.title === "缂栬緫") {
this.productTableList.tableData = this.editConfig.infomation.products
}
@@ -692,11 +715,10 @@
} 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)){
+ 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;
+ return true
}
}
}
@@ -790,19 +812,17 @@
this.count=res.data.count;
if (value === "鍏ㄩ儴浜у搧") {
// 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
- // }
- // })
- // })
-
- // }
+ // 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
+ // }
+ // })
+ // })
+ // }
// })
}
}
@@ -970,9 +990,9 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
@@ -985,21 +1005,23 @@
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
// let productData = this.quotationList.products
- let isBjdRequird=false
- if(this.autoCodeHeadersObj.Bjd=='yes'){
- isBjdRequird=true
+ let isBjdRequird = false
+ if (this.autoCodeHeadersObj.Bjd == "yes") {
+ isBjdRequird = true
}
this.productTableList = {
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true,min:110, },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
+ { label: "瑙勬牸", prop: "specs" },
+ { label: "鍨嬪彿", prop: "type" },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "閿�鍞崟浠�", prop: "price",inputFloat: !isBjdRequird, isRequird: true },
- { label: "鎴愭湰鍗曚环", prop: "cost",input: !isBjdRequird},
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: !isBjdRequird, isRequird: true },
+ { 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" }
]
@@ -1034,14 +1056,14 @@
// this.showSummary.show = true
},
// 鏂板鏂瑰紡淇敼
- getSelectArray(val){
- if(val.length>0){
+ getSelectArray(val) {
+ if (val.length > 0) {
val.map((item, index) => {
- item.productId = this.tableData.length + index+1
+ item.productId = this.tableData.length + index + 1
})
}
- this.tableData=this.tableData.concat(val);
- this.productTableList.tableData=this.tableData
+ this.tableData = this.tableData.concat(val)
+ this.productTableList.tableData = this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
@@ -1056,9 +1078,9 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
--
Gitblit v1.8.0