From 7979474ca5570945126d7f087fa4363272d964b4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 28 二月 2024 14:34:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 232 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 166 insertions(+), 66 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 0477013..53e1390 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%"
@@ -106,6 +115,7 @@
@select="handleSelectClient('chance', $event)"
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
+ <!-- &&editConfig.infomation.client_name -->
<div
v-if="!isNameChanceEdit && !isView"
class="common-select-btn"
@@ -161,8 +171,18 @@
</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'
+ }
+ ]"
+ >
+ <!-- isAddQuatation || -->
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -174,21 +194,22 @@
value-key="number"
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
- placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation || isView"
+ placeholder="璇烽�夋嫨閿�鍞姤浠峰崟"
+ :disabled=" isView"
></el-autocomplete>
+ <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
<div
- v-if="!isAddQuatation && !isView"
+ v-if=" !isView"
class="common-select-btn"
@click="selClientClick('quotation')"
>
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
+ <!-- !isAddQuatation && -->
<div
v-if="
editConfig.infomation.quotation_number &&
editConfig.infomation.quotation_number.length > 0 &&
- !isAddQuatation &&
!isView
"
class="common-select-btn"
@@ -208,6 +229,7 @@
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
:disabled="isView"
+ :picker-options="pickerOptionsBefore"
>
</el-date-picker>
</el-form-item>
@@ -235,6 +257,7 @@
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
:disabled="isView"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
@@ -299,7 +322,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
<el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
@@ -308,7 +331,7 @@
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
<el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -405,13 +428,22 @@
<!-- :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="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"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@clearupProduct="clearupProduct"
></CommonFormTableView>
@@ -597,18 +629,44 @@
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
- selectBox: this.editCommonConfig.title !== "鏌ョ湅",
- thatMember: {}
+ thatMember: {},
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ },
+ pickerOptionsBefore: {
+ disabledDate(time) {
+ return time.getTime() > Date.now()
+ }
+ }
}
},
created() {
if (this.editConfig.title !== "鏂板缓") {
+ this.productTableList.tableData=[
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ cost: "",
+ profit: "",
+ margin: "",
+ total: 0,
+ unit: ""
+ }
+ ]
this.isAddQuatation = false
}
this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
this.formInfo()
+ this.getUseSystemSet({ modeType: "xsmx" })
if (this.editConfig.title === "缂栬緫") {
this.productTableList.tableData = this.editConfig.infomation.products
}
@@ -675,11 +733,11 @@
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)){
+ 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;
+ return true
}
}
}
@@ -770,22 +828,21 @@
if (res.code == 200) {
console.log(res)
this.quotationList = res.data.list
+ this.count=res.data.count;
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
+ // }
+ // })
+ // })
+ // }
+ // })
}
}
})
@@ -797,11 +854,15 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ if(this.editConfig.infomation.client_name){
+ restaurants = this.saleChancelist
+ }
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- restaurants = this.quotationList
+ if(this.editConfig.infomation.sale_chance_name){
+ restaurants = this.quotationList
+ }
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -869,7 +930,9 @@
if (value === "client") {
this.editSelectClientConfig.editVisible = true
} else if (value === "chance") {
- this.editSelectChanceConfig.clientId = this.clientId
+ if(this.clientId){
+ this.editSelectChanceConfig.clientId = this.clientId
+ }
this.editSelectChanceConfig.editVisible = true
} else if (value === "subbill") {
this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
@@ -877,22 +940,37 @@
this.editSelCommonConfig.clientId = this.clientId
} else if (value === "quotation") {
this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ if(this.saleChanceId&&this.clientId){
+ this.editSelCommonConfig.clientId = this.clientId
+ // 姝ｅ悜閫夋嫨瀹㈡埛 閿�鍞満浼� 鎶ヤ环鍗�
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count=this.count
+ this.editSelCommonConfig.tableInfomation = [...this.quotationList]
+ }else{
+ // 鍙嶅悜閫夋嫨
+ this.editSelCommonConfig.isRequest = true;
+ }
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.clientId = this.clientId
- this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
selClient(row, value) {
if (value === "client") {
this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId=''
this.editConfig.infomation.subbill_name = ""
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
this.getSubOrderList(row)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
this.saleChanceId = row.id
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
this.isAddQuatation = false
this.getQuotation(row.id)
} else if (value === "subbill") {
@@ -902,6 +980,12 @@
this.productTableList.tableData = row.products
// this.tableData = row.products
this.editConfig.infomation.quotation_number = row.number
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = row.sale_chance.name
+ this.saleChanceId = row.sale_chance.id
this.quotationId = row.id
}
},
@@ -946,33 +1030,38 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
]
} 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'){
- 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" }
]
@@ -989,21 +1078,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
},
// 浜у搧娓呯┖
@@ -1018,9 +1118,9 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
--
Gitblit v1.8.0