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 | 262 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 213 insertions(+), 49 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index d4806a9..83c70a2 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -27,10 +27,11 @@
<el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number">
<el-input
v-if="
+ isView ||
editConfig.title == '缂栬緫' ||
(editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
"
- :disabled="editConfig.title == '缂栬緫'"
+ :disabled="editConfig.title == '缂栬緫' || isView"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
@@ -65,16 +66,21 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
- :disabled="isNameChanceEdit"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
+ <div
+ v-if="!isNameChanceEdit && !isView"
+ class="common-select-btn"
+ @click="selClientClick('client')"
+ >
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
v-if="
editConfig.infomation.client_name &&
editConfig.infomation.client_name.length > 0 &&
- !isNameChanceEdit
+ !isNameChanceEdit &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('client')"
@@ -84,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%"
@@ -98,16 +104,21 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
- :disabled="isNameChanceEdit"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
+ <div
+ v-if="!isNameChanceEdit && !isView"
+ class="common-select-btn"
+ @click="selClientClick('chance')"
+ >
<i class="el-icon-circle-plus-outline"></i>
</div>
<div
v-if="
editConfig.infomation.sale_chance_name &&
editConfig.infomation.sale_chance_name.length > 0 &&
- !isNameChanceEdit
+ !isNameChanceEdit &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('chance')"
@@ -117,7 +128,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閿�鍞瓙鍗�" prop="subbill_name">
<div class="custom-name">
<el-autocomplete
@@ -148,9 +159,10 @@
</div>
</div>
</el-form-item>
- </el-col>
+ </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"
@@ -163,16 +175,21 @@
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation"
+ :disabled="isAddQuatation || isView"
></el-autocomplete>
- <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
+ <div
+ v-if="!isAddQuatation && !isView"
+ class="common-select-btn"
+ @click="selClientClick('quotation')"
+ >
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
v-if="
editConfig.infomation.quotation_number &&
editConfig.infomation.quotation_number.length > 0 &&
- !isAddQuatation
+ !isAddQuatation &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('quotation')"
@@ -190,6 +207,7 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
>
</el-date-picker>
</el-form-item>
@@ -201,6 +219,7 @@
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
+ :disabled="isView"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -215,6 +234,7 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
>
</el-date-picker>
</el-form-item>
@@ -226,8 +246,28 @@
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
+ :disabled="isView"
>
<el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select
+ v-model="editConfig.infomation.projectId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="isView"
+ >
+ <el-option
+ v-for="item in projectList"
+ :key="item.projectId"
+ :label="item.projectName"
+ :value="item.projectId"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -240,12 +280,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏀惰揣浜�" prop="addressee">
- <el-input v-model="editConfig.infomation.addressee"></el-input>
+ <el-input v-model="editConfig.infomation.addressee" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="phone">
- <el-input v-model="editConfig.infomation.phone"></el-input>
+ <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -255,17 +295,18 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.address"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
- <el-input v-model="editConfig.infomation.logisticCompany"></el-input>
+ <el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
- <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
+ <el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -277,6 +318,7 @@
:precision="2"
:controls="false"
style="width: 100%; margin-right: 5px"
+ :disabled="isView"
></el-input-number>
</el-form-item>
</el-col>
@@ -293,6 +335,7 @@
type="textarea"
:autosize="{ minRows: 4 }"
v-model="editConfig.infomation.conditions"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -308,6 +351,7 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.remark"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -343,23 +387,33 @@
<!-- 浜у搧绠＄悊 -->
<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" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <el-select
+ v-model="editConfig.infomation.currency"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 63%"
+ :disabled="isView"
+ >
<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="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:''"
:product-table-list="productTableList"
@inputContent="inputContent"
- @getSelectArray="getSelectArray"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @clearupProduct="clearupProduct"
></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -441,7 +495,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getAddSalesDetails, getUpdateSalesDetails } 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"
@@ -489,9 +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" }]
+ 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: [],
@@ -504,7 +559,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -537,10 +592,13 @@
isAddQuatation: true,
// 浜や粯绫诲瀷
deliveryTypeList: getDataByType("deliveryType"),
+ projectList: [],
quotationList: [],
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
- selProductData: []
+ isView: this.editCommonConfig.title === "鏌ョ湅",
+ selectBox: this.editCommonConfig.title !== "鏌ョ湅",
+ thatMember: {}
}
},
created() {
@@ -554,6 +612,7 @@
if (this.editConfig.title === "缂栬緫") {
this.productTableList.tableData = this.editConfig.infomation.products
}
+ this.getProjectList()
},
watch: {
"editClientManageConfig.visible"(val) {
@@ -579,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) => {
@@ -607,15 +674,24 @@
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()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
this.tableData.map((item) => {
- this.amountTotal += item.total
+ this.amountTotal += parseFloat(item.total)
})
let config = {
amountTotal: this.amountTotal,
@@ -652,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,
@@ -662,7 +738,9 @@
logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || "",
quotationId: this.quotationId,
- deliverType: data.deliverType || 0
+ deliverType: data.deliverType || 0,
+ status: 1,
+ projectId: data.projectId || ""
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -699,15 +777,14 @@
this.tableData = item.products
this.tableData.map((item, index) => {
item.productId = index + 1
- })
- this.productTableList.tableData = item.products
- this.selProductData.forEach((key) => {
- this.tableData.forEach((row) => {
- if (key.number === row.number) {
- this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
+ this.tableData.forEach((key) => {
+ if (item.number === key.number) {
+ item.amount = key.amount
+ item.id = key.id
}
})
})
+ this.productTableList.tableData = this.tableData
}
})
}
@@ -766,6 +843,7 @@
},
handleSelectClient(value, item) {
if (value === "client") {
+ this.thatMember = item.member
this.editConfig.infomation.subbill_name = ""
this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
@@ -782,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
@@ -834,6 +912,8 @@
this.editConfig.infomation.sale_chance_name = ""
this.editConfig.infomation.client_name = ""
this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
this.clientId = 0
this.saleChanceId = 0
this.subbillId = 0
@@ -846,7 +926,11 @@
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = ""
this.subbillId = 0
+ } else if (value === "quotation") {
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
}
+ this.productTableList.tableData = []
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -854,20 +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: "unit" },
+ { 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: "price" },
{ label: "浠风◣鍚堣", prop: "total" }
]
}
@@ -881,9 +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() {
+ await getProjectList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ this.projectList = res.data
+ })
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0