@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/outbound/delivery/action/index.vue

@@ -10,82 +10,88 @@
     <div class="lw-global-page-box">
 
       <!-- 发运单信息 -->
-      <order-content-title :order-content="orderContent"/>
-
-      <!-- tab -->
-      <div
-        v-if="orderContent.billStatus!=='300'"
-        style="margin: 10px 0"
-        class="lw-global-tab-box"
-      >
-        <van-tabs
-          type="card"
-          animated
-          v-model="tabActive"
-          @change="tabChange()"
+      <order-content-title
+        :delivery-id="deliveryId"
+        :order-content="orderContent"
+        @changeCarSuccess="init"
+      />
+
+      <template v-if="!isAbn">
+        <!-- tab -->
+        <div
+          v-if="orderContent.billStatus!=='300'"
+          style="margin-top: 10px"
+          class="lw-global-tab-box"
         >
-          <van-tab
+          <van-tabs
+            type="card"
+            animated
+            v-model="tabActive"
+            @change="tabChange()"
+          >
+            <van-tab
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByOrder','按单装车')"
               name="so"
-          ></van-tab>
+            ></van-tab>
 
-          <van-tab
+            <van-tab
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByLpn','按托盘装车')"
               name="lpn"
-          ></van-tab>
+            ></van-tab>
 
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox','按箱装车')"
-            name="box"
-          ></van-tab>
-        </van-tabs>
-      </div>
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox','按箱装车')"
+              name="box"
+            ></van-tab>
+          </van-tabs>
+        </div>
 
-      <!-- 按箱 -->
-      <template v-if="tabActive==='box'">
+        <!-- 按箱 -->
+        <template v-if="tabActive==='box'">
 
-        <!-- 输入框 -->
-        <div
-          v-if="orderContent.billStatus!=='300'"
-          class="lw-global-model-box"
-        >
-          <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"
-            @confirm="boxConfirm"
+          <!-- 输入框 -->
+          <div
+            v-if="orderContent.billStatus!=='300'"
+            class="lw-global-model-box"
           >
-            <template #button>
-              <lw-button
-                round
-                mini
-                @click="boxConfirm"
-              >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar','装车') }}</lw-button>
-            </template>
-          </lw-input>
-        </div>
+            <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"
+              @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.boxNo"
-          :item="i"
-          :index="k"
-          :hidden-del-btn="orderContent.billStatus==='300'"
-          @del="boxDel"
-        />
+          <!-- 已装车箱 -->
+          <box-item
+            v-for="(i,k) in box.list"
+            :key="i.boxNo"
+            :item="i"
+            :index="k"
+            :hidden-del-btn="orderContent.billStatus==='300'"
+            @del="boxDel"
+          />
 
-      </template>
+        </template>
 
-      <!-- 按单 -->
-      <template v-if="tabActive==='so'">
+        <!-- 按单 -->
+        <template v-if="tabActive==='so'">
 
-        <!-- 输入框 -->
-        <div class="lw-global-model-box">
-          <div>
-            <lw-input
+          <!-- 输入框 -->
+          <div class="lw-global-model-box">
+            <div>
+              <lw-input
                 v-model="so.value"
                 :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo', '出库单号')"
                 :get-focus.sync="so.focus"
@@ -93,123 +99,147 @@
                 required
                 rule-key="order"
                 @confirm="soConfirm"
-            >
-              <template #button>
-                <lw-button
+              >
+                <template #button>
+                  <lw-button
                     round
                     mini
                     @click="soConfirm"
-                >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar','装车') }}</lw-button>
-              </template>
-            </lw-input>
-          </div>
+                  >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
+                  </lw-button>
+                </template>
+              </lw-input>
+            </div>
 
-        </div>
+          </div>
 
