拆单审核

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -870,6 +870,9 @@ export default {
     },
     // 显示入库记录
     showWarehouse(row){
+      if(!row.specsRecordVOList){
+        return this.$message.info(this.$t('暂无入仓记录'))
+      }
       this.currentWarehouseRecord = row.specsRecordVOList
     }
   },

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

@@ -46,35 +46,48 @@
                         <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
                     </template>
                 </el-table-column>
-                <el-table-column :label="$t('体积')">
+                <el-table-column :label="$t('入仓体积')">
                     <template slot-scope="{row}">{{row.volume}} m³</template>
                 </el-table-column>
-                <el-table-column :label="$t('重量')">
+                <el-table-column :label="$t('收费体积')">
+                  <template slot-scope="{row}">{{row.chargeVolume}} m³</template>
+                </el-table-column>
+                <el-table-column :label="$t('入仓重量')">
                     <template slot-scope="{row}">{{row.weight}}kg</template>
                 </el-table-column>
+                <el-table-column :label="$t('收费重量')">
+                  <template slot-scope="{row}">{{row.chargeWeight}}kg</template>
+                </el-table-column>
                 <el-table-column :label="$t('箱数')">
-                    <template slot-scope="{row}">{{row.num}}</template>
+                    <template slot-scope="{row}">
+                      <el-button type="text" @click="showWarehouseRecord(row)">{{row.num}}</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column :label="$t('数量')">
                     <template slot-scope="{row}">{{row.quantity}}</template>
                 </el-table-column>
             </el-table>
         </template>
+      <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" append-to-body></warehouse-record>
     </div>
 </template>
 <script>
 import {getOrder} from '@/api/ecw/order'
 import {getBoxApproval} from '@/api/ecw/box'
 import {getChannel} from '@/api/ecw/channel'
+import WarehouseRecord from "@/views/ecw/order/splitApply/components/WarehouseRecord";
 export default {
-    props:{
+  components: {WarehouseRecord},
+  props:{
         id: [String, Number]
     },
     data(){
         return {
             detail: null,
             order: null,
-            channel: null
+            channel: null,
+            // 查看入仓记录的条目
+            currentWarehouseRecord: null
         }
     },
     watch:{
@@ -110,6 +123,12 @@ export default {
             getChannel(this.order.channelId).then(res => {
                 this.channel = res.data
             })
+        },
+        showWarehouseRecord(row){
+          if(!row.specsRecordVOList){
+            return this.$message.info(this.$t('暂无入仓记录'))
+          }
+          this.currentWarehouseRecord = row.specsRecordVOList
         }
     }
 }
@@ -122,4 +141,4 @@ export default {
         font-weight: bold;
     }
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -46,31 +46,42 @@
                         <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                     </template>
                 </el-table-column>
-                <el-table-column :label="$t('体积')">
-                    <template slot-scope="{row}">{{row.volume}} m³</template>
-                </el-table-column>
-                <el-table-column :label="$t('重量')">
-                    <template slot-scope="{row}">{{row.weight}}kg</template>
-                </el-table-column>
-                <el-table-column :label="$t('箱数')">
-                    <template slot-scope="{row}">{{row.num}}</template>
-                </el-table-column>
+              <el-table-column :label="$t('入仓体积')">
+                <template slot-scope="{row}">{{row.volume}} m³</template>
+              </el-table-column>
+              <el-table-column :label="$t('收费体积')">
+                <template slot-scope="{row}">{{row.chargeVolume}} m³</template>
+              </el-table-column>
+              <el-table-column :label="$t('入仓重量')">
+                <template slot-scope="{row}">{{row.weight}}kg</template>
+              </el-table-column>
+              <el-table-column :label="$t('收费重量')">
+                <template slot-scope="{row}">{{row.chargeWeight}}kg</template>
+              </el-table-column>
+              <el-table-column :label="$t('箱数')">
+                <template slot-scope="{row}">
+                  <el-button type="text" @click="showWarehouseRecord(row)">{{row.num}}</el-button>
+                </template>
+              </el-table-column>
                 <el-table-column :label="$t('数量')">
                     <template slot-scope="{row}">{{row.quantity}}</template>
-                </el-table-column> 
+                </el-table-column>
                 <el-table-column :label="$t('备注')">
                     <template slot-scope="{row}">{{row.remark}}</template>
-                </el-table-column>          
+                </el-table-column>
             </el-table>
         </template>
+      <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" append-to-body></warehouse-record>
     </div>
 </template>
 <script>
 import {getApproval, getOrder} from '@/api/ecw/order'
 import {getChannel} from '@/api/ecw/channel'
 import {getSplitList} from '@/api/ecw/orderHandle'
+import WarehouseRecord from "@/views/ecw/order/splitApply/components/WarehouseRecord";
 export default {
-    props:{
+  components: {WarehouseRecord},
+  props:{
         id: [String, Number]
     },
     data(){
@@ -78,7 +89,9 @@ export default {
             detail: null,
             order: null,
             channel: null,
-            orderSplitBackVOList: []
+            orderSplitBackVOList: [],
+          // 查看入仓记录的条目
+          currentWarehouseRecord: null
         }
     },
     watch:{
@@ -121,7 +134,13 @@ export default {
             getChannel(this.order.channelId).then(res => {
                 this.channel = res.data
             })
+        },
+      showWarehouseRecord(row){
+        if(!row.specsRecordVOList){
+          return this.$message.info(this.$t('暂无入仓记录'))
         }
+        this.currentWarehouseRecord = row.specsRecordVOList
+      }
     }
 }
 </script>
@@ -133,4 +152,4 @@ export default {
         font-weight: bold;
     }
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -996,6 +996,9 @@ export default {
     },
     // 显示入库记录
     showWarehouse(row){
+      if(!row.specsRecordVOList){
+        return this.$message.info(this.$t('暂无入仓记录'))
+      }
       this.currentWarehouseRecord = row.specsRecordVOList
     }
   }