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

Merge pull request 'develop' (#208) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/208
This commit is contained in:
wuteng 2026-03-03 17:02:29 +08:00
commit c893af6d2f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
View File

@ -377,7 +377,7 @@ import { getEmisWaybillByBillCode, getBatchDtl} from "@/api/emis/emisWaybill";
import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm'; import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue';
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue'; import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue'; import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';

3
src/views/emis/emisWaybill/waybillGot.vue
View File

@ -2369,7 +2369,8 @@ methods: {
if(this.form.sendDate==undefined||this.form.sendDate==null||this.form.sendDate==''){ if(this.form.sendDate==undefined||this.form.sendDate==null||this.form.sendDate==''){
this.form.sendDate =this.sendDate; this.form.sendDate =this.sendDate;
} }
let qObj={from:item.currency,to:'CNY',rateDate:this.form.sendDate}; // let qObj={from:item.currency,to:'CNY',rateDate:this.form.sendDate};
let qObj={from:item.currency,to:'CNY',rateDate:this.sendDate};
console.log("===>getValidExchangeRate==>",qObj); console.log("===>getValidExchangeRate==>",qObj);
let res= await getValidExchangeRate(qObj); let res= await getValidExchangeRate(qObj);
if(res.code==200){ if(res.code==200){