Skip to content

J
jiedao-app-operator-master
Commit 1409f5eb authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge branch 'feature/cargo_control' into pre-release

parents 57642874 aac43b37
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/views/ecw/order/components/updateReleaseLimitApproval.vue
View file @ 1409f5eb
...@@ -3,6 +3,7 @@ import { getApproval, getOrderDetail } from '@/api/ecw/order' ...@@ -3,6 +3,7 @@ import { getApproval, getOrderDetail } from '@/api/ecw/order'
import { getPickRleaseInfo } from '@/api/ecw/orderCargoControl' import { getPickRleaseInfo } from '@/api/ecw/orderCargoControl'
import Template from '@/views/cms/template/index.vue' import Template from '@/views/cms/template/index.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { parseTime } from '../../../../utils/ruoyi'
export default { export default {
name: 'updateReleaseLimitApproval', name: 'updateReleaseLimitApproval',
...@@ -31,6 +32,7 @@ export default { ...@@ -31,6 +32,7 @@ export default {
} }
}, },
methods:{ methods:{
parseTime,
getApprovalDetail(){ getApprovalDetail(){
getApproval(this.id).then(res => { getApproval(this.id).then(res => {
try { try {
...@@ -73,7 +75,7 @@ export default { ...@@ -73,7 +75,7 @@ export default {
{{detail.sumNum - detail.releaseNum}} {{detail.sumNum - detail.releaseNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('卸柜/到仓时间')"> <el-descriptions-item :label="$t('卸柜/到仓时间')">
{{releaseInfo.unloadTime || '-'}} {{ parseTime(detail.unloadTime ) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('订单限制修改收货人')"> <el-descriptions-item :label="$t('订单限制修改收货人')">
{{releaseInfo.isLimitUpdateConsignee ? $t('是') : $t('否')}} {{releaseInfo.isLimitUpdateConsignee ? $t('是') : $t('否')}}
......
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