aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/emis/emisWaybill/waybillModify.vue
View File

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

2
src/views/emis/emisWaybill/waybillRecord.vue
View File

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