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

src/api/ecw/boxAir.js

@@ -253,6 +253,20 @@ export function getMergeTagById(id) {
   });
 }
 
+/**
+ * 完成合包
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function finishMergePkg(shipmentId) {
+  return request({
+    url: "/ecw/box-merge-pkg/finishMergePkg?shipmentId="+shipmentId,
+    method: "get"
+  });
+}
+
 /*****************************  合包 end **********************************/
 
 

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

@@ -26,6 +26,7 @@
               type="primary"
               @click="
                 addMergedialogVisible = true
+                isMergeEdit = false
                 addMergeForm = {}
                 mergeTitle = $t('新建合包箱号')
               "
@@ -123,7 +124,7 @@
 </template>
 
 <script>
-import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById } from '@/api/ecw/boxAir'
+import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById, finishMergePkg } from '@/api/ecw/boxAir'
 import { formatDate, serviceMsg } from '../../utils'
 import unPkgPage from './unPkgPage.vue'
 import PkgPage from './pkgPage.vue'
@@ -249,7 +250,13 @@ export default {
       this.getList()
       this.pkgPagedialogVisible = false
     },
-    finish() {}
+    finish() {
+      finishMergePkg(this.$attrs.shipmentObj.id).then((res) => {
+        serviceMsg(res, this).then(() => {
+          this.$emit("closeDialog", "submit");
+        });
+      });
+    }
   }
 }
 </script>

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

@@ -43,7 +43,7 @@
           <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
             <template slot-scope="{ row }">
               <div v-for="item in row.orderItemDOS" :key="item.orderItemId">
-                {{ notset(item.positionNo) }}
+                {{ notset(getpositionNo(item.warehouseInInfoVO.orderLocationMergeVOSet)) }}
               </div>
             </template>
           </el-table-column>
@@ -108,6 +108,14 @@ export default {
       })
       return arr.toString()
     },
+    getpositionNo(arr){
+      if(!arr) return arr
+      let data = []
+      arr.forEach(item=>{
+        data.push(item.locationName)
+      })
+      return data.toString()
+    },
     addPkg(row) {
       let data = {
         pkgId: this.pkgData.id,

src/views/ecw/box/shippingAir/seaStepDetail.vue

@@ -2,7 +2,7 @@
   <div class="app-seaStepDetail">
     <el-scrollbar :vertical="true" viewClass="shipping-step">
       <template v-for="(step, index) in flatSeaStep">
-        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['box:'+step.type+':show'])" class="step-table">
+        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['boxAir:'+step.type+':show'])" class="step-table">
           <div class="step-title">{{step.title}}</div>
           <div v-for="(data, index) in columnsMapping[step.voName]" :key="index" class="step-content">
             <p>{{data.title}}</p>

src/views/ecw/box/shippingAir/shippingAir.vue

@@ -29,7 +29,7 @@
         <seaProcess :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :allLading="allLading" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
 
         <!-- 海运步骤图 -->
-        <seaStepDetail :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
+        <seaStepDetail v-if="seaBaseData.length>0" :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
       </el-col>
     </el-row>
   </div>

src/views/ecw/order/prepayDeal.vue

@@ -958,6 +958,7 @@
       changeExceptionStatus(){
         this.$set(this.handlerParams,'orderExceptionHandlerResult','')
       },
+      //订单详情
       getOrderData(){
         getOrder(this.orderId).then(response => {
           this.orderData = response.data
@@ -974,11 +975,11 @@
             this.orderData.orderItemVOList.map(v=>{
               if(!v.oneSeaFreight){
                 v.seaFreightCurrency = this.currencyList[0]['id']
-                v.seaFreightVolume = this.unitList[0]['id']
+                v.seaFreightVolume = this.unitList[1]['id']
               }
               if(!v.oneClearanceFreight){
                 v.clearanceFreightCurrency = this.currencyList[0]['id']
-                v.clearanceFreightVolume = this.unitList[0]['id']
+                v.clearanceFreightVolume = this.unitList[1]['id']
               }
             })
           }

src/views/ecw/warehouse/index.vue

@@ -856,7 +856,9 @@ export default {
       }
       serviceConfig({
         lineId: this.lineform.lineId,
-        otherService: otherService.join(',')
+        otherService: otherService.join(','),
+        isClientShow:this.ladingform.isClientShow,
+        makeBillNode:this.ladingform.makeBillNode
         }).then(res => {
           this.$modal.msgSuccess(this.$t("操作成功"));