小bug

src/views/ecw/customer/components/Delay.vue

@@ -31,7 +31,7 @@ export default {
             return JSON.parse(this.info.details)
         },
         pictures(){
-            if(!this.detail) return []
+            if(!this.detail || !this.detail.voucher) return []
             return this.detail.voucher.split(',').filter(item => !!item)
         }
     },

src/views/ecw/order/index.vue

@@ -246,7 +246,11 @@
                 </template>
 
                 <!-- 合单日志，提货日志 -->
-                <template v-if="(scope.row.status > 2)">
+                <template v-if="(
+                  scope.row.status > 2 &&
+                  exclude(scope.row.status + '-' + scope.row.shipmentState, ['17-391', '18-392', '15-332', '15-330']) &&
+                  exclude(scope.row.status + '-' + scope.row.inWarehouseState, ['16-202'])
+                )">
                   <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
                 </template>