Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/detail.vue

@@ -164,17 +164,17 @@
             </el-table-column>
             <el-table-column prop="volume" :label="$t('体积') + '(m³)'"  width="90px">
               <template slot-scope="{row}">
-                {{order.inWarehouseState > 1 && row.warehouseInInfoVO ? row.warehouseInInfoVO.volume : row.volume}}
+                {{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 ? row.warehouseInInfoVO.weight : row.weight}}
+                {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight}}
               </template>
             </el-table-column>
             <el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'"  width="90px">
               <template slot-scope="{row}">
-                {{(order.inWarehouseState > 1 && row.warehouseInInfoVO) ? row.warehouseInInfoVO.quantityAll : row.quantity}}
+                {{row.warehouseInInfoVO ? row.warehouseInInfoVO.quantityAll : row.quantity}}
               </template>
             </el-table-column>
             <el-table-column prop="" :label="$t('费用类型')">

src/views/ecw/order/warehousing/index.vue

@@ -60,7 +60,7 @@
         prop="createTime"
         :label="$t('最后操作时间')">
         <template v-slot="{row}">
-          {{ parseTime(row.createTime) }}
+          {{ parseTime(row.updateTime) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -83,10 +83,10 @@
         <template v-slot="{ row, column, $index }">
           <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>
           <template v-else-if="wareItem(row.orderItemId) && wareItem(row.orderItemId).orderWarehouseInBackItemDoList && wareItem(row.orderItemId).orderWarehouseInBackItemDoList.length > 0">
-            <template v-if="!order.parentOrderId">
+<!--            <template v-if="!order.parentOrderId">-->
               <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>
               <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
-            </template>
+<!--            </template>-->
           </template>
           <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>
         </template>