Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/order.js

@@ -1039,3 +1039,12 @@ export function getOrderItemDeleted(orderId){
     method: 'get',
   })
 }
+
+
+// 打包页面订单数据统计
+export function getPackStatistics(orderId){
+  return request({
+    url: '/ecw/order/order-packed-page-statistics/' + orderId,
+    method: 'get'
+  })
+}

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

@@ -200,15 +200,37 @@
       </el-form-item>-->
 
       <h2>{{$t('订单数据')}}</h2>
-      <el-form-item :label="$t('总方数')" style="width: 380px">
-        <el-input v-model="form.sumVolume" :placeholder="$t('请输入总方数')" readonly>
-          <span slot="append">m³</span>
-        </el-input>
+      <el-form-item :label="$t('下单统计')" class="mb-0">
+        {{ $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+          num: statistics.sumCartonsNumFinishedWarehouseIn,
+          weight: statistics.sumWeightFinishedWarehouseIn,
+          volume: statistics.sumVolumeFinishedWarehouseIn,
+          quantity: statistics.sumQuantityAllFinishedWarehouseIn
+        }) }}
       </el-form-item>
-      <el-form-item :label="$t('总重量')" style="width: 380px">
-        <el-input v-model="form.sumWeight" :placeholder="$t('请输入总重量')" readonly>
-          <span slot="append">kg</span>
-        </el-input>
+      <el-form-item :label="$t('入仓统计')" class="mb-0">
+        {{ $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+          num: statistics.sumNum,
+          weight: statistics.sumWeight,
+          volume: statistics.sumVolume,
+          quantity: statistics.sumQuantity
+        }) }}
+      </el-form-item>
+      <el-form-item :label="$t('打包前统计')" class="mb-0">
+        {{ $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+          num: statistics.sumCartonsNumPrevPacked,
+          weight: statistics.sumWeightPrevPacked,
+          volume: statistics.sumVolumePrevPacked,
+          quantity: statistics.sumQuantityAllPrevPacked
+        }) }}
+      </el-form-item>
+      <el-form-item :label="$t('打包后统计')" class="mb-0">
+        {{ $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+          num: statistics.sumNumInput,
+          weight: statistics.sumWeightInput,
+          volume: statistics.sumVolumeInput,
+          quantity: statistics.sumQuantityInput
+        }) }}
       </el-form-item>
 
       <el-card style="margin-top: 15px;">
@@ -273,7 +295,8 @@ import {
   getOrderWarehouseIn,
   getSpecialListByOrderId,
   noNeedPack, rollbackDelete,
-  warehousePictureList
+  warehousePictureList,
+  getPackStatistics
 } from '@/api/ecw/order'
 import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
@@ -310,10 +333,9 @@ export default {
   mounted() {
     if(this.$route.query.id){
       this.orderId = parseInt(this.$route.query.id || undefined)
-      this.getOrderItemList()
-      getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
 
-      this.getOrder()
+      getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
+      this.getList()
     }
     getCurrencyList().then(res => this.currencyList = res.data)
     getProductAttrList().then(res => this.productAttrList = res.data)
@@ -377,12 +399,20 @@ export default {
       // 是否显示添加新品弹窗
       showNewProductDialog: false,
       // 是否显示打印标签弹层
-      showPrintTagDialog: false
+      showPrintTagDialog: false,
+      // 统计数据
+      statistics:{}
     }
   },
 
   methods: {
     formatTime,
+    getStatistics() {
+      console.log('获取统计数据')
+      getPackStatistics(this.orderId).then(res => {
+        this.statistics = res.data
+      })
+    },
     getOrderItemList(){
       this.orderItemList = []
       return getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
@@ -390,6 +420,7 @@ export default {
     getList(){
       this.getOrder()
       this.getOrderItemList()
+      this.getStatistics()
     },
     getWarehousePictureList(){
       return warehousePictureList({