From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 17 十月 2023 15:10:13 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style --- src/views/sales/subOrder/AddSubOrderDialog.vue | 665 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 472 insertions(+), 193 deletions(-) diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue index 4e198db..55628d2 100644 --- a/src/views/sales/subOrder/AddSubOrderDialog.vue +++ b/src/views/sales/subOrder/AddSubOrderDialog.vue @@ -5,13 +5,16 @@ :visible.sync="editConfig.visible" :width="dialogWidth" :before-close="handleClose" + append-to-body + custom-class="iframe-dialog" > <el-form + v-if="refreshFlag" ref="form" :model="editConfig.infomation" :rules="rules" label-position="right" - label-width="308px" + label-width="100px" size="mini" > <!-- 淇℃伅 --> @@ -21,32 +24,89 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="瀹㈡埛鍚嶇О" prop="customName"> + <el-form-item label="鍗曟嵁缂栧彿" prop="number"> + <WordInput + v-if="codenumer && (explain != '' || isIdDisabled) && method == 0" + :codenumer="codenumer" + :sum="sum" + :disabled="editConfig.title !== '鏂板缓' || isIdDisabled" + :inputValue="inputValue" + @codeList="codeList" + /> + <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> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.customName"></el-input> - <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> - <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> + <el-autocomplete + v-model="editConfig.infomation.client_name" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'client') + } + " + value-key="name" + @select="handleSelectClient('client', $event)" + ></el-autocomplete> + <div 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" + class="common-select-btn" + @click="clearupClient('client')" + > + <i class="el-icon-remove-outline" title="娓呴櫎"></i> + </div> + </div> + </el-form-item> + </el-col> + + <el-col :span="12"> + <el-form-item label="閿�鍞�诲崟" prop="master_order_number"> + <div class="custom-name"> + <el-autocomplete + v-model="editConfig.infomation.master_order_number" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'master') + } + " + value-key="number" + @select="handleSelectClient('master', $event)" + placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О" + :disabled="isAddMaster" + ></el-autocomplete> + <div v-if="!isAddMaster" class="common-select-btn" @click="selClientClick('master')"> + <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> + </div> + <div + v-if=" + editConfig.infomation.master_order_number && + editConfig.infomation.master_order_number.length > 0 && + !isAddMaster + " + class="common-select-btn" + @click="clearupClient('master')" + > + <i class="el-icon-remove-outline" title="娓呴櫎"></i> + </div> </div> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鍗曟嵁缂栧彿" prop="documentNumber"> - <el-input v-model="editConfig.infomation.documentNumber"></el-input> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="閿�鍞�诲崟" prop="masterOrder"> - <div class="custom-name"> - <el-input v-model="editConfig.infomation.masterOrder"></el-input> - <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> - <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> - </div> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="璐熻矗浜�" prop="owner"> - <el-select v-model="editConfig.infomation.owner" placeholder="璇烽�夋嫨" size="mini" style="width: 63%"> - <el-option v-for="item in ownerOptions" :key="item.value" :label="item.label" :value="item.value"> + <el-form-item label="璐熻矗浜�" prop="memberId"> + <el-select + v-model="editConfig.infomation.memberId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 100%" + > + <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -54,7 +114,7 @@ </el-row> </div> <!-- 闄勪欢淇℃伅 --> - <div class="basic-info-title">闄勪欢淇℃伅</div> + <!-- <div class="basic-info-title">闄勪欢淇℃伅</div> <div class="basic-info-view"> <el-row> <el-col :span="12"> @@ -79,87 +139,65 @@ </el-form-item> </el-col> </el-row> - </div> + </div> --> <!-- 浜у搧绠$悊 --> <div class="basic-info-title" style="display: flex"> 浜у搧绠$悊 <div style="margin-left: 400px"> 甯佺 <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%"> - <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value"> + <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </div> </div> <div class="product-view"> - <CommonFormTableView :product-table-list="productTableList" /> - </div> - <!-- 鍚堣 --> - <div class="basic-info-view"> - <el-row> - <el-col :span="7" :offset="17"> - <el-form-item prop="discount"> - <template slot="label"> - <span>鏁村崟鎶樻墸</span> - <el-select - v-model="discount" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 104px; margin-left: 3px" - > - <el-option - v-for="item in discountOptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </template> - <el-input v-model="editConfig.infomation.discount"></el-input> - </el-form-item> - </el-col> - <el-col :span="7" :offset="17"> - <el-form-item prop="discount"> - <template slot="label"> - <span>璋冩暣</span> - <el-select v-model="adjust" placeholder="璇烽�夋嫨" size="mini" style="width: 74px; margin-left: 3px"> - <el-option - v-for="item in adjustOptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </template> - <el-input v-model="editConfig.infomation.discount"></el-input> - </el-form-item> - </el-col> - <el-col :span="7" :offset="17"> - <el-form-item label="鍚堣" prop="total"> - <el-button type="text" v-model="editConfig.infomation.total" style="color: #555; font-size: 13px">{{ - editConfig.infomation.total ? editConfig.infomation.total : "0.00" - }}</el-button> - </el-form-item> - </el-col> - </el-row> + <CommonFormTableView + :show-summary="showSummary" + :product-table-list="productTableList" + @inputContent="inputContent" + @addProductClick="addProductClick" + @emptyProductClick="emptyProductClick" + @recalculateProductClick="recalculateProductClick" + @clearupProduct="clearupProduct" + /> </div> </div> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button> + <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button> <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button> </div> + <!-- 閫夋嫨瀹㈡埛 --> + <SelectClientDialog + v-if="editSelectClientConfig.editVisible" + :edit-common-config="editSelectClientConfig" + @selClient="selClient" + /> + <!-- 閫夋嫨閿�鍞�诲崟 --> + <SelectCommonDialog + v-if="editSelectMasterConfig.editVisible" + :edit-common-config="editSelectMasterConfig" + @selClient="selClient" + /> </el-dialog> </div> </template> <script> import CommonFormTableView from "@/components/makepager/CommonFormTableView" +import { getAllData } from "@/api/client/client" +import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder" +import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" +import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog" +import WordInput from "@/components/wordInput.vue" +import codeMixin from "@/views/client/followupRecords/mixin/codeMixin" +import { getMasterOrderList } from "@/api/sales/masterOrder" + export default { - name: "QuotationDialog", - components: { CommonFormTableView }, + name: "SubOrderDialog", + mixins: [codeMixin], + components: { WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog }, props: { editCommonConfig: { type: Object, @@ -167,40 +205,33 @@ return { visible: false, title: "鏂板缓", - infomation: { - customName: "", - documentNumber: "AC6521", - masterOrder: "", - owner: "", - currency: "", - discount: "", - total: "14.00" - } + infomation: {} } } } }, - computed: {}, + computed: { + clientList() { + return this.$store.state.getClientName.clientList + } + // masterOrderList() { + // return this.$store.state.getClientName.masterOrderList + // } + }, data() { return { - dialogWidth: "80%", + refreshFlag: true, + dialogWidth: "50%", editConfig: this.editCommonConfig, rules: { - documentNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - owner: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] + number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + master_order_number: [{ required: true, message: "璇烽�夋嫨鎴栧垱寤洪攢鍞�诲崟", trigger: "blur" }], + client_name: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], + memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] }, - ownerOptions: [ - // 璐熻矗浜� - { value: "1", label: "BOSS" }, - { value: "2", label: "Mia" }, - { value: "3", label: "璐㈠姟" }, - { value: "4", label: "甯傚満" }, - { value: "5", label: "绯荤粺绠$悊鍛�" }, - { value: "6", label: "閿�鍞�" }, - { value: "7", label: "閿�鍞�荤洃" } - ], + memberOptions: [], discount: "2", - currencyOptions: [], + currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺 discountOptions: [ { value: "1", label: "鐧惧垎姣旈檷浠�" }, { value: "2", label: "鐩存帴闄嶄环" } @@ -213,119 +244,367 @@ productTableList: {}, showSummary: { show: true, - total: false, - sumProp: ["other1", "other7"], - mergeNumber: 7 - } + total: true, + sumProp: ["Amount", "total"], + mergeNumber: 2 + }, + editSelectClientConfig: { + editVisible: false, + title: "", + infomation: {} + }, + editSelectMasterConfig: { + editVisible: false, + title: "", + infomation: {} + }, + clientId: this.editCommonConfig.infomation.client_id, + masterId: this.editCommonConfig.infomation.masterOrderId, + tableData: [], + productId: 1, + addProductArr: [], + objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�", codeStandID: "" }, + isAddMaster: true, + masterOrderList: [] } }, created() { + this.$store.dispatch("geClient") + // this.$store.dispatch("geMaster") this.setTableForm() + this.getCommonData() + this.formInfo() + }, + watch: { + "editConfig.visible"(val) { + if (val) { + this.formInfo() + } + }, + "editConfig.infomation.codeStandID"() { + this.formInfo() + } }, methods: { - setTableForm() { - this.productTableList = { - tableData: [ - { - id: "1", - productName: "涓婃捣鏈夐檺鍏徃", - other0: "ZDYBD03-1", - other1: "12", - other2: "", - other6: "3.00", - other7: "2.00" - } - ], - tableColumn: [ - { label: "#", prop: "id", width: 40 }, - { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true }, - { label: "浜у搧缂栧彿", prop: "other0" }, - { label: "璁¢噺鍗曚綅", prop: "other2" }, - { label: "瑙勬牸缂栧彿", prop: "other3" }, - { label: "婧愬崟绫诲瀷", prop: "other4" }, - { label: "鍚堝悓淇℃伅", prop: "other5" }, - { label: "鏁伴噺", prop: "other1", input: true, isRequird: true }, - { label: "鍚◣鍗曚环", prop: "other6", input: true }, - { label: "浠风◣鍚堣", prop: "other7", input: true }, - { label: "鎻忚堪", prop: "other8" } - ] + formInfo() { + this.objCode.codeStandID = "" + if (this.editConfig.infomation.codeStandID) { + this.objCode.codeStandID = this.editConfig.infomation.codeStandID } + this.getRCodeStandardList() + }, + getCommonData() { + getAllData() + .then((res) => { + console.log(res) + if (res.code === 200) { + this.memberOptions = res.data.member + this.dataProcess() + } + }) + .catch((err) => { + console.log(err) + }) + }, + dataProcess() { + this.masterOrderList.map((item) => { + if (this.masterId === item.id) { + this.editConfig.infomation.master_order_number = item.number + } + }) + }, + /** + * 寮哄埗鍒锋柊form缁勪欢 + * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇 + */ + refresh() { + this.refreshFlag = false + requestAnimationFrame(() => { + this.refreshFlag = true + }) + }, + // 淇濆瓨 + saveClick(formName) { + this.$refs[formName].validate((valid) => { + this.validateFormNumber() + if (valid) { + console.log(this.editConfig.infomation) + 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 { + const params = this.saveParams() + console.log(params) + if (this.editConfig.title === "鏂板缓") { + getAddSubOrder(params).then((res) => { + console.log(res) + this.editConfig.visible = false + if (res.code === 200) { + this.$message.success("娣诲姞鎴愬姛") + this.$parent.getData() + } + }) + } else { + getUpdateSubOrder(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 + } + }) + }, + saveParams() { + let data = this.editConfig.infomation + let params = { + id: this.editConfig.title === "鏂板缓" ? 0 : data.id, + clientId: this.clientId || 0, + masterOrderId: this.masterId || 0, + memberId: data.memberId || 0, + number: data.number || "", + product: this.tableData, + codeStandID: data.ID, + codeRule: this.codeRule + } + return params }, handleClose() { this.editConfig.visible = false }, + // 鑾峰彇閿�鍞�诲崟 + getMasterList(id) { + getMasterOrderList({ + page: 0, + pageSize: 0, + search_map: { + client_id: id + } + }).then((res) => { + if (res.code == 200) { + this.masterOrderList = res.data.list + } + }) + }, + // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 + querySearchAsync(queryString, cb, value) { + var restaurants = [] + if (value === "client") { + restaurants = this.clientList + } else if (value === "master") { + restaurants = this.masterOrderList + } + var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants + cb(results) + }, + createStateFilter(queryString, value) { + return (state) => { + console.log(state) + if (value === "client") { + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } else if (value === "master") { + return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } + } + }, + handleSelectClient(value, item) { + if (value === "client") { + this.clientId = item.id + this.isAddMaster = false + this.getMasterList(item.id) + this.editConfig.infomation.master_order_number = "" + this.masterId = 0 + } else if (value === "master") { + this.editConfig.infomation.master_order_number = item.number + this.masterId = item.id + } + this.refresh() + }, + selClientClick(value) { + if (value == "client") { + this.editSelectClientConfig.editVisible = true + } else if (value == "master") { + this.editSelectMasterConfig.title = "閿�鍞�诲崟" + this.editSelectMasterConfig.editVisible = true + this.editSelectMasterConfig.clientId = this.clientId + this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList] + } + }, + selClient(row, value) { + if (value == "client") { + this.editConfig.infomation.client_name = row.name + this.editConfig.infomation.client_id = row.id + this.clientId = row.id + this.isAddMaster = false + this.getMasterList(row.id) + this.editConfig.infomation.master_order_number = "" + this.masterId = 0 + } else if (value == "master") { + this.editConfig.infomation.master_order_number = row.number + this.masterId = row.id + } + this.refresh() + }, + // 娓呴櫎宸查�夋嫨鐢ㄦ埛 + clearupClient(value) { + if (value == "client") { + this.editConfig.infomation.client_name = "" + this.editConfig.infomation.client_id = 0 + this.clientId = 0 + this.isAddMaster = true + this.editConfig.infomation.master_order_number = "" + this.masterId = 0 + } else if (value == "master") { + this.editConfig.infomation.master_order_number = "" + this.masterId = 0 + } + this.refresh() + }, // 娣诲姞闄勪欢 addAnnexClick() {}, // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡 - setFormatClick() {} + 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 + } + ] + } else { + this.tableData = this.editConfig.infomation.products + this.tableData.map((item, index) => { + item.productId = index + 1 + }) + } + this.productTableList = { + tableData: this.tableData, + tableColumn: [ + { label: "#", prop: "productId", width: 40 }, + { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true }, + { label: "浜у搧缂栧彿", prop: "number" }, + { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true }, + { label: "閿�鍞崟浠�", prop: "price", inputFloat: true }, + { label: "浠风◣鍚堣", prop: "total", inputFloat: true } + ] + } + }, + // 浜у搧鍒楄〃杈撳叆 + inputContent(val, prop, row) { + this.productId = row.productId + this.tableData.map((item) => { + if (item.productId === row.productId) { + item[prop] = val + } + }) + }, + // 浜у搧鏂板 + 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 + } } } </script> <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> -.add-quotation { - .basic-info { - .basic-info-title { - background-color: #f4f8fe; - padding-left: 10px; - font-size: 15px; - font-weight: bold; - color: #666; - height: 42px; - line-height: 42px; - } - .basic-info-view { - margin-top: 10px; - padding-right: 40px; - .custom-name { +::v-deep { + .iframe-dialog .el-dialog__body { + .basic-info { + .basic-info-title { + background-color: #f4f8fe; + padding-left: 10px; + font-size: 15px; + font-weight: bold; + color: #666; + height: 42px; + line-height: 42px; + } + .basic-info-view { + margin-top: 10px; + padding-right: 40px; + .custom-name { + display: flex; + .common-select-btn { + margin-left: 5px; + font-size: 18px; + cursor: pointer; + } + .el-autocomplete { + flex: 1; + } + } + } + .address-view { + margin-top: 10px; + padding-right: 40px; + } + .annex-view { display: flex; - .common-select-btn { - margin-left: 5px; - font-size: 18px; + color: #6166d3; + .setFormat { + margin-left: 10px; } } } - .address-view { - margin-top: 10px; - padding-right: 40px; - } - .annex-view { - display: flex; - color: #6166d3; - .setFormat { - margin-left: 10px; - } - } - } - .dialog-footer { - background-color: #f5f5f5; - height: 55px; - line-height: 55px; - } -} -::v-deep { - .el-dialog__header { - padding: 12.5px 10px; - border-bottom: 1px solid #e5e5e5; - .el-dialog__title { - font-size: 15px; - color: #323232; - font-weight: bold; - } - } - .el-dialog__body { - padding: 0px; - } - .el-dialog__footer { - padding: 0px; - text-align: center; - box-sizing: border-box; - border-top: 1px solid #dadee5; - } - .product-view { - .el-form-item__label { - padding: 0; + .dialog-footer { + background-color: #f5f5f5; + height: 55px; + line-height: 55px; } } } -- Gitblit v1.8.0