订单编辑等

src/api/ecw/order.js

@@ -439,4 +439,22 @@ export function orderSpecialNeedGet(params){
     url:'/ecw/order/update/info/' + id,
     method:'get'
   })
+}
+
+ // 根据审批ID获得订单修改申请详情
+ export function getUpdateInfoByApproveId(approveId){
+  return request({
+    url:'/ecw/order/update/info',
+    method:'get',
+    params: {approveId}
+  })
+}
+
+// (新修改订单)订单修改审批申请
+export function updateApply(data){
+  return request({
+    url:'/ecw/order/update/apply',
+    method:'put',
+    data
+  })
 }
\ No newline at end of file

src/views/bpm/processInstance/detail.vue

@@ -304,7 +304,19 @@ export default {
           component: () => import('@/views/ecw/order/components/LandingBillDetail'),
           id: this.processInstance.businessKey,
           path: this.processInstance.processDefinition?.formCustomViewPath
-        }
+        },
+        // 订单审核详情
+        order_approval:{
+          component: () => import('@/views/ecw/order/components/ApprovalDetail'),
+          id: this.processInstance.businessKey,
+          path: this.processInstance.processDefinition?.formCustomViewPath
+        },
+        // 订单修改审批
+        order_update:{
+          component: () => import('@/views/ecw/order/components/UpdateDetail'),
+          id: this.processInstance.businessKey,
+          path: this.processInstance.processDefinition?.formCustomViewPath
+        },
       }
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
     }

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

@@ -86,7 +86,6 @@ export default {
     created(){
         if(this.id){
             this.getData()
-            getBillService({id: this.id})
         }
     },
     methods:{

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

+<!--订单修改审核的申请信息部分-->
+<template>
+    <div v-if="order">
+        <el-descriptions :column="4" v-if="order" :colon="false">
+            <el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('运输方式')">
+                <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('出货方式')">
+                {{channel ? channel.nameZh : '/'}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('订单状态')">
+                {{order.statusMsg}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('始发仓')">
+                {{order.logisticsInfoDto ? $l(order.logisticsInfoDto, 'startTitle') : '-'}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('目的仓')" :span="2">
+                {{order.logisticsInfoDto ? $l(order.logisticsInfoDto, 'destAddress') : '-'}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('申请理由')" :span="4">
+                <div>
+                    <div v-for="(item, index) in order.applyInfoList" :key="index">
+                    {{index+1}}、 {{item.name}} {{$t('从旧的【{orgValue}】改成新的【{newValue}】', {orgValue: item.orgValue, newValue: item.newValue })}}
+                    </div>
+                </div>
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+<script>
+import {getOrder, getUpdateInfoByApproveId} from '@/api/ecw/order'
+import {getChannel} from '@/api/ecw/channel'
+import {getBillOfLandingInProcessing, getBillService} from '@/api/ecw/box'
+
+export default {
+    name: 'OrderApprovalDetail',
+    props:{
+        id: [String, Number],
+        path: String
+    },
+    components:{
+        PrintLandingBill: () => import('./PrintLadingBill.vue')
+    },
+    data(){
+        return {
+            order: null,
+            channel: null
+        }
+    },
+    watch:{
+        id(){
+            this.getData()
+        },
+        order(){
+            if(this.order.channelId){
+                this.getChannel()
+            }
+        }
+    },
+    created(){
+        if(this.id){
+            this.getData()
+        }
+    },
+    methods:{
+        getData(){
+            getUpdateInfoByApproveId(this.id).then(res => {
+                this.order = res.data
+            })
+        },
+        getChannel(){
+            getChannel(this.order.channelId).then(res => {
+                this.channel = res.data
+            })
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+.title{
+    padding: 10px 0;
+    span{
+        font-size: 14px;
+        font-weight: bold;
+    }
+}
+</style>
\ No newline at end of file

src/views/ecw/order/detail.vue

@@ -129,12 +129,12 @@
             </el-table-column>
             <el-table-column prop="volume" :label="$t('体积') + '(m³)'"  width="90px">
               <template slot-scope="{row}">
-                {{order.inWarehouseState > 1 ? row.warehouseInInfoVO.volume : row.volume}}
+                {{order.inWarehouseState > 1 && row.warehouseInInfoVO ? row.warehouseInInfoVO.volume : row.volume}}
               </template>
             </el-table-column>
             <el-table-column prop="weight" :label="$t('重量') + '(kg)'"  width="90px">
               <template slot-scope="{row}">
-                {{order.inWarehouseState > 1 ? row.warehouseInInfoVO.weight : row.weight}}
+                {{order.inWarehouseState > 1 && row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight}}
               </template>
             </el-table-column>
             <el-table-column prop="quantity" :label="$t('数量') + '(个)'"  width="90px"/>

src/views/ecw/order/index.vue

@@ -177,7 +177,7 @@
                   exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
                   exclude(scope.row.status, [20,21]) &&
                   exclude(scope.row.shipmentState, [320,322,323]) &&
-                  (exclude(scope.row.inWarehouseState, [ 212, 218, 213, 214, 215]) && exclude(scope.row.status, [5,8]) )
+                  exclude(scope.row.inWarehouseState, [ 212, 218, 213, 214, 215])
                   ">
                   <el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item>
                 </template>