From f8849f7028fed4435ef4831f791c2ceaec95648e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 06 十一月 2023 14:38:44 +0800
Subject: [PATCH] 新建仓库添加多个产品修复
---
src/views/overview/AddOverviewDialog.vue | 266 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 183 insertions(+), 83 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 94908bd..9b2adc0 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>
@@ -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="璇烽�夋嫨"
@@ -107,7 +106,21 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col v-if="showOperationType" :span="12">
+ <el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
+ <el-select
+ 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-form-item>
+ </el-col>
+ <el-col v-else :span="12">
<el-form-item label="鍏ュ簱绫诲瀷">
<el-input v-model="receiptType" disabled style="width: 90%"></el-input>
</el-form-item>
@@ -131,7 +144,12 @@
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>
@@ -145,9 +163,60 @@
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>
@@ -155,57 +224,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'">
@@ -249,9 +268,9 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <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="saveClick('form')">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -260,7 +279,14 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
-import { getLocationList, addOperation, updateOperation, updateStatus, deleteOperation } from "@/api/overview/overview"
+import {
+ getLocationList,
+ addOperation,
+ updateOperation,
+ updateStatus,
+ deleteOperation,
+ getListTransfer
+} from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
name: "AddOverviewDialog",
@@ -283,6 +309,10 @@
addName: {
type: String,
default: "璋冩嫧"
+ },
+ showOperationType: {
+ type: Boolean,
+ default: false
}
},
components: { CommonFormTableView },
@@ -295,7 +325,8 @@
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }]
+ fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
+ operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
},
companyOptions: [], // 鍏徃
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
@@ -321,10 +352,11 @@
detailId: 0,
isNoDetail: false, // 娣诲姞璇︽儏鏄庣粏琛屾椂鏄惁鏈�夋嫨
tableColumn: [],
- receiptType: this.addName, // 鍏ュ簱绫诲瀷
+ receiptType: "", // 鍏ュ簱绫诲瀷
companyObj: {},
contacterObj: {},
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
+ operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃
}
},
created() {
@@ -333,14 +365,18 @@
this.setDetailTableForm()
this.getCompanyList()
this.getLocationList()
+ this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
+ if (this.showOperationType) {
+ this.getListTransfer()
+ }
},
methods: {
// 鑾峰彇鍏徃鍒楄〃
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
}
})
},
@@ -348,6 +384,7 @@
async getLocationList() {
await getLocationList({
keyWord: "",
+ jointName: this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
@@ -357,14 +394,49 @@
}
})
},
+ // 鑾峰彇浠撳簱绫诲瀷
+ async getListTransfer() {
+ await getListTransfer({
+ keyword: "",
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
+ return {
+ name: item.name,
+ id: item.id
+ }
+ })
+ this.operationTypeOptions = list || []
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
+ console.log(this.editConfig.infomation.status)
if (this.editConfig.title === "鏂板缓") {
this.showButton = false
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (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 === "瀹屾垚") {
+ this.isValidateClick = false
+ } else {
+ this.isValidateClick = true
+ }
+ } else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
this.showButton = true
this.showEdit = false
this.isDelClick = true
@@ -376,6 +448,7 @@
this.showFooter = false
this.isValidateClick = false
} else {
+ // 灏辩华---
this.showButton = true
this.showEdit = true
this.showFooter = false
@@ -385,7 +458,8 @@
this.list[0].status = "active"
} else {
this.list.map((item) => {
- if (item.value === this.editConfig.infomation.status) {
+ console.log(item, this.editConfig.infomation.status, "鎵撳嵃淇℃伅")
+ if (item.value === this.editConfig.infomation.status || item.label === this.editConfig.infomation.status) {
item.status = "active"
} else {
item.status = "todo"
@@ -443,9 +517,9 @@
let contacterName = ""
if (this.editConfig.title === "鏂板缓") {
companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
- companyName = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.label
+ 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 ? 0 : this.contacterObj.label
+ contacterName = Object.keys(this.contacterObj).length === 0 ? "" : this.contacterObj.label
} else {
companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
@@ -453,6 +527,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,
@@ -461,9 +536,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,
@@ -484,7 +559,23 @@
},
// 鎿嶄綔鍒楄〃
setTableForm() {
- this.tableData = this.editConfig.title !== "鏂板缓" ? this.editConfig.infomation.details : []
+ if (
+ this.editConfig.title !== "鏂板缓" &&
+ this.editConfig.infomation.details &&
+ this.editConfig.infomation.details.length > 0
+ ) {
+ 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: [
@@ -492,7 +583,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" }
]
}
@@ -508,6 +599,7 @@
},
// 鏂板
addProductClick(value) {
+ console.log(value)
if (value === "鎿嶄綔") {
console.log(this.tableData)
for (let i = 0; i < this.tableData.length; i++) {
@@ -643,13 +735,13 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
- .basic-info-view {
- margin-top: 20px;
- }
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
.purchase-view {
display: flex;
@@ -668,7 +760,7 @@
::v-deep {
.el-dialog__headerbtn {
position: absolute;
- top: 18px;
+ top: 15px;
}
.el-button {
&:hover {
@@ -676,13 +768,21 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #333;
+ background: #f1f3f8;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
+ }
+ .el-tabs__header {
+ margin: 0 0 1px;
}
}
</style>
--
Gitblit v1.8.0