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

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

@@ -254,14 +254,7 @@
                 </div>
                 <div class="table-button">
                   <el-button v-if="item.relateOrderList" type="primary" size="small" style="margin-right: 20px;" @click="getRelationOrder(item)">{{$t('关联订单')}}</el-button>
-                  <el-dropdown trigger="click" @command="(command)=>handleGoods('all',item,command)">
-                    <el-button type="success" size="small" :disabled="isAudit">{{$t('分拣全部')}}</el-button>
-                    <el-dropdown-menu slot="dropdown" v-if="preList.sectionGoodList">
-                      <el-dropdown-item :command="part" v-for="(part, index) in preList.sectionGoodList" :key="part.id">
-                        {{$t('第{index}部分', {index: index+1})}}
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
+                  <el-button v-if="preList.sectionGoodList" type="success" size="small" :disabled="isAudit" @click="handleGoods('all',item,preList.sectionGoodList[0])">{{$t('分拣')}}</el-button>
                 </div>
               </el-row>
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">

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

@@ -255,7 +255,7 @@ export default {
     },
     /* 一键卸柜 */
     modifyAllUnload() {
-      this.$confirm(this.$t("确认卸柜？"), this.$t("提示"), {
+      this.$confirm(this.$t("确认到仓？"), this.$t("提示"), {
         type: "warning",
       })
         .then((_) => {

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

@@ -149,8 +149,8 @@ export default {
           return;
         }
       }
+      console.log(currIndex,this.currIndex)
       if (currIndex > this.currIndex) {
-        console.log(currIndex,this.currIndex)
         this.$message.error(this.errorMsg);
         return;
       }