This commit is contained in:
linfso 2024-08-31 16:32:09 +08:00
parent bb720a6b77
commit dcc248fe47
2 changed files with 12 additions and 3 deletions

View File

@ -113,12 +113,12 @@
</el-col>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :sideCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.pickupMethod==1">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :sideCode="form.sendSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :siteCode="form.sendSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
@ -1880,6 +1880,10 @@ methods: {
// console.log("===>calcExp222==expr==>",expr);
// console.log("===>calcExp222==row==>",row);
}
}
}
@ -1894,12 +1898,17 @@ methods: {
let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
if(res.code==200){
newFee=newFee*Number(res.data);
newFee=newFee.toFixed(2);
item.remark="汇率:"+res.data+","+newFee+"(CNY)"
}
}
newFee=newFee.toFixed(2);
totalFee=Number(totalFee)+Number(newFee);
if(item.blAutoGen==0){
item.fee=item.realFee;
}
}
}
this.form.freight = totalFee.toFixed(2);

View File

@ -1898,7 +1898,7 @@ methods: {
let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
if(res.code==200){
newFee=newFee*Number(res.data);
newFee=newFee*Number(res.data).toFixed(2);
newFee=newFee.toFixed(2);
item.remark="汇率:"+res.data+","+newFee+"(CNY)"
}
}