From 37630069ea5db733bd8d20fd6b10b5000fb99eb9 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 08 四月 2024 10:55:57 +0800
Subject: [PATCH] 发货单关联发货仓库
---
src/views/sales/salesDetails/shipmentsDialog.vue | 150 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 54 deletions(-)
diff --git a/src/views/sales/salesDetails/shipmentsDialog.vue b/src/views/sales/salesDetails/shipmentsDialog.vue
index 62ee623..f7e7039 100644
--- a/src/views/sales/salesDetails/shipmentsDialog.vue
+++ b/src/views/sales/salesDetails/shipmentsDialog.vue
@@ -30,13 +30,12 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24">
+ <!-- <el-col :span="24">
<el-form-item label="鍏宠仈椤圭洰锛�" prop="projectId">
<el-select
v-model="editConfig.infomation.projectId"
placeholder="璇烽�夋嫨"
size="mini"
- :disabled="true"
>
<el-option
v-for="item in projectList"
@@ -47,26 +46,27 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
- <!-- <el-col :span="24">
+ </el-col> -->
+ <el-col :span="24">
<el-form-item label="鍙戣揣浠撳簱" prop="addressee">
- <el-select v-model="value" placeholder="璇烽�夋嫨">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" @change="optionsChange">
<el-option
v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.warehouseId"
+ :label="item.warehouseName"
+ :value="item">
</el-option>
</el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</div>
- <div class="product-view">
+ <div class="product-view" v-if="isCommonShow">
<CommonFormTableView
ref="commonFormTableView"
:detail-enter="isView ? true : false"
:selectBox="false"
+ :colOpenShow="true"
:addTypeIdMultiple="true"
pageName="quotation"
:isBorder="true"
@@ -97,7 +97,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getProjectList,getDeliveryPrepareInfo,confirmOutput } from "@/api/sales/salesDetails"
+import { getProjectList,getDeliveryPrepareInfo,confirmOutput,getDeliveryPrepareInfoByWarehouse } from "@/api/sales/salesDetails"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getDataByType } from "@/api/data"
@@ -128,14 +128,14 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "number", isShowColumn:true, },
- { label: "浜у搧鍚嶇О", prop: "name",isShowColumn:true, min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount",min:110, isShowColumn:true,},
- { label: "璁㈠崟瀹屾垚鏁伴噺", min:120,prop: "finishAmount",isShowColumn:true, },
- { label: "鍙敤搴撳瓨", prop: "availableAmount",isShowColumn:true, },
- { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120,isShowColumn:true, },
- { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,isShowColumn:true,},
- { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount",min:120,isShowColumn:true,},
+ { label: "浜у搧缂栧彿", prop: "number",},
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",min:110,},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120,prop: "finishAmount",},
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
+ { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,},
+ { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount",min:120,},
]
return {
dialogWidth: "60%",
@@ -210,18 +210,14 @@
return time.getTime() > Date.now()
}
},
- options: [{
- value: '1',
- label: '浠撳簱1--搴撳瓨涓嶈冻鐨勬儏鍐�'
- }, {
- value: '2',
- label: '浠撳簱1--搴撳瓨鍏呰冻鐨勬儏鍐�'
- }],
+ options: [],
value:"",
shipmentsList:[],
shipmentsMsg:"",
dissatisfy:false, // 涓�娆″彂璐�-涓嶈冻
completely:false, // 澶氭鍙戣揣锛屽厖瓒�
+ isCommonShow:true,
+ warehouseId:null,
}
},
mounted(){
@@ -239,6 +235,11 @@
this.getDeliveryPrepareInfo({
saleDetailID: this.editCommonConfig.infomation.saleDetailID,
saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
+ })
+ this.getDeliveryPrepareInfoByWarehouse({
+ groupByWarehouse: true,
+ saleDetailID: this.editCommonConfig.infomation.saleDetailID,
+ saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
})
},
watch: {
@@ -289,12 +290,11 @@
this.$refs[formName].validate((valid) => {
if (valid) {
const params = this.saveParams()
- console.log(params,"鍙傛暟")
let isShipments=false
let shipmentsNum=false
this.shipmentsList.map((item)=>{
if(this.editConfig.infomation.deliverType===1){
- if(item.leftAmount<item.availableAmount&&item.leftAmount>0){
+ if(item.leftAmount<=item.availableAmount&&item.leftAmount>0){
isShipments=false
}else if(item.leftAmount<=0){
shipmentsNum=true
@@ -305,8 +305,6 @@
if(item.outputAmount>item.availableAmount||item.outputAmount>item.leftAmount){
isShipments=true
}else if(item.outputAmount===0){
- shipmentsNum=true
- }else if(!item.outputAmount){
shipmentsNum=true
}else if(item.leftAmount<=0){
isShipments=true
@@ -334,7 +332,8 @@
saveParams() {
let params = {
products:[],
- saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber
+ saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber,
+ warehouseId:this.warehouseId
}
this.shipmentsList.map((item)=>{
let obj={
@@ -373,7 +372,6 @@
var restaurants = []
if (value === "client") {
restaurants = this.clientList
- console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
restaurants = this.saleChancelist
} else if (value === "subbill") {
@@ -468,19 +466,19 @@
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
this.tableColumn=[
- { label: "浜у搧缂栧彿", prop: "number", isShowColumn:true, },
- { label: "浜у搧鍚嶇О", prop: "name",isShowColumn:true, min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount", isShowColumn:true,},
- { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount",isShowColumn:true, }
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount", }
]
this.productTableList = {
tableData: this.tableData,
isReturn: true,
// tableColumn: [
- // { label: "浜у搧缂栧彿", prop: "number", isShowColumn:true, },
- // { label: "浜у搧鍚嶇О", prop: "name",isShowColumn:true, min: 110 },
- // { label: "璁㈠崟鏁伴噺", prop: "orderAmount", isShowColumn:true,},
- // { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount",isShowColumn:true, }
+ // { label: "浜у搧缂栧彿", prop: "number",},
+ // { label: "浜у搧鍚嶇О", prop: "name",min: 110 },
+ // { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ // { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount",}
// ],
tableColumn: this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
}
@@ -568,6 +566,9 @@
pageSize: 100
}).then((res) => {
this.projectList = res.data
+ // if(res&&res.data.length>0){
+ // this.editConfig.infomation.projectId=res.data[0].projectId
+ // }
})
},
// 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
@@ -584,15 +585,19 @@
this.shipmentsList=[]
this.dissatisfy=false
this.completely=false
+ this.isCommonShow=false;
+ this.$nextTick(()=>{
+ this.isCommonShow=true;
+ })
if(value==1){
this.productTableList.showcol= ['浜у搧缂栧彿','浜у搧鍚嶇О', "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨"]
this.productTableList.allcol= ["璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨"]
this.tableColumn=[
- { label: "浜у搧缂栧彿", prop: "number",isShowColumn:true, },
- { label: "浜у搧鍚嶇О", prop: "name",isShowColumn:true, min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount",isShowColumn:true, },
- { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount",isShowColumn:true, },
- { label: "鍙敤搴撳瓨", prop: "availableAmount",isShowColumn:true, },
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name",min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount", },
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
]
this.productTableList.tableColumn=this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
this.dissatisfy=false
@@ -642,14 +647,14 @@
this.productTableList.showcol= ['浜у搧缂栧彿','浜у搧鍚嶇О', "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨","鏈彂璐ф暟閲�", "鏈鍙戣揣鏁伴噺","鍓╀綑鍙戣揣鏁伴噺",]
this.productTableList.allcol= [ "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨","鏈彂璐ф暟閲�", "鍓╀綑鍙戣揣鏁伴噺",]
this.tableColumn= [
- { label: "浜у搧缂栧彿", prop: "number",isShowColumn:true, },
- { label: "浜у搧鍚嶇О", prop: "name", min: 110 ,isShowColumn:true,},
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount",isShowColumn:true, },
- { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount" ,isShowColumn:true,},
- { label: "鍙敤搴撳瓨", prop: "availableAmount",isShowColumn:true, },
- { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, isShowColumn:true, },
- { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,isShowColumn:true,},
- { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount", min:120,isShowColumn:true,},
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 ,},
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount", },
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount" ,},
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
+ { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,},
+ { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount", min:120,},
]
this.productTableList.tableColumn=this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
let portion=0
@@ -696,7 +701,6 @@
this.shipmentsList.push(item)
}
})
- console.log(portion,"portion2")
if(portion===0){// 娌℃湁浜у搧婊¤冻鍙戣揣鏉′欢
this.completely=false
this.dissatisfy=true
@@ -714,6 +718,44 @@
}
}
})
+ },
+ // 鎸変粨搴撹繘琛屽彂璐�
+ async getDeliveryPrepareInfoByWarehouse(params){
+ await getDeliveryPrepareInfoByWarehouse(params).then((res)=>{
+ this.options=res.data
+ })
+ },
+ // 閫夋嫨浠撳簱
+ optionsChange(val){
+ this.warehouseId=val.warehouseId
+ this.productTableList.tableData=val.storeInfoList||[]
+ if(this.editConfig.infomation.deliverType===1){
+ let portion=0
+ this.productTableList.tableData.map((item)=>{
+ item.availableAmount=Number(item.availableAmount)
+ item.leftAmount=Number(item.leftAmount)
+ item.finishAmount=Number(item.finishAmount)
+ item.orderAmount=Number(item.orderAmount)
+ if(item.availableAmount>=item.leftAmount&&item.availableAmount>0&&item.leftAmount>0){
+ portion++
+ this.shipmentsList.push(item)
+ }
+ })
+ if(portion===0){// 娌℃湁浜у搧婊¤冻鍙戣揣鏉′欢
+ this.completely=false
+ this.dissatisfy=true
+ this.shipmentsMsg="鍙敤搴撳瓨鎴栨湭鍙戣揣鏁伴噺涓�0鎴栧綋鍓嶅彲鐢ㄥ簱瀛樹笉婊¤冻鏈彂璐ф暟閲忥紝涓嶈兘瀹屾垚涓�娆″彂璐�"
+ }else if(portion>0&&portion<this.productTableList.tableData.length){
+ this.dissatisfy=false
+ this.completely=true
+ this.shipmentsMsg="鍙兘婊¤冻閮ㄥ垎鍙戣揣闇�姹傦紝鏄惁纭鍙戣揣"
+ // 閮ㄥ垎浜у搧婊¤冻鍙戣揣鏉′欢
+ }else{
+ this.dissatisfy=false
+ this.completely=true
+ this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
+ }
+ }
}
}
}
--
Gitblit v1.8.0