From 05b72b58002a8733b8b31825ea5edabe7e279283 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 22 三月 2024 18:56:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/overview/AddOverviewDialog.vue | 318 ++++++++++++++++++++++++++++++----------------------
1 files changed, 184 insertions(+), 134 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 446e496..e7dda7d 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -202,8 +202,8 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12" >
- <el-form-item :label="workType === 1?'浠撳簱浣嶇疆':'婧愪綅缃�'" prop="location">
+ <el-col :span="12">
+ <el-form-item :label="workType === 1 ? '浠撳簱浣嶇疆' : '璋冨嚭浣嶇疆'" prop="location">
<el-select
@change="rootLocationChange"
v-model="editConfig.infomation.location"
@@ -216,7 +216,7 @@
v-for="item in formLocationOptions"
:key="item.id"
:label="item.jointName"
- :value="{label:item.jointName,value:item.id}"
+ :value="{ label: item.jointName, value: item.id }"
>
</el-option>
</el-select>
@@ -243,7 +243,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="workType === 3">
- <el-form-item label="浠撳簱浣嶇疆" prop="toLocation">
+ <el-form-item label="璋冨叆浣嶇疆" prop="toLocation">
<el-select
@change="toLocationChange"
v-model="editConfig.infomation.toLocation"
@@ -256,7 +256,7 @@
v-for="item in toLocationOptions"
:key="item.id"
:label="item.jointName"
- :value="{label:item.jointName,value:item.id}"
+ :value="{ label: item.jointName, value: item.id }"
>
</el-option>
</el-select>
@@ -301,17 +301,22 @@
<CommonFormTableView
ref="tableView"
:islistingrules="true"
+ :addTypeIdMultiple="true"
:product-table-list="productTableList"
:detail-enter="!showFooter"
@inputContent="inputContent"
@addProductClick="addProductClick('鎿嶄綔')"
+ @getSelectArray="getSelectArray"
+ @emptyProductClick="emptyProductClick"
+ @clearupProduct="clearupProduct"
>
<template v-if="showFooter" slot="tableButton">
<el-table-column label="鎿嶄綔" width="60" fixed="right" align="center">
<template slot-scope="scope">
- <div @click="handleDelClick(scope, '鎿嶄綔')">
+ <!-- <div @click="handleDelClick(scope, '鎿嶄綔')">
<i class="el-icon-delete"></i>
- </div>
+ </div> -->
+ <el-button type="text" size="small" @click.stop="handleDelClick(scope, '鎿嶄綔')">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -469,9 +474,9 @@
},
workType: {
type: Number,
- default: function() {
- // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
- return 1;
+ default: function () {
+ // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
+ return 1
}
},
addName: {
@@ -492,8 +497,8 @@
rules: {
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
- toLocation: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- location: [{ 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"] }]
},
@@ -511,12 +516,12 @@
supplierOptions: [], //渚涘簲鍟�
clientOptions: [], //瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
- formLocationOptions:[],// 婧愪綅缃�
+ formLocationOptions: [], // 璋冨嚭浣嶇疆
toLocationOptions: [], // 浠撳簱浣嶇疆
showButton: true,
activeName: "first",
productTableList: {},
- tableData:[],
+ tableData: [],
countId: 0,
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
@@ -564,14 +569,13 @@
}
this.getLogisticCompanyList()
this.formInfo()
- if(this.editConfig.title==="鏌ョ湅"||this.editConfig.title==="缂栬緫"){
+ if (this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫") {
setTimeout(() => {
this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
- }, 100);
+ }, 100)
}
},
- mounted(){
- },
+ mounted() {},
methods: {
formInfo() {
this.objCode.type = this.workType === 1 ? "鍏ュ簱缂栫爜" : this.workType === 2 ? "鍑哄簱缂栫爜" : "璋冩嫧缂栫爜"
@@ -624,7 +628,7 @@
})
}
},
- // 鑾峰彇婧愪綅缃�/浠撳簱浣嶇疆鍒楄〃
+ // 鑾峰彇璋冨嚭浣嶇疆/浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
await getLocationList({
keyWord: "",
@@ -761,7 +765,7 @@
console.log(validArr, "xxx")
Promise.all(validArr)
.then((results) => {
- console.log(results, "鎵ц鎴愬姛")
+ console.log(results, "鎵ц鎴愬姛", this.tableData)
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].productName.length === 0) {
this.isNoProduct = true
@@ -785,46 +789,46 @@
// })
// }
// 浜у搧鍒楄〃瑙ｆ瀯
- if(this.editConfig.title === "缂栬緫"||this.editConfig.title === "鏌ョ湅"){
- let arr=[]
- if(this.workType===1){
- params.details.map((item)=>{
+ 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
+ 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){
+ 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,
+ operationId: item.operationId,
+ amount: item.amount,
+ fromLocationId: item.fromLocationId.value,
+ productId: item.productId
})
- }else{
+ } else {
arr.push({
- operationId:item.operationId,
- amount:item.amount,
- fromLocationId:item.fromLocation.id,
- productId:item.productId,
+ 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)=>{
+ 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,
- })
+ 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,
@@ -843,17 +847,17 @@
// })
// }
})
- params.details=arr
+ params.details = arr
}
- }else if(this.editConfig.title === "鏂板缓"){
- if(this.workType===2){
- params.details.map((item)=>{
- item.fromLocationId=item.fromLocationId.value
+ } 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
+ } else if (this.workType === 3) {
+ params.details.map((item) => {
+ item.fromLocationId = item.fromLocationId.value
+ item.toLocationId = item.toLocationId.value
})
}
}
@@ -870,7 +874,7 @@
this.$message.success("缂栬緫鎴愬姛")
}
this.$parent.getData()
- }else{
+ } else {
this.$message.success(res.msg)
}
})
@@ -897,8 +901,8 @@
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={}
- if(this.workType===1||this.workType===2){
+ let params = {}
+ if (this.workType === 1 || this.workType === 2) {
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
@@ -913,7 +917,7 @@
operationDate: data.operationDate || "",
operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
- sourceNumber:data.sourceNumber || "" ,
+ sourceNumber: data.sourceNumber || "",
status: 3,
// toLocationId: data.toLocation.value||0,
waybillNumber: data.waybillNumber || "",
@@ -924,7 +928,7 @@
receiverName: data.receiverName || "",
receiverPhone: data.receiverPhone || ""
}
- }else if(this.workType===3){
+ } else if (this.workType === 3) {
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
@@ -939,9 +943,9 @@
operationDate: data.operationDate || "",
operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
- sourceNumber:data.sourceNumber || "" ,
+ sourceNumber: data.sourceNumber || "",
status: 3,
- toLocationId: data.toLocation.value||0,
+ toLocationId: data.toLocation.value || 0,
waybillNumber: data.waybillNumber || "",
weight: data.weight || 0,
logisticWeight: data.logisticWeight || 0,
@@ -975,6 +979,7 @@
return {
...item,
productName: item.product.name,
+ productId: item.product.id,
unit: item.product.unit
}
})
@@ -983,27 +988,36 @@
this.tableData = []
}
// this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
- let tableColumnArr=[]
- if(this.workType===1){
- tableColumnArr= [
- { label: "浜у搧", prop: "productName", productName: true, isRequird: true },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
- { label: "璁￠噺鍗曚綅", prop: "unit" }
- ]
- }else if(this.workType===2){
+ let tableColumnArr = []
+ if (this.workType === 1) {
tableColumnArr = [
- { label: "浜у搧", prop: "productName", productName: true, isRequird: true },
- { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
- { label: "璁￠噺鍗曚綅", prop: "unit" }
+ { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true }
]
- }else if(this.workType===3){
+ } else if (this.workType === 2) {
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" }
+ { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ // { label: "璋冨嚭浣嶇疆", prop: "fromLocationId", sonLocation: true, isRequird: true },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true }
+ ]
+ } else if (this.workType === 3) {
+ tableColumnArr = [
+ { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "璋冨嚭浣嶇疆", prop: "fromLocationId", sonLocation: true, isRequird: true },
+ { label: "璋冨叆浣嶇疆", prop: "toLocationId", toLocation: true, isRequird: true },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true }
]
}
this.productTableList = {
@@ -1023,56 +1037,92 @@
// 鏂板
addProductClick(value) {
console.log(value)
- if (value === "鎿嶄綔") {
- console.log(this.tableData)
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].productName.length === 0) {
- this.isNoProduct = false
- break
- } else {
- this.isNoProduct = true
- }
- }
- if (this.isNoProduct) {
- this.countId++
- this.tableData.push({
- countId: this.countId,
- productId: "",
- amount: 0,
- unit: "",
- productName: "",
- })
- }
- } else {
- console.log(this.detailTableData)
- for (let i = 0; i < this.detailTableData.length; i++) {
- if (this.detailTableData[i].name.length === 0) {
- this.isNoDetail = true
- break
- } else {
- this.isNoDetail = false
- }
- }
- if (!this.isNoDetail) {
- this.detailId++
- this.detailTableData.push({
- detailId: this.detailId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
- }
+ // if (value === "鎿嶄綔") {
+ // console.log(this.tableData)
+ // for (let i = 0; i < this.tableData.length; i++) {
+ // if (this.tableData[i].productName.length === 0) {
+ // this.isNoProduct = false
+ // break
+ // } else {
+ // this.isNoProduct = true
+ // }
+ // }
+ // if (this.isNoProduct) {
+ // this.countId++
+ // this.tableData.push({
+ // countId: this.countId,
+ // productId: "",
+ // amount: 0,
+ // unit: "",
+ // productName: ""
+ // })
+ // }
+ // } else {
+ // console.log(this.detailTableData)
+ // for (let i = 0; i < this.detailTableData.length; i++) {
+ // if (this.detailTableData[i].name.length === 0) {
+ // this.isNoDetail = true
+ // break
+ // } else {
+ // this.isNoDetail = false
+ // }
+ // }
+ // if (!this.isNoDetail) {
+ // this.detailId++
+ // this.detailTableData.push({
+ // detailId: this.detailId,
+ // id: 0,
+ // amount: 0,
+ // desc: "",
+ // name: "",
+ // number: "",
+ // price: 0,
+ // total: 0
+ // })
+ // }
+ // }
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val, index) {
+ if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ this.tableData = []
}
+ if (index < this.tableData.length) {
+ this.tableData.splice(index, 1)
+ val.map((item, ind) => {
+ this.tableData.splice(index + ind, 0, item)
+ })
+ } else {
+ this.tableData = this.tableData.concat(val)
+ }
+ console.log(this.tableData)
+ let list = this.tableData.map((res) => {
+ return {
+ ...res,
+ productName: res.name,
+ productId: res.id
+ }
+ })
+ this.tableData = list
+ this.productTableList.tableData = list
+ // this.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.tableData = []
+ this.productTableList.tableData = this.tableData
+ },
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
},
// 鍒犻櫎
handleDelClick(scope, value) {
console.log(scope)
if (value === "鎿嶄綔") {
this.tableData.splice(scope.$index, 1)
+ this.productTableList.tableData.splice(scope.$index, 1)
+ this.$message.success("鍒犻櫎鎴愬姛锛�")
} else {
this.detailTableData.splice(scope.$index, 1)
}
@@ -1186,20 +1236,20 @@
}
}
},
- // 婧愪綅缃�夋嫨
- rootLocationChange(val){
- this.editConfig.infomation.location=val
+ // 璋冨嚭浣嶇疆閫夋嫨
+ 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")
+ this.$refs.tableView.setLocationList(val.label, "fromLocation")
},
// 浠撳簱浣嶇疆閫夋嫨
- toLocationChange(val){
- this.editConfig.infomation.toLocation=val
- this.$refs.tableView.setLocationList(val.label,"toLocation")
+ toLocationChange(val) {
+ this.editConfig.infomation.toLocation = val
+ this.$refs.tableView.setLocationList(val.label, "toLocation")
}
}
}
--
Gitblit v1.8.0