@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

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

@@ -9,16 +9,28 @@
 
     <lw-page-body-module>
 
+      <lw-user-checkbox-module
+        class="lw-global-model-box"
+        style="margin-bottom: 10px"
+        :title="$lwLanguage.get('', '装货人员')"
+        v-model="staffList"
+        :is-row="false"
+        @change="mixinStaffChange"
+      />
+
       <!-- 发运单信息 -->
       <order-content-title
         :delivery-id="deliveryId"
         :order-content="orderContent"
-        @changeCarSuccess="init"
+        @changeCarSuccess="getOrderData"
       />
 
       <template v-if="!isAbn">
         <!-- tab -->
-        <lw-tab-box style="margin-top: 10px">
+        <lw-tab-box
+          v-if="tabList.length > 1"
+          style="margin-top: 10px"
+        >
           <van-tabs
             type="card"
             animated
@@ -26,18 +38,9 @@
             @change="tabChange()"
           >
             <van-tab
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox','按箱装车')"
-              name="box"
-            ></van-tab>
-
-            <van-tab
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByOrder','按单装车')"
-              name="so"
-            ></van-tab>
-
-            <van-tab
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByLpn','按托盘装车')"
-              name="lpn"
+              v-for="i in tabList"
+              :key="i.name"
+              v-bind="i"
             ></van-tab>
 
           </van-tabs>
@@ -49,7 +52,7 @@
           <!-- 输入框 -->
           <div
             v-if="orderContent.billStatus!=='300'"
-            class="lw-global-model-box"
+            class="lw-global-model-box lw-global-model-box-3px"
           >
             <lw-input
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo','箱号')"
@@ -57,6 +60,8 @@
               :get-focus.sync="box.focus"
               required
               rule-key="box"
+              :create-rule="$lwScanRule.create('装车发运-执行页-箱号','CASE')"
+              :show-bottom-border="false"
               @confirm="boxConfirm"
             >
               <template #button>
@@ -73,12 +78,18 @@
           <!-- 已装车箱 -->
           <box-item
             v-for="(i,k) in box.list"
-            :key="i.boxNo"
+            :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>
 
@@ -98,6 +109,7 @@
               :placeholder="$lwLanguage.get('wms_project.pda.outbound.delivery.action.inputOrderNo','出库单号/外部单号/客户单号')"
               required
               rule-key="order"
+              :create-rule="$lwScanRule.create('装车发运-执行页-出库单号','SO')"
               :show-bottom-border="false"
               @confirm="soConfirm"
             >
@@ -116,12 +128,18 @@
           <!-- 已装车单 -->
           <so-and-lpn-item
             v-for="(i,k) in so.list"
-            :key="i.soNo"
+            :key="k"
             :index="k"
             :item="i"
             :show-del="orderContent.billStatus!=='300'"
             @del="soDel"
           />
+          <lw-pagination
+            v-model="so.pageNum"
+            :page-total="so.pageTotal"
+            :page-size.sync="so.pageSize"
+            @change="tabChange"
+          />
 
         </template>
 
@@ -139,6 +157,7 @@
               :get-focus.sync="lpn.focus"
               required
               rule-key="lpn"
+              :create-rule="$lwScanRule.create('装车发运-执行页-托盘号','LPN')"
               :show-bottom-border="false"
               @confirm="lpnConfirm"
             >
@@ -156,13 +175,19 @@
           <!-- 已装车托盘 -->
           <so-and-lpn-item
             v-for="(i,k) in lpn.list"
-            :key="i.palletNo"
+            :key="k"
             :index="k"
             :item="i"
             type="lpn"
             :show-del="orderContent.billStatus!=='300'"
             @del="lpnDel"
           />
+          <lw-pagination
+            v-model="lpn.pageNum"
+            :page-total="lpn.pageTotal"
+            :page-size.sync="lpn.pageSize"
+            @change="tabChange"
+          />
 
         </template>
       </template>
@@ -226,39 +251,45 @@
       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"
