From c4158c84f0b6b17ccb2818d80b963d803fb922b4 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 30 三月 2024 16:56:23 +0800
Subject: [PATCH] 销售明细单确认发货完成替换接口，发货修改判断条件
---
src/views/sales/salesDetails/shipmentsDialog.vue | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/views/sales/salesDetails/shipmentsDialog.vue b/src/views/sales/salesDetails/shipmentsDialog.vue
index 62ee623..3b9f538 100644
--- a/src/views/sales/salesDetails/shipmentsDialog.vue
+++ b/src/views/sales/salesDetails/shipmentsDialog.vue
@@ -62,11 +62,12 @@
</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"
@@ -128,14 +129,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%",
@@ -222,6 +223,7 @@
shipmentsMsg:"",
dissatisfy:false, // 涓�娆″彂璐�-涓嶈冻
completely:false, // 澶氭鍙戣揣锛屽厖瓒�
+ isCommonShow:true,
}
},
mounted(){
@@ -294,7 +296,7 @@
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
@@ -468,19 +470,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)
}
@@ -584,15 +586,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 +648,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
--
Gitblit v1.8.0