完善升级版拆单

src/views/ecw/order/splitApply/components/WarehouseRecord.vue

+<template>
+  <!-- 拆单入仓记录 -->
+  <el-dialog :title="$t('入仓记录')" :visible="show" :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
+    <el-table :data="list">
+      <el-table-column type="index" :label="$t('序号')" />
+      <el-table-column :label="$t('箱数')" prop="num" />
+      <el-table-column :label="$t('入仓类型')" prop="specificationType">
+        <template slot-scope="{row}">
+          <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('包装类型')" prop="unit">
+        <template slot-scope="{row}">
+          <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('长')" prop="boxGauge">
+        <template slot-scope="{row}">
+          {{row.boxGauge.split('*')[0]}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('宽')" prop="boxGauge" >
+        <template slot-scope="{row}">
+          {{row.boxGauge.split('*')[1]}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('高')" prop="boxGauge" >
+        <template slot-scope="{row}">
+          {{row.boxGauge.split('*')[2]}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
+      <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
+      <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
+      <!--<el-table-column :label="$t('入仓快递单号')" prop="expressNo" />-->
+      <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
+        <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
+      </el-table-column>-->
+      <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
+        <template slot-scope="{row}">
+          {{getLocationName(row.orderLocationBackVOList)}}
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "WarehouseRecord",
+  props:{
+    list:{
+      type: Array,
+      default: []
+    }
+  },
+  data(){
+    return {
+      show: false
+    }
+  },
+  mounted() {
+    this.show = true
+  },
+  methods:{
+    // 获取储位名称
+    getLocationName(locationArr){
+      if(!locationArr || !locationArr.length) return ''
+      let arr = []
+      locationArr.forEach(item => {
+        arr.push(`${item.areaName}${item.locationName || ''}`)
+      })
+      return Array.from(new Set(arr)).join(",")
+    },
+    closeDialog(){
+      this.show = false
+      this.$emit('close');
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/order/splitApply.vue → src/views/ecw/order/splitApply/index.vue

@@ -162,16 +162,7 @@
               <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('入仓类型')" align="center" >
-            <template slot-scope="{row}">
-              <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('入仓规格')" align="center" >
-            <template slot-scope="{row}">
-              {{row.boxGauge}}
-            </template>
-          </el-table-column>
+
           <el-table-column :label="$t('入仓体积')" align="center" >
             <template slot-scope="scope">
                 <el-input v-model="scope.row.volume" @change="updateField(scope.row, 'volume')" size="mini" :disabled="index === 0">
@@ -208,9 +199,9 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">
-          <template slot-scope="scope">
-                 <span>{{scope.row.num}}</span>
-              </template>
+            <template slot-scope="scope">
+              <el-button type="text" @click="showWarehouse(scope.row)">{{scope.row.num}}</el-button>
+            </template>
           </el-table-column>
           <el-table-column :label="$t('操作')" align="center">
             <template slot-scope="scope">
@@ -478,6 +469,24 @@
        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
      </span>
     </el-dialog>
+
+    <el-dialog
+      :title="$t('提示')"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <span class="cancel_notice">{{$t('拆单申请正在审核中，你确定取消拆单申请吗？')}}</span>
+      <div class="cancel_content">
+        <span>{{$t('取消原因：')}}</span>
+        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+       <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
+       <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
+     </span>
+    </el-dialog>
+
+    <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" :visible.sync="warehouseRecordVisible"></warehouse-record>
   </div>
 </template>
 
@@ -499,10 +508,14 @@ import WorkFlow from '@/components/WorkFlow'
 import {getOrder, splitItemUpdate} from '@/api/ecw/order'
 import Decimal from 'decimal.js'
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect";
+import WarehouseDetail from "@/views/ecw/order/components/WarehouseDetail";
+import WarehouseRecord from "@/views/ecw/order/splitApply/components/WarehouseRecord";
 
 export default {
   name: "SplitApply",
   components: {
+    WarehouseRecord,
+    WarehouseDetail,
     WarehouseAreaSelect,
     WorkFlow
   },
@@ -550,7 +563,9 @@ export default {
         rows:20
       },
       splitItemIndex:0,
-      quantitySum:0
+      quantitySum:0,
+      // 当前查看的入仓记录
+      currentWarehouseRecord: null
     };
   },
   async created() {
@@ -979,6 +994,10 @@ export default {
       volume = Math.max(0.01, volume.toNumber().toFixed(2))
       this.$set(row, 'volume', volume)
       this.$set(row, 'chargeVolume', volume)
+    },
+    // 显示入库记录
+    showWarehouse(row){
+      this.currentWarehouseRecord = row.specsRecordVOList
     }
   }
 }