Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator 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/channel/componrnts/packaging-type.vue

@@ -80,8 +80,6 @@ export default {
   name: "packaging-type",
   components: {Template, WeightSelect, CurrencySelect},
   created() {
-
-    console.log(this.getDictDatas(this.DICT_TYPE.AIR_CUSTOM_CLEARANCE),'123')
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     getUnitList().then(res => this.unitList = res.data)
     },
@@ -105,11 +103,14 @@ export default {
         num = this.getDictDatas(this.DICT_TYPE. AIR_COMMODITY_CUSTOM_CLEARANCE)[0]?.value
       }
 
-      return +num
+      return num
     }
   },
   mounted() {
     this.value1 = this.value
+    if(!this.value1.airWeightLimit){
+      this.value1.airWeightLimit = this.screenCom
+    }
       this.$nextTick(()=>{
         if(this.value1[this.keyArr] && this.value1[this.keyArr].length === 0){
           this.addInterval()

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