@logwire/logwire-wms-pda-ui 3.5.4 → 3.5.5-wat.2

package/src/views/wms/page/outbound/delivery/action/index.vue

@@ -23,6 +23,7 @@
         :delivery-id="deliveryId"
         :order-content="orderContent"
         @changeCarSuccess="getOrderData"
+        @lookLoaded="lookLoaded"
       />
 
       <template v-if="!isAbn">
@@ -45,64 +46,36 @@
 
           </van-tabs>
         </lw-tab-box>
-
-        <!-- 按箱 -->
-        <template v-if="tabActive==='box'">
-
-          <!-- 输入框 -->
-          <div
-            v-if="orderContent.billStatus!=='300'"
-            class="lw-global-model-box lw-global-model-box-3px"
-          >
-            <lw-input
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo','箱号')"
-              v-model="box.value"
-              :get-focus.sync="box.focus"
-              required
-              rule-key="box"
-              :create-rule="$lwScanRule.create('装车发运-执行页-箱号','CASE')"
-              :show-bottom-border="false"
-              @confirm="boxConfirm"
-            >
-              <template #button>
-                <lw-button
-                  round
-                  mini
-                  @click="boxConfirm"
-                >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
-                </lw-button>
-              </template>
-            </lw-input>
-          </div>
-
-          <!-- 已装车箱 -->
-          <box-item
-            v-for="(i,k) in box.list"
-            :key="i.boxId"
-            :item="i"
-            :index="k"
-            :hidden-del-btn="orderContent.billStatus==='300'"
-            @del="boxDel"
-          />
-          <lw-pagination
-            v-model="box.pageNum"
-            :page-total="box.pageTotal"
-            :page-size.sync="box.pageSize"
-            @change="tabChange"
-          />
-
-        </template>
-
         <!-- 按单 -->
         <template v-if="tabActive==='so'">
 
           <!-- 输入框 -->
           <div
             v-if="orderContent.billStatus!=='300'"
-            class="lw-global-model-box lw-global-model-box-3px"
+            class="lw-global-model-box"
+            style="padding-bottom: 3px"
           >
 
+            <div class="lw-global-flex-start lw-global-row-start">
+              <div class="lw-global-title">
+                {{ $lwLanguage.get('', '撤销装车') }}
+              </div>
+
+              <van-switch
+                style="margin-left: 5px"
+                v-model="so.cancelLoading"
+                size="18px"
+              />
+            </div>
+            <div
+              v-if="so.cancelLoading"
+              style="text-align: center"
+              class="lw-global-row lw-global-value-bold-red"
+            >
+              {{ $lwLanguage.get('', '撤销装车已开启，当前扫描的单是需要从车上卸货的单') }}
+            </div>
             <lw-input
+              ref="so"
               v-model="so.value"
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo', '出库单号')"
               :get-focus.sync="so.focus"
@@ -117,7 +90,7 @@
                 <lw-button
                   round
                   mini
-                  @click="soConfirm"
+                  @click="$refs.so.confirm()"
                 >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
                 </lw-button>
               </template>
@@ -151,6 +124,24 @@
             v-if="orderContent.billStatus!=='300'"
             class="lw-global-model-box lw-global-model-box-3px"
           >
+            <div class="lw-global-flex-start lw-global-row-start">
+              <div class="lw-global-title">
+                {{ $lwLanguage.get('', '撤销装车') }}
+              </div>
+
+              <van-switch
+                style="margin-left: 5px"
+                v-model="lpn.cancelLoading"
+                size="18px"
+              />
+            </div>
+            <div
+              v-if="lpn.cancelLoading"
+              style="text-align: center"
+              class="lw-global-row lw-global-value-bold-red"
+            >
+              {{ $lwLanguage.get('', '撤销装车已开启，当前扫描的托盘是需要从车上卸货的托盘') }}
+            </div>
             <lw-input
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn','托盘号')"
               v-model="lpn.value"
@@ -190,6 +181,75 @@
           />
 
         </template>
