From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001 From: songshankun <songshankun@foxmail.com> Date: 星期五, 03 十一月 2023 14:50:31 +0800 Subject: [PATCH] Merge branch 'dev' into songshankun/add-token --- src/views/overview/AddOverviewDialog.vue | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 54a2cf0..e11476a 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -46,7 +46,7 @@ <el-row> <el-col :span="12"> <el-form-item prop="companyName"> - <span slot="label">{{ workType === 1 ? "瀹㈡埛" : workType === 2 ? "閫佽揣鍦板潃" : "鑱旂郴浜�" }}</span> + <span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span> <el-select v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨" @@ -144,7 +144,7 @@ style="width: 90%" :disabled="!showFooter" > - <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id"> + <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -158,7 +158,7 @@ style="width: 90%" :disabled="!showFooter" > - <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id"> + <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -275,7 +275,7 @@ updateOperation, updateStatus, deleteOperation, - getOperationType + getListTransfer } from "@/api/overview/overview" import { getCompanyList } from "@/api/common/other" export default { @@ -357,7 +357,7 @@ this.getLocationList() this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName if (this.showOperationType) { - this.getOperationType() + this.getListTransfer() } }, methods: { @@ -365,8 +365,8 @@ async getCompanyList() { await getCompanyList().then((res) => { console.log(res) - if (res.data.code === 200) { - this.companyOptions = res.data.data + if (res.code === 200) { + this.companyOptions = res.data } }) }, @@ -374,6 +374,7 @@ async getLocationList() { await getLocationList({ keyWord: "", + jointName:this.editConfig.code, page: 0, pageSize: 0 }).then((res) => { @@ -384,15 +385,15 @@ }) }, // 鑾峰彇浠撳簱绫诲瀷 - async getOperationType() { - await getOperationType({ + async getListTransfer() { + await getListTransfer({ keyword: "", page: 0, pageSize: 0 }).then((res) => { - console.log(res.data.data) - if (res.data.code === 200) { - const list = res.data.data.map((item) => { + console.log(res.data) + if (res.code === 200) { + const list = res.data.map((item) => { return { name: item.name, id: item.id @@ -516,6 +517,7 @@ contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label } let params = { + baseOperationType:data.baseOperationType, comment: data.comment || "", companyID: companyID, companyName: companyName, @@ -571,7 +573,7 @@ // { label: "璇存槑", prop: "number", input: true }, // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true }, // { label: "鎴鏃ユ湡", prop: "price", date: true }, - { label: "瀹屾垚", prop: "amount", inputFloat: true }, + { label: "鏁伴噺", prop: "amount", inputFloat: true }, { label: "璁¢噺鍗曚綅", prop: "unit" } ] } -- Gitblit v1.8.0