Merge branch 'feature/cargo_control' into pre-release

src/views/ecw/order/components/updateReleaseLimitApproval.vue

@@ -3,6 +3,7 @@ import { getApproval, getOrderDetail } from '@/api/ecw/order'
 import { getPickRleaseInfo } from '@/api/ecw/orderCargoControl'
 import Template from '@/views/cms/template/index.vue'
 import dayjs from 'dayjs'
+import { parseTime } from '../../../../utils/ruoyi'
 
 export default {
   name: 'updateReleaseLimitApproval',
@@ -31,6 +32,7 @@ export default {
     }
   },
   methods:{
+    parseTime,
     getApprovalDetail(){
       getApproval(this.id).then(res => {
         try {
@@ -73,7 +75,7 @@ export default {
         {{detail.sumNum - detail.releaseNum}}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('卸柜/到仓时间')">
-        {{releaseInfo.unloadTime || '-'}}
+        {{ parseTime(detail.unloadTime ) }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('订单限制修改收货人')">
         {{releaseInfo.isLimitUpdateConsignee ? $t('是') : $t('否')}}