-            @confirm="querySo"
-          >
-            <template #button>
-              <lw-button mini round @click="querySo">
-                {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.search', '查询') }}
-              </lw-button>
-            </template>
-          </lw-input>
-
-          <lw-not-data v-if="!AddSOsPopup.list.length"/>
-        </div>
-
-        <so-and-lpn-item
-          v-for="(i,k) in AddSOsPopup.list"
-          :key="i.soNo"
-          :index="k"
-          :item="i"
-          type="lpn"
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo','出库单号')"
+          :placeholder="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNoa','出库单号/出库计划单号/外部单号/客户单号')"
+          v-model="AddSOsPopup.searchKey"
+          :get-focus.sync="AddSOsPopup.focus"
+          rule-key="addSoPopupSo"
+          :create-rule="$lwScanRule.create('装车发运-添加出库单弹框-出库单号','SO')"
+          :show-bottom-border="false"
+          @confirm="querySo"
         >
-          <van-switch
-            v-model="i.choosed"
-            size="22px"
-            @change="(val) => chooseSoChange(i, k, val)"
-          />
-        </so-and-lpn-item>
-      </template>
+          <template #button>
+            <lw-button mini round @click="querySo">
+              {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.search', '查询') }}
+            </lw-button>
+          </template>
+        </lw-input>
+      </div>
+
+      <so-and-lpn-item
+        v-for="(i,k) in AddSOsPopup.list"
+        :key="k"
+        :index="k"
+        :item="i"
+        type="lpn"
+        @click="chooseSoChange(i, k, !i.choosed)"
+      >
+        <van-checkbox
+          v-model="i.choosed"
+          size="18px"
+        />
+      </so-and-lpn-item>
+      <lw-pagination
+        v-model="AddSOsPopup.pageNum"
+        :page-total="AddSOsPopup.pageTotal"
+        :page-size.sync="AddSOsPopup.pageSize"
+        @change="querySo"
+      />
+      <lw-not-data v-if="!AddSOsPopup.list.length"/>
 
       <template #bottomInfo>
         <div>
@@ -301,12 +332,18 @@
       <template #button>
 
         <lw-button @click="confirmAbn">
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.zhlefpdr','提交异常') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.zhlefpdr', '提交异常') }}
         </lw-button>
 
       </template>
 
     </lw-popup>
+
+    <!-- 拦截弹框 -->
+    <block-popup
+      ref="blockPopupRef"
+      @confirmBlock="confirmBlock"
+    />
   </div>
 </template>
 
@@ -315,34 +352,58 @@
 import boxItem from './../components/boxItem/index.vue'
 import soAndLpnItem from './../components/soAndLpnItem/index.vue'
 import orderContentTitle from './../components/orderContentTitle/index.vue'
+import blockPopup from "./../../../../components/blockPopup.vue";
 import {
   projectDeliveryAddBox,
   projectDeliveryAddLpn,
   projectDeliveryAddOrder,
-  projectDeliveryCompleteLoad, projectDeliveryConfirm,
+  projectDeliveryCompleteLoad,
+  projectDeliveryConfirm,
   projectDeliveryContinueLoad,
-  projectDeliveryExecuteShip,
+  projectDeliveryExecuteShip, projectDeliveryQueryLoadSoInfo,
   projectDeliveryReload,
   projectDeliveryRemoveBox,
   projectDeliveryRemoveLpn,
-  projectDeliveryRemoveOrder, projectDeliverySubmitAbnormal,
-  projectQueryDeliveryBoxDetail,
+  projectDeliveryRemoveOrder,
+  projectDeliverySubmitAbnormal,
+  projectQueryDeliveryBoxDetailV2,
   projectQueryDeliveryDetail,
-  projectQueryDeliveryLpnDetail,
-  projectQueryDeliverySoDetail,
+  projectQueryDeliveryLpnDetailV2,
+  projectQueryDeliverySoDetailV2,
   projectWmsDeliveryBatchAddOrder,
   projectWmsQueryOrderForDelivery
 } from "../../../../api/outbound/delivery/action";
