Merge pull request 'develop' (#1) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-sapp/pulls/1
This commit is contained in:
commit
a76c4f3528
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name" : "探路国际速运",
|
||||
"appid" : "__UNI__BAEB38C",
|
||||
"description" : "探路国际速运",
|
||||
"name" : "探路速运",
|
||||
"appid" : "__UNI__21F858F",
|
||||
"description" : "探路速运",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
"transformPx" : false,
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"id": "tan-express-sapp",
|
||||
"name": "tan-express-sapp",
|
||||
"displayName": "探运国际",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.2",
|
||||
"description": "探运国际",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
|
||||
@ -18,6 +18,11 @@
|
||||
<view class="blcok-white">
|
||||
<!-- 地址选择 -->
|
||||
<bpe-addressinfo-tmp v-model:value="submitParam" @onChange="handleAddressChange"></bpe-addressinfo-tmp>
|
||||
<view class="mt-20" style=";text-align: right;">
|
||||
<span style="#999;font-size:10px" v-if="submitParam.sendSiteName">寄件网点:<span class="font-weight " style="#000;">{{submitParam.sendSiteName }}</span></span>
|
||||
<span style="#999;font-size:10px" v-if="submitParam.dispatchUnderlingSiteName">派件网点:<span class="font-weight" style="#000;">{{submitParam.dispatchUnderlingSiteName }}</span></span>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="com-section mt-30">路线信息</view>
|
||||
@ -35,7 +40,7 @@
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
|
||||
mode="drop"
|
||||
mode="drop" @onChange="handlePickupMethodChange"
|
||||
>
|
||||
<tpx-text-item :required="true" label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
|
||||
</tpx-select>
|
||||
@ -381,12 +386,16 @@
|
||||
},
|
||||
handleWayChange(val) { // 线路切换
|
||||
let { productRes, submitParam } = this.getDefaultData()
|
||||
|
||||
console.log("====>==>",);
|
||||
// 清空产品类型数据
|
||||
this.submitParam.productType = submitParam.productType
|
||||
this.submitParam.productTypeName = submitParam.productTypeName
|
||||
const item = this.wayRes.list.filter(t=> t.val == val)[0]
|
||||
this.updateDltDestSite({ lineCode: val })
|
||||
if(this.submitParam.pickupMethod==2){
|
||||
this.updateDltSendSite({ lineCode: val })
|
||||
}
|
||||
if(item?.transType == 1) {
|
||||
this.submitParam.customsEclaration = 1
|
||||
this.submitParam.customsClear = 1
|
||||
@ -418,6 +427,31 @@
|
||||
this.submitParam.intoWarehouseAddress = item.address
|
||||
this.submitParam.intoWarehouseContact = item.contact
|
||||
this.submitParam.intoWarehousePhone = item.tel
|
||||
|
||||
this.submitParam.intoWarehouseCode=item.code;
|
||||
this.submitParam.intoWarehouseName=item.name;
|
||||
|
||||
this.submitParam.sendSiteCode = item.code;
|
||||
this.submitParam.sendSiteName = item.name
|
||||
|
||||
// 重新计算产品
|
||||
// this.handleWayChange()
|
||||
},
|
||||
handlePickupMethodChange(val){
|
||||
this.submitParam.pickupMethod=val;
|
||||
console.log("==>val==>",val);
|
||||
console.log("==>this.submitParam.pickupMethod==>",this.submitParam.pickupMethod);
|
||||
if(this.submitParam.pickupMethod==2){
|
||||
this.submitParam.intoWarehouseCode=null;
|
||||
this.submitParam.intoWarehouseName=null;
|
||||
this.updateDltSendSite({ lineCode: this.submitParam.transLine })
|
||||
this.handleWayChange()
|
||||
}
|
||||
// 仓库收货,整柜提货
|
||||
else if(this.submitParam.pickupMethod==1 || this.submitParam.pickupMethod==3){
|
||||
// 重新计算产品
|
||||
this.handleWayChange()
|
||||
}
|
||||
},
|
||||
handleCstClrChange(val){
|
||||
if(val == 2){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user