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

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -322,8 +322,8 @@ export default {
       
     },
     /** 取消 */
-    cancel() {
-      this.$emit("closeStart", "submit");
+    cancel(type) {
+      this.$emit('closeDialog', type)
     },
     /* 关闭弹窗 */
     closeDialog(type) {
@@ -361,7 +361,7 @@ export default {
         shipmentId: shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.cancel();
+          this.cancel("submit");
         });
       });
     },

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

@@ -67,7 +67,7 @@
             <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" >
+            <el-table-column :label="$t('入仓时间')" prop="inTime" min-width="150">
               <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
             </el-table-column>
             <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
@@ -77,7 +77,7 @@
             </el-table-column>
             <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
               <template slot-scope="{row}">
-               <el-button type="primary" @click="seeMv(orderWarehouseInContent.pictures)">{{$t('查看')}}</el-button>
+               <el-button type="primary" @click="seeMv(orderWarehouseInContent.pictureUrls)">{{$t('查看')}}</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -123,7 +123,7 @@
             <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" >
+            <el-table-column :label="$t('入仓时间')" prop="inTime" min-width="150">
               <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
             </el-table-column>
             <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
@@ -293,6 +293,8 @@ export default {
                 type: this.isImageFile(e) ? 'image' : 'video',
               }
             })
+          }else{
+            this.pictureUrls = []
           }
 
         },

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

@@ -7,7 +7,7 @@
           <el-table-column :label="$t('箱数')" prop="cartonsNum">
             <template slot-scope="{row}">
               <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
-                <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" text readonly />
+                <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" :num="row.cartonsNum" text readonly />
               </template>
               <template v-else>{{ row.cartonsNum }}</template>
             </template>

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

@@ -16,12 +16,12 @@
         <template slot-scope="props">
           <div style="padding-left: 80px">
             <el-table v-if="wareItem(props.row.orderItemId).orderWarehouseInBackItemDoList" :data="wareItem(props.row.orderItemId).orderWarehouseInBackItemDoList">
-              <el-table-column :label="$t('序号')">
+              <el-table-column :label="$t('序号')" width="80px">
                 <template slot-scope="{row, column, $index}">
                   {{$index + 1}}
                 </template>
               </el-table-column>
-              <el-table-column prop="cartonsNum" :label="$t('箱数')"></el-table-column>
+              <el-table-column prop="cartonsNum" :label="$t('箱数')" width="60px"></el-table-column>
               <el-table-column prop="areaName" :label="$t('入仓类型')">
                 <template v-slot="{row}">
                   <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType"></dict-tag>
@@ -32,20 +32,22 @@
                   <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit"></dict-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="areaName" :label="$t('长')">
+              <el-table-column prop="areaName" :label="$t('长') + '(cm)'" width="70px">
                 <template v-slot="{row}">{{row.boxGauge.split('*')[0]}}</template>
               </el-table-column>
-              <el-table-column prop="areaName" :label="$t('宽')">
+              <el-table-column prop="areaName" :label="$t('宽') + '(cm)'" width="70px">
                 <template v-slot="{row}">{{row.boxGauge.split('*')[1]}}</template>
               </el-table-column>
-              <el-table-column prop="areaName" :label="$t('高')">
+              <el-table-column prop="areaName" :label="$t('高') + '(cm)'" width="70px">
                 <template v-slot="{row}">{{row.boxGauge.split('*')[2]}}</template>
               </el-table-column>
               <el-table-column prop="volume" :label="$t('体积')+'(m³)'"></el-table-column>
               <el-table-column prop="weight" :label="$t('重量')+'(kg)'"></el-table-column>
               <el-table-column prop="quantityAll" :label="$t('数量') + '(个)'"></el-table-column>
               <el-table-column prop="expressNo" :label="$t('快递单号')"></el-table-column>
-              <!--<el-table-column prop="areaName" :label="$t('首次入仓时间')"></el-table-column>-->
+              <el-table-column prop="createTime" :label="$t('首次入仓时间')">
+                <template v-slot="{row}">{{parseTime(row.inTime)}}</template>
+              </el-table-column>
               <el-table-column prop="areaName" :label="$t('储位')">
                 <template v-slot="{row}">
                   {{row.orderLocationStr4Merge}}
@@ -56,6 +58,13 @@
                   <el-button type="text" @click="showMedia(props.row)">{{$t('查看')}}</el-button>
                 </template>
               </el-table-column>
+              <el-table-column prop="areaName" :label="$t(' ')" width="220px">
+                <template v-slot="{row}">
+                  <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" @input="saveDetail(props.row)" />
+                  <el-button class="pl-5 pr-5" size="mini" type="primary" @click="package(props.row, $t('修改打包'))">{{$t('修改')}}</el-button>
+                  <el-button class="pl-5 pr-5" size="mini" type="danger" @click="package(props.row, $t('修改打包'))">{{$t('删除')}}</el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </template>
@@ -229,7 +238,8 @@
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
 import {
-   finishStock,
+  finishPacked,
+  finishStock,
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId,
@@ -248,11 +258,14 @@ import Package from './components/Package'
 import Template from "@/views/cms/template/index.vue";
 import {getProductAttrList} from "@/api/ecw/productAttr";
 import MediaDialog from "@/views/ecw/order/stocking/components/MediaDialog.vue";
+import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue";
+import {formatTime} from "../../../../utils";
 
 export default {
   name: "Stocking",
 
   components: {
+    WarehouseRecordDetail,
     MediaDialog,
     Template,
     orderBaseInfo,
@@ -335,6 +348,7 @@ export default {
   },
 
   methods: {
+    formatTime,
     getOrderItemList(){
       this.orderItemList = []
       return getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
@@ -429,6 +443,24 @@ export default {
         return this.$message.info(this.$t('暂无影像'))
       }
       this.curPictrues = wareItem.pictureUrls || []
+    },
+    // 保存箱明细
+    saveDetail(row){
+      const wareItem = this.wareItem(row.orderItemId)
+      const orderWarehouseInItemDtoList = wareItem.orderWarehouseInBackItemDoList
+      orderWarehouseInItemDtoList.map(item =>{
+        item.orderLocationCreateReqVOList = item.orderLocationBackVOList || []
+        return item
+      })
+      const data = {
+        orderId: row.orderId,
+        orderItemId: row.orderItemId,
+        orderWarehouseInItemDtoList: orderWarehouseInItemDtoList,
+        pictureUrls: wareItem.pictureUrls || []
+      }
+      finishPacked(data).then(res => {
+        this.$message.success(this.$t('操作成功'))
+      })
     }
   },
   watch: {

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

 <template>
   <div style="display: inline-block">
     <template v-if="text">
-      <el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ value.length }}（混箱）</el-button>
+      <el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ num }}（混箱）</el-button>
     </template>
     <template v-else>
       <el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
@@ -57,6 +57,10 @@ export default {
     text: {
       type: Boolean,
       default: false
+    },
+    num:{
+      type:Number,
+      default:0
     }
   },