+import {deliveryMixin} from "./../mixin";
 
 export default {
   name: "lwOutboundDeliveryActionPage",
   components: {
     boxItem,
     soAndLpnItem,
-    orderContentTitle
+    orderContentTitle,
+    blockPopup,
   },
+  mixins: [deliveryMixin],
   data() {
     return {
+      // 装车方式
+      deliveryMethodAll: {
+
+        box: {
+          title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox', '按箱装车'),
+          name: 'box'
+        },
+        so: {
+          title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByOrder', '按单装车'),
+          name: 'so'
+        },
+        lpn: {
+          title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByLpn', '按托盘装车'),
+          name: 'lpn'
+        },
+      },
+      // tab项目
+      tabList: [],
       // 发运id
       deliveryId: '',
 
@@ -358,138 +419,154 @@ export default {
       box: {
         value: '',
         focus: false,
-        list: []
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
       },
 
       // 按箱
       so: {
         value: '',
         focus: false,
-        list: []
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
       },
 
       // 按托盘
       lpn: {
         value: '',
         focus: false,
-        list: []
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
       },
 
-      //
+      // 添加发运单弹框
       AddSOsPopup: {
         searchKey: '',
         list: [],
         soIds: [],
         show: false,
-        focus: false
+        focus: false,
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
       },
 
       // 确认异常弹框
-      confirmAbnPopup:{
+      confirmAbnPopup: {
         show: false,
         abnType: '',
         abnMsg: ''
-      }
+      },
     }
   },
-  computed:{
-    isAbn(){
+  computed: {
+    isAbn() {
       return this.orderContent.billStatus === '400' || this.orderContent.billStatus === '100'
     }
   },
   mounted() {
     this.deliveryId = this.$route.query.lwDeliveryId
-    this.init()
+    this.getOrderData()
   },
   methods: {
 
-    // 初始化
-    init() {
-      this.getOrderData()
-      this.tabChange()
-    },
-
     // 获取订单数据
     getOrderData() {
       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())
       })
     },
 
     // tab切换
-    tabChange(key, value) {
+    tabChange() {
 
       this.box.list = []
       this.so.list = []
       this.lpn.list = []
+      const tabType = this.tabActive
 
       let api
-      switch (this.tabActive) {
+      switch (tabType) {
         case 'box':
-          api = projectQueryDeliveryBoxDetail
+          api = projectQueryDeliveryBoxDetailV2
           break;
 
         case 'so':
-          api = projectQueryDeliverySoDetail
+          api = projectQueryDeliverySoDetailV2
           break;
 
         case 'lpn':
-          api = projectQueryDeliveryLpnDetail
+          api = projectQueryDeliveryLpnDetailV2
           break;
 
       }
 
       api({
-        deliveryId: this.deliveryId
+        deliveryId: this.deliveryId,
+        pageSize: this[tabType].pageSize,
+        pageNum: this[tabType].pageNum
       }).then(res => {
+        this[tabType].list = res.datas || []
+        this[tabType].pageTotal = res.total || 0
+        this[tabType].value = ''
+        this[tabType].focus = true
+      })
+    },
 
-        if (key) {
-          let index = 0
-          for (let i = 0; i < res.length; i++) {
-            if (res[i][key] === value) {
-              index = i
-              break
-            }
-          }
-
-          const start = res.splice(index, 1)[0]
-          res.unshift({...start, lwPdaStart: true})
-
+    // 检查员工
+    checkStaff() {
+      if (this.staffList.length) {
+        return {
+          success: true,
+          data: this.staffList.map(item => item.code)
         }
-
-        this[this.tabActive].list = res
-        this[this.tabActive].value = ''
-        this[this.tabActive].focus = true
-
-      })
+      }
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('', '装货员工不能为空')
+      )
+      return {success: false, data: []}
     },
 
     // 装车执行
-    submitData(key) {
+    async submitData(key) {
+      const {success, data} = this.checkStaff()
+      if (!success) return
 
       let query = {
-        deliveryId: this.deliveryId
+        deliveryId: this.deliveryId,
+        staffList: data
       }
-      let dataKey, fn, nullMsg
+
+      let fn, nullMsg
       switch (key) {
         case 'box':
           fn = projectDeliveryAddBox
           query.boxNo = this.box.value
-          dataKey = 'boxNo'
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.boxNo.null', '箱号不能为空')
           break;
         case 'so':
           fn = projectDeliveryAddOrder
           query.soNo = this.so.value
-          dataKey = 'soNo'
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo.null', '单号不能为空')
           break;
         case 'lpn':
           fn = projectDeliveryAddLpn
           query.lpn = this.lpn.value
-          dataKey = 'palletNo'
           nullMsg = this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn.null', '托盘号不能为空')
           break;
       }
@@ -500,14 +577,25 @@ export default {
         return
       }
 
+      // 判断是否拦截
+      if (
+        key === 'so' &&
+        await this.$refs.blockPopupRef.checkBlock({soNo: this.so.value})
+      ) {
 
-      fn(query).then(res => {
+        this.so.focus = false
+        return
+
+      }
+
+
+      fn(query).then(() => {
         this[key].value = ''
         this[key].focus = true
 
         this.getOrderData()
-        this.tabChange(dataKey, res[dataKey])
-      }).catch(()=>{
+        this.tabChange()
+      }).catch(() => {
         this[key].value = ''
       })
     },
@@ -541,7 +629,7 @@ export default {
           this.$lwToast.success(
             this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.deleteSuccess', '删除成功')
           )
-          this.init()
+          this.getOrderData()
           this[key].value = ''
           this[key].focus = true
         })
@@ -609,8 +697,8 @@ export default {
           this.$lwToast.success(
             this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess', '操作成功')
           )
-          this.tabActive = 'box'
-          this.init()
+          this.tabActive = this.tabList[0].name
+          this.getOrderData()
         })
       }).catch(() => {
       })
@@ -619,7 +707,29 @@ export default {
 
     // 完成装车
     async over() {
+      const res = await projectDeliveryQueryLoadSoInfo({deliveryId: this.deliveryId})
+
+      if (!res.finishPlanSoLoad) {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('', '提示'),
+          message: this.$lwLanguage.get('', '下列计划出库单未完成装载，是否完成装车'),
+          msgList: res.unloadSoList.map(item => {
+            return {value: item}
+          }),
+          confirmButtonText: this.$lwLanguage.get('', '确认装车')
+        }).then(() => {
+          this.overFn()
+        }).catch(() => {
 
+        })
+        return
+      }
+
+      await this.overFn()
+
+    },
+    // 完成装车方法
+    async overFn() {
       await projectDeliveryCompleteLoad({
         deliveryId: this.deliveryId
       })
@@ -631,7 +741,7 @@ export default {
       }).then(() => {
         this.transportSubmit()
       }).catch(() => {
-        this.init()
+        this.getOrderData()
       })
     },
 