-        <!-- 已装车单 -->
-        <so-and-lpn-item
-          v-for="(i,k) in so.list"
-          :key="i.soNo"
-          :index="k"
-          :item="i"
-          @del="soDel"
-        />
+          <!-- 已装车单 -->
+          <so-and-lpn-item
+            v-for="(i,k) in so.list"
+            :key="i.soNo"
+            :index="k"
+            :item="i"
+            @del="soDel"
+          />
 
-      </template>
+        </template>
 
-      <!-- 按托盘 -->
-      <template v-if="tabActive==='lpn'">
+        <!-- 按托盘 -->
+        <template v-if="tabActive==='lpn'">
 
-        <!-- 输入框 -->
-        <div class="lw-global-model-box">
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn','托盘号')"
-            v-model="lpn.value"
-            :get-focus.sync="lpn.focus"
-            required
-            rule-key="lpn"
-            @confirm="lpnConfirm"
-          >
-            <template #button>
-              <lw-button
-                round
-                mini
-                @click="lpnConfirm"
-              >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar','装车') }}</lw-button>
-            </template>
-          </lw-input>
-        </div>
+          <!-- 输入框 -->
+          <div class="lw-global-model-box">
+            <lw-input
+              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn','托盘号')"
+              v-model="lpn.value"
+              :get-focus.sync="lpn.focus"
+              required
+              rule-key="lpn"
+              @confirm="lpnConfirm"
+            >
+              <template #button>
+                <lw-button
+                  round
+                  mini
+                  @click="lpnConfirm"
+                >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
+                </lw-button>
+              </template>
+            </lw-input>
+          </div>
 
-        <!-- 已装车托盘 -->
+          <!-- 已装车托盘 -->
 
-        <so-and-lpn-item
-          v-for="(i,k) in lpn.list"
-          :key="i.palletNo"
-          :index="k"
-          :item="i"
-          type="lpn"
-          @del="lpnDel"
-        />
+          <so-and-lpn-item
+            v-for="(i,k) in lpn.list"
+            :key="i.palletNo"
+            :index="k"
+            :item="i"
+            type="lpn"
+            @del="lpnDel"
+          />
 
+        </template>
       </template>
 
     </div>
 
-    <lw-bottom-bar v-if="orderContent.billStatus!=='300'">
-      <lw-button
+    <template v-if="!isAbn">
+      <lw-bottom-bar v-if="orderContent.billStatus!=='300'">
+        <lw-button
           v-if="tabActive==='so'"
           type="last"
           plain
           @click="openSoBatchOp"
-      >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo','添加出库单') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo', '添加出库单') }}
+        </lw-button>
 
-      <lw-button
-        type="last"
-        plain
-        @click="reload"
-      >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.redoLoadCar', '重新装车') }}
-      </lw-button>
+        <lw-button
+          type="last"
+          plain
+          @click="reload"
+        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.redoLoadCar', '重新装车') }}
+        </lw-button>
 
-      <lw-button @click="over">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.doneLoadCar', '完成装车') }}
-      </lw-button>
-    </lw-bottom-bar>
-    <lw-bottom-bar v-else>
-      <lw-button
+        <lw-button @click="over">
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.doneLoadCar', '完成装车') }}
+        </lw-button>
+      </lw-bottom-bar>
+      <lw-bottom-bar v-else>
+        <lw-button
           v-if="tabActive==='so'"
           type="last"
           plain
           @click="openSoBatchOp"
-      >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo','添加出库单') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo', '添加出库单') }}
+        </lw-button>
+
+        <lw-button
+          type="normal"
+          plain
+          @click="goOn"
+        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.goOnLoadCar', '继续装车') }}
+        </lw-button>
+
+        <lw-button @click="transport">
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.ship', '发运') }}
+        </lw-button>
+      </lw-bottom-bar>
+    </template>
+
+    <lw-bottom-bar v-if="isAbn">
 
       <lw-button
-        type="normal"
-        plain
-        @click="goOn"
-      >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.goOnLoadCar', '继续装车') }}
-      </lw-button>
+        type="last"
+        @click="confirmAbnPopup.show=true"
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.hdidpqix','确认异常') }}</lw-button>
 
