|
@@ -1080,7 +1080,7 @@ export default {
|
|
|
this.$message.error('临时库货权不可转出!')
|
|
|
return
|
|
|
}
|
|
|
- if(array[i].amountEdPayable == 0 && !array[i].approveStatus&&array[i].redeemFlag!='赎'||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus&&array[i].redeemFlag!='赎'){
|
|
|
+ if(array[i].amountEdPayable == 0 && !array[i].approveStatus&&array[i].redeemFlag!='赎'||array[i].amountEdPayable == 0 && !array[i].approveStatus&&array[i].redeemFlag=='赎'&&array[i].surplusWeight!=0||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus&&array[i].redeemFlag!='赎'||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus&&array[i].redeemFlag=='赎'&&array[i].surplusWeight!=0){
|
|
|
arr.push(array[i])
|
|
|
}else if(array[i].redeemFlag=='赎'&&array[i].surplusWeight==0){
|
|
|
this.$message.error('请选择未货权转出的条目!')
|