Skip to content

J
jiedao-app-customer-new-master
Commit 9671fbcd authored by dragondean@qq.com's avatar dragondean@qq.com Committed by zhengyi
Browse files
Options

放货优化

parent 600306dc
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 14 deletions
src/pages/order/order.vue
View file @ 9671fbcd
...@@ -222,24 +222,58 @@ ...@@ -222,24 +222,58 @@
<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">
<view class="countrySn-item"> {{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}
<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"> {{lendingFrom.consigneePhone}}
<view class="uni-input">{{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}</view> </view>
</picker> <view class="corder-phone" v-else>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image> <view class="countrySn-item">
</view> <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">
<input class="countrySn-input" v-model="lendingFrom.consigneePhone" maxlength="11" type="number" :placeholder="$lang.lang.notices.phone" /> <view class="uni-input" style="white-space: nowrap;">{{$request.checkAddIcon(config.countrySn.value[config.countrySn.index])}}</view>
</view> </picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
</view>
<input class="countrySn-input" :disabled="disableUpdateCongsignee" v-model="lendingFrom.consigneePhone" maxlength="11" type="number" :placeholder="$lang.lang.notices.phone" />
</view>
</view> </view>
<view class="corder-tab1-item"> <view class="corder-tab1-item">
<text>{{$lang.lang.order.num}}<span class="redcolor">*</span></text> <text>{{$lang.lang.order.num}}<span class="redcolor">*</span></text>
...@@ -512,6 +546,16 @@ ...@@ -512,6 +546,16 @@
loading:false loading:false
} }
}, },
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()
...@@ -1321,4 +1365,9 @@ ...@@ -1321,4 +1365,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 @ 9671fbcd
...@@ -385,7 +385,6 @@ ...@@ -385,7 +385,6 @@
import Drawee from "@/pages/create_order/components/drawee.vue"; import Drawee from "@/pages/create_order/components/drawee.vue";
//#ifdef H5 //#ifdef H5
import FileSaver from 'file-saver' import FileSaver from 'file-saver'
import Drawee from "@/pages/create_order/components/drawee.vue";
//#endif //#endif
export default { export default {
components: { components: {
......
src/static/lang/en/order.js
View file @ 9671fbcd
...@@ -79,5 +79,15 @@ export default { ...@@ -79,5 +79,15 @@ export default {
"member": "member", "member": "member",
"manager": "administrators", "manager": "administrators",
"lendingType": "Parity", "lendingType": "Parity",
"lendSussess": "Successfully released the goods" "lendSussess": "Successfully released the goods",
} "copy": "copy",
\ No newline at end of file "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 @ 9671fbcd
...@@ -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": "备注：订单允许修改控货收货人",
} }
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