From 25b727a5dc28f3c2d225c5e017da58f35c6b84b3 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期二, 26 九月 2023 19:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/overview/AddOverviewDialog.vue | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7e31f48..cc0d9d5 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -8,7 +8,7 @@
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + addName }}</span>
+ <span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -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">
@@ -160,7 +171,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">鍏朵粬淇℃伅</div>
- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
+ <!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
<el-select
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
@@ -171,7 +182,7 @@
<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> -->
<el-form-item label="璐熻矗浜�" prop="contacterName">
<el-select
v-model="editConfig.infomation.contacterName"
@@ -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 },
@@ -321,10 +343,11 @@
detailId: 0,
isNoDetail: false, // 娣诲姞璇︽儏鏄庣粏琛屾椂鏄惁鏈�夋嫨
tableColumn: [],
- receiptType: this.addName, // 鍏ュ簱绫诲瀷
+ receiptType: "", // 鍏ュ簱绫诲瀷
companyObj: {},
contacterObj: {},
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
+ operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃
}
},
created() {
@@ -333,6 +356,10 @@
this.setDetailTableForm()
this.getCompanyList()
this.getLocationList()
+ this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
+ if (this.showOperationType) {
+ this.getOperationType()
+ }
},
methods: {
// 鑾峰彇鍏徃鍒楄〃
@@ -357,6 +384,25 @@
}
})
},
+ // 鑾峰彇浠撳簱绫诲瀷
+ 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 || []
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
@@ -364,13 +410,13 @@
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === "瀹屾垚") {
+ } else if (this.editConfig.infomation.status === 4) {
this.showButton = true
this.showEdit = false
this.isDelClick = true
this.showFooter = false
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === "宸插彇娑�") {
+ } else if (this.editConfig.infomation.status === 5) {
this.showButton = true
this.showEdit = false
this.showFooter = false
@@ -442,15 +488,15 @@
let contacterID = 0
let contacterName = ""
if (this.editConfig.title === "鏂板缓") {
- companyID = this.companyObj.length === 0 ? 0 : this.companyObj.value
- companyName = this.companyObj.length === 0 ? 0 : this.companyObj.label
- contacterID = this.contacterObj.length === 0 ? 0 : this.contacterObj.value
- contacterName = this.contacterObj.length === 0 ? 0 : this.contacterObj.label
+ companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
+ companyName = Object.keys(this.companyObj).length === 0 ? "" : this.companyObj.label
+ contacterID = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.value
+ contacterName = Object.keys(this.contacterObj).length === 0 ? "" : this.contacterObj.label
} else {
- companyID = this.companyObj.length === 0 ? data.companyID : this.companyObj.value
- companyName = this.companyObj.length === 0 ? data.companyName : this.companyObj.label
- contacterID = this.contacterObj.length === 0 ? data.contacterID : this.contacterObj.value
- contacterName = this.contacterObj.length === 0 ? data.contacterName : this.contacterObj.label
+ companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
+ companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
+ contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value
+ contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
}
let params = {
comment: data.comment || "",
@@ -461,9 +507,10 @@
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,
toLocationId: data.toLocationId || 0
@@ -483,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: [
@@ -667,7 +726,7 @@
::v-deep {
.el-dialog__headerbtn {
position: absolute;
- top: 18px;
+ top: 15px;
}
.el-button {
&:hover {
--
Gitblit v1.8.0