From a63bbe043b87d9becfe483bb1477d471a79edcd8 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期日, 23 七月 2023 11:45:24 +0800 Subject: [PATCH] 全部删除接口联调 --- src/views/service/orderManage/AddOrderManageDialog.vue | 191 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 129 insertions(+), 62 deletions(-) diff --git a/src/views/service/orderManage/AddOrderManageDialog.vue b/src/views/service/orderManage/AddOrderManageDialog.vue index e4afce2..27c15f6 100644 --- a/src/views/service/orderManage/AddOrderManageDialog.vue +++ b/src/views/service/orderManage/AddOrderManageDialog.vue @@ -22,54 +22,79 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="瀹㈡埛鍚嶇О" prop="customName"> + <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 :span="12"> - <el-form-item label="宸ュ崟缂栧彿" prop="orderNumber"> - <el-input v-model="editConfig.infomation.orderNumber"></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="orderName"> - <el-input v-model="editConfig.infomation.orderName"></el-input> + <el-form-item label="宸ュ崟鍚嶇О" prop="name"> + <el-input v-model="editConfig.infomation.name"></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="宸ュ崟绫诲瀷" prop="orderType"> - <CommonSelectView - :common-value="editConfig.infomation.orderType" - :common-options="orderTypeOptions" - /> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.orderType" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in orderTypeOptions" :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-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鑱旂郴浜哄鍚�" prop="contactName"> + <el-form-item label="鑱旂郴浜哄鍚�" prop="contactId"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.contactName"></el-input> + <el-input v-model="editConfig.infomation.contactId"></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="repairSource"> - <CommonSelectView - :common-value="editConfig.infomation.repairSource" - :common-options="repairSourceOptions" - /> + <el-form-item label="鎶ヤ慨鏉ユ簮" prop="reportSourceId"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.reportSourceId" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in reportSourceOptions" :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-form-item> </el-col> - <el-col :span="12"> - <el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder"> - <el-select v-model="editConfig.infomation.selSourceOrder" size="mini"> + <!-- <el-col :span="12"> + <el-form-item label="閫夋嫨婧愬崟" prop="sourceSheet"> + <el-select v-model="editConfig.infomation.sourceSheet" size="mini"> <el-option - v-for="item in selSourceOrderOptions" + v-for="item in sourceSheetOptions" :key="item.value" :label="item.label" :value="item.value" @@ -77,7 +102,7 @@ </el-option> </el-select> </el-form-item> - </el-col> + </el-col> --> </el-row> </div> <!-- 闂鎻忚堪 --> @@ -85,12 +110,12 @@ <div class="basic-info-view"> <el-row> <el-col :span="24"> - <el-form-item label="闂鎻忚堪" prop="problemDesc"> + <el-form-item label="闂鎻忚堪" prop="problemDescription"> <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="璇疯緭鍏ュ唴瀹�" - v-model="editConfig.infomation.problemDesc" + v-model="editConfig.infomation.problemDescription" ></el-input> </el-form-item> </el-col> @@ -124,7 +149,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="20"> @@ -162,23 +187,28 @@ </el-form-item> </el-col> </el-row> - </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="editConfig.visible = false">淇濆瓨</el-button> + <!-- <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 CommonSelectView from "@/components/makepager/CommonSelectView" import { getAllData } from "@/api/client/client" -import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder" +import { getAddOrderManage, getUpdateOrderManage } from "@/api/serviceManage/orderManage" +import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" export default { name: "AddOrderManageDialog", props: { @@ -193,8 +223,11 @@ } } }, - components: { CommonSelectView }, + components: { SelectClientDialog }, computed: { + clientList() { + return this.$store.state.getClientName.clientList + }, searchCommonHeight() { return this.$refs.searchCommonView.offsetHeight } @@ -204,21 +237,27 @@ dialogWidth: "80%", editConfig: this.editCommonConfig, rules: { - customName: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }], - orderNumber: [{ required: true, message: "璇疯緭鍏ュ伐鍗曠紪鍙�", trigger: "blur" }], + clientId: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }], + number: [{ required: true, message: "璇疯緭鍏ュ伐鍗曠紪鍙�", trigger: "blur" }], orderType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], - problemDesc: [{ required: true, message: "璇疯緭鍏ラ棶棰樻弿杩�", trigger: "blur" }] + problemDescription: [{ required: true, message: "璇疯緭鍏ラ棶棰樻弿杩�", trigger: "blur" }] }, - orderTypeOptions: [], // 宸ュ崟绫诲瀷 - repairSourceOptions: [], // 鎶ヤ慨鏉ユ簮 - selSourceOrderOptions: [ - { value: "1", label: "閿�鍞槑缁嗗崟" }, - { value: "2", label: "鏈嶅姟鍚堝悓" } - ], - approvalWorkflowOptions: [] // 瀹℃壒娴佺▼ + orderTypeOptions: [{ id: 1, name: "绫诲瀷1" }], // 宸ュ崟绫诲瀷 + reportSourceOptions: [], // 鎶ヤ慨鏉ユ簮 + // sourceSheetOptions: [ + // { value: "1", label: "閿�鍞槑缁嗗崟" }, + // { value: "2", label: "鏈嶅姟鍚堝悓" } + // ], + approvalWorkflowOptions: [], // 瀹℃壒娴佺▼ + editSelectClientConfig: { + editVisible: false, + title: "", + infomation: {} + } } }, created() { + this.$store.dispatch("geClient") this.getCommonData() }, methods: { @@ -226,6 +265,8 @@ getAllData() .then((res) => { this.memberOptions = res.data.member + this.orderTypeOptions = res.data.orderType + this.reportSourceOptions = res.data.reportSource }) .catch((err) => { console.log(err) @@ -239,7 +280,7 @@ const params = this.saveParams() console.log(params) if (this.editConfig.title === "鏂板缓") { - getAddSubOrder(params) + getAddOrderManage(params) .then((res) => { console.log(res) this.editConfig.visible = false @@ -255,7 +296,7 @@ console.log(err) }) } else { - getUpdateSubOrder(params) + getUpdateOrderManage(params) .then((res) => { console.log(res) this.editConfig.visible = false @@ -281,26 +322,47 @@ 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, + clientId: parseInt(data.clientId) || 0, + contactId: data.contactId || 0, + file: data.file || "", + name: data.name || "", number: data.number || "", - product: [ - { - amount: 0, - desc: "", - id: 0, - name: "", - number: "", - price: 0, - total: 0 - } - ] + orderType: data.orderType || 0, + problemDescription: data.problemDescription || "", + reportSourceId: data.reportSourceId || 0, + sourceSheet: data.sourceSheet || 0 } 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() {}, @@ -326,11 +388,16 @@ .basic-info-view { margin-top: 10px; padding-right: 40px; - .custom-name { + .custom-name, + .common-select { display: flex; + .common-select-sel { + width: 270px; + } .common-select-btn { margin-left: 5px; - font-size: 18px; + font-size: 16px; + cursor: pointer; } } } -- Gitblit v1.8.0