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 | 141 ++++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 68 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 348a411..e11476a 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -29,7 +29,6 @@ label-position="right" label-width="120px" size="mini" - style="height: 60vh; overflow-x: hidden" > <div> <!-- <div>aaa</div> --> @@ -47,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="璇烽�夋嫨" @@ -145,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> @@ -159,9 +158,55 @@ 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> + </el-col> + <el-col :span="12"> + <el-form-item label="璐熻矗浜�" prop="contacterName"> + <el-select + v-model="editConfig.infomation.contacterName" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + @change="contacterChange" + > + <el-option + v-for="item in memberOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <!-- <el-col :span="12"> + <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> + <el-select + v-model="editConfig.infomation.memberId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + > + <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="24"> + <el-form-item label="澶囨敞" prop="comment"> + <el-input + v-model.trim="editConfig.infomation.comment" + size="mini" + type="textarea" + style="width: 96%" + :autosize="{ minRows: 3 }" + :disabled="!showFooter" + ></el-input> </el-form-item> </el-col> </el-row> @@ -169,57 +214,7 @@ <div class="bottom"> <el-tabs v-model="activeName" type="card"> <!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> --> - <el-tab-pane label="鎿嶄綔" name="first"> </el-tab-pane> - <el-tab-pane label="鍏朵粬淇℃伅" name="second"> - <div class="purchase-view"> - <div class="left"> - <!-- <div class="second-label">鍏朵粬淇℃伅</div> --> - <!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> - <el-select - v-model="editConfig.infomation.memberId" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - > - <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> - </el-option> - </el-select> - </el-form-item> --> - <el-form-item label="璐熻矗浜�" prop="contacterName"> - <el-select - v-model="editConfig.infomation.contacterName" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - @change="contacterChange" - > - <el-option - v-for="item in memberOptions" - :key="item.id" - :label="item.name" - :value="{ value: item.id, label: item.name }" - > - </el-option> - </el-select> - </el-form-item> - </div> - <div class="right"></div> - </div> - </el-tab-pane> - <el-tab-pane label="澶囨敞" name="third"> - <el-form-item label="澶囨敞" prop="comment"> - <el-input - v-model.trim="editConfig.infomation.comment" - size="mini" - type="textarea" - style="width: 85%" - :autosize="{ minRows: 8 }" - :disabled="!showFooter" - ></el-input> - </el-form-item> - </el-tab-pane> + <el-tab-pane label="浜у搧" name="first"> </el-tab-pane> </el-tabs> <!-- 鎿嶄綔 --> <div v-if="activeName === 'first'"> @@ -280,7 +275,7 @@ updateOperation, updateStatus, deleteOperation, - getOperationType + getListTransfer } from "@/api/overview/overview" import { getCompanyList } from "@/api/common/other" export default { @@ -362,7 +357,7 @@ this.getLocationList() this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName if (this.showOperationType) { - this.getOperationType() + this.getListTransfer() } }, methods: { @@ -370,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 } }) }, @@ -379,6 +374,7 @@ async getLocationList() { await getLocationList({ keyWord: "", + jointName:this.editConfig.code, page: 0, pageSize: 0 }).then((res) => { @@ -389,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 @@ -415,9 +411,14 @@ this.showEdit = false this.showFooter = true this.isValidateClick = false - } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) { + } else if (this.editConfig.title === "缂栬緫") { this.showButton = true this.showEdit = false + this.isDelClick = true + this.showFooter = true + } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) { + this.showButton = true + this.showEdit = true this.isDelClick = true this.showFooter = false if (this.editConfig.infomation.status === "瀹屾垚") { @@ -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" } ] } @@ -759,8 +761,8 @@ border-bottom: none; } .el-tabs__item.is-active { - color: #fff; - background: #2a78fb; + color: #333; + background: #f1f3f8; } .el-tabs__item { height: 30px; @@ -768,5 +770,8 @@ font-size: 13px; background: #f3f3f3; } + .el-tabs__header { + margin: 0 0 1px; + } } </style> -- Gitblit v1.8.0