From 789a2ddb815dbcac398928b32a048a490a5b414d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 十二月 2023 19:00:17 +0800
Subject: [PATCH] 收款计划的收款计划负责人默认选中登录人的逻辑，之前是name修改为id，切初始的时候循环添加到列表中
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 52 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 48f7a0b..83c70a2 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -90,9 +90,9 @@
</div>
</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.ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -161,7 +161,8 @@
</el-form-item>
</el-col> -->
<el-col :span="12">
- <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number">
+ <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"
@@ -261,7 +262,12 @@
style="width: 100%"
:disabled="isView"
>
- <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectName" :value="item.projectId">
+ <el-option
+ v-for="item in projectList"
+ :key="item.projectId"
+ :label="item.projectName"
+ :value="item.projectId"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -381,7 +387,7 @@
<!-- 浜у搧绠＄悊 -->
<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"
@@ -393,17 +399,21 @@
<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">
+ <!-- :detail-enter="true" -->
<CommonFormTableView
ref="commonFormTableView"
- :detail-enter="true"
- :select-box="selectBox"
: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:''"
:product-table-list="productTableList"
@inputContent="inputContent"
- @getSelectArray="getSelectArray"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @clearupProduct="clearupProduct"
></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -485,7 +495,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getAddSalesDetails, getUpdateSalesDetails,getProjectList,sendSalesDetailsToApsProject } from "@/api/sales/salesDetails"
+import { getAddSalesDetails, getUpdateSalesDetails, getProjectList } from "@/api/sales/salesDetails"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
@@ -533,10 +543,10 @@
// subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
- sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
- quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }],
- deliveryDate: [{ required: true, message: "璇烽�夋嫨浜や粯鏃ユ湡", trigger: "change" }],
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
+ // sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
+ // quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }],
+ deliveryDate: [{ required: true, message: "璇烽�夋嫨浜や粯鏃ユ湡", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -549,7 +559,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -582,14 +592,13 @@
isAddQuatation: true,
// 浜や粯绫诲瀷
deliveryTypeList: getDataByType("deliveryType"),
- projectList:[],
+ projectList: [],
quotationList: [],
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
- selProductData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
selectBox: this.editCommonConfig.title !== "鏌ョ湅",
- thatMember:{}
+ thatMember: {}
}
},
created() {
@@ -629,6 +638,14 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "memberId", item.id)
+ }
+ })
+ }
// this.dataProcess()
})
.catch((err) => {
@@ -646,8 +663,8 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- for (let i = 0; i < this.selProductData.length; i++) {
- if (this.selProductData[i].name.length === 0) {
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
this.isNoProduct = true
break
} else {
@@ -657,20 +674,23 @@
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 === "鏂板缓") {
- if(params.projectId!==0){
- sendSalesDetailsToApsProject({...params,member:this.thatMember}).then((res)=>{
- if(res.code===200){
- this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
- }
- })
- }
getAddSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.selProductData.map((item) => {
+ this.tableData.map((item) => {
this.amountTotal += parseFloat(item.total)
})
let config = {
@@ -681,7 +701,6 @@
}
})
} else {
- console.log(this.selProductData)
getUpdateSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -709,7 +728,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: this.selProductData,
+ products: this.tableData,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -721,7 +740,7 @@
quotationId: this.quotationId,
deliverType: data.deliverType || 0,
status: 1,
- projectId:data.projectId||0
+ projectId: data.projectId || ""
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -758,7 +777,7 @@
this.tableData = item.products
this.tableData.map((item, index) => {
item.productId = index + 1
- this.selProductData.forEach((key) => {
+ this.tableData.forEach((key) => {
if (item.number === key.number) {
item.amount = key.amount
item.id = key.id
@@ -766,13 +785,6 @@
})
})
this.productTableList.tableData = this.tableData
- this.selProductData.forEach((key) => {
- this.tableData.forEach((row) => {
- if (key.number === row.number) {
- this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
- }
- })
- })
}
})
}
@@ -831,7 +843,7 @@
},
handleSelectClient(value, item) {
if (value === "client") {
- this.thatMember=item.member
+ this.thatMember = item.member
this.editConfig.infomation.subbill_name = ""
this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
@@ -848,7 +860,7 @@
this.subbillId = item.id
this.editConfig.infomation.subbill_name = item.number
} else if (value === "quotation") {
- this.productTableList.tableData = item.products
+ // this.productTableList.tableData = item.products
// this.tableData = item.products
this.editConfig.infomation.quotation_number = item.number
this.quotationId = item.id
@@ -926,21 +938,43 @@
setFormatClick() {},
setTableForm() {
if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
- this.tableData = []
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
+ total: 0,
+ unit: ""
+ }
+ ]
} else {
- this.selProductData = this.editConfig.infomation.products
+ this.tableData = this.editConfig.infomation.products
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
// let productData = this.quotationList.products
+ let isBjdRequird=false
+ if(this.autoCodeHeadersObj.bjd=='yes'){
+ isBjdRequird=true
+ }
this.productTableList = {
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", 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" },
+ { label: "閿�鍞崟浠�", prop: "price",inputFloat: !isBjdRequird, isRequird: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost",input: !isBjdRequird},
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "浠风◣鍚堣", prop: "total" }
]
}
@@ -954,18 +988,66 @@
}
})
},
- // 閫夋嫨浜у搧
- getSelectArray(val) {
- this.selProductData = val
+ // 浜у搧鏂板
+ 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.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ cost:'',
+ profit:'',
+ margin:'',
+ total: 0,
+ unit: ""
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
},
// 鑾峰彇椤圭洰鍒楄〃
- async getProjectList(){
+ async getProjectList() {
await getProjectList({
page: 1,
- pageSize: 100,
+ pageSize: 100
}).then((res) => {
- this.projectList=res.data
+ this.projectList = res.data
})
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0