From 83fe183a48dd08242d61788fa982e36d81b97727 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 18:53:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 299 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 173 insertions(+), 126 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 33587d1..4cead8b 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -28,16 +28,14 @@
<el-input
v-if="
editConfig.title == '缂栬緫' ||
- (editConfig.title == '鏂板缓' &&
- codenumer &&
- (explain != '' || isIdDisabled))
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
"
:disabled="editConfig.title == '缂栬緫'"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
</el-input>
- <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
<!-- <WordInput
@@ -88,7 +86,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -119,7 +117,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
@@ -150,20 +148,40 @@
</div>
</div>
</el-form-item>
- </el-col>
- <!-- <el-col :span="12">
- <el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
- <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
- <el-option
- v-for="item in selSourceOrderOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
</el-col> -->
+ <el-col :span="12">
+ <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number">
+ <div class="custom-name">
+ <el-autocomplete
+ v-model="editConfig.infomation.quotation_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'quotation')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('quotation', $event)"
+ style="width: 100%"
+ placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
+ :disabled="isAddQuatation"
+ ></el-autocomplete>
+ <div v-if="!isAddQuatation" 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
+ "
+ class="common-select-btn"
+ @click="clearupClient('quotation')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="绛剧害鏃ユ湡" prop="signTime">
<el-date-picker
@@ -201,29 +219,19 @@
</el-date-picker>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
- <el-form-item label="寰俊璁㈠崟鐘舵��" prop="wechatOrderStatus">
- <div class="common-select">
- <el-select
- v-model="editConfig.infomation.wechatOrderStatus"
- placeholder="璇烽�夋嫨"
- class="common-select-sel"
- size="mini"
- >
- <el-option
- v-for="item in wechatOrderStatusOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- <div class="common-select-btn">
- <i class="el-icon-setting"></i>
- </div>
- </div>
+ <el-col :span="12">
+ <el-form-item label="浜や粯绫诲瀷" prop="deliverType">
+ <el-select
+ v-model="editConfig.infomation.deliverType"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ >
+ <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>
</el-row>
</div>
<!-- 鏀惰揣淇℃伅 -->
@@ -345,14 +353,14 @@
</div>
<div class="product-view">
<CommonFormTableView
+ ref="commonFormTableView"
+ :detail-enter="true"
+ :select-box="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
- @addProductClick="addProductClick"
- @emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
- @clearupProduct="clearupProduct"
- />
+ @getSelectArray="getSelectArray"
+ ></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -441,8 +449,9 @@
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-
+import { getDataByType } from "@/api/data"
import { mapActions } from "vuex"
+import { getQuotationList } from "@/api/sales/quotation"
export default {
name: "AddSalesDetailsDialog",
@@ -478,9 +487,11 @@
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
// subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
- number: [{ required: true,validator: this.validateCheckCode, trigger: ["blur",'change'] }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
- memberId: [{ 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" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -522,30 +533,38 @@
infomation: {}
},
amountTotal: 0,
- isNameChanceEdit: false
+ isNameChanceEdit: false,
+ isAddQuatation: true,
+ // 浜や粯绫诲瀷
+ deliveryTypeList: getDataByType("deliveryType"),
+ quotationList: [],
+ quotationId: this.editCommonConfig.infomation.quotationId,
+ tableData: [],
+ selProductData: []
}
},
created() {
+ if (this.editConfig.title !== "鏂板缓") {
+ this.isAddQuatation = false
+ }
this.$store.dispatch("geClient")
- // this.$store.dispatch("geChance")
- // this.$store.dispatch("getSubunit")
this.setTableForm()
this.getCommonData()
this.formInfo()
- // if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) {
- // this.isNameChanceEdit = true
- // }
- // else {
-
- // }
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
},
watch: {
"editClientManageConfig.visible"(val) {
if (val) {
this.formInfo()
}
- },
+ }
},
+ // beforeUpdate() {
+ // this.$refs.commonFormTableView.toggleSelection(this.tableData)
+ // },
methods: {
...mapActions(["getChanceFilter", "getSubunitFliter"]),
formInfo() {
@@ -577,8 +596,8 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
+ for (let i = 0; i < this.selProductData.length; i++) {
+ if (this.selProductData[i].name.length === 0) {
this.isNoProduct = true
break
} else {
@@ -586,7 +605,7 @@
}
}
if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ this.$message.error("璇烽�夋嫨浜у搧")
} else {
const params = this.saveParams()
console.log(params)
@@ -606,6 +625,7 @@
}
})
} else {
+ console.log(this.selProductData)
getUpdateSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -633,7 +653,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: this.tableData,
+ products: this.selProductData,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -642,6 +662,8 @@
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || "",
+ quotationId: this.quotationId,
+ deliverType: data.deliverType || 0
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -660,6 +682,45 @@
handleClose() {
this.editConfig.visible = false
},
+ // 鑾峰彇鎶ヤ环鍗�
+ getQuotation(id, value) {
+ getQuotationList({
+ page: 0,
+ pageSize: 0,
+ search_map: {
+ sale_chance_id: id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ console.log(res)
+ this.quotationList = res.data.list
+ 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.selProductData.forEach((key) => {
+ if (item.number === key.number) {
+ item.amount = key.amount
+ item.id = key.id
+ }
+ })
+ })
+ 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)
+ }
+ })
+ })
+ }
+ })
+ }
+ }
+ })
+ },
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
var restaurants = []
@@ -670,13 +731,15 @@
restaurants = this.saleChancelist
} else if (value === "subbill") {
restaurants = this.subOrderList
+ } else if (value === "quotation") {
+ restaurants = this.quotationList
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
createStateFilter(queryString, value) {
return (state) => {
- if (value === "subbill") {
+ if (value === "subbill" || value === "quotation") {
return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
} else {
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
@@ -710,8 +773,8 @@
},
handleSelectClient(value, item) {
if (value === "client") {
- this.editConfig.infomation.subbill_name =""
- this.editConfig.infomation.sale_chance_name=""
+ this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
this.getSaleChanceList(item)
@@ -719,10 +782,17 @@
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.sale_chance_name = item.name
+ this.isAddQuatation = false
+ this.getQuotation(item.id)
} else if (value === "subbill") {
console.log("涓嬫媺妗嗙偣鍑�", item)
this.subbillId = item.id
this.editConfig.infomation.subbill_name = item.number
+ } else if (value === "quotation") {
+ this.productTableList.tableData = item.products
+ // this.tableData = item.products
+ this.editConfig.infomation.quotation_number = item.number
+ this.quotationId = item.id
}
},
selClientClick(value) {
@@ -735,12 +805,17 @@
this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
this.editSelCommonConfig.editVisible = true
this.editSelCommonConfig.clientId = this.clientId
+ } else if (value === "quotation") {
+ this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ 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.editConfig.infomation.subbill_name=""
+ this.editConfig.infomation.sale_chance_name = ""
+ this.editConfig.infomation.subbill_name = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
@@ -748,25 +823,43 @@
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
+ this.isAddQuatation = false
+ this.getQuotation(row.id)
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = row.number
this.subbillId = row.id
+ } else if (value === "quotation") {
+ this.productTableList.tableData = row.products
+ // this.tableData = row.products
+ this.editConfig.infomation.quotation_number = row.number
+ this.quotationId = row.id
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation.sale_chance_name=""
+ this.editConfig.infomation.sale_chance_name = ""
this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.subbill_name =""
+ this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
this.clientId = 0
+ this.saleChanceId = 0
+ this.subbillId = 0
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
+ this.isAddQuatation = true
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
} 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() {},
@@ -774,33 +867,21 @@
setFormatClick() {},
setTableForm() {
if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ this.tableData = []
} else {
- this.tableData = this.editConfig.infomation.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- })
+ this.selProductData = this.editConfig.infomation.products
+ this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
+ // let productData = this.quotationList.products
this.productTableList = {
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧鍚嶇О", prop: "name", isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
- { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "浠风◣鍚堣", prop: "total" }
]
}
},
@@ -813,43 +894,9 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
- this.showSummary.show = true
- },
- // 浜у搧娓呯┖
- emptyProductClick() {
- this.productId = 1
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
- this.productTableList.tableData = this.tableData
- },
- // 浜у搧閲嶇畻
- recalculateProductClick() {},
- clearupProduct(data) {
- this.tableData = data
- this.productTableList.tableData = this.tableData
+ // 閫夋嫨浜у搧
+ getSelectArray(val) {
+ this.selProductData = val
}
}
}
--
Gitblit v1.8.0