-      <lw-button @click="transport">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.ship', '发运') }}
+      <lw-button @click="confirmNotAbn">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.gtsqwjxg','确认无误') }}
       </lw-button>
+
     </lw-bottom-bar>
 
     <!-- 添加出库单弹框 -->
     <lw-popup
-        :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo','添加出库单')"
-        v-model="AddSOsPopup.show"
-        background="#F0F0F0"
+      :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo','添加出库单')"
+      v-model="AddSOsPopup.show"
+      background="#F0F0F0"
+      @closed="clearAddSOsPopup"
     >
       <template>
         <div class="lw-global-model-box">
           <lw-input
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo','出库单号')"
-              v-model="AddSOsPopup.searchKey"
-              :get-focus.sync="AddSOsPopup.focus"
-              rule-key="so"
+            :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo','出库单号')"
+            v-model="AddSOsPopup.searchKey"
+            :get-focus.sync="AddSOsPopup.focus"
+            rule-key="so"
+            @confirm="querySo"
           >
             <template #button>
-              <lw-button mini round @click="querySo">{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.search','查询') }}</lw-button>
+              <lw-button mini round @click="querySo">
+                {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.search', '查询') }}
+              </lw-button>
             </template>
           </lw-input>
 
@@ -217,24 +247,28 @@
         </div>
 
         <so-and-lpn-item
-            v-for="(i,k) in AddSOsPopup.list"
-            :key="i.soNo"
-            :index="k"
-            :item="i"
-            type="lpn"
+          v-for="(i,k) in AddSOsPopup.list"
+          :key="i.soNo"
+          :index="k"
+          :item="i"
+          type="lpn"
         >
           <van-switch
-              v-model="i.choosed"
-              size="22px"
-              @change="(val) => chooseSoChange(i, k, val)"
+            v-model="i.choosed"
+            size="22px"
+            @change="(val) => chooseSoChange(i, k, val)"
           />
         </so-and-lpn-item>
       </template>
 
       <template #bottomInfo>
         <div>
-          <span class="lw-global-title">{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.orderCount', '已选择单数') }}</span>
-          <span class="lw-global-value-bold-red lw-global-value-bold" style="font-size: 16px">{{ selectSoCount() }}</span>
+          <span class="lw-global-title">{{
+              $lwLanguage.get('wms_project.pda.outbound.delivery.action.orderCount', '已选择单数')
+            }}</span>
+          <span class="lw-global-value-bold-red lw-global-value-bold" style="font-size: 16px">{{
+              selectSoCount()
+            }}</span>
         </div>
       </template>
 
@@ -244,6 +278,36 @@
         </lw-button>
       </template>
     </lw-popup>
+
+    <!-- 确认异常弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.ekazgfnt','车辆确认异常')"
+      v-model="confirmAbnPopup.show"
+    >
+
+      <lw-cell-popup-radio
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.qrcxhcdb','异常类型')"
+        v-model="confirmAbnPopup.abnType"
+        dict-key="OutboundDeliveryAbnormalType"
+        required
+      />
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.ypsfbzqx','异常信息')"
+        v-model="confirmAbnPopup.abnMsg"
+        type="textarea"
+        :rows="4"
+      />
+
+      <template #button>
+
+        <lw-button @click="confirmAbn">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.zhlefpdr','提交异常') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
   </div>
 </template>
 
@@ -256,73 +320,92 @@ import {
   projectDeliveryAddBox,
   projectDeliveryAddLpn,
   projectDeliveryAddOrder,
-  projectDeliveryCompleteLoad, projectDeliveryContinueLoad, projectDeliveryExecuteShip,
+  projectDeliveryCompleteLoad, projectDeliveryConfirm,
+  projectDeliveryContinueLoad,
+  projectDeliveryExecuteShip,
   projectDeliveryReload,
   projectDeliveryRemoveBox,
   projectDeliveryRemoveLpn,
-  projectDeliveryRemoveOrder,
+  projectDeliveryRemoveOrder, projectDeliverySubmitAbnormal,
   projectQueryDeliveryBoxDetail,
   projectQueryDeliveryDetail,
   projectQueryDeliveryLpnDetail,
   projectQueryDeliverySoDetail,
-  projectWmsQueryOrderForDelivery,
-  projectWmsDeliveryBatchAddOrder
+  projectWmsDeliveryBatchAddOrder,
+  projectWmsQueryOrderForDelivery
 } from "../../../../../api/outbound/delivery/action";
+
 export default {
   name: "lwOutboundDeliveryActionPage",
-  components:{
+  components: {
     boxItem,
     soAndLpnItem,
     orderContentTitle
   },
   data() {
     return {
+      // 发运id
+      deliveryId:'',
+
       // 折叠面板展开项目
       activeNames: [],
       // 订单数据
       orderContent: {},
 
       // tab集货数据
-      tabActive:'so',
+      tabActive: 'so',
 
       // 按箱
-      box:{
-        value:'',
+      box: {
+        value: '',
         focus: false,
-        list:[]
+        list: []
       },
 
       // 按箱
-      so:{
-        value:'',
+      so: {
+        value: '',
         focus: false,
-        list:[]
+        list: []
       },
 
       // 按托盘
-      lpn:{
-        value:'',
+      lpn: {
+        value: '',
         focus: false,
-        list:[]
+        list: []
       },
 
       //
-      AddSOsPopup:{
+      AddSOsPopup: {
         searchKey: '',
-        list:[],
+        list: [],
         soIds: [],
         show: false,
         focus: false
+      },
+
+      // 确认异常弹框
+      confirmAbnPopup:{
+        show: false,
+        abnType: '',
+        abnMsg: ''
       }
     }
   },
+  computed:{
+    isAbn(){
+      return this.orderContent.billStatus === '400' || this.orderContent.billStatus === '100'
+    }
+  },
   mounted() {
+    this.deliveryId = this.$route.query.lwDeliveryId
     this.init()
   },
   methods: {
 
     // 初始化
-    init(){
+    init() {
       this.getOrderData()
       this.tabChange()
     },
@@ -330,43 +413,43 @@ export default {
     // 获取订单数据
     getOrderData() {
       projectQueryDeliveryDetail({
-        deliveryId: this.$route.query.lwDeliveryId
+        deliveryId: this.deliveryId
       }).then(res => {
         this.orderContent = res
       })
     },
 
     // tab切换
-    tabChange(key, value){
+    tabChange(key, value) {
 
-      this.box.list=[]
-      this.so.list=[]
-      this.lpn.list=[]
+      this.box.list = []
+      this.so.list = []
+      this.lpn.list = []
 
       let api
-      switch (this.tabActive){
+      switch (this.tabActive) {
         case 'box':
-          api=projectQueryDeliveryBoxDetail
+          api = projectQueryDeliveryBoxDetail
           break;
 
         case 'so':
-          api=projectQueryDeliverySoDetail
+          api = projectQueryDeliverySoDetail
           break;
 
         case 'lpn':
-          api=projectQueryDeliveryLpnDetail
+          api = projectQueryDeliveryLpnDetail
           break;
 
       }
 
       api({
-        deliveryId:this.$route.query.lwDeliveryId
-      }).then(res=>{
+        deliveryId: this.deliveryId
+      }).then(res => {
 
-        if (key){
+        if (key) {
           let index = 0
           for (let i = 0; i < res.length; i++) {
-            if(res[i][key] === value){
+            if (res[i][key] === value) {
               index = i
               break
             }
@@ -385,10 +468,10 @@ export default {
     },
 
     // 装车执行
-    submitData(key){
+    submitData(key) {
 
-      let query={
-        deliveryId: this.$route.query.lwDeliveryId
+      let query = {
+        deliveryId: this.deliveryId
       }
       let dataKey, fn, nullMsg
       switch (key) {
@@ -412,102 +495,104 @@ export default {
           break;
       }
 
-      if (!this[key].value){
+      if (!this[key].value) {
         this[key].focus = true
         this.$lwShowErrorMsg(nullMsg)
         return
       }
 
 
-
-      fn(query).then(res=>{
+      fn(query).then(res => {
         this[key].value = ''
         this[key].focus = true
 
         this.getOrderData()
         this.tabChange(dataKey, res[dataKey])
+      }).catch(()=>{
+        this[key].value = ''
       })
     },
 
     // 删除执行
-    submitDel({value, key}){
-      this.$dialog.confirm({
-        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.$route.query.lwDeliveryId
+    submitDel({value, key}) {
+      this.$lwDialog.confirm({
+        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){
+        switch (key) {
           case 'box':
-            fn=projectDeliveryRemoveBox
+            fn = projectDeliveryRemoveBox
             query.boxNo = value
             break;
           case 'so':
-            fn=projectDeliveryRemoveOrder
+            fn = projectDeliveryRemoveOrder
             query.soNo = value
             break;
           case 'lpn':
-            fn=projectDeliveryRemoveLpn
+            fn = projectDeliveryRemoveLpn
             query.lpn = value
             break;
         }
 
-        fn(query).then(()=>{
+        fn(query).then(() => {
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deleteSuccess','删除成功')
+            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deleteSuccess', '删除成功')
           )
           this.init()
-          this[key].value=''
-          this[key].focus=true
+          this[key].value = ''
+          this[key].focus = true
         })
 
-      }).catch(()=>{})
+      }).catch(() => {
+      })
     },
 
     // 按箱装车
-    boxConfirm(){
+    boxConfirm() {
       this.submitData('box')
     },
     // 删除箱
-    boxDel(boxNo){
+    boxDel(boxNo) {
 
       this.submitDel({
         value: boxNo,
-        key:'box'
+        key: 'box'
       })
 
     },
 
     // 按单装车
-    soConfirm(){
+    soConfirm() {
 
       this.submitData('so')
 
     },
     // 删除单
-    soDel(soNo){
+    soDel(soNo) {
 
       this.submitDel({
         value: soNo,
-        key:'so'
+        key: 'so'
       })
 
     },
 
     // 按托盘装车
-    lpnConfirm(){
+    lpnConfirm() {
 
       this.submitData('lpn')
 
     },
     // 删除托盘
-    lpnDel(lpn){
+    lpnDel(lpn) {
 
       this.submitDel({
         value: lpn,
-        key:'lpn'
+        key: 'lpn'
       })
 
     },
@@ -515,20 +600,21 @@ export default {
     // 重新装车
     reload() {
 
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.alter','警告'),
-        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.message','确认重新装车？执行该操作后，现有数据将全部清空')
-      }).then(()=>{
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.alter', '警告'),
+        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.message', '确认重新装车？执行该操作后，现有数据将全部清空')
+      }).then(() => {
         projectDeliveryReload({
-          deliveryId: this.$route.query.lwDeliveryId
-        }).then(()=>{
+          deliveryId: this.deliveryId
+        }).then(() => {
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess','操作成功')
+            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess', '操作成功')
           )
           this.tabActive = 'box'
           this.init()
         })
-      }).catch(()=>{})
+      }).catch(() => {
+      })
 
     },
 
@@ -536,28 +622,28 @@ export default {
     async over() {
 
       await projectDeliveryCompleteLoad({
-        deliveryId: this.$route.query.lwDeliveryId
+        deliveryId: this.deliveryId
       })
 
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify','提示'),
-        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery','装车完成，是否发运'),
-        confirmButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.ship','发运'),
-        cancelButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.return','返回')
-      }).then(()=>{
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery', '装车完成，是否发运'),
+        confirmButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.ship', '发运'),
+        cancelButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.return', '返回')
+      }).then(() => {
         this.transportSubmit()
-      }).catch(()=>{
+      }).catch(() => {
         history.go(-1)
       })
     },
 
     // 继续装车
-    goOn(){
+    goOn() {
       projectDeliveryContinueLoad({
-        deliveryId: this.$route.query.lwDeliveryId
-      }).then(()=>{
+        deliveryId: this.deliveryId
+      }).then(() => {
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess','操作成功')
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess', '操作成功')
         )
         this.tabActive = 'box'
         this.init()
@@ -565,21 +651,22 @@ export default {
     },
 
     // 发运
-    transport(){
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify','提示'),
-        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery','确认发运？'),
-      }).then(()=>{
+    transport() {
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery', '确认发运？'),
+      }).then(() => {
         this.transportSubmit()
-      }).catch(()=>{})
+      }).catch(() => {
+      })
     },
     // 发运提交
-    transportSubmit(){
+    transportSubmit() {
       projectDeliveryExecuteShip({
-        deliveryId: this.$route.query.lwDeliveryId
-      }).then(()=>{
+        deliveryId: this.deliveryId
+      }).then(() => {
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deliveried','已发运')
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deliveried', '已发运')
         )
         history.go(-1)
       })
@@ -590,10 +677,17 @@ export default {
       this.AddSOsPopup.show = true
       this.AddSOsPopup.focus = true
     },
+    clearAddSOsPopup() {
+      this.AddSOsPopup.show = false
+      this.AddSOsPopup.focus = false
+      this.AddSOsPopup.searchKey = ''
+      this.AddSOsPopup.list = []
+      this.AddSOsPopup.soIds = []
+    },
     // 查询出库单
     querySo() {
       projectWmsQueryOrderForDelivery({
-        deliveryId: this.$route.query.lwDeliveryId,
+        deliveryId: this.deliveryId,
         soNo: this.AddSOsPopup.searchKey
       }).then(res => {
         this.AddSOsPopup.list = res
@@ -603,13 +697,13 @@ export default {
     addSosConfirm() {
       if (this.AddSOsPopup.soIds.length === 0) {
         this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soCount.zero', '出库单不能选择0个')
+          this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soCount.zero', '出库单不能选择0个')
         )
         return false
       }
 
       projectWmsDeliveryBatchAddOrder({
-        deliveryId: this.$route.query.lwDeliveryId,
+        deliveryId: this.deliveryId,
         soIdList: this.AddSOsPopup.soIds
       }).then(res => {
         this.AddSOsPopup.searchKey = ''
@@ -636,6 +730,50 @@ export default {
         const idx = this.AddSOsPopup.soIds.indexOf(item.soId)
         this.AddSOsPopup.soIds.splice(idx, 1)
       }
+    },
+
+    // 确认异常弹框 - 确认
+    confirmAbn(){
+      if (!this.confirmAbnPopup.abnType){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.nmihaeli','异常类型不能为空')
+        )
+        return
+      }
+
+      projectDeliverySubmitAbnormal({
+        deliveryId: this.deliveryId,
+        abnType: this.confirmAbnPopup.abnType,
+        abnMsg: this.confirmAbnPopup.abnMsg,
+      }).then(()=>{
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.pwggyqro','已确认')
+        )
+        this.confirmAbnPopup.show = false
+        this.init()
+      })
+
+    },
+    // 确认异常弹框 - 关闭
+    confirmAbnOff(){
+      this.confirmAbnPopup.abnType = ''
+      this.confirmAbnPopup.abnMsg = ''
+    },
+    // 确认无误
+    confirmNotAbn(){
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.hhbwvcgm','提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.ntzqyfid','确认发运单无误？')
+      }).then(()=>{
+        projectDeliveryConfirm({
+          deliveryId: this.deliveryId
+        }).then(()=>{
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.hyazapaa','确认成功')
+          )
+          this.init()
+        })
+      }).catch(()=>{})
     }
   }
 }