+
+        <!-- 按箱 -->
+        <template v-if="tabActive==='box'">
+
+          <!-- 输入框 -->
+          <div
+            v-if="orderContent.billStatus!=='300'"
+            class="lw-global-model-box"
+            style="padding-bottom: 3px"
+          >
+            <div class="lw-global-flex-start lw-global-row-start">
+              <div class="lw-global-title">
+                {{ $lwLanguage.get('', '撤销装车') }}
+              </div>
+
+              <van-switch
+                style="margin-left: 5px"
+                v-model="box.cancelLoading"
+                size="18px"
+              />
+            </div>
+            <div
+              v-if="box.cancelLoading"
+              style="text-align: center"
+              class="lw-global-row lw-global-value-bold-red"
+            >
+              {{ $lwLanguage.get('', '撤销装车已开启，当前扫描的箱是需要从车上卸货的箱') }}
+            </div>
+            <lw-input
+              ref="box"
+              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo','箱号')"
+              v-model="box.value"
+              :get-focus.sync="box.focus"
+              required
+              rule-key="box"
+              :create-rule="$lwScanRule.create('装车发运-执行页-箱号','CASE')"
+              :show-bottom-border="false"
+              @confirm="boxConfirm"
+            >
+              <template #button>
+                <lw-button
+                  round
+                  mini
+                  @click="$refs.box.confirm()"
+                >
+                  {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
+                </lw-button>
+              </template>
+            </lw-input>
+          </div>
+
+          <!-- 已装车箱 -->
+          <box-item
+            v-for="(i,k) in box.list"
+            :key="i.boxId"
+            :item="i"
+            :index="k"
+            :hidden-del-btn="orderContent.billStatus==='300'"
+            @del="boxDel"
+          />
+          <lw-pagination
+            v-model="box.pageNum"
+            :page-total="box.pageTotal"
+            :page-size.sync="box.pageSize"
+            @change="tabChange"
+          />
+
+        </template>
+
       </template>
 
     </lw-page-body-module>
@@ -212,9 +272,18 @@
         >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.redoLoadCar', '重新装车') }}
         </lw-button>
 
-        <lw-button @click="over">
+        <lw-button
+          v-if="this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_FINISH_LOAD_AUTO_SHIP')==='false'"
+          @click="over"
+        >
           {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.doneLoadCar', '完成装车') }}
         </lw-button>
+        <lw-button
+          v-else
+          @click="overLoadAndDelivery"
+        >
+          {{ $lwLanguage.get('', '完成装车并发运') }}
+        </lw-button>
       </lw-bottom-bar>
       <lw-bottom-bar v-else>
 
@@ -344,12 +413,417 @@
       ref="blockPopupRef"
       @confirmBlock="confirmBlock"
     />
+
+    <!-- 选择装车方式的弹框 -->
+    <lw-popup-checkbox
+      v-model="selectLoadingMethodsPopup.show"
+      :selected="selectLoadingMethodsPopup.selected"
+      :title="$lwLanguage.get('', '请选择装车方式')"
+      dict-key="OutboundDeliveryLoadMethod"
+      :close-on-click-overlay="false"
+      :off-btn-text="$lwLanguage.get('', '退出')"
+      @clickCloseBtn="selectLoadingMethodsPopupClose"
+      @confirm="selectLoadingMethodsPopupConfirm"
+    />
+
+    <!-- 已装货列表弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('','查看已装')"
+      v-model="loadedPopup.show"
+      background="#f0f0f0"
+      height="80%"
+      @closed="loadedPopupOff"
+    >
+      <lw-tab-box :fixed="false">
+        <van-tabs
+          type="card"
+          animated
+          v-model="loadedPopup.tabActive"
+          @change="loadedTabChange"
+        >
+          <van-tab
+            name="so"
+            :title="$lwLanguage.get('', '已装单据')"
+          >
+
+            <div class="lw-global-model-box lw-global-model-box-3px">
+              <lw-input
+                ref="loadedPopupSo"
+                :title="$lwLanguage.get('', '出库单号')"
+                v-model="loadedPopup.so.search"
+                rule-key="loadedPopupSo"
+                :create-rule="$lwScanRule.create('装车发运-查看已装-出库单号','SO')"
+                :show-bottom-border="false"
+                @input="loadedPopupSearchConfirm('so')"
+              >
+                <template #button>
+                  <lw-button
+                    mini
+                    @click="$refs.loadedPopupSo.confirm()"
+                  >
+                    {{ $lwLanguage.get('', '查询') }}
+                  </lw-button>
+                </template>
+              </lw-input>
+            </div>
+
+            <so-and-lpn-item
+              v-for="(i,k) in loadedPopup.so.datas"
+              :key="k"
+              :index="k"
+              :item="i"
+              :show-del="false"
+            />
+            <lw-pagination
+              v-model="loadedPopup.so.pageNum"
+              :page-size.sync="loadedPopup.so.pageSize"
+              :total="loadedPopup.so.total"
+              @change="loadedPopupPageChange('so')"
+            />
+            <lw-not-data v-if="!loadedPopup.so.pageTotal"/>
+
+          </van-tab>
+          <van-tab
+            name="lpn"
+            :title="$lwLanguage.get('', '已装托盘')"
+          >
+
+            <div class="lw-global-model-box lw-global-model-box-3px">
+              <lw-input
+                ref="loadedPopupLpn"
+                :title="$lwLanguage.get('', '托盘号')"
+                v-model="loadedPopup.lpn.search"
+                rule-key="loadedPopupLpn"
+                :create-rule="$lwScanRule.create('装车发运-查看已装-托盘号','LPN')"
+                :show-bottom-border="false"
+                @input="loadedPopupSearchConfirm('lpn')"
+              >
+                <template #button>
+                  <lw-button
+                    mini
+                    @click="$refs.loadedPopupLpn.confirm()"
+                  >
+                    {{ $lwLanguage.get('', '查询') }}
+                  </lw-button>
+                </template>
+              </lw-input>
+            </div>
+
+            <so-and-lpn-item
+              v-for="(i,k) in loadedPopup.lpn.datas"
+              :key="k"
+              :index="k"
+              :item="i"
+              type="lpn"
+              :show-del="false"
+            />
+            <lw-pagination
+              v-model="loadedPopup.lpn.pageNum"
+              :page-size.sync="loadedPopup.lpn.pageSize"
+              :total="loadedPopup.lpn.total"
+              @change="loadedPopupPageChange('lpn')"
+            />
+            <lw-not-data v-if="!loadedPopup.lpn.pageTotal"/>
+
+          </van-tab>
+          <van-tab
+            name="box"
+            :title="$lwLanguage.get('', '已装箱')"
+          >
+
+            <div class="lw-global-model-box lw-global-model-box-3px">
+              <lw-input
+                ref="loadedPopupBox"
+                :title="$lwLanguage.get('', '箱号')"
+                v-model="loadedPopup.boxsearch"
+                rule-key="loadedPopupBox"
+                :create-rule="$lwScanRule.create('装车发运-查看已装-箱号','CASE')"
+                :show-bottom-border="false"
+                @input="loadedPopupSearchConfirm('box')"
+              >
+                <template #button>
+                  <lw-button
+                    mini
+                    @click="$refs.loadedPopupBox.confirm()"
+                  >
+                    {{ $lwLanguage.get('', '查询') }}
+                  </lw-button>
+                </template>
+              </lw-input>
+            </div>
+
+            <box-item
+              v-for="(i,k) in loadedPopup.box.datas"
+              :key="i.boxId"
+              :item="i"
+              :index="k"
+              hidden-del-btn
+            />
+            <lw-pagination
+              v-model="loadedPopup.box.pageNum"
+              :page-size.sync="loadedPopup.box.pageSize"
+              :total="loadedPopup.box.total"
+              @change="loadedPopupPageChange('box')"
+            />
+            <lw-not-data v-if="!loadedPopup.box.pageTotal"/>
+
+          </van-tab>
+        </van-tabs>
+      </lw-tab-box>
+
+    </lw-popup>
+
+    <!-- 装车提示弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('', '装车提示')"
+      v-model="loadingTipPopup.show"
+      :show-keyboard-placeholder="false"
+      background="#f0f0f0"
+    >
+      <div
+        style="text-align: center;margin-bottom: 10px"
+        class="lw-global-value-bold-red"
+      >
+        {{ $lwLanguage.get('', '存在未装车商品，请进行装车确认') }}
+      </div>
+
+      <div
+        class="lw-global-model-box lw-global-animation-out"
+        v-for="(i,k) in loadingTipPopup.datas"
+        :key="k"
+        :style="{animationDelay: 50 * k + 'ms'}"
+      >
+
+        <lw-label-value-group
+          class="lw-global-row-start"
+          :list="i.lv"
+        />
+
+        <div
+          style="text-align: right"
+          class="lw-global-row-end"
+        >
+          <lw-button
+            mini
+            type="last"
+            plain
+            @click="loadingTipPopupLookContent(i)"
+          >
+            {{ $lwLanguage.get('', '查看详情') }}
+          </lw-button>
+          <lw-button
+            :disabled="!i.canLoad"
+            mini
+            @click="loadingTipPopupConfirmLoad(i)"
+          >
+            {{ $lwLanguage.get('', '确认装载') }}
+          </lw-button>
+        </div>
+
+      </div>
+
+      <template #button>
+        <lw-button @click="loadingTipPopupSubmit">
+          {{ $lwLanguage.get('', '忽略，并完成装车') }}
+        </lw-button>
+      </template>
+
+    </lw-popup>
+
+    <!-- 装车提示详情弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('', '装车提示 - 详情')"
+      v-model="loadingTipContentPopup.show"
+      background="#f0f0f0"
+      height="90%"
+      :show-keyboard-placeholder="false"
+      @open="loadingTipContentPopupOpen"
+      @closed="loadingTipContentPopupOff"
+    >
+
+      <template v-if="loadingTipContentPopup.render">
+        <lw-label-value-group
+          :list="loadingTipContentPopup.soInfo.lv"
+          show-model-style
+        />
+
+        <lw-tab-box
+          style="margin-top: 10px"
+          :fixed="false"
+        >
+          <van-tabs
+            type="card"
+            animated
+            v-model="loadingTipContentPopup.tabActive"
+            @change="loadingTipContentPopupTabChange"
+          >
+
+            <van-tab
+              v-if="loadingTipContentPopupShowTab.wait"
+              name="wait"
+              :title="$lwLanguage.get('', '未装车')"
+            >
+
+              <div class="lw-global-model-box lw-global-model-box-3px">
+                <lw-input
+                  ref="loadingTipContentPopupWait"
+                  :placeholder="$lwLanguage.get('', '托盘号、商品编码')"
+                  v-model="loadingTipContentPopup.wait.keyword"
+                  rule-key="loadingTipContentPopupWait"
+                  :create-rule="$lwScanRule.create('装车发运-装车提示详情-托盘','LPN')"
+                  :show-bottom-border="false"
+                  @confirm="loadingTipContentPopupWaitOrOverSearch('wait')"
+                >
+                  <template #button>
+                    <lw-button
+                      mini
+                      @click="$refs.loadingTipContentPopupWait.confirm()"
+                    >
+                      {{ $lwLanguage.get('', '查询') }}
+                    </lw-button>
+                  </template>
+                </lw-input>
+              </div>
+
+              <loading-tip-content-popup-item
+                v-for="(i,k) in loadingTipContentPopup.wait.showData"
+                :key="k"
+                :item="i"
+              />
+
+            </van-tab>
+            <van-tab
+              v-if="loadingTipContentPopupShowTab.over"
+              name="over"
+              :title="$lwLanguage.get('', '已装车')"
+            >
+
+              <div class="lw-global-model-box lw-global-model-box-3px">
+                <lw-input
+                  ref="loadingTipContentPopupOver"
+                  :placeholder="$lwLanguage.get('', '托盘号、商品编码')"
+                  v-model="loadingTipContentPopup.over.keyword"
+                  rule-key="loadingTipContentPopupOver"
+                  :create-rule="$lwScanRule.create('装车发运-装车提示详情-托盘','LPN')"
+                  :show-bottom-border="false"
+                  @confirm="loadingTipContentPopupWaitOrOverSearch('over')"
+                >
+                  <template #button>
+                    <lw-button
+                      mini
+                      @click="$refs.loadingTipContentPopupOver.confirm()"
+                    >
+                      {{ $lwLanguage.get('', '查询') }}
+                    </lw-button>
+                  </template>
+                </lw-input>
+              </div>
+
+              <loading-tip-content-popup-item
+                v-for="(i,k) in loadingTipContentPopup.over.showData"
+                :key="k"
+                :item="i"
+              />
+
+            </van-tab>
+            <van-tab
+              name="skuInfo"
+              :title="$lwLanguage.get('', '商品信息')"
+            >
+
+              <div class="lw-global-model-box lw-global-model-box-3px">
+                <lw-input
+                  ref="loadingTipContentPopupSkuInfo"
+                  :placeholder="$lwLanguage.get('', '商品编码')"
+                  v-model="loadingTipContentPopup.skuInfo.keyword"
+                  rule-key="loadingTipContentPopupSkuInfo"
+                  :create-rule="$lwScanRule.create('装车发运-装车提示详情-托盘','SKU')"
+                  :show-bottom-border="false"
+                  @confirm="loadingTipContentPopupSkuInfoSearch"
+                >
+                  <template #button>
+                    <lw-button
+                      mini
+                      @click="$refs.loadingTipContentPopupSkuInfo.confirm()"
+                    >
+                      {{ $lwLanguage.get('', '查询') }}
+                    </lw-button>
+                  </template>
+                </lw-input>
+              </div>
+
+              <div
+                class="lw-global-model-box lw-global-animation-out"
+                v-for="(i,k) in loadingTipContentPopup.skuInfo.datas"
+                :key="k"
+                :style="{animationDelay: 50 * k + 'ms'}"
+              >
+
+                <div class="lw-global-row-start lw-global-flex-start">
+                  <div class="lw-global-value-bold">{{ i.skuCode }}</div>
+                  <div
+                    style="margin-left: 5px"
+                    class="lw-global-title"
+                  >
+                    {{ i.skuName }}
+                  </div>
+
+                </div>
+
+                <div class="lw-global-row-end">
+
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('', '计划量')"
+                    :value="i.totalQtyLabel"
+                    val-bold
+                    :is-row="false"
+                  />
+
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('', '待拣量')"
+                    :value="i.waitPickQtyLabel"
+                    val-bold
+                    val-red
+                    :is-row="false"
+                  />
+
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('', '已拣量')"
+                    :value="i.pickQtyLabel"
+                    val-bold
+                    val-blue
+                    :is-row="false"
+                  />
+
+                </div>
+
+              </div>
+
+            </van-tab>
+
+          </van-tabs>
+        </lw-tab-box>
+      </template>
+
+      <template #button>
+
+        <lw-button
+          v-if="loadingTipContentPopupShowTab.wait"
+          @click="loadingTipContentPopupConfirmLoad"
+        >
+          {{ $lwLanguage.get('', '确认装载') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
   </div>
 </template>
 
 <script>
 
 import boxItem from './../components/boxItem/index.vue'
+import loadingTipContentPopupItem from './../components/loadingTipContentPopupItem.vue'
 import soAndLpnItem from './../components/soAndLpnItem/index.vue'
 import orderContentTitle from './../components/orderContentTitle/index.vue'
 import blockPopup from "./../../../../components/blockPopup.vue";
@@ -357,23 +831,29 @@ import {
   projectDeliveryAddBox,
   projectDeliveryAddLpn,
   projectDeliveryAddOrder,
-  projectDeliveryCompleteLoad,
+  projectDeliveryCompleteLoad, projectDeliveryCompleteLoadAndShip,
   projectDeliveryConfirm,
   projectDeliveryContinueLoad,
-  projectDeliveryExecuteShip, projectDeliveryQueryLoadSoInfo,
+  projectDeliveryExecuteShip,
+  projectDeliveryFindSoWaitLoad,
+  projectDeliveryFindSoWaitLoadOnlyPacked,
+  projectDeliveryFindWaitLoadSoDetail,
+  projectDeliveryFindWaitLoadSoList,
   projectDeliveryReload,
   projectDeliveryRemoveBox,
   projectDeliveryRemoveLpn,
   projectDeliveryRemoveOrder,
   projectDeliverySubmitAbnormal,
+  projectDeliveryUpdateLoadMethods,
   projectQueryDeliveryBoxDetailV2,
   projectQueryDeliveryDetail,
   projectQueryDeliveryLpnDetailV2,
   projectQueryDeliverySoDetailV2,
   projectWmsDeliveryBatchAddOrder,
+  projectWmsOutboundPDASoPickSkuPageV2,
   projectWmsQueryOrderForDelivery
 } from "../../../../api/outbound/delivery/action";
-import {deliveryMixin} from "./../mixin";
+import {deliveryMixin} from "../mixin";
 
 export default {
   name: "lwOutboundDeliveryActionPage",
@@ -382,13 +862,13 @@ export default {
     soAndLpnItem,
     orderContentTitle,
     blockPopup,
+    loadingTipContentPopupItem,
   },
   mixins: [deliveryMixin],
   data() {
     return {
       // 装车方式
       deliveryMethodAll: {
-
         box: {
           title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox', '按箱装车'),
           name: 'box'
@@ -419,6 +899,7 @@ export default {
       box: {
         value: '',
         focus: false,
+        cancelLoading: false,
         list: [],
         pageNum: 1,
         pageSize: 10,
@@ -429,6 +910,7 @@ export default {
       so: {
         value: '',
         focus: false,
+        cancelLoading: false,
         list: [],
         pageNum: 1,
         pageSize: 10,
@@ -439,6 +921,7 @@ export default {
       lpn: {
         value: '',
         focus: false,
+        cancelLoading: false,
         list: [],
         pageNum: 1,
         pageSize: 10,
@@ -463,33 +946,146 @@ export default {
         abnType: '',
         abnMsg: ''
       },
+
+      // 装车方式弹框
+      selectLoadingMethodsPopup: {
+        show: false,
+        selected: []
+      },
+
+      // 已装载弹框
+      loadedPopup: {
+        show: false,
+        tabActive: 'so',
+        so: {
+          search: '',
+          pageNum: 1,
+          pageSize: 10,
+          pageTotal: 0,
+          datas: []
+        },
+        lpn: {
+          search: '',
+          pageNum: 1,
+          pageSize: 10,
+          pageTotal: 0,
+          datas: []
+        },
+        box: {
+          search: '',
+          pageNum: 1,
+          pageSize: 10,
+          pageTotal: 0,
+          datas: []
+        },
+      },
+
+      // 装车提示弹框
+      loadingTipPopup: {
+        show: false,
+        type: '',
+        datas: []
+      },
+
+      // 装车提示详情弹框
+      loadingTipContentPopup: {
+        show: false,
+        render: false,
+        hasSubmit: false,
+        tabActive: 'wait',
+        soId: '',
+        soNo: '',
+        soInfo: {},
+        wait: {
+          keyword: '',
+          showData: [],
+          datas: [],
+          isPackData: {}
+        },
+        over: {
+          keyword: '',
+          showData: [],
+          datas: [],
+          isPackData: {}
+        },
+        skuInfo: {
+          keyword: '',
+          pageNum: 1,
+          pageSize: 10,
+          pageTotal: 0,
+          datas: []
+        },
+      },
     }
   },
   computed: {
     isAbn() {
       return this.orderContent.billStatus === '400' || this.orderContent.billStatus === '100'
-    }
+    },
+
+    // 装车提示弹框详情 - 是否显示未装车、已装车和操作按钮
+    loadingTipContentPopupShowTab() {
+      const isPack = this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_NEED_EXECUTE_PACK') === 'true'
+      const {wait, over} = this.loadingTipContentPopup
+      if (isPack) {
+        return {
+          wait: Object.keys(wait.isPackData).length && (wait.isPackData.lpnBoxList?.length || wait.isPackData.noneLpnList?.length),
+          over: Object.keys(over.isPackData).length && (over.isPackData.lpnBoxList?.length || over.isPackData.noneLpnList?.length),
+        }
+      }
+      return {
+        wait: !!wait.datas.length,
+        over: !!over.datas.length,
+      }
+    },
   },
-  mounted() {
+  async mounted() {
     this.deliveryId = this.$route.query.lwDeliveryId
-    this.getOrderData()
+    await this.getOrderData()
   },
   methods: {
 
+    // 装车方式弹框确认
+    selectLoadingMethodsPopupConfirm(val) {
+      projectDeliveryUpdateLoadMethods({
+        deliveryId: this.deliveryId,
+        loadMethods: val
+      }).then(() => {
+        this.getOrderData()
+      }).catch(() => this.selectLoadingMethodsPopupClose())
+    },
+    // 装车方式弹框用户取消
+    selectLoadingMethodsPopupClose() {
+      this.selectLoadingMethodsPopup.show = false
+      history.go(-1)
+    },
+
     // 获取订单数据
-    getOrderData() {
-      projectQueryDeliveryDetail({
+    async getOrderData() {
+      const res = await projectQueryDeliveryDetail({
         deliveryId: this.deliveryId
-      }).then(res => {
-        this.orderContent = res
-        if (!this.tabList.length) {
-          res.loadMethodList.forEach(item => {
-            this.tabList.push(this.deliveryMethodAll[item])
-          })
-          this.tabActive = res.loadMethodList[0]
-        }
-        this.$nextTick(() => this.tabChange())
       })
+      this.orderContent = res
+      if (!this.tabList.length) {
+        if (!res.loadMethodList) {
+          const loadMethodStr = this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_METHOD')
+          const loadMethod = loadMethodStr ? loadMethodStr.split(',') : []
+          
+          if (loadMethod.length === 1) {
+            this.selectLoadingMethodsPopupConfirm(loadMethod.join(','))
+          } else {
+            this.selectLoadingMethodsPopup.selected = loadMethod
+            this.selectLoadingMethodsPopup.show = true
+          }
+          return
+        }
+
+        res.loadMethodList.forEach(item => {
+          this.tabList.push(this.deliveryMethodAll[item])
+        })
+        this.tabActive = res.loadMethodList[0]
+      }
+      this.$nextTick(() => this.tabChange())
     },
 
     // tab切换
@@ -543,7 +1139,8 @@ export default {
     },
 
     // 装车执行
-    async submitData(key) {
+    async submitData(key, val) {
+
       const {success, data} = this.checkStaff()
       if (!success) return
 
@@ -556,22 +1153,22 @@ export default {
       switch (key) {
         case 'box':
           fn = projectDeliveryAddBox
-          query.boxNo = this.box.value
+          query.boxNo = val || this.box.value
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo.null', '箱号不能为空')
           break;
         case 'so':
           fn = projectDeliveryAddOrder
-          query.soNo = this.so.value
+          query.soNo = val || this.so.value
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo.null', '单号不能为空')
           break;
         case 'lpn':
           fn = projectDeliveryAddLpn
-          query.lpn = this.lpn.value
+          query.lpn = val || this.lpn.value
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn.null', '托盘号不能为空')
           break;
       }
 
-      if (!this[key].value) {
+      if (!val) {
         this[key].focus = true
         this.$lwShowErrorMsg(nullMsg)
         return
@@ -580,7 +1177,7 @@ export default {
       // 判断是否拦截
       if (
         key === 'so' &&
-        await this.$refs.blockPopupRef.checkBlock({soNo: this.so.value})
+        await this.$refs.blockPopupRef.checkBlock({soNo: val})
       ) {
 
         this.so.focus = false
@@ -589,15 +1186,16 @@ export default {
       }
 
 
-      fn(query).then(() => {
-        this[key].value = ''
-        this[key].focus = true
+      await fn(query)
 
-        this.getOrderData()
-        this.tabChange()
-      }).catch(() => {
-        this[key].value = ''
-      })
+      this.$lwToast.success(
+        this.$lwLanguage.get('', '操作成功')
+      )
+      this[key].value = ''
+      this[key].focus = true
+
+      this.getOrderData()
+      this.tabChange()
     },
 
     // 删除执行
@@ -606,41 +1204,53 @@ export default {
         title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.alter', '警告'),
         message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.confirmDelete', '确认删除') + value
       }).then(() => {
-        let query = {
-          deliveryId: this.deliveryId
-        }
-        let fn
-        switch (key) {
-          case 'box':
-            fn = projectDeliveryRemoveBox
-            query.boxNo = value
-            break;
-          case 'so':
-            fn = projectDeliveryRemoveOrder
-            query.soNo = value
-            break;
-          case 'lpn':
-            fn = projectDeliveryRemoveLpn
-            query.lpn = value
-            break;
-        }
-
-        fn(query).then(() => {
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deleteSuccess', '删除成功')
-          )
-          this.getOrderData()
-          this[key].value = ''
-          this[key].focus = true
-        })
-
+        this.delApi(key, value)
       }).catch(() => {
       })
     },
+    delApi(key, value) {
+      let query = {
+        deliveryId: this.deliveryId
+      }
+      let fn
+      switch (key) {
+        case 'box':
+          fn = projectDeliveryRemoveBox
+          query.boxNo = value
+          break;
+        case 'so':
+          fn = projectDeliveryRemoveOrder
+          query.soNo = value
+          break;
+        case 'lpn':
+          fn = projectDeliveryRemoveLpn
+          query.lpn = value
+          break;
+      }
+
+      fn(query).then(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '操作成功')
+        )
+        this.getOrderData()
+        this[key].value = ''
+        this[key].focus = true
+      })
+    },
 
     // 按箱装车
-    boxConfirm() {
-      this.submitData('box')
+    boxConfirm(val, {data}) {
+
+      const box = data.case || data.key
+      if (!box) {
+        this.box.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo.null', '箱号不能为空')
+        )
+        return
+      }
+
+      this.box.cancelLoading ? this.delApi('box', box) : this.submitData('box', box)
     },
     // 删除箱
     boxDel(boxNo) {
@@ -653,9 +1263,17 @@ export default {
     },
 
     // 按单装车
-    soConfirm() {
+    soConfirm(val, {data}) {
+      const so = data.so || data.key
+      if (!so) {
+        this.so.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo.null', '单号不能为空')
+        )
+        return
+      }
 
-      this.submitData('so')
+      this.so.cancelLoading ? this.delApi('so', so) : this.submitData('so', so)
 
     },
     // 删除单
@@ -669,9 +1287,18 @@ export default {
     },
 
     // 按托盘装车
-    lpnConfirm() {
+    lpnConfirm(val, {data}) {
+
+      const lpn = data.lpn || data.key
+      if (!lpn) {
+        this.lpn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn.null', '托盘号不能为空')
+        )
+        return
+      }
 
-      this.submitData('lpn')
+      this.lpn.cancelLoading ? this.delApi('lpn', lpn) : this.submitData('lpn', lpn)
 
     },
     // 删除托盘
@@ -705,10 +1332,26 @@ export default {
 
     },
 
+    // 完成装车并发运
+    overLoadAndDelivery() {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('', '提示'),
+        message: this.$lwLanguage.get('', '是否确认发运'),
+      }).then(() => {
+        projectDeliveryCompleteLoadAndShip({deliveryId: this.deliveryId})
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '操作成功')
+        )
+        history.go(-1)
+      }).catch(() => {
+      })
+
+
+    },
     // 完成装车
     async over() {
-      const res = await projectDeliveryQueryLoadSoInfo({deliveryId: this.deliveryId})
-
+      /*const res = await projectDeliveryQueryLoadSoInfo({deliveryId: this.deliveryId})
       if (!res.finishPlanSoLoad) {
         this.$lwDialog.confirm({
           title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.delivery.action.index.rztfflbr', '提示'),
@@ -723,7 +1366,9 @@ export default {
 
         })
         return
-      }
+      }*/
+
+      if (!await this.loadingTipPopupGetSoData('over')) return
 
       await this.overFn()
 
@@ -762,10 +1407,11 @@ export default {
     },
 
     // 发运
-    transport() {
+    async transport() {
+      if (!await this.loadingTipPopupGetSoData('transport')) return
 
       const message = this.orderContent.shipConfirmRemark || this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery', '确认发运？')
-      
+
       this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify', '提示'),
         message,
@@ -923,7 +1569,231 @@ export default {
         this.so.value = ''
         this.so.focus = true
       }
-    }
+    },
+
+    // 查看已装弹框 - 打开
+    lookLoaded() {
+      this.loadedPopup.show = true
+      this.loadedPopup.tabActive = this.tabActive
+      this.loadedPopupSearchConfirm(this.tabActive)
+    },
+    // 查看已装弹框 - tab切换
+    loadedTabChange() {
+      const key = this.loadedPopup.tabActive
+      !this.loadedPopup[key].datas.length && this.loadedPopupSearchConfirm(key)
+    },
+    // 查看已装弹框 - 确认搜索
+    loadedPopupSearchConfirm(key) {
+      this.loadedPopup[key].pageNum = 1
+      this.loadedPopupPageChange(key)
+    },
+    // 查看已装弹框 - 页码改变
+    loadedPopupPageChange(key) {
+      let api
+      switch (key) {
+        case 'box':
+          api = projectQueryDeliveryBoxDetailV2
+          break;
+        case 'so':
+          api = projectQueryDeliverySoDetailV2
+          break;
+        case 'lpn':
+          api = projectQueryDeliveryLpnDetailV2
+          break;
+
+      }
+      api({
+        deliveryId: this.deliveryId,
+        pageSize: this.loadedPopup[key].pageSize,
+        pageNum: this.loadedPopup[key].pageNum,
+        keyword: this.loadedPopup[key].search
+      }).then(res => {
+        this.loadedPopup[key].datas = res.datas || []
+        this.loadedPopup[key].pageTotal = res.total || 0
+      })
+    },
+    // 查看已装弹框 - 关闭
+    loadedPopupOff() {
+      const keys = ['so', 'lpn', 'box']
+      keys.forEach(k => {
+        this.loadedPopup[k].pageNum = 1
+        this.loadedPopup[k].pageSize = 10
+        this.loadedPopup[k].datas = []
+        this.loadedPopup[k].search = ''
+      })
+    },
+
+    // 装车提示弹框 - 获取关联的出库单数据
+    async loadingTipPopupGetSoData(type) {
+      const res = await projectDeliveryFindWaitLoadSoList({
+        deliveryId: this.deliveryId
+      })
+      if (!res || !res.length) {
+        this.loadingTipPopup.show = false
+        return true
+      }
+      this.loadingTipPopup.type = type
+      this.loadingTipPopup.datas = res
+      this.loadingTipPopup.show = true
+    },
+    // 装车提示弹框 - 确认装载
+    async loadingTipPopupConfirmLoad(item) {
+      await this.submitData('so', item.soNo)
+      await this.loadingTipPopupGetSoData(this.loadingTipPopup.type)
+    },
+    // 装车提示弹框 - 查看详情
+    loadingTipPopupLookContent(item) {
+      this.loadingTipContentPopup.soId = item.soId
+      this.loadingTipContentPopup.soNo = item.soNo
+      this.loadingTipContentPopup.show = true
+    },
+    // 装车提示弹框 - 忽略，并完成装车
+    loadingTipPopupSubmit() {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('', '提示'),
+        message: this.$lwLanguage.get('', '确认忽略这些订单，并完成装车？')
+      }).then(() => {
+
+        this.loadingTipPopup.type === 'over' ? this.overFn() : this.transportSubmit()
+
+      }).catch(() => {
+      })
+    },
+
+
+    // 装车提示弹框详情 - 打开
+    async loadingTipContentPopupOpen() {
+      projectDeliveryFindWaitLoadSoDetail({
+        soId: this.loadingTipContentPopup.soId,
+        deliveryId: this.deliveryId
+      }).then(res => {
+        this.loadingTipContentPopup.soInfo = res
+        this.loadingTipContentPopup.render = true
+      })
+
+      await this.loadingTipContentPopupGetLoadData('wait')
+      await this.loadingTipContentPopupGetLoadData('over')
+
+      this.$nextTick(() => {
+        if (this.loadingTipContentPopupShowTab.wait) {
+          this.loadingTipContentPopup.tabActive = 'wait'
+          return
+        }
+        if (this.loadingTipContentPopupShowTab.over) {
+          this.loadingTipContentPopup.tabActive = 'over'
+          return
+        }
+        this.loadingTipContentPopupSkuInfoSearch()
+        this.loadingTipContentPopup.tabActive = 'skuInfo'
+      })
+
+
+    },
+    // 装车提示弹框详情 - tab切换
+    loadingTipContentPopupTabChange(active) {
+      const obj = this.loadingTipContentPopup[active]
+
+      if (active === 'skuInfo') {
+        if (obj.datas.length) return;
+        this.loadingTipContentPopupSkuInfoSearch()
+        return;
+      }
+
+      if (obj.datas.length || Object.keys(obj.isPackData).length) return;
+      this.loadingTipContentPopupGetLoadData(active)
+
+    },
+
+    // 装车提示弹框详情 - 获取未装车、已装车数据
+    async loadingTipContentPopupGetLoadData(type) {
+      const isPack = this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_NEED_EXECUTE_PACK') === 'true'
+      const api = isPack ? projectDeliveryFindSoWaitLoadOnlyPacked : projectDeliveryFindSoWaitLoad
+
+      if (isPack) {
+        this.loadingTipContentPopup[type].isPackData = await api({
+          soId: this.loadingTipContentPopup.soId,
+          queryLoaded: type !== 'wait'
+        })
+
+      } else {
+
+        this.loadingTipContentPopup[type].datas = await api({
+          soId: this.loadingTipContentPopup.soId,
+          queryLoaded: type !== 'wait'
+        })
+
+      }
+      this.loadingTipContentPopupWaitOrOverSearch(type)
+    },
+    // 装车提示弹框详情 - 未装车搜索
+    loadingTipContentPopupWaitOrOverSearch(type) {
+      const isPack = this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_NEED_EXECUTE_PACK') === 'true'
+      const keyword = this.loadingTipContentPopup[type].keyword
+      if (isPack) {
+        const packData = this.loadingTipContentPopup[type].isPackData
+        const lpnBoxList = packData.lpnBoxList.filter(item => {
+          if (item.lpn.includes(keyword)) return true
+          return item.boxList.some(box => {
+            if (box.boxNo.includes(keyword)) return true
+            return box.skuList.some(sku => sku.skuCode.includes(keyword));
+          });
+
+        })
+
+        const noneLpnList = packData.noneLpnList.filter(item => {
+          if (item.boxNo.includes(keyword)) return true
+          return item.skuList.some(sku => sku.skuCode.includes(keyword))
+        })
+
+        this.loadingTipContentPopup[type].showData = [...lpnBoxList, ...noneLpnList]
+      } else {
+        this.loadingTipContentPopup[type].showData = this.loadingTipContentPopup[type].datas.filter(item => {
+          if (item.containerNo.includes(keyword)) return true
+          return item.skuList.some(sku => sku.skuCode.includes(keyword))
+        })
+      }
+    },
+
+    // 装车提示弹框详情 - 商品信息搜索
+    loadingTipContentPopupSkuInfoSearch() {
+      this.loadingTipContentPopup.skuInfo.pageNum = 1
+      this.loadingTipContentPopupGetSkuInfo()
+    },
+    // 装车提示弹框详情 - 获取商品信息
+    loadingTipContentPopupGetSkuInfo() {
+      projectWmsOutboundPDASoPickSkuPageV2({
+        soId: this.loadingTipContentPopup.soId,
+        pageNum: this.loadingTipContentPopup.skuInfo.pageNum,
+        pageSize: this.loadingTipContentPopup.skuInfo.pageSize,
+        keyword: this.loadingTipContentPopup.skuInfo.keyword
+      }).then(res => {
+        this.loadingTipContentPopup.skuInfo.datas = res.datas || []
+        this.loadingTipContentPopup.skuInfo.pageTotal = res.total || 0
+      })
+    },
+    // 装车提示弹框详情 - 确认装车
+    async loadingTipContentPopupConfirmLoad() {
+      await this.submitData('so', this.loadingTipContentPopup.soNo)
+      this.loadingTipContentPopup.skuInfo.pageNum = 1
+      this.loadingTipContentPopup.skuInfo.datas = []
+      await this.loadingTipContentPopupOpen()
+      this.loadingTipContentPopup.hasSubmit = true
+    },
+    // 装车提示弹框详情 - 关闭
+    loadingTipContentPopupOff() {
+      this.loadingTipContentPopup.render = false
+      this.loadingTipContentPopup.wait.keyword = ''
+      this.loadingTipContentPopup.wait.datas = []
+      this.loadingTipContentPopup.over.keyword = ''
+      this.loadingTipContentPopup.over.datas = []
+      this.loadingTipContentPopup.skuInfo.keyword = ''
+      this.loadingTipContentPopup.skuInfo.pageNum = 1
+      this.loadingTipContentPopup.skuInfo.datas = []
+      if (this.loadingTipContentPopup.hasSubmit) {
+        this.loadingTipPopupGetSoData(this.loadingTipPopup.type)
+      }
+    },
   }
 }
 </script>