From 2fb4239e828bcfa9711ce4cecc4b942767621d62 Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期一, 06 十一月 2023 17:20:20 +0800 Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev --- src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 485 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 339 insertions(+), 146 deletions(-) diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue index 76b4762..2bd7459 100644 --- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue +++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue @@ -24,8 +24,22 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="璁㈠崟缂栧彿" prop="number"> - <WordInput + <el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number"> + <el-input + v-if=" + isView || + editConfig.title == '缂栬緫' || + (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled)) + " + :disabled="editConfig.title == '缂栬緫' || isView" + v-model="editConfig.infomation.number" + placeholder="璇疯緭鍏ョ紪鐮�" + > + </el-input> + <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c" + >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span + > + <!-- <WordInput v-if="codenumer && (explain != '' || isIdDisabled) && method == 0" :codenumer="codenumer" :sum="sum" @@ -36,7 +50,7 @@ <span v-else-if="method == 0" style="color: #f56c6c" >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span > - <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> + <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> --> </el-form-item> </el-col> <el-col :span="12"> @@ -52,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')" @@ -73,7 +92,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%" @@ -85,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')" @@ -105,18 +129,75 @@ </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-form-item label="閿�鍞瓙鍗�" prop="subbill_name"> + <div class="custom-name"> + <el-autocomplete + style="width: 100%" + v-model="editConfig.infomation.subbill_name" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'subbill') + } + " + value-key="number" + @select="handleSelectClient('subbill', $event)" + :disabled="isNameChanceEdit" + ></el-autocomplete> + <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('subbill')"> + <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> + </div> + <div + v-if=" + editConfig.infomation.subbill_name && + editConfig.infomation.subbill_name.length > 0 && + !isNameChanceEdit + " + class="common-select-btn" + @click="clearupClient('subbill')" > - </el-option> - </el-select> + <i class="el-icon-remove-outline" title="娓呴櫎"></i> + </div> + </div> </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 || isView" + ></el-autocomplete> + <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 && + !isView + " + 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 @@ -125,6 +206,7 @@ type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 100%" + :disabled="isView" > </el-date-picker> </el-form-item> @@ -136,6 +218,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> @@ -150,33 +233,25 @@ type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 100%" + :disabled="isView" > </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%" + :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> </el-row> </div> <!-- 鏀惰揣淇℃伅 --> @@ -185,12 +260,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"> @@ -200,17 +275,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"> @@ -222,6 +298,7 @@ :precision="2" :controls="false" style="width: 100%; margin-right: 5px" + :disabled="isView" ></el-input-number> </el-form-item> </el-col> @@ -238,6 +315,7 @@ type="textarea" :autosize="{ minRows: 4 }" v-model="editConfig.infomation.conditions" + :disabled="isView" ></el-input> </el-form-item> </el-col> @@ -253,6 +331,7 @@ type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.remark" + :disabled="isView" ></el-input> </el-form-item> </el-col> @@ -290,7 +369,13 @@ 浜у搧绠$悊 <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> @@ -298,14 +383,14 @@ </div> <div class="product-view"> <CommonFormTableView + ref="commonFormTableView" + :detail-enter="true" + :select-box="selectBox" :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> @@ -371,6 +456,12 @@ :edit-common-config="editSelectChanceConfig" @selClient="selClient" /> + <!-- 閿�鍞瓙鍗� --> + <SelectCommonDialog + v-if="editSelCommonConfig.editVisible" + :edit-common-config="editSelCommonConfig" + @selClient="selClient" + /> <!-- 鏂板缓 鏀舵璁″垝 --> <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" /> </el-dialog> @@ -384,9 +475,13 @@ import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog" import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan" -import codeMixin from "@/views/client/followupRecords/mixin/codeMixin" -import { getSaleChanceList} from "@/api/sales/salesOpportunity" -import {mapActions} from "vuex" +import codeMixin from "@/components/makepager/mixin/codeMixin" +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", @@ -403,14 +498,17 @@ } } }, - components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan }, + components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan, SelectCommonDialog }, computed: { clientList() { return this.$store.state.getClientName.clientList - }, - saleChancelist() { - return this.$store.state.getClientName.saleChancelist } + // saleChancelist() { + // return this.$store.state.getClientName.saleChancelist + // }, + // subOrderList() { + // return this.$store.state.getClientName.subOrderList + // } }, data() { return { @@ -418,9 +516,12 @@ editConfig: this.editCommonConfig, rules: { client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }], - number: [{ required: true, message: "璇疯緭鍏ヨ鍗曠紪鍙�", trigger: "blur" }], + // 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: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }] + memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }], + sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }], + quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }] // approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }] }, memberOptions: [], @@ -443,10 +544,17 @@ editSelectChanceConfig: { editVisible: false, title: "", + infomation: {}, + search_map: {} + }, + editSelCommonConfig: { + editVisible: false, + title: "", infomation: {} }, clientId: this.editCommonConfig.infomation.client_id, - saleChanceId: this.editCommonConfig.infomation.saleChanceId, + saleChanceId: this.editCommonConfig.infomation.sale_chance_id, + subbillId: this.editCommonConfig.infomation.subbillId, productId: 1, isNoProduct: true, addCollectionConfig: { @@ -455,34 +563,42 @@ infomation: {} }, amountTotal: 0, - isNameChanceEdit: false + isNameChanceEdit: false, + isAddQuatation: true, + // 浜や粯绫诲瀷 + deliveryTypeList: getDataByType("deliveryType"), + quotationList: [], + quotationId: this.editCommonConfig.infomation.quotationId, + tableData: [], + selProductData: [], + isView: this.editCommonConfig.title === "鏌ョ湅", + selectBox: this.editCommonConfig.title !== "鏌ョ湅" } }, created() { + if (this.editConfig.title !== "鏂板缓") { + this.isAddQuatation = false + } this.$store.dispatch("geClient") - this.$store.dispatch("geChance") this.setTableForm() this.getCommonData() this.formInfo() - if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) { - this.isNameChanceEdit = true + if (this.editConfig.title === "缂栬緫") { + this.productTableList.tableData = this.editConfig.infomation.products } - // else { - - // } }, watch: { "editClientManageConfig.visible"(val) { if (val) { this.formInfo() } - }, - "editClientManageConfig.infomation.codeStandID"() { - this.formInfo() } }, + // beforeUpdate() { + // this.$refs.commonFormTableView.toggleSelection(this.tableData) + // }, methods: { - ...mapActions(["getChanceFilter"]), + ...mapActions(["getChanceFilter", "getSubunitFliter"]), formInfo() { this.objCode.type = "閿�鍞槑缁嗙紪鐮�" this.objCode.codeStandID = "" @@ -495,7 +611,7 @@ getAllData() .then((res) => { this.memberOptions = res.data.member - this.dataProcess() + // this.dataProcess() }) .catch((err) => { console.log(err) @@ -512,9 +628,8 @@ saveClick(formName) { this.$refs[formName].validate((valid) => { if (valid) { - console.log(this.editConfig.infomation) - 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 { @@ -522,7 +637,7 @@ } } if (this.isNoProduct) { - this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖") + this.$message.error("璇烽�夋嫨浜у搧") } else { const params = this.saveParams() console.log(params) @@ -542,6 +657,7 @@ } }) } else { + console.log(this.selProductData) getUpdateSalesDetails(params).then((res) => { console.log(res) this.editConfig.visible = false @@ -569,7 +685,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, @@ -578,7 +694,8 @@ logisticCompany: data.logisticCompany || "", logisticCost: data.logisticCost || 0, logisticNumber: data.logisticNumber || "", - codeRule: this.codeRule + quotationId: this.quotationId, + deliverType: data.deliverType || 0 } let params = {} if (this.editConfig.title === "鏂板缓") { @@ -597,62 +714,184 @@ 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 = [] if (value === "client") { restaurants = this.clientList + console.log(restaurants, "瀹㈡埛鍗�") } else if (value === "chance") { 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)) : restaurants + var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants cb(results) }, - createStateFilter(queryString) { + createStateFilter(queryString, value) { return (state) => { - return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + if (value === "subbill" || value === "quotation") { + return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } else { + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } } }, - async handleSelectClient(value, item) { + // 閿�鍞満浼氬垪琛� + async getSaleChanceList(item) { + await getSaleChanceList({ + page: 1, + pageSize: 15, + search_map: { + client_id: item.id + } + }).then((res) => { + console.log(res) + this.saleChancelist = res.data.list + }) + }, + // 閿�鍞瓙鍗曞垪琛� + async getSubOrderList(item) { + await getSubOrderList({ + page: 1, + pageSize: 15, + search_map: { + client_id: item.id + } + }).then((res) => { + this.subOrderList = res.data.list + }) + }, + handleSelectClient(value, item) { if (value === "client") { + this.editConfig.infomation.subbill_name = "" + this.editConfig.infomation.sale_chance_name = "" this.clientId = item.id this.editConfig.infomation.client_name = item.name - // 闇�瑕佷慨鏀� - await getSaleChanceList({ - client_id:this.clientId - }).then((res)=>{ - this.getChanceFilter(res.data.list) - }) + this.getSaleChanceList(item) + this.getSubOrderList(item) } else if (value === "chance") { this.saleChanceId = item.id - this.editConfig.infomation.client_name = item.name + 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) { if (value === "client") { this.editSelectClientConfig.editVisible = true } else if (value === "chance") { + this.editSelectChanceConfig.clientId = this.clientId this.editSelectChanceConfig.editVisible = true + } else if (value === "subbill") { + 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.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.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.client_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() {}, @@ -660,33 +899,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" } ] } }, @@ -699,43 +926,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