@@ -643,8 +753,9 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.operateSuccess', '操作成功')
         )
-        this.tabActive = 'box'
-        this.init()
+
+        this.tabActive = this.tabList[0].name
+        this.getOrderData()
       })
     },
 
@@ -671,9 +782,9 @@ export default {
     },
 
     // 打开出库单批量操作弹窗
-    openSoBatchOp() {
+    async openSoBatchOp() {
+      await this.querySo()
       this.AddSOsPopup.show = true
-      this.AddSOsPopup.focus = true
     },
     clearAddSOsPopup() {
       this.AddSOsPopup.show = false
@@ -683,16 +794,19 @@ export default {
       this.AddSOsPopup.soIds = []
     },
     // 查询出库单
-    querySo() {
-      projectWmsQueryOrderForDelivery({
+    async querySo() {
+      const res = await projectWmsQueryOrderForDelivery({
         deliveryId: this.deliveryId,
-        soNo: this.AddSOsPopup.searchKey
-      }).then(res => {
-        this.AddSOsPopup.list = res
+        soNo: this.AddSOsPopup.searchKey,
+        pageNum: this.AddSOsPopup.pageNum,
+        pageSize: this.AddSOsPopup.pageSize
       })
+      this.AddSOsPopup.list = res.datas
+      this.AddSOsPopup.pageTotal = res.total
+      this.AddSOsPopup.soIds = []
     },
     // 添加出库单
-    addSosConfirm() {
+    async addSosConfirm() {
       if (this.AddSOsPopup.soIds.length === 0) {
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.soCount.zero', '出库单不能选择0个')
@@ -700,10 +814,28 @@ export default {
         return false
       }
 
+
+      const {success, data} = this.checkStaff()
+      if (!success) return
+
+      // 通过单id获取单号
+      const soNoList = []
+      this.AddSOsPopup.soIds.forEach(item => {
+        for (const i of this.AddSOsPopup.list) {
+          if (item === i.soId) {
+            soNoList.push(i.soNo)
+            break
+          }
+        }
+      })
+      if (await this.$refs.blockPopupRef.checkBlock({soNo: soNoList.join(',')})) return
+
+
       projectWmsDeliveryBatchAddOrder({
         deliveryId: this.deliveryId,
-        soIdList: this.AddSOsPopup.soIds
-      }).then(res => {
+        soIdList: this.AddSOsPopup.soIds,
+        staffList: data
+      }).then(() => {
         this.AddSOsPopup.searchKey = ''
         this.AddSOsPopup.soIds = []
         this.AddSOsPopup.list = []
@@ -713,7 +845,7 @@ export default {
         this['so'].value = ''
         this['so'].focus = true
         this.getOrderData()
-        this.tabChange('soNo', res['soNo'])
+        this.tabChange()
       })
     },
     // 选中的出库单数目
@@ -722,12 +854,14 @@ export default {
     },
     // 选择出库单改变
     chooseSoChange(item, key, val) {
+      this.AddSOsPopup.list[key].choosed = val
       if (val) {
         this.AddSOsPopup.soIds.push(item.soId)
       } else {
         const idx = this.AddSOsPopup.soIds.indexOf(item.soId)
         this.AddSOsPopup.soIds.splice(idx, 1)
       }
+      this.$forceUpdate()
     },
 
     // 确认异常弹框 - 确认
@@ -748,7 +882,7 @@ export default {
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.pwggyqro','已确认')
         )
         this.confirmAbnPopup.show = false
-        this.init()
+        this.getOrderData()
       })
 
     },
@@ -760,18 +894,30 @@ export default {
     // 确认无误
     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(()=>{
+        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(()=>{
+        }).then(() => {
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.hyazapaa','确认成功')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.action.index.hyazapaa', '确认成功')
           )
-          this.init()
+          this.getOrderData()
         })
-      }).catch(()=>{})
+      }).catch(() => {
+      })
+    },
+
+
+    // 确认拦截
+    confirmBlock() {
+      if (this.AddSOsPopup.show) {
+        this.querySo()
+      } else {
+        this.so.value = ''
+        this.so.focus = true
+      }
     }
   }
 }