From 23d80c1b64f23ede237ab8e89ebc2ee2aaf43f26 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期三, 19 七月 2023 19:32:10 +0800 Subject: [PATCH] 销售模块接口联调 --- src/views/sales/subOrder/AddSubOrderDialog.vue | 165 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 123 insertions(+), 42 deletions(-) diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue index 0000851..a9ad5d0 100644 --- a/src/views/sales/subOrder/AddSubOrderDialog.vue +++ b/src/views/sales/subOrder/AddSubOrderDialog.vue @@ -21,32 +21,37 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="瀹㈡埛鍚嶇О" prop="customName"> + <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.customName"></el-input> + <el-input v-model="editConfig.infomation.clientId"></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="documentNumber"> - <el-input v-model="editConfig.infomation.documentNumber"></el-input> + <el-form-item label="鍗曟嵁缂栧彿" prop="number"> + <el-input v-model="editConfig.infomation.number"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="閿�鍞�诲崟" prop="masterOrder"> + <el-form-item label="閿�鍞�诲崟" prop="masterOrderId"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.masterOrder"></el-input> + <el-input v-model="editConfig.infomation.masterOrderId"></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: 63%" + > + <el-option v-for="item in memberOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> @@ -85,7 +90,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 + > <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> @@ -106,6 +117,7 @@ placeholder="璇烽�夋嫨" size="mini" style="width: 104px; margin-left: 3px" + disabled > <el-option v-for="item in discountOptions" @@ -116,14 +128,20 @@ </el-option> </el-select> </template> - <el-input v-model="editConfig.infomation.discount"></el-input> + <el-input v-model="editConfig.infomation.discount" disabled></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-select + v-model="adjust" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 74px; margin-left: 3px" + disabled + > <el-option v-for="item in adjustOptions" :key="item.value" @@ -133,7 +151,7 @@ </el-option> </el-select> </template> - <el-input v-model="editConfig.infomation.discount"></el-input> + <el-input v-model="editConfig.infomation.discount" disabled></el-input> </el-form-item> </el-col> <el-col :span="7" :offset="17"> @@ -157,6 +175,8 @@ <script> import CommonFormTableView from "@/components/makepager/CommonFormTableView" +import { getAllData } from "@/api/client/client" +import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder" export default { name: "QuotationDialog", components: { CommonFormTableView }, @@ -167,15 +187,7 @@ return { visible: false, title: "鏂板缓", - infomation: { - customName: "", - documentNumber: "AC6521", - masterOrder: "", - owner: "", - currency: "", - discount: "", - total: "14.00" - } + infomation: {} } } } @@ -186,19 +198,10 @@ dialogWidth: "80%", editConfig: this.editCommonConfig, rules: { - documentNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - owner: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] + number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + 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: [], discountOptions: [ @@ -221,8 +224,93 @@ }, created() { this.setTableForm() + this.getCommonData() }, methods: { + getCommonData() { + getAllData() + .then((res) => { + this.memberOptions = res.data.member + }) + .catch((err) => { + console.log(err) + }) + }, + // 淇濆瓨 + saveClick(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + console.log(this.editConfig.infomation) + 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({ + message: "娣诲姞鎴愬姛", + type: "success" + }) + this.$parent.getData() + } + }) + .catch((err) => { + console.log(err) + }) + } else { + getUpdateSubOrder(params) + .then((res) => { + console.log(res) + this.editConfig.visible = false + if (res.code === 200) { + this.$message({ + message: "缂栬緫鎴愬姛", + type: "success" + }) + this.$parent.getData() + } + }) + .catch((err) => { + console.log(err) + }) + } + } else { + console.log("error submit") + return false + } + }) + }, + saveParams() { + let data = this.editConfig.infomation + let params = { + id: this.editConfig.title === "鏂板缓" ? 0 : data.id, + clientId: data.clientId || 0, + masterOrderId: data.masterOrderId || 0, + memberId: data.memberId || 0, + number: data.number || "", + product: [ + { + amount: 0, + desc: "", + id: 0, + name: "", + number: "", + price: 0, + total: 0 + } + ] + } + return params + }, + handleClose() { + this.editConfig.visible = false + }, + // 娣诲姞闄勪欢 + addAnnexClick() {}, + // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡 + setFormatClick() {}, setTableForm() { this.productTableList = { tableData: [ @@ -250,14 +338,7 @@ { label: "鎻忚堪", prop: "other8" } ] } - }, - handleClose() { - this.editConfig.visible = false - }, - // 娣诲姞闄勪欢 - addAnnexClick() {}, - // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡 - setFormatClick() {} + } } } </script> -- Gitblit v1.8.0