退仓品名优化

src/api/ecw/order.js

@@ -1040,10 +1040,17 @@ export function getOrderItemDeleted(orderId){
   })
 }
 
+// 打包页面订单数据统计
+export function getPackStatistics(orderId){
+  return request({
+    url: '/ecw/order/order-packed-page-statistics/' + orderId,
+    method: 'get'
+  })
+}
 //获得订单品名对应的退仓入仓货物详情
 export function getOrderWarehouseDeleted(orderId,orderItem){
   return request({
     url: '/order/order-warehouse-in/get-order-warehouse-in-deleted?orderId=' + orderId+'&orderItemId='+orderItem,
-    method: 'get'
+
   })
-}
+}
\ No newline at end of file

src/components/RoutersSelector/index.vue

@@ -204,7 +204,8 @@ export default {
             this.getOpenedRouterList()
         },
         importCity(){
-            this.getOpenedRouterList()
+          this.getChannelList()
+          this.getOpenedRouterList()
         },
         selectedRoutes(val){
             this.$emit('input', val)
@@ -246,7 +247,7 @@ export default {
       }
     },
     async created(){
-      this.channelList = (await getChannelList()).data
+      this.getChannelList()
       this.tradeCityList = (await getTradeCityList()).data
       // 路线需要过滤失效的进出口城市，所以在程序加载后再加载路线
       await this.getOpenedRouterList()
@@ -268,6 +269,12 @@ export default {
       this.inited = true
     },
     methods:{
+      async getChannelList(){
+        let query = {
+          cityId: this.importCity
+        }
+        this.channelList = (await getChannelList(query)).data
+      },
       getAttrList(){
         getProductAttrList().then(res => {
           this.attrList = res.data

src/views/ecw/box/indexAir.vue

@@ -74,7 +74,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+    <el-table size="mini" v-loading="loading" :data="list">
       <el-table-column :label="$t('自编号')" align="center" prop="selfNo">
         <template slot-scope="scope">
           <a href="javascript:void(0)" @click="handleCommand(scope.row, 'detail')">{{ scope.row.selfNo }}</a>
@@ -92,16 +92,26 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('方数（分拣/已装）')" align="center" prop="">
+      <el-table-column :label="$t('订单方数（分拣/已装）')" align="center" prop="">
         <template slot-scope="{row}">
           {{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('重量（分拣/已装）')" align="center" prop="weight">
+      <el-table-column :label="$t('订单重量（分拣/已装）')" align="center" prop="weight">
         <template slot-scope="{row}">
           {{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
         </template>
       </el-table-column>
+      <el-table-column :label="$t('合包方数（分拣/已装）')" align="center" prop="weight">
+        <template slot-scope="{row}">
+          {{row.boxStatistics.volume }}/{{row.boxStatistics.mergeVolume}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('合包重量（分拣/已装）')" align="center" prop="weight">
+        <template slot-scope="{row}">
+          {{row.boxStatistics.weight}}/{{row.boxStatistics.mergeWeight}}
+        </template>
+      </el-table-column>
 
       <el-table-column :label="$t('状态')" align="center" prop="shipmentStatusText" />
 
@@ -125,8 +135,8 @@
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['shipment:box:delete']">{{$t('删除')}}</el-button> -->
           <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)" style="marginRight:10px;">
-            <el-button type="primary"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
-            <el-dropdown-menu slot="dropdown">
+            <el-button type="text"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+            <el-dropdown-menu  slot="dropdown">
               <el-dropdown-item command="edit" v-has-permi="['shipment:air:edit']" :disabled="scope.row.prStatus>21">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="air" v-has-permi="['shipment:air:action']">{{$t('操作')}}-{{$t('空运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-has-permi="['shipment:air:exception']">{{$t('异常登记')}}</el-dropdown-item>
@@ -141,7 +151,7 @@
           'shipment:air:download:downloadLoadGoodsList','shipment:air:download:downloadReceivableList',
           'shipment:air:download:downloadAgentListFiles','shipment:air:download:downloadSoncapFiles',
           'shipment:air:download:zipDownload','shipment:air:download:downloadLadingCopy']">
-            <el-button type="primary">
+            <el-button type="text">
               {{$t('下载')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">

src/views/ecw/box/shippingAir/nodePage/mergePkg/supplementOrder.vue

@@ -40,6 +40,7 @@
         <el-col :span="18" class="right-area">
 
           <el-row class="right-title">
+            <div>{{$t('自编号')}}：{{selfNo}}</div>
             <div>{{$t('货物筛选')}}</div>
             <div>{{$t('出货渠道')}}：{{channelName}}</div>
             <div>{{$t('可出特性')}}：{{attrName}}</div>
@@ -193,6 +194,7 @@ export default {
       // 选中部分
       partData: {},
       // 部分列表
+      selfNo: this.$attrs.shipmentObj.selfNo,
       partList: [],
       // 部分统计
       loadStatistics: {},
@@ -597,6 +599,12 @@ export default {
         > div:first-child + div {
           margin-left: 20px;
         }
+        > div:first-child + div + div {
+          margin-left: 20px;
+        }
+        > div:first-child + div + div + div {
+          margin-left: 20px;
+        }
         > div:last-child {
           flex: 1;
           text-align: right;

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({

src/views/ecw/product/index.vue

@@ -224,10 +224,10 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label-width="150px" label="空运订单重量上限kg">
-          <el-input-number v-model="form.airWeightLimit"  controls-position="right"  ></el-input-number>
+<!--        <el-form-item label-width="150px" label="空运订单重量上限kg">-->
+<!--          <el-input-number v-model="form.airWeightLimit"  controls-position="right"  ></el-input-number>-->
 
-        </el-form-item>
+<!--        </el-form-item>-->
 <!--        <packaging-type  key-arr="priceStepClearanceList" v-model="form">-->
 <!--          <el-button @click="visible =  true; open = false;" type="text">选择空运模板</el-button>-->
 <!--        </packaging-type>-->
@@ -588,7 +588,6 @@ export default {
       if (this.queryParams.typeId) {
         this.form.typeId = this.queryParams.typeId;
       }
-      this.form.airWeightLimit = this.getDictDatas(this.DICT_TYPE. AIR_COMMODITY_CUSTOM_CLEARANCE)[0]?.value
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -625,9 +624,9 @@ export default {
         if (!valid) {
           return;
         }
-        if(!this.form.airWeightLimit){
-          return this.$message.warning('请输入空运订单重量上限')
-        }
+        // if(!this.form.airWeightLimit){
+        //   return this.$message.warning('请输入空运订单重量上限')
+        // }
         // if(this.form.priceStepClearanceList.length === 0){
         //   return this.$message.warning('阶梯定价输入不完整！')
         // }else {

src/views/ecw/productPrice/editAir.vue

@@ -343,21 +343,6 @@ export default {
     },
     stepPrice(val){
       this.$set(this.form, 'stepPrice', val ? 1 : 0)
-    },
-    selectedRoutes(routers) {
-      let transportIds = []
-      routers.forEach(item => {
-        item.shippingChannelId = item.channelId
-        transportIds.push(+item.transportId)
-      })
-
-      // 如果只选择了空运（3），则默认体积单位改成千克
-      transportIds = new Set(transportIds)
-      console.log(transportIds)
-      window.transportIds = transportIds
-      if(transportIds.size == 1 && transportIds.has(3)){
-        this.setDefaultVolumeUnit(6)
-      }else this.setDefaultVolumeUnit(7)
     }
   },
   async created() {