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

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -244,6 +244,7 @@
 import dayjs from "dayjs";
 import supplementOrder from "./supplementOrder.vue";
 import { getCabinetPage } from "@/api/ecw/cabinet";
+import { getbox } from "@/api/ecw/box";
 import {
   loadSecGoodsList,
   orderTagList,
@@ -333,6 +334,7 @@ export default {
       selectedUsers: [],
       // 订单信息
       boxOrderInfo: {},
+      newshipmentObj: {}
     };
   },
   created() {
@@ -341,9 +343,16 @@ export default {
     getCabinetPage(null).then((response) => {
       this.cabinetList = response.data.list;
     });
+    this.getBoxInfo()
   },
   methods: {
     getTotlContent,
+    getBoxInfo() {
+      getbox(this.shipmentObj.id).then((res) => {
+        const { data } = res;
+        this.newshipmentObj = data ?? {};
+      });
+    },
     /* 装柜部分列表 */
     getLoadSecGoodsList() {
       loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {
@@ -419,7 +428,8 @@ export default {
         case "modifyCabinet":
           this.$set(this.dialogConfig, "fullscreen", false);
           this.modifyCabinetObj = {};
-          this.$set(this.modifyCabinetObj,'cabinetId',this.shipmentObj.cabinetId)
+          this.$set(this.modifyCabinetObj,'cabinetId',this.newshipmentObj.cabinetId)
+          this.$set(this.modifyCabinetObj,'cubNo',this.newshipmentObj.cubNo)
           break;
         case "splitOrder":
           this.$set(this.dialogConfig, "fullscreen", true);
@@ -535,6 +545,7 @@ export default {
       };
       boxUpdate(params).then((res) => {
         serviceMsg(res, this);
+        this.getBoxInfo()
         this.closeDialog2();
       });
     },

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -73,7 +73,11 @@
               <el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
               </el-table-column>
               <el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
-              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
+              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
+                <template slot-scope="scope">
+                  {{notset(scope.row.positionNo)}}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
                 <template slot-scope="scope">
                   {{scope.row.tallyStatus === 1 ? $t('已理货') : $t('未理货')}}
@@ -150,6 +154,13 @@ export default {
   methods: {
     // 格式化日期
     formatDate,
+    //去重
+    notset(string){
+      if(!string) return string
+      let arr = string.split(',')
+      arr = arr.filter((item,index)=>{return arr.indexOf(item)==index})
+      return arr.toString()
+    },
     // 查询理货列表
     getList() {
       getTallyList({ shipmentId: this.shipmentObj.id }).then((res) => {

src/views/ecw/currency/index.vue

@@ -214,6 +214,7 @@ export default {
         fuhao: undefined,
         status: undefined,
         huilv: undefined,
+        exchangeToFc: undefined,
         aorder: undefined,
         createAt: undefined,
         updateAt: undefined,

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

@@ -152,15 +152,15 @@ export default {
             if(!valid){
               return false
             }
-            // 放货箱数不能大于总控货箱数
+            // 放货箱数不能大于可放货箱数
             let errNos = []
             this.selectedOrders.forEach(item => {
-              if(item.releaseNum > item.sumNum){
+              if(item.releaseNum > item.sumNum - item.releaseNum){
                 errNos.push(item.orderNo)
               }
             })
             if(errNos.length){
-              return this.$message.error(this.$t("订单{no}的放货箱数不能大于控货箱数", {no: errNos.join(",")}))
+              return this.$message.error(this.$t("订单{no}的放货箱数不能大于可放货箱数", {no: errNos.join(",")}))
             }
             updateApply(Object.assign({
               cargoControlPickId: this.cargoControlPickId,

src/views/ecw/order/index.vue

@@ -311,7 +311,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
@@ -347,7 +347,7 @@
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
-                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
+                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
                     scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
@@ -356,7 +356,7 @@
                   <!-- 入仓修改 -->
                   <template v-if="
                       (
-                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) &&
+                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 202, 214, 215, 216, 204, 205]) &&
                         scope.row.status != 11 && exclude(scope.row.shipmentState, [314,315,317,318])
                       )
                     ">