From 26c39cd359bc0d2edc88408ff51ef70554e32a90 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 29 二月 2024 09:48:17 +0800
Subject: [PATCH] 跟进记录明细报价单没点击弹框下拉数据为空的问题选择机会或者报价单赋值客户名称
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 525 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 408 insertions(+), 117 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 25ad76f..de79216 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,18 @@
</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 +113,22 @@
"
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')">
+ <!-- &&editConfig.infomation.client_name -->
+ <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')"
@@ -150,7 +171,18 @@
</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'
+ }
+ ]"
+ >
+ <!-- isAddQuatation || -->
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -162,17 +194,19 @@
value-key="number"
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
- placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation"
+ placeholder="璇烽�夋嫨閿�鍞姤浠峰崟"
+ :disabled="isView"
></el-autocomplete>
- <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
+ <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
+ <div 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"
@click="clearupClient('quotation')"
@@ -190,6 +224,8 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
+ :picker-options="pickerOptionsBefore"
>
</el-date-picker>
</el-form-item>
@@ -201,6 +237,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 +252,8 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
@@ -226,8 +265,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 +299,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,19 +314,20 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.address"
+ :disabled="isView"
></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"></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> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -277,6 +337,7 @@
:precision="2"
:controls="false"
style="width: 100%; margin-right: 5px"
+ :disabled="isView"
></el-input-number>
</el-form-item>
</el-col>
@@ -293,6 +354,7 @@
type="textarea"
:autosize="{ minRows: 4 }"
v-model="editConfig.infomation.conditions"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -308,6 +370,7 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.remark"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -343,23 +406,42 @@
<!-- 浜у搧绠＄悊 -->
<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"
+ :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 : ''"
:product-table-list="productTableList"
@inputContent="inputContent"
+ @addProductClick="addProductClick"
@getSelectArray="getSelectArray"
+ @emptyProductClick="emptyProductClick"
+ @clearupProduct="clearupProduct"
></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -441,7 +523,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"
@@ -472,7 +554,7 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- }
+ },
// saleChancelist() {
// return this.$store.state.getClientName.saleChancelist
// },
@@ -482,16 +564,17 @@
},
data() {
return {
- dialogWidth: "50%",
+ dialogWidth: "60%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
// 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 +587,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -537,23 +620,57 @@
isAddQuatation: true,
// 浜や粯绫诲瀷
deliveryTypeList: getDataByType("deliveryType"),
+ projectList: [],
quotationList: [],
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
- selProductData: []
+ isView: this.editCommonConfig.title === "鏌ョ湅",
+ thatMember: {},
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ },
+ pickerOptionsBefore: {
+ disabledDate(time) {
+ return time.getTime() > Date.now()
+ }
+ }
}
+ },
+ mounted(){
+ this.getSaleChanceList()
+ this.getQuotation()
},
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
}
+ this.getProjectList()
},
watch: {
"editClientManageConfig.visible"(val) {
@@ -579,6 +696,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) => {
@@ -596,53 +721,67 @@
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) {
- this.isNoProduct = true
- break
- } else {
- this.isNoProduct = false
+ // for (let i = 0; i < this.tableData.length; i++) {
+ // if (this.tableData[i].name.length === 0) {
+ // this.isNoProduct = true
+ // break
+ // } else {
+ // this.isNoProduct = false
+ // }
+ // }
+ // 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
+ }
}
}
- if (this.isNoProduct) {
- this.$message.error("璇烽�夋嫨浜у搧")
+ const params = this.saveParams()
+ 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 += parseFloat(item.total)
+ })
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
+ }
+ })
} else {
- 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
- })
- let config = {
- amountTotal: this.amountTotal,
- id: res.data.id
- }
- this.$emit("addCollectionPlanClick", config)
- }
- })
- } else {
- getUpdateSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
- }
+ getUpdateSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
- } else {
- console.log("error submit")
- return false
}
+ // } else {
+ // console.log("error submit")
+ // return false
+ // }
})
},
saveParams() {
let data = this.editConfig.infomation
+ let products = []
+ this.tableData.map((item) => {
+ if (item.number.length > 0) {
+ products.push(item)
+ }
+ })
let commonParam = {
address: data.address || "",
addressee: data.addressee || "",
@@ -652,7 +791,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: this.selProductData,
+ products: products,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -662,7 +801,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 === "鏂板缓") {
@@ -683,33 +824,34 @@
},
// 鑾峰彇鎶ヤ环鍗�
getQuotation(id, value) {
- getQuotationList({
- page: 0,
+ let params={
+ page: 0,
pageSize: 0,
- search_map: {
- sale_chance_id: id
- }
- }).then((res) => {
+ }
+ if(id){
+ params.search_map={
+ sale_chance_id: id
+ }
+ }
+ getQuotationList(params).then((res) => {
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.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.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
+ // }
+ // })
+ // })
+ // }
+ // })
}
}
})
@@ -721,11 +863,11 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ restaurants = this.saleChancelist
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- restaurants = this.quotationList
+ restaurants = this.quotationList
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -741,13 +883,22 @@
},
// 閿�鍞満浼氬垪琛�
async getSaleChanceList(item) {
- await getSaleChanceList({
- page: 1,
- pageSize: 15,
- search_map: {
+ let params={}
+ if(item){
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ params.search_map={
client_id: item.id
}
- }).then((res) => {
+ }else{
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ }
+ await getSaleChanceList(params).then((res) => {
console.log(res)
this.saleChancelist = res.data.list
})
@@ -766,6 +917,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
@@ -775,7 +927,10 @@
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.sale_chance_name = item.name
+ this.clientId = item.client.id
+ this.editConfig.infomation.client_name = item.client.name
this.isAddQuatation = false
+ this.getSaleChanceList({id:this.clientId})
this.getQuotation(item.id)
} else if (value === "subbill") {
console.log("涓嬫媺妗嗙偣鍑�", item)
@@ -783,16 +938,26 @@
this.editConfig.infomation.subbill_name = item.number
} else if (value === "quotation") {
this.productTableList.tableData = item.products
- // this.tableData = item.products
+ this.tableData = item.products
this.editConfig.infomation.quotation_number = item.number
this.quotationId = item.id
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = item.client.name
+ this.clientId = item.client.id
+ this.getSaleChanceList({id:this.clientId})
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = item.sale_chance.name
+ this.saleChanceId = item.sale_chance.id
+ this.getQuotation(this.saleChanceId)
}
},
selClientClick(value) {
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 = "閿�鍞瓙鍗�"
@@ -800,22 +965,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") {
@@ -823,8 +1003,14 @@
this.subbillId = row.id
} else if (value === "quotation") {
this.productTableList.tableData = row.products
- // this.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
}
},
@@ -839,12 +1025,14 @@
this.clientId = 0
this.saleChanceId = 0
this.subbillId = 0
+ this.getSaleChanceList()
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
this.isAddQuatation = true
this.editConfig.infomation.quotation_number = ""
this.quotationId = 0
+ this.getQuotation(this.saleChanceId)
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = ""
this.subbillId = 0
@@ -853,6 +1041,7 @@
this.quotationId = 0
}
this.productTableList.tableData = []
+ this.tableData = []
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -860,36 +1049,138 @@
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.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
+ }
this.productTableList = {
tableData: this.tableData,
+ isReturn: true,
tableColumn: [
- { label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", isRequird: true },
+ // { label: "#", prop: "productId", width: 40 },
+ { 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: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin", min: 90 },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price" },
{ label: "浠风◣鍚堣", prop: "total" }
]
}
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- this.productId = row.productId
+ // this.productId = row.productId
this.tableData.map((item) => {
- if (item.productId === row.productId) {
+ if (item.number === row.number) {
item[prop] = val
}
})
},
- // 閫夋嫨浜у搧
- 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
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val, index) {
+ if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ this.tableData = []
+ }
+ if (index < this.tableData.length) {
+ this.tableData.splice(index, 1)
+ val.map((item, ind) => {
+ this.tableData.splice(index + ind, 0, item)
+ })
+ } else {
+ this.tableData = this.tableData.concat(val)
+ }
+ this.productTableList.tableData = this.tableData
+ 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