Skip to content

J
jiedao-app-customer-new-master
Commit a2d040dc authored by Smile's avatar Smile
Browse files
Options

Merge remote-tracking branch 'origin/release' into jd_dev 

# Conflicts:
#	src/pages/orderInfo/orderInfo.vue
#	src/static/lang/en/create.js
#	src/static/lang/en/order.js
#	src/static/lang/en/orderInfo.js
parents ee8e4c8d fbcd9094
Show whitespace changes
Inline Side-by-side
Showing with 346 additions and 136 deletions
src/manifest.json
View file @ a2d040dc
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "E&C logistics", "name" : "E&C logistics",
"appid" : "__UNI__B690450", "appid" : "__UNI__B690450",
"description" : "", "description" : "",
"versionName" : "225", "versionName" : "226",
"versionCode" : 225, "versionCode" : 226,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
......
src/pages/create_order/create_order.vue
View file @ a2d040dc
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
<view class="corder-v5"> <view class="corder-v5">
<view class="corder-v5-v"> <view class="corder-v5-v">
<view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.marks}}</view> <view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.marks}}</view>
<input type="text" v-model="params.marks" maxlength="255" :placeholder="$lang.lang.notices.marks" /> <input type="text" v-model="params.marks" maxlength="255" :placeholder="$lang.lang.notices.marks" @blur="trimMarks" />
</view> </view>
<view class="corder-v5-v" > <view class="corder-v5-v" >
<view class="corder-v5-label" @click="cnoticeType2=!cnoticeType2"> <view class="corder-v5-label" @click="cnoticeType2=!cnoticeType2">
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
<view class="corder-v5-v corder-picker" > <view class="corder-v5-v corder-picker" >
<view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.date}}</view> <view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.date}}</view>
<picker mode="date" class="date-picker" :value="date" :start="startDate" :end="endDate" @change="bindDateChange"> <picker mode="date" class="date-picker" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
<view class="uni-input">{{date}}</view> <view class="uni-input">{{params.deliveryDate ? params.deliveryDate.split(" ")[0] : '请选择'}}</view>
</picker> </picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image> <image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
</view> </view>
...@@ -931,9 +931,9 @@ ...@@ -931,9 +931,9 @@
</template> </template>
<script> <script>
import cuihaiCombox from '../../components/cuihai-combox/cuihai-combox.vue' import Drawee from "@/pages/create_order/components/drawee.vue";
import Drawee from "@/pages/create_order/components/drawee.vue";
export default { export default {
components: {Drawee}, components: {Drawee},
data() { data() {
const currentDate = this.getDate({ const currentDate = this.getDate({
...@@ -1112,7 +1112,7 @@ ...@@ -1112,7 +1112,7 @@
channelId:0,//渠道ID channelId:0,//渠道ID
orderItemVOList:[], orderItemVOList:[],
costVO:{}, costVO:{},
deliveryDate:currentDate+' 00:00:00', deliveryDate: null,
drawee:2, drawee:2,
number:'', number:'',
isCargoControl:false, isCargoControl:false,
...@@ -1154,12 +1154,13 @@ ...@@ -1154,12 +1154,13 @@
dialCode:'', dialCode:'',
id:0 id:0
}, },
date:currentDate, date: '',
time:'00:00', time:'00:00',
isClick:false, isClick:false,
link:'', link:'',
conIndex:-1, conIndex:-1,
orderId:0, orderId:0,
copy:false,
unitType:[], unitType:[],
currencyType:[], currencyType:[],
lineMethod: false, lineMethod: false,
...@@ -1210,8 +1211,16 @@ ...@@ -1210,8 +1211,16 @@
this.getClientaData() this.getClientaData()
if(op.id){ if(op.id){
await this.$nextTick() await this.$nextTick()
this.getOrderData(op.id)
this.orderId = op.id this.orderId = op.id
if (op.copy && op.copy == 1){
this.copy = true
this.getOrderData(op.id, true)
}else {
this.getOrderData(op.id, false)
}
}else{
this.setDefaultDrawee()
} }
if(op.transportId){ if(op.transportId){
/*this.params.transportId = op.transportId /*this.params.transportId = op.transportId
...@@ -1295,6 +1304,9 @@ ...@@ -1295,6 +1304,9 @@
this.params.isCargoControl = true this.params.isCargoControl = true
} }
}, },
"params.isCargoControl"() {
this.setDefaultDrawee()
},
"params.drawee"(drawee) { "params.drawee"(drawee) {
// 240224 微信反馈 // 240224 微信反馈
// 不好意思，这写错了，付款人=发货人----提单价格默认否；付款人=收货人，提交价格默认是 // 不好意思，这写错了，付款人=发货人----提单价格默认否；付款人=收货人，提交价格默认是
...@@ -1307,12 +1319,23 @@ ...@@ -1307,12 +1319,23 @@
} }
}, },
methods: { methods: {
setDefaultDrawee(){
// 优先级为：发货人默认付款，发货人付款>收货人默认付款，收货人付款>订单控货，收货人付款
if(this.$store.state.userInfo.defaultPay){
this.$set(this.params, 'drawee', 1)
return
}
if(this.params.isCargoControl){
this.$set(this.params, 'drawee', 2)
}
},
changeHasConsignee(e){ changeHasConsignee(e){
this.hasConsignee = e.detail.value === "1" this.hasConsignee = e.detail.value === "1"
// 无收货人默认发货人付款 // 无收货人默认发货人付款
if(!this.hasConsignee){ // if(!this.hasConsignee){
this.$set(this.params, 'drawee', 1) // this.$set(this.params, 'drawee', 1)
} // }
this.setDefaultDrawee()
}, },
toback(){ toback(){
uni.navigateBack() uni.navigateBack()
...@@ -1738,12 +1761,12 @@ ...@@ -1738,12 +1761,12 @@
title: this.$lang.lang.notices.consigneePhone, title: this.$lang.lang.notices.consigneePhone,
icon: 'error', icon: 'error',
}) })
}else if(!this.params.isCargoControl && this.params.countryCode==this.config.countrySn.value[0]){ }/*else if(!this.params.isCargoControl && this.params.countryCode==this.config.countrySn.value[0]){
return uni.showToast({ return uni.showToast({
title: this.$lang.lang.notices.foreignConsignee, title: this.$lang.lang.notices.foreignConsignee,
icon: 'error', icon: 'error',
}) })
} }*/
if(this.params.consigneeEmail){ if(this.params.consigneeEmail){
let email_reg = /[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/ let email_reg = /[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/
...@@ -1954,15 +1977,108 @@ ...@@ -1954,15 +1977,108 @@
}) })
}, },
getOrderData(id){ getOrderData(id, copy){
let that = this let that = this
that.$request.get('/app-api/my/order/get',{orderId:id}).then(async (res) => { that.$request.get('/app-api/my/order/get',{orderId:id}).then(async (res) => {
if(res.code==0&&res.data){ if(res.code==0&&res.data){
that.params = res.data that.params = res.data
if (copy){
// 复制订单，需要将数据初始化
that.params.orderId = null
that.params.orderNo = null
that.params.containerNumber = null
that.params.tidanNo = null
that.params.parentOrderId = null
that.params.parentNumber = null
that.params.number = null
that.params.initialParentOrderId = null
that.params.initialParentOrderNo = null
that.params.noChargeRecord = null
that.params.oldNumbers = null
that.params.userId = 0
that.params.sumNum = null
that.params.sumQuantity = null
that.params.sumVolume = null
that.params.sumWeight = null
that.params.pickleType = null
that.params.pickRatio = null
that.params.pickNum = null
that.params.releaseRatio = null
that.params.cost = null
that.params.packingListUrl = null
that.params.commissionPayable = null
that.params.specialVWeight = null
that.params.handlerChannelAttrException = null
that.params.weightBeforePack = null
that.params.weightAfterPack = null
that.params.stockOverWeightLimit = null
that.params.firstStockedTime = null
that.params.isLimitUpdateConsignee = null
that.params.lockConsigneeDay = null
that.params.lockConsigneeTime = null
that.params.firstStockedTime = null
// 状态重置
that.params.status = 0
that.params.cargoControlStatus = 0
that.params.abnormalState = 0
that.params.inWarehouseState = 0
that.params.shipmentState = 0
that.params.auditType = 0
that.params.auditResult = null
that.params.airShipment = null
that.params.splitSeparateOrder = null
that.params.pickState = null
that.params.guanLianOrderStatus = null
that.params.oldInWarehouseState = null
that.params.oldStatus = null
that.params.oldShipmentState = null
// 时间重置
that.params.takeTime = null
that.params.unloadTime = null
that.params.rucangTime = null
that.params.loadTime = null
that.params.preLoadTime = null
that.params.deliveryDate = null
that.params.daogangTime = null
that.params.qingguanTime = null
that.params.splitTime = null
that.params.isException = null
that.params.exceptionReason = null
that.params.externalWarehouseJson = null
that.params.hasExitAndEntry = null
that.params.hasSendRucangSms = null
that.params.hasSendWarehouseInNotice = null
if (that.params.consignorVO){
that.params.consignorVO.id = null
that.params.consignorVO.orderId = null
}
if (that.params.consigneeVO){
that.params.consigneeVO.id = null
that.params.consigneeVO.orderId = null
}
}
// if(!that.params.number) that.params.number = '' // if(!that.params.number) that.params.number = ''
that.getType() that.getType()
if(that.params.orderItemVOList.length>0){ if(that.params.orderItemVOList.length>0){
that.params.orderItemVOList.forEach((item,index)=>{ that.params.orderItemVOList.forEach((item,index)=>{
if (this.$route.query.copy && this.$route.query.copy == 1) {
item = {
link: item.link,
prodId: item.prodId,
prodTitleEn: item.prodTitleEn,
prodTitleZh: item.prodTitleZh,
prodAttrIds: item.prodAttrIds,
prodType: item.prodType,
volume: item.volume,
weight: item.weight,
quantity: item.quantity,
num: item.num,
worth: item.worth,
boxGauge: item.boxGauge,
brand: item.brand,
brandType: item.brandType
}
}
if(item.prodAttrIds) item.prodAttrs = item.prodAttrIds.split(',') if(item.prodAttrIds) item.prodAttrs = item.prodAttrIds.split(',')
}) })
} }
...@@ -2101,7 +2217,7 @@ ...@@ -2101,7 +2217,7 @@
async updateOrder(){ async updateOrder(){
await this.validateCountryAndAreaCode() await this.validateCountryAndAreaCode()
this.params.hasConsignee = this.hasConsignee this.params.hasConsignee = this.hasConsignee
this.$request.put('/app-api/my/order/update', this.params).then(res => { this.$request.put('/app-api/my/order/update', { ...this.params, status: 2}).then(res => {
this.isClick = false this.isClick = false
if(res.code == 0){ if(res.code == 0){
this.params = { this.params = {
...@@ -3104,7 +3220,8 @@ ...@@ -3104,7 +3220,8 @@
}, },
createOrder(){ createOrder(){
this.closePayNotice() this.closePayNotice()
if(this.orderId>0){ if(this.orderId > 0 && !this.copy){
// 订单id大于0，且不是复制订单，则调用编辑订单业务
this.updateOrder() this.updateOrder()
}else{ }else{
this.creatOrder() this.creatOrder()
...@@ -3338,6 +3455,10 @@ ...@@ -3338,6 +3455,10 @@
changeHarvestMethod(e){ changeHarvestMethod(e){
this.currentHarvestIndex = e.detail.value this.currentHarvestIndex = e.detail.value
this.params.harvestMethod = this.harvestList[this.currentHarvestIndex].value this.params.harvestMethod = this.harvestList[this.currentHarvestIndex].value
},
// 去掉唛头首尾空格
trimMarks(){
this.params.marks = this.params.marks.trim()
} }
} }
} }
......
src/pages/order/order.vue
View file @ a2d040dc
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</view> </view>
<view v-if="selectIndex==1||(selectIndex==0&&item.deliverGoods)" class="order-btn"> <view v-if="selectIndex==1||(selectIndex==0&&item.deliverGoods)" class="order-btn">
<view @click="toOrderInfo(item.orderId)">{{$lang.lang.order.see}}</view> <view @click="toOrderInfo(item.orderId)">{{$lang.lang.order.see}}</view>
<view v-if='item.status==0||item.status==2' @click="toEditOrder(item.orderId)">{{$lang.lang.order.edit}}</view> <view v-if='item.status==0||item.status==2' @click="toEditOrder(item.orderId, false)">{{$lang.lang.order.edit}}</view>
<view v-if='item.status==0||item.status==88' @click="delOrder(item.orderId)">{{$lang.lang.order.delete}}</view> <view v-if='item.status==0||item.status==88' @click="delOrder(item.orderId)">{{$lang.lang.order.delete}}</view>
<view v-if='item.status==2&&item.status!=88' @click="cancelOrder(item.orderId)">{{$lang.lang.order.cancelOrder}}</view> <view v-if='item.status==2&&item.status!=88' @click="cancelOrder(item.orderId)">{{$lang.lang.order.cancelOrder}}</view>
<view v-if='item.status==5&&item.status!=88' @click="returnOrder(index)">{{$lang.lang.order.exit}}</view> <view v-if='item.status==5&&item.status!=88' @click="returnOrder(index)">{{$lang.lang.order.exit}}</view>
...@@ -222,23 +222,57 @@ ...@@ -222,23 +222,57 @@
<text>{{$lang.lang.order.haveNum}}：{{parseInt(selectOrder.sumNum)-parseInt(selectOrder.releaseNum)}}</text> <text>{{$lang.lang.order.haveNum}}：{{parseInt(selectOrder.sumNum)-parseInt(selectOrder.releaseNum)}}</text>
<text>{{$lang.lang.order.sumVolume}}：{{selectOrder.sumVolume}}</text> <text>{{$lang.lang.order.sumVolume}}：{{selectOrder.sumVolume}}</text>
<text>{{$lang.lang.order.sumWeight}}：{{selectOrder.sumWeight}}</text> <text>{{$lang.lang.order.sumWeight}}：{{selectOrder.sumWeight}}</text>
<text style="width:100%">{{$lang.lang.order.unloadTime}}：{{releaseData.unloadTime || '-'}}</text>
<text style="width:100%">{{$lang.lang.order.lockConsigneeTime}}：{{releaseData.lockConsigneeTime || '-'}}</text>
<text style="width:100%">{{$lang.lang.order.isLimitUpdateConsignee}}：{{releaseData.isLimitUpdateConsignee ? $lang.lang.order.yes : $lang.lang.order.no}}</text>
</view> </view>
<view class="lendFrom_title">{{$lang.lang.order.writeInfo}}</view> <view class="lendFrom_title">{{$lang.lang.order.writeInfo}}</view>
<!--
http://czxy.cpolar.top/task-view-818.html
新增备注信息，逻辑如下：
1. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间<=放货锁定收货人到期时间
备注：订单锁定收货人未到期，不允许修改控货收货人
2. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间>放货锁定收货人到期时间
备注：订单锁定收货人信息已到期，允许修改控货收货人
3. 当订单限制修改收货人=是&&订单未卸柜/到仓
备注：订单未卸柜/到仓，不允许修改控货收货人
4. 当订单限制修改收货人=否
备注： 订单允许修改控货收货人
-->
<view class="tips" v-if="releaseData.isLimitUpdateConsignee && releaseData.unloadTime && Date.now() <= (new Date(releaseData.lockConsigneeTime)).getTime()">
{{$lang.lang.order.remark1}}
</view>
<view class="tips" v-if="releaseData.isLimitUpdateConsignee && releaseData.unloadTime && Date.now() > (new Date(releaseData.lockConsigneeTime)).getTime()">
{{$lang.lang.order.remark2}}
</view>
<view class="tips" v-if="releaseData.isLimitUpdateConsignee && !releaseData.unloadTime">
{{$lang.lang.order.remark1}}
</view>
<view class="tips" v-if="!releaseData.isLimitUpdateConsignee">
{{$lang.lang.order.remark4}}
</view>
<view class="lendFrom_info"> <view class="lendFrom_info">
<view class="corder-tab1-item"> <view class="corder-tab1-item">
<text>{{$lang.lang.order.consignee}}<span class="redcolor">*</span></text> <text>{{$lang.lang.order.consignee}}<span class="redcolor">*</span></text>
<input v-model="lendingFrom.consigneeName" type="text" :placeholder="$lang.lang.notices.consignee" /> <view v-if="disableUpdateCongsignee" class="corder-phone">
{{lendingFrom.consigneeName}}
</view>
<input v-else v-model="lendingFrom.consigneeName" type="text" :placeholder="$lang.lang.notices.consignee" />
</view> </view>
<view class="corder-tab1-item"> <view class="corder-tab1-item">
<text>{{$lang.lang.order.consigneeTel}}<span class="redcolor">*</span></text> <text>{{$lang.lang.order.consigneeTel}}<span class="redcolor">*</span></text>
<view class="corder-phone"> <view class="corder-phone" v-if="disableUpdateCongsignee">
{{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}
{{lendingFrom.consigneePhone}}
</view>
<view class="corder-phone" v-else>
<view class="countrySn-item"> <view class="countrySn-item">
<picker class="countrySn" :value="config.countrySn.index" :range="config.countrySn.label" data-config="countrySn" data-key="consigneeCountryCode" @change="configChange" v-if="config.countrySn.value.length > 0"> <picker class="countrySn" :value="config.countrySn.index" :range="config.countrySn.label" data-config="countrySn" data-key="consigneeCountryCode" @change="configChange" v-if="config.countrySn.value.length > 0">
<view class="uni-input">{{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}</view> <view class="uni-input" style="white-space: nowrap;">{{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}</view>
</picker> </picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image> <image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
</view> </view>
<input class="countrySn-input" v-model="lendingFrom.consigneePhone" maxlength="11" type="number" :placeholder="$lang.lang.notices.phone" /> <input class="countrySn-input" :disabled="disableUpdateCongsignee" v-model="lendingFrom.consigneePhone" maxlength="11" type="number" :placeholder="$lang.lang.notices.phone" />
</view> </view>
</view> </view>
<view class="corder-tab1-item"> <view class="corder-tab1-item">
...@@ -519,6 +553,16 @@ ...@@ -519,6 +553,16 @@
smsIndex: 0 smsIndex: 0
} }
}, },
computed:{
disableUpdateCongsignee(){
if(!this.releaseData?.isLimitUpdateConsignee) return false
// 锁定且过期了返回false，其他情况全部是true
if(this.releaseData.isLimitUpdateConsignee && this.releaseData.lockConsigneeTime && new Date(this.releaseData.lockConsigneeTime).getTime() < Date.now()){
return false
}
return true
}
},
onLoad() { onLoad() {
this.getStatusData() this.getStatusData()
this.getCountrySn() this.getCountrySn()
...@@ -1126,10 +1170,16 @@ ...@@ -1126,10 +1170,16 @@
url:'../orderInfo/orderInfo?id='+id url:'../orderInfo/orderInfo?id='+id
}) })
}, },
toEditOrder(id){ toEditOrder(id, copy){
if (copy){
uni.navigateTo({
url:'../create_order/create_order?id='+id +'&copy=1'
})
}else {
uni.navigateTo({ uni.navigateTo({
url:'../create_order/create_order?id='+id url:'../create_order/create_order?id='+id
}) })
}
}, },
toException(id){ toException(id){
uni.navigateTo({ uni.navigateTo({
...@@ -1326,9 +1376,10 @@ ...@@ -1326,9 +1376,10 @@
}) })
},*/ },*/
copy(orderId){ copy(orderId){
this.$request.post("/app-api/my/order/copy/" + orderId).then(res => { this.toEditOrder(orderId, true)
this.toEditOrder(res.data) // this.$request.post("/app-api/my/order/copy/" + orderId).then(res => {
}) // this.toEditOrder(res.data)
// })
} }
}, },
...@@ -1337,4 +1388,9 @@ ...@@ -1337,4 +1388,9 @@
<style> <style>
@import url("../../static/css/order.css"); @import url("../../static/css/order.css");
.lendFrom_content .tips{
color: red;
padding-left: 12px;
padding-bottom: 10px;
}
</style> </style>
src/pages/orderInfo/orderInfo.vue
View file @ a2d040dc
...@@ -134,12 +134,9 @@ ...@@ -134,12 +134,9 @@
<text>{{$lang.lang.orderInfo.logistics}}</text> <text>{{$lang.lang.orderInfo.logistics}}</text>
</view> </view>
<view class="order-info-txt"> <view class="order-info-txt">
<view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?orderData.initialLogisticsInfoDto[$lang.startTitle]:''}}</view> <view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</view>
<!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> --> <!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> -->
<!-- <view class="begin">{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?(orderData.initialLogisticsInfoDto[$lang.destCountryTitle]+'-'+(objectCity?objectCity[$lang.title]:'')+'-'+orderData.initialLogisticsInfoDto[$lang.destTitle]):''}}</view>--> <view>{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?(orderData.initialLogisticsInfoDto.destCountryTitleZh+'-'+(objectCity?objectCity.titleZh:'')+'-'+orderData.initialLogisticsInfoDto.destTitleZh):(orderData.initialLogisticsInfoDto.destCountryTitleEn+'-'+(objectCity?objectCity.titleEn:'')+'-'+orderData.initialLogisticsInfoDto.destTitleEn)):''}}</view>
</view>
<view class="order-info-txt">
<view class="begin">{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?(orderData.initialLogisticsInfoDto[$lang.destCountryTitle]+'-'+(objectCity?objectCity[$lang.title]:'')+'-'+orderData.initialLogisticsInfoDto[$lang.destTitle]):''}}</view>
</view> </view>
<view class="order-info-txt"> <view class="order-info-txt">
<view class="">{{$lang.lang.orderInfo.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view> <view class="">{{$lang.lang.orderInfo.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view>
...@@ -152,68 +149,68 @@ ...@@ -152,68 +149,68 @@
<view class="order-info"> <view class="order-info">
<view class="order-info-v"> <view class="order-info-v">
<view class="order-info-title"> <view class="order-info-title">
<view style="flex: 1">
<image src=".../../static/img/order-basic.png" mode=""></image> <image src=".../../static/img/order-basic.png" mode=""></image>
<text>{{$lang.lang.orderInfo.basic}}</text> <text>{{$lang.lang.orderInfo.basic}}</text>
</view> </view>
<view class="addicon" @click="basicShowMore=!basicShowMore">
<image src="/static/img/add.png" v-if="!basicShowMore"></image>
<image src="/static/img/sub.png" v-else></image>
</view>
</view>
<view class="order-info-line"> <view class="order-info-line">
<view class="order-info-line-v"> <view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view> <view style="height: 36px;">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view>
<view style="min-height: 36px;"> <view style="height: 36px;">
{{$lang.lang.orderInfo.warehouse}}：{{orderData.sumNum||0}}{{$lang.lang.orderInfo.box}} {{$lang.lang.orderInfo.warehouse}}：{{orderData.sumNum||0}}{{$lang.lang.orderInfo.box}}
{{orderData.sumWeight||0}}KG {{orderData.sumWeight||0}}KG
{{orderData.sumVolume||0}}m³ {{orderData.sumVolume||0}}m³
{{orderData.sumQuantity||0}}{{$lang.lang.create.aunit}} {{orderData.sumQuantity||0}}{{$lang.lang.create.aunit}}
</view> </view>
<view style="min-height: 36px;" v-if="orderData.drawee==1">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignor}}</view> <view style="height: 36px;" v-if="orderData.drawee==1">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignor}}</view>
<view style="min-height: 36px;" v-else-if="orderData.drawee==2">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignee}}</view> <view style="height: 36px;" v-else-if="orderData.drawee==2">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignee}}</view>
<view style="min-height: 36px;" v-else @click="showCustomDrawee">{{$lang.lang.create.payer}}：{{$lang.lang.create.customDrawee}}</view> <view style="height: 36px;" v-else @click="showCustomDrawee">{{$lang.lang.create.payer}}：{{$lang.lang.create.customDrawee}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.objectport}}:{{orderData.productRecord==1?$lang.lang.orderInfo.ourUndertakes:$lang.lang.orderInfo.customerUndertakes}}</view> <view style="height: 36px;">{{$lang.lang.orderInfo.objectport}}:{{orderData.productRecord==1?$lang.lang.orderInfo.ourUndertakes:$lang.lang.orderInfo.customerUndertakes}}</view>
<view style="min-height: 36px;">{{$lang.lang.create.special}}:{{packageTypeName||''}}</view> <view style="height: 36px;">{{$lang.lang.create.special}}:{{packageTypeName||''}}</view>
</view>
<view class="order-info-line-v"> <template v-if="basicShowMore">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}} <view style="height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
{{orderData.costVO?orderData.costVO.totalWeight:0}}KG <view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{orderData.costVO?orderData.costVO.totalVolume:0}}m³
{{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view style="min-height: 36px;">{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
</view>
</view>
<view class="addicon" @click="basicShowMore=!basicShowMore">
<image src="/static/img/add.png" v-if="!basicShowMore"></image>
<image src="/static/img/sub.png" v-else></image>
</view>
<view :class="basicShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line" >
<view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{$lang.lang.orderInfo.clearCard}}： {{$lang.lang.orderInfo.clearCard}}：
<template v-if="orderData.customsClearCert !== null"> <template v-if="orderData.customsClearCert !== null">
{{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}} {{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}}
</template> </template>
<template v-else>-</template> <template v-else>-</template>
</view> </view>
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view> <view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view> <view style="height: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
<view style="min-height: 72px;" v-if="orderData.isExternalWarehouse&& orderData.externalWarehousedtolist && orderData.externalWarehousedtolist.length"> <view style="height: 72px;" v-if="orderData.isExternalWarehouse&& orderData.externalWarehousedtolist && orderData.externalWarehousedtolist.length">
<text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text> <text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text>
<text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text> <text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
<text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text> <text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
</view> </view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view> <view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view>
</template>
</view> </view>
<view class="order-info-line-v"> <view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view> <view style="height: 36px;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}}
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view> {{orderData.costVO?orderData.costVO.totalWeight:0}}KG
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view> {{orderData.costVO?orderData.costVO.totalVolume:0}}m³
<view style="min-height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view> {{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
<view style="min-height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</view> </view>
<view style="height: 36px;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;">{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
<template v-if="basicShowMore">
<view style="height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view>
<view style="height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</template>
</view> </view>
</view> </view>
</view> </view>
...@@ -235,41 +232,28 @@ ...@@ -235,41 +232,28 @@
<view class="order-table" v-if="activeIndex==0&&orderData.orderItemVOList&&orderData.orderItemVOList.length>0"> <view class="order-table" v-if="activeIndex==0&&orderData.orderItemVOList&&orderData.orderItemVOList.length>0">
<view style="width: 100%;" v-for="(item,index) in orderData.orderItemVOList" :key="index"> <view style="width: 100%;" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<view class="number_shop">{{parseInt(index)+1}}</view> <view class="number_shop">
<view class="order-info-line" > <view style="flex: 1">
<view class="order-info-line-v"> {{parseInt(index)+1}}
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.prod}}:{{item[$lang.prodTitle]}}</text>
</view> </view>
<view class="order-table-v"> <view class="addicon" @click="shopShowMore=!shopShowMore">
<text>{{$lang.lang.orderInfo.formInfo}}:&nbsp;{{item.num}}{{$lang.lang.orderInfo.box}}&nbsp;{{item.weight}}KG&nbsp;{{item.volume}}m³&nbsp;{{item.quantity}}{{$lang.lang.create.aunit}}</text> <image src="/static/img/add.png" v-if="!shopShowMore"></image>
</view> <image src="/static/img/sub.png" v-else></image>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text>
</view> </view>
</view> </view>
<view class="order-info-line" >
<view class="order-info-line-v"> <view class="order-info-line-v">
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.orderInfo.brand}}:</text> <text>{{$lang.lang.orderInfo.prodZh}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
<text v-if="item.brandName">{{item.brandName}}</text>
<text v-else>{{item.brandType?($lang.lang.orderInfo.have+$lang.lang.orderInfo.brand):($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{ $lang.lang.orderInfo.inWarehouseInfo }}:&nbsp;{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.cartonsNum : 0 }}{{ $lang.lang.orderInfo.box }}{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.weight : 0 }}KG{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.volume : 0 }}m³{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.quantityAll : 0 }}{{ $lang.lang.create.aunit }} <text>{{$lang.lang.orderInfo.formInfo}}:{{item.num}}{{$lang.lang.orderInfo.box}}{{item.weight}}KG{{item.volume}}m³{{item.quantity}}{{$lang.lang.create.aunit}}</text>
</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text> <text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text>
</view>
</view>
</view>
<view class="addicon" @click="shopShowMore=!shopShowMore">
<image src="/static/img/add.png" v-if="!shopShowMore"></image>
<image src="/static/img/sub.png" v-else></image>
</view> </view>
<view :class="shopShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line"> <template v-if="shopShowMore">
<view class="order-info-line-v">
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.exception.type}}:</text> <text>{{$lang.lang.exception.type}}:</text>
<text >{{item.warehouseType}}</text> <text >{{item.warehouseType}}</text>
...@@ -281,8 +265,26 @@ ...@@ -281,8 +265,26 @@
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.create.link}}:{{item.link}}</text> <text>{{$lang.lang.create.link}}:{{item.link}}</text>
</view> </view>
</template>
</view> </view>
<view class="order-info-line-v"> <view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.brand}}:</text>
<text v-if="item.brandName">{{item.brandName}}</text>
<text v-else>{{item.brandType?($lang.lang.orderInfo.have+$lang.lang.orderInfo.brand):($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.inWarehouseInfo}}:</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}{{$lang.lang.orderInfo.box}}</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:0}}KG</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:0}}m³</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:0}}{{$lang.lang.create.aunit}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text>
</view>
<template v-if="shopShowMore">
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.orderInfo.unitType}}:</text> <text>{{$lang.lang.orderInfo.unitType}}:</text>
<text>{{getConfigLabel('unit',item.unit)}}</text> <text>{{getConfigLabel('unit',item.unit)}}</text>
...@@ -292,8 +294,15 @@ ...@@ -292,8 +294,15 @@
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
</view> </view>
</template>
</view> </view>
</view> </view>
<view :class="shopShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line">
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -347,10 +356,10 @@ ...@@ -347,10 +356,10 @@
<text>{{$lang.lang.orderInfo.marks}}:{{orderData.marks}}</text> <text>{{$lang.lang.orderInfo.marks}}:{{orderData.marks}}</text>
<text>{{$lang.lang.orderInfo.consigneeAndTel}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}|{{orderData.consigneeVO?orderData.consigneeVO.countryCode:''}}{{orderData.consigneeVO?orderData.consigneeVO.phone:''}}</text> <text>{{$lang.lang.orderInfo.consigneeAndTel}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}|{{orderData.consigneeVO?orderData.consigneeVO.countryCode:''}}{{orderData.consigneeVO?orderData.consigneeVO.phone:''}}</text>
<text>{{$lang.lang.orderInfo.consignorAndTel}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}|{{orderData.consignorVO?orderData.consignorVO.countryCode:''}}{{orderData.consignorVO?orderData.consignorVO.phone:''}}</text> <text>{{$lang.lang.orderInfo.consignorAndTel}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}|{{orderData.consignorVO?orderData.consignorVO.countryCode:''}}{{orderData.consignorVO?orderData.consignorVO.phone:''}}</text>
<text>{{$lang.lang.orderInfo.ballAddress}}：{{orderData.logisticsInfoDto?orderData.logisticsInfoDto[$lang.destTitle]:''}}</text> <text>{{$lang.lang.orderInfo.ballAddress}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.destTitleZh:orderData.logisticsInfoDto.destTitleEn):''}}</text>
</view> </view>
<view class="order_info" v-for="(item,index) in orderData.orderItemVOList" :key="index"> <view class="order_info" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<text>{{$lang.lang.orderInfo.goodsRemark}}:{{item[$lang.prodTitle]}}</text> <text>{{$lang.lang.orderInfo.goodsRemark}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
<view> <view>
<text>{{$lang.lang.orderInfo.brand}}：{{item.brandName?item.brandName:($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text> <text>{{$lang.lang.orderInfo.brand}}：{{item.brandName?item.brandName:($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
<text>{{$lang.lang.orderInfo.num}}：{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}</text> <text>{{$lang.lang.orderInfo.num}}：{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}</text>
...@@ -889,4 +898,10 @@ ...@@ -889,4 +898,10 @@
.corder-goods-v-item view text:nth-child(2){ .corder-goods-v-item view text:nth-child(2){
line-height: unset; line-height: unset;
} }
.order-info-line{
flex-wrap: wrap;
}
.order-info-line-v{
width: 50%;
}
</style> </style>
src/static/css/orderInfo.css
View file @ a2d040dc
...@@ -356,5 +356,5 @@ page{ ...@@ -356,5 +356,5 @@ page{
border-bottom: none; border-bottom: none;
margin-bottom: -20upx; margin-bottom: -20upx;
padding-left: 8rpx; padding-left: 8rpx;
display: flex;
} }
src/static/lang/en/order.js
View file @ a2d040dc
...@@ -80,5 +80,14 @@ export default { ...@@ -80,5 +80,14 @@ export default {
"manager": "Administrator", "manager": "Administrator",
"lendingType": "Verification Method", "lendingType": "Verification Method",
"lendSussess": "Successfully released", "lendSussess": "Successfully released",
"copy": "Copy" "copy": "Copy",
"unloadTime": "Warehouse Arrival/Unloading Date",
"lockConsigneeTime": "Consignee Lock Expiration",
"isLimitUpdateConsignee": "Order Restricts Consignee Modification",
"yes": "Yes",
"no": "No",
"remark1": "Note: Consignee lock period has not expired; consignee modification is not allowed.",
"remark2": "Note: Consignee lock period has expired; consignee modification is allowed.",
"remark3": "Note: Order has not been unloaded/arrived at the warehouse; consignee modification is not allowed.",
"remark4": "Note: Consignee modification is allowed for the order."
} }
src/static/lang/zh/order.js
View file @ a2d040dc
...@@ -80,5 +80,14 @@ export default { ...@@ -80,5 +80,14 @@ export default {
"manager": "管理员", "manager": "管理员",
"lendingType": "校验方式", "lendingType": "校验方式",
"lendSussess": "放货成功", "lendSussess": "放货成功",
"copy": "复制" "copy": "复制",
"unloadTime": "到仓日期/卸柜日期",
"lockConsigneeTime": "放货锁定收货人到期",
"isLimitUpdateConsignee": "订单限制修改收货人",
"yes": "是",
"no": "否",
"remark1": "备注：订单锁定收货人未到期，不允许修改控货收货人",
"remark2": "备注：订单锁定收货人信息已到期，允许修改控货收货人",
"remark3": "备注：订单未卸柜/到仓，不允许修改控货收货人",
"remark4": "备注：订单允许修改控货收货人",
} }
src/utils/config.js
View file @ a2d040dc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// const domain = 'https://api.jd.jdshangmen.com' // const domain = 'https://api.jd.jdshangmen.com'
// const domain = 'https://api.sit.jdshangmen.com' // const domain = 'https://api.sit.jdshangmen.com'
// const domain = 'https://api2.groupage.cn' // const domain = 'https://api2.groupage.cn'
const domain = 'https://apitest.groupage.cn' const domain = 'https://api2.groupage.cn'
const config = { const config = {
CDN_DOMAIN: domain, CDN_DOMAIN: domain,
API: domain API: domain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment