From dd3d892936eff96a4418cfaa8f3c4219dfa23f1d Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期一, 24 七月 2023 14:30:19 +0800 Subject: [PATCH] config修改 --- src/views/sales/masterOrder/AddMasterOrderDialog.vue | 230 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 160 insertions(+), 70 deletions(-) diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue index 307d059..012cd7f 100644 --- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue +++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue @@ -20,49 +20,63 @@ <div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div> <div class="basic-info-view"> <el-row> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="瀹㈡埛鍚嶇О" prop="customName"> + <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="querySearchAsync" + value-key="name" + @select="handleSelectClient" + ></el-autocomplete> + <div class="common-select-btn" @click="selClientClick"> + <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> + </div> + <div class="common-select-btn" @click="clearupClient"> + <i class="el-icon-edit-outline" title="娓呴櫎"></i> + </div> </div> </el-form-item> </el-col> <el-col v-if="isUnflod" :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 v-if="isUnflod" :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="member_id"> + <el-select + v-model="editConfig.infomation.member_id" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 63%" + > + <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鏈嶅姟寮�濮嬫椂闂�" prop="serviceStartTime"> - <el-date-picker v-model="editConfig.infomation.serviceStartTime" type="date" placeholder="閫夋嫨鏃ユ湡"> + <el-form-item label="鏈嶅姟寮�濮嬫椂闂�" prop="start_time"> + <el-date-picker v-model="editConfig.infomation.start_time" type="date" placeholder="閫夋嫨鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鏈嶅姟鎴鏃堕棿" prop="serviceDeadline"> - <el-date-picker v-model="editConfig.infomation.serviceDeadline" type="date" placeholder="閫夋嫨鏃ユ湡"> + <el-form-item label="鏈嶅姟鎴鏃堕棿" prop="end_time"> + <el-date-picker v-model="editConfig.infomation.end_time" type="date" placeholder="閫夋嫨鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鍚堝悓閲戦" prop="contractAmount"> - <el-input v-model="editConfig.infomation.contractAmount"></el-input> + <el-form-item label="鍚堝悓閲戦" prop="money"> + <el-input v-model="editConfig.infomation.money"></el-input> </el-form-item> </el-col> </el-row> </div> <!-- 闄勪欢淇℃伅 --> - <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div> + <!-- <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div> <div v-if="isUnflod" class="basic-info-view"> <el-row> <el-col :span="12"> @@ -87,24 +101,33 @@ </el-form-item> </el-col> </el-row> - </div> + </div> --> </div> <!-- 灞曞紑鏀惰捣 --> - <div v-if="editConfig.title === '鏂板缓'" class="unflod-collapse" @click="unflodCollapseClick"> + <!-- <div v-if="editConfig.title === '鏂板缓'" class="unflod-collapse" @click="unflodCollapseClick"> <div>{{ unflodCollapseStr }}</div> <div v-if="isUnflod"><i class="el-icon-arrow-up"></i></div> <div v-else><i class="el-icon-arrow-down"></i></div> - </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" + /> </el-dialog> </div> </template> <script> +import { getAllData } from "@/api/client/client" +import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder" +import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" export default { name: "QuotationDialog", props: { @@ -114,46 +137,137 @@ return { visible: false, title: "鏂板缓", - infomation: { - customName: "", - documentNumber: "AC6521", - owner: "", - serviceStartTime: "", - serviceDeadline: "", - contractAmount: "" - } + infomation: {} } } } }, - components: {}, - computed: {}, + components: { SelectClientDialog }, + computed: { + clientList() { + return this.$store.state.getClientName.clientList + } + }, data() { return { dialogWidth: "80%", editConfig: this.editCommonConfig, rules: { - documentNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - owner: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] + number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + member_id: [{ 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: [], unflodCollapseStr: "鏀惰捣", - isUnflod: true + isUnflod: true, + editSelectClientConfig: { + editVisible: false, + title: "", + infomation: {} + } } }, - created() {}, + created() { + this.$store.dispatch("geClient") + 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 === "鏂板缓") { + getAddMasterOrder(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 { + getUpdateMasterOrder(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, + client_id: parseInt(data.client_id) || 0, + end_time: data.end_time || "", + member_id: data.member_id || 0, + money: parseFloat(data.money) || "0", + number: data.number || "", + start_time: data.start_time || "" + } + return params + }, handleClose() { this.editConfig.visible = false + }, + // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 + querySearchAsync(queryString, cb) { + var restaurants = this.clientList + var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants + cb(results) + }, + createStateFilter(queryString) { + return (state) => { + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } + }, + handleSelectClient(item) { + this.editConfig.infomation.client_id = item.id + }, + selClientClick() { + this.editSelectClientConfig.editVisible = true + }, + selClient(row) { + console.log(row) + this.editConfig.infomation.client_name = row.name + this.editConfig.infomation.client_id = row.id + }, + // 娓呴櫎宸查�夋嫨鐢ㄦ埛 + clearupClient() { + this.editConfig.infomation.client_name = "" + this.editConfig.infomation.client_id = 0 }, // 娣诲姞闄勪欢 addAnnexClick() {}, @@ -194,6 +308,7 @@ .common-select-btn { margin-left: 5px; font-size: 18px; + cursor: pointer; } } } @@ -220,31 +335,6 @@ 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; - } } } </style> -- Gitblit v1.8.0