From d68b036a3b3c67273b8effa3c9925ef3869a91ba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 07 二月 2024 13:56:50 +0800
Subject: [PATCH] wms项目 wms系统参数设置的页面开发+路由+是否显示表头配置
---
src/views/overview/AddOverviewDialog.vue | 299 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 235 insertions(+), 64 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 9956ae6..446e496 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -202,39 +202,21 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="workType !== 1" label="婧愪綅缃�" prop="fromLocationId">
+ <el-col :span="12" >
+ <el-form-item :label="workType === 1?'浠撳簱浣嶇疆':'婧愪綅缃�'" prop="location">
<el-select
- v-model="editConfig.infomation.fromLocationId"
+ @change="rootLocationChange"
+ v-model="editConfig.infomation.location"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 90%"
:disabled="!showFooter"
>
<el-option
- v-for="item in toLocationOptions"
+ v-for="item in formLocationOptions"
: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 v-if="workType !== 2" label="浠撳簱浣嶇疆" prop="toLocationId">
- <el-select
- v-model="editConfig.infomation.toLocationId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- >
- <el-option
- v-for="item in toLocationOptions"
- :key="item.id"
- :label="item.jointName"
- :value="item.id"
+ :value="{label:item.jointName,value:item.id}"
>
</el-option>
</el-select>
@@ -255,6 +237,26 @@
: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" v-if="workType === 3">
+ <el-form-item label="浠撳簱浣嶇疆" prop="toLocation">
+ <el-select
+ @change="toLocationChange"
+ v-model="editConfig.infomation.toLocation"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.jointName"
+ :value="{label:item.jointName,value:item.id}"
>
</el-option>
</el-select>
@@ -297,6 +299,8 @@
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
<CommonFormTableView
+ ref="tableView"
+ :islistingrules="true"
:product-table-list="productTableList"
:detail-enter="!showFooter"
@inputContent="inputContent"
@@ -465,7 +469,10 @@
},
workType: {
type: Number,
- default: 1
+ default: function() {
+ // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
+ return 1;
+ }
},
addName: {
type: String,
@@ -485,8 +492,8 @@
rules: {
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
- toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
+ toLocation: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
+ location: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }],
number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
},
@@ -504,11 +511,12 @@
supplierOptions: [], //渚涘簲鍟�
clientOptions: [], //瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
- toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆
+ formLocationOptions:[],// 婧愪綅缃�
+ toLocationOptions: [], // 浠撳簱浣嶇疆
showButton: true,
activeName: "first",
productTableList: {},
- tableData: [],
+ tableData:[],
countId: 0,
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
@@ -556,6 +564,13 @@
}
this.getLogisticCompanyList()
this.formInfo()
+ if(this.editConfig.title==="鏌ョ湅"||this.editConfig.title==="缂栬緫"){
+ setTimeout(() => {
+ this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
+ }, 100);
+ }
+ },
+ mounted(){
},
methods: {
formInfo() {
@@ -609,11 +624,22 @@
})
}
},
- // 鑾峰彇浠撳簱浣嶇疆鍒楄〃
+ // 鑾峰彇婧愪綅缃�/浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
await getLocationList({
keyWord: "",
jointName: this.editConfig.code,
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ this.formLocationOptions = res.data
+ }
+ })
+ await getLocationList({
+ keyWord: "",
+ // jointName: this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
@@ -747,12 +773,95 @@
if (this.isNoProduct) {
this.$message.error("璇锋坊鍔犳槑缁嗚鎴栭�夋嫨浜у搧涓嶈兘涓虹┖")
} else {
- let requestUrl = this.editConfig.title === "鏂板缓" ? addOperation : updateOperation
let params = this.saveParams()
+ // if(this.workType===2){
+ // params.details.map((item)=>{
+ // item.fromLocationId=item.fromLocationId.value
+ // })
+ // }else if(this.workType===3){
+ // params.details.map((item)=>{
+ // item.fromLocationId=item.fromLocationId.value
+ // item.toLocationId=item.toLocationId.value
+ // })
+ // }
+ // 浜у搧鍒楄〃瑙ｆ瀯
+ if(this.editConfig.title === "缂栬緫"||this.editConfig.title === "鏌ョ湅"){
+ let arr=[]
+ if(this.workType===1){
+ params.details.map((item)=>{
+ arr.push({
+ operationId:item.operationId,
+ amount:item.amount,
+ productId:item.productId
+ })
+ })
+ params.details=arr
+ }else if(this.workType===2){
+ params.details.map((item)=>{
+ if(item.fromLocationId.value){
+ arr.push({
+ operationId:item.operationId,
+ amount:item.amount,
+ fromLocationId:item.fromLocationId.value,
+ productId:item.productId,
+ })
+ }else{
+ arr.push({
+ operationId:item.operationId,
+ amount:item.amount,
+ fromLocationId:item.fromLocation.id,
+ productId:item.productId,
+ })
+ }
+ })
+ params.details=arr
+ }else if(this.workType===3){
+ console.log(params.details,"鐪嬬湅")
+ params.details.map((item)=>{
+ arr.push({
+ operationId:item.operationId,
+ amount:item.amount,
+ fromLocationId:item.fromLocationId.value?item.fromLocationId.value:item.fromLocation.id,
+ toLocationId:item.toLocationId.value?item.toLocationId.value:item.toLocation.id,
+ productId:item.productId,
+ })
+ // if(item.fromLocationId.value){
+ // arr.push({
+ // operationId:item.operationId,
+ // amount:item.amount,
+ // fromLocationId:item.fromLocationId.value,
+ // toLocationId:item.toLocation.id,
+ // productId:item.productId,
+ // })
+ // }else{
+ // arr.push({
+ // operationId:item.operationId,
+ // amount:item.amount,
+ // fromLocationId:item.fromLocation.id,
+ // toLocationId:item.toLocation.id,
+ // productId:item.productId,
+ // })
+ // }
+ })
+ params.details=arr
+ }
+ }else if(this.editConfig.title === "鏂板缓"){
+ if(this.workType===2){
+ params.details.map((item)=>{
+ item.fromLocationId=item.fromLocationId.value
+ })
+ }else if(this.workType===3){
+ params.details.map((item)=>{
+ item.fromLocationId=item.fromLocationId.value
+ item.toLocationId=item.toLocationId.value
+ })
+ }
+ }
+ let requestUrl = this.editConfig.title === "鏂板缓" ? addOperation : updateOperation
+ // let params = this.saveParams()
requestUrl({
...params
}).then((res) => {
- console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
if (this.editConfig.title === "鏂板缓") {
@@ -761,6 +870,8 @@
this.$message.success("缂栬緫鎴愬姛")
}
this.$parent.getData()
+ }else{
+ this.$message.success(res.msg)
}
})
}
@@ -786,30 +897,59 @@
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 = {
- baseOperationType: data.baseOperationType,
- comment: data.comment || "",
- companyID: companyID,
- companyName: companyName,
- contacterID: contacterID,
- contacterName: contacterName,
- details: this.tableData,
- fromLocationId: data.fromLocationId || 0,
- id: data.id,
- number: data.number || "",
- operationDate: data.operationDate || "",
- operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
- operationTypeName: this.receiptType,
- sourceNumber: data.sourceNumber || "",
- status: 3,
- toLocationId: data.toLocationId || 0,
- waybillNumber: data.waybillNumber || "",
- weight: data.weight || 0,
- logisticWeight: data.logisticWeight || 0,
- logisticCompanyId: data.logisticCompanyId,
- receiverAddr: data.receiverAddr || "",
- receiverName: data.receiverName || "",
- receiverPhone: data.receiverPhone || ""
+ let params={}
+ if(this.workType===1||this.workType===2){
+ params = {
+ baseOperationType: data.baseOperationType,
+ comment: data.comment || "",
+ companyID: companyID,
+ companyName: companyName,
+ contacterID: contacterID,
+ contacterName: contacterName,
+ details: this.tableData,
+ locationId: data.location.value || 0,
+ id: data.id,
+ number: data.number || "",
+ operationDate: data.operationDate || "",
+ operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
+ operationTypeName: this.receiptType,
+ sourceNumber:data.sourceNumber || "" ,
+ status: 3,
+ // toLocationId: data.toLocation.value||0,
+ waybillNumber: data.waybillNumber || "",
+ weight: data.weight || 0,
+ logisticWeight: data.logisticWeight || 0,
+ logisticCompanyId: data.logisticCompanyId,
+ receiverAddr: data.receiverAddr || "",
+ receiverName: data.receiverName || "",
+ receiverPhone: data.receiverPhone || ""
+ }
+ }else if(this.workType===3){
+ params = {
+ baseOperationType: data.baseOperationType,
+ comment: data.comment || "",
+ companyID: companyID,
+ companyName: companyName,
+ contacterID: contacterID,
+ contacterName: contacterName,
+ details: this.tableData,
+ locationId: data.location.value || 0,
+ id: data.id,
+ number: data.number || "",
+ operationDate: data.operationDate || "",
+ operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
+ operationTypeName: this.receiptType,
+ sourceNumber:data.sourceNumber || "" ,
+ status: 3,
+ toLocationId: data.toLocation.value||0,
+ waybillNumber: data.waybillNumber || "",
+ weight: data.weight || 0,
+ logisticWeight: data.logisticWeight || 0,
+ logisticCompanyId: data.logisticCompanyId,
+ receiverAddr: data.receiverAddr || "",
+ receiverName: data.receiverName || "",
+ receiverPhone: data.receiverPhone || ""
+ }
}
return params
},
@@ -843,23 +983,39 @@
this.tableData = []
}
// this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
- this.productTableList = {
- tableData: this.tableData,
- tableColumn: [
+ let tableColumnArr=[]
+ if(this.workType===1){
+ tableColumnArr= [
{ label: "浜у搧", prop: "productName", productName: true, isRequird: true },
- // { label: "璇存槑", prop: "number", input: true },
- // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true },
- // { label: "鎴鏃ユ湡", prop: "price", date: true },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" }
]
+ }else if(this.workType===2){
+ tableColumnArr = [
+ { label: "浜у搧", prop: "productName", productName: true, isRequird: true },
+ { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
+ { label: "璁￠噺鍗曚綅", prop: "unit" }
+ ]
+ }else if(this.workType===3){
+ tableColumnArr = [
+ { label: "浜у搧", prop: "productName", productName: true, isRequird: true },
+ { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
+ { label: "鑷�", prop: "toLocationId", toLocation: true,isRequird: true },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
+ { label: "璁￠噺鍗曚綅", prop: "unit" }
+ ]
+ }
+ this.productTableList = {
+ tableData: this.tableData,
+ tableColumn: tableColumnArr
}
},
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
this.countId = row.countId
this.tableData.map((item) => {
- if (item.countId === row.countId) {
+ if (item.id === row.id) {
item[prop] = val
}
})
@@ -884,7 +1040,7 @@
productId: "",
amount: 0,
unit: "",
- productName: ""
+ productName: "",
})
}
} else {
@@ -1029,6 +1185,21 @@
console.error(error)
}
}
+ },
+ // 婧愪綅缃�夋嫨
+ rootLocationChange(val){
+ this.editConfig.infomation.location=val
+ // this.productTableList.tableData.map((item)=>{
+ // console.log(item,"item")
+ // // item.toLocationId={}
+ // // item.fromLocationId={}
+ // })
+ this.$refs.tableView.setLocationList(val.label,"fromLocation")
+ },
+ // 浠撳簱浣嶇疆閫夋嫨
+ toLocationChange(val){
+ this.editConfig.infomation.toLocation=val
+ this.$refs.tableView.setLocationList(val.label,"toLocation")
}
}
}
--
Gitblit v1.8.0