From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/views/sales/salesDetails/shipmentsDialog.vue | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/views/sales/salesDetails/shipmentsDialog.vue b/src/views/sales/salesDetails/shipmentsDialog.vue
index f7e7039..bd60295 100644
--- a/src/views/sales/salesDetails/shipmentsDialog.vue
+++ b/src/views/sales/salesDetails/shipmentsDialog.vue
@@ -30,11 +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="璇烽�夋嫨"
+ disabled
size="mini"
>
<el-option
@@ -46,7 +47,7 @@
</el-option>
</el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
<el-col :span="24">
<el-form-item label="鍙戣揣浠撳簱" prop="addressee">
<el-select v-model="value" placeholder="璇烽�夋嫨" @change="optionsChange">
@@ -87,7 +88,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" :disabled="dissatisfy" @click="saveClick('form')">纭畾鍙戣揣</el-button>
+ <el-button type="primary" size="small" :disabled="dissatisfy" @click.stop="saveClick('form')">纭畾鍙戣揣</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -134,7 +135,7 @@
{ label: "璁㈠崟瀹屾垚鏁伴噺", min:120,prop: "finishAmount",},
{ label: "鍙敤搴撳瓨", prop: "availableAmount",},
{ label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
- { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,},
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true},
{ label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount",min:120,},
]
return {
@@ -229,7 +230,6 @@
this.setTableForm()
this.handleRadioChange()
this.getCommonData()
- this.formInfo()
this.getUseSystemSet({ modeType: "xsmx" })
this.getProjectList()
this.getDeliveryPrepareInfo({
@@ -312,12 +312,18 @@
isShipments=false
}
}
- })
+ });
if(isShipments){
this.$message.warning("鍙戣揣鏁伴噺瓒呭嚭鏈彂璐ф暟閲忔垨瓒呭嚭褰撳墠鍙敤搴撳瓨")
- }else if(shipmentsNum){
+ }/*else if(shipmentsNum){
this.$message.warning("鍙戣揣鏁伴噺涓嶈兘涓�0")
- }else{
+ }*/else{
+ //杩囨护鎺変负绌虹殑鏁版嵁
+ params.products=params.products.filter(item=>item.outputAmount);
+ if(params.products.length===0){
+ this.$message.warning('娌℃湁婊¤冻鍙戣揣鏉′欢鐨勬槑缁嗭紝鏃犳硶鍙戣揣');
+ return;
+ }
confirmOutput(params).then((res)=>{
if(res&&res.code===200){
this.$message.success("鍙戣揣鎴愬姛!")
@@ -341,7 +347,7 @@
outputAmount:this.editConfig.infomation.deliverType===1?item.leftAmount:item.outputAmount // 鏈鍙戣揣鏁伴噺
}
params.products.push(obj)
- })
+ });
return params
},
@@ -566,9 +572,6 @@
pageSize: 100
}).then((res) => {
this.projectList = res.data
- // if(res&&res.data.length>0){
- // this.editConfig.infomation.projectId=res.data[0].projectId
- // }
})
},
// 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
@@ -653,7 +656,7 @@
{ label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount" ,},
{ label: "鍙敤搴撳瓨", prop: "availableAmount",},
{ label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
- { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true,isRequird:true,},
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true},
{ label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount", min:120,},
]
this.productTableList.tableColumn=this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
--
Gitblit v1.8.0