From 4d52923cb03b457176bfeac7bf2247baecf9e7f5 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 26 九月 2023 15:22:59 +0800 Subject: [PATCH] 修改新建调拨失败(5067) --- src/views/overview/AddOverviewDialog.vue | 69 +++++++++++++++++++++++++++++++--- 1 files changed, 63 insertions(+), 6 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index b984d55..cc0d9d5 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -109,7 +109,18 @@ </el-col> <el-col :span="12"> <el-form-item label="鍏ュ簱绫诲瀷"> - <el-input v-model="receiptType" disabled style="width: 90%"></el-input> + <el-select + v-if="showOperationType" + v-model="editConfig.infomation.operationTypeId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + > + <el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <el-input v-else v-model="receiptType" disabled style="width: 90%"></el-input> </el-form-item> </el-col> <el-col :span="12"> @@ -260,7 +271,14 @@ <script> import CommonFormTableView from "@/components/makepager/CommonFormTableView" -import { getLocationList, addOperation, updateOperation, updateStatus, deleteOperation } from "@/api/overview/overview" +import { + getLocationList, + addOperation, + updateOperation, + updateStatus, + deleteOperation, + getOperationType +} from "@/api/overview/overview" import { getCompanyList } from "@/api/common/other" export default { name: "AddOverviewDialog", @@ -283,6 +301,10 @@ addName: { type: String, default: "璋冩嫧" + }, + showOperationType: { + type: Boolean, + default: false } }, components: { CommonFormTableView }, @@ -324,7 +346,8 @@ receiptType: "", // 鍏ュ簱绫诲瀷 companyObj: {}, contacterObj: {}, - isValidateClick: false // 楠岃瘉鏄惁鏄剧ず + isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず + operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃 } }, created() { @@ -334,6 +357,9 @@ this.getCompanyList() this.getLocationList() this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName + if (this.showOperationType) { + this.getOperationType() + } }, methods: { // 鑾峰彇鍏徃鍒楄〃 @@ -355,6 +381,25 @@ console.log(res) if (res.code === 200) { this.toLocationOptions = res.data + } + }) + }, + // 鑾峰彇浠撳簱绫诲瀷 + async getOperationType() { + await getOperationType({ + keyword: "", + page: 0, + pageSize: 0 + }).then((res) => { + console.log(res.data.data) + if (res.data.code === 200) { + const list = res.data.data.map((item) => { + return { + name: item.name, + id: item.id + } + }) + this.operationTypeOptions = list || [] } }) }, @@ -462,9 +507,9 @@ details: this.tableData, fromLocationId: data.fromLocationId || 0, id: data.id, - number: "", + number: data.number || "", operationDate: data.operationDate || "", - operationTypeId: this.editConfig.operationTypeId, + operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId, operationTypeName: this.receiptType, sourceNumber: data.sourceNumber || "", status: 3, @@ -485,7 +530,19 @@ }, // 鎿嶄綔鍒楄〃 setTableForm() { - this.tableData = this.editConfig.title !== "鏂板缓" ? this.editConfig.infomation.details : [] + if (this.editConfig.title !== "鏂板缓") { + const list = this.editConfig.infomation.details.map((item) => { + return { + ...item, + productName: item.product.name, + unit: item.product.unit + } + }) + this.tableData = list + } else { + this.tableData = [] + } + // this.tableData = this.editConfig.title !== "鏂板缓" ? list : [] this.productTableList = { tableData: this.tableData, tableColumn: [ -- Gitblit v1.8.0