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

package/src/views/vin/page/keyRoom/transfer/index.vue

@@ -15,7 +15,7 @@
         class="lw-global-model-box"
       >
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.transfer.index.pkefgakn','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/maintain/components/taskActionItem.vue

@@ -15,6 +15,7 @@
       <van-checkbox
         v-if="showTitleCheckbox"
         v-model="titleVal"
+        shape="square"
         @change="titleCheckboxChange"
       >
         {{ item.name }}
@@ -25,6 +26,7 @@
       <van-checkbox
         v-if="titleVal"
         v-model="hasQuestion"
+        shape="square"
         @change="questionCheckboxChange"
       >
         {{ $lwLanguage.get('', '有问题') }}

package/src/views/vin/page/maintain/move/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box lw-global-model-box-3px">
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           v-if="showUser"
           :title="$lwLanguage.get('','员工')"
           v-model="userNo.value"

package/src/views/vin/page/maintain/recharge/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box lw-global-model-box-3px">
 
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staff.list"
           :focus.sync="staff.focus"
         />

package/src/views/vin/page/maintain/task/components/taskMyItem.vue

@@ -13,6 +13,7 @@
       class="checkbox-box"
       style="flex: 1"
       :name="item.groupCode"
+      shape="square"
     >
 
       <div class="box">

package/src/views/vin/page/maintain/task/index.vue

@@ -15,7 +15,7 @@
         class="lw-global-model-box"
       >
 
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staffList"
           :focus.sync="staffFocus"
           is-row-start
@@ -157,6 +157,7 @@
       >
         <van-checkbox
           v-model="myTaskAll"
+          shape="square"
           @click="myTaskAllClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: myTaskCarNum}) }}

package/src/views/vin/page/maintain/task/myTaskGroup.vue

@@ -44,6 +44,7 @@
             class="checkbox-box"
             style="flex: 1"
             :name="i.zoneCode"
+            shape="square"
           >
 
             <div class="box">
@@ -102,6 +103,7 @@
       >
         <van-checkbox
           v-model="all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/task/taskGroup.vue

@@ -44,6 +44,7 @@
             class="checkbox-box"
             style="flex: 1"
             :name="i.zoneCode"
+            shape="square"
           >
 
             <div class="box">
@@ -120,6 +121,7 @@
       >
         <van-checkbox
           v-model="all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/task/taskGroupContent.vue

@@ -36,6 +36,7 @@
                 <van-checkbox
                   class="checkbox-box"
                   :name="i.vin"
+                  shape="square"
                 >
 
                   <task-group-zone-item
@@ -97,6 +98,7 @@
       >
         <van-checkbox
           v-model="wait.all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/wash/index.vue

@@ -12,9 +12,9 @@
 
       <div class="lw-global-model-box lw-global-model-box-3px">
 
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staff.list"
-          :get-focus.sync="staff.focus"
+          :focus.sync="staff.focus"
         />
 
         <lw-cell-popup-radio

package/src/views/vin/page/outbound/delivery/index.vue

@@ -22,7 +22,7 @@
 
             <div class="lw-global-model-box">
 
-              <lw-vin-user-select-module
+              <lw-user-select-module
                 :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.delivery.index.wjhnmrwo','员工')"
                 v-model="userNo.value"
                 :focus.sync="userNo.focus"

package/src/views/vin/page/outbound/keyAllot/action.vue

@@ -63,7 +63,7 @@
               />
 
 
-              <lw-vin-user-select-module
+              <lw-user-select-module
                 :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.keyAllot.action.wzthbrni','作业人员')"
                 v-model="userNo.value"
                 :focus.sync="userNo.focus"

package/src/views/vin/page/outbound/keyAllot/index.vue

@@ -20,7 +20,7 @@
           @confirm="userNo.focus = true"
         />
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.keyAllot.index.dwomgwaj','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/outbound/pick/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box">
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.pick.index.dlcmwmia','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/quality/register/action.vue

@@ -158,6 +158,7 @@
                   v-for="(i,k) in qualityList.typeList"
                   :key="k"
                   :name="i.value"
+                  shape="square"
                 >
                   {{ i.label }}
                 </van-checkbox>

package/src/views/vin/page/quality/register/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box" style="padding-top: 3px">
 
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="userList"
           :focus.sync="userFocus"
         />

package/src/views/vin/page/receive/back/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box lw-global-model-box-3px">
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.back.index.ugculbdq','员工编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/receive/components/receiveOrderInfo.vue

@@ -8,7 +8,7 @@
 
     <div>
 
-      <lw-vin-user-select-module
+      <lw-user-select-module
         :title="$lwLanguage.get('wms_project.pda.vin.page.receive.components.receiveOrderInfo.vzxvitpx','收车人工号')"
         v-model="userNo"
         @initConfirm="getClassData"
@@ -79,6 +79,7 @@
             v-for="(i,k) in lockLocPopup.list"
             :key="k"
             :name="i.code"
+            shape="square"
           >
             <div
               style="width: 100%"
@@ -109,6 +110,7 @@
         <van-checkbox
           v-model="lockLocPopup.all"
           :disabled="!lockLocPopup.list.length"
+          shape="square"
           @click="lockLocPopupAllClick"
         >
           {{ $lwLanguage.get('wms_project.pda.vin.page.receive.components.receiveOrderInfo.vrzvvnkl','全选') }}

package/src/views/vin/page/receive/stopRecord/action.vue

@@ -30,7 +30,7 @@
           @confirm="vinConfirm"
         />
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.stopRecord.action.osobyuxy','入位员工编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/receive/stopRecord/index.vue

@@ -12,7 +12,7 @@
 
       <div class="lw-global-model-box" style="padding-top: 3px">
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.stopRecord.index.wfwbgblj','工作车司机编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/wms/api/inbound/receive.js

@@ -465,3 +465,11 @@ export function wmsMobileInboundGetAsnDetail(data) {
   })
 }
 
+// 生成收货托盘
+export function wmsMobileInboundNewReceiveLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundNewReceiveLpn',
+    data
+  })
+}
+

package/src/views/wms/api/outbound/assignLpnPick.js

@@ -0,0 +1,38 @@
+/*
+* 指定整托盘拣选api
+* @author: 张文
+* @date  2023-06-05
+* */
+import lwAxios from '../../../../utils/Axios'
+
+// 获取指定任务的数据
+export function projectWmsOutboundPDASoLoadAppointPickData(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoLoadAppointPickData',
+    data
+  })
+}
+
+// 获取当前托的拣选数据
+export function projectWmsOutboundPDASoAppointLpnQuery(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnQuery',
+    data
+  })
+}
+
+// 整托零散拣选
+export function projectWmsOutboundPDASoAppointLpnSkuPick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnSkuPick',
+    data
+  })
+}
+
+// 整托拣选
+export function projectWmsOutboundPDASoAppointLpnWholePick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnWholePick',
+    data
+  })
+}

package/src/views/wms/api/outbound/pick/sort.js

@@ -0,0 +1,23 @@
+/*
+* 拣选分货
+* @author: 张文
+* @date  2023-07-18
+* */
+import lwAxios from "../../../../../utils/Axios";
+
+
+// 获取拣选数据
+export function projectWmsOutboundContainerQueryDistributeData(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundContainerQueryDistributeData',
+    data
+  })
+}
+
+// 执行分拣
+export function projectWmsOutboundContainerDistribute(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundContainerDistribute',
+    data
+  })
+}

package/src/views/wms/api/outbound/pickConsole/orderPick.js

@@ -175,3 +175,21 @@ export function projectWmsOutboundPDAQuerySkuInvAbQty(data) {
     data
   })
 }
+
+
+// 整箱拣选
+export function projectWmsOutboundPDASoCasePick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoCasePick',
+    data
+  })
+}
+
+
+// 回单
+export function projectWmsOutboundPDASoPickReceipt(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoPickReceipt',
+    data
+  })
+}

package/src/views/wms/api/receive/moreOrder.js

@@ -0,0 +1,108 @@
+/*
+* 多单收货
+* @author: 张文
+* @date  2023-07-03
+* */
+
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 通过单号查询到货单
+export function wmsMobileInboundQueryAsn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundQueryAsn',
+    data
+  })
+}
+
+
+// 通过到货单id获取数据
+export function wmsMobileMultiInGetOrders(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInGetOrders',
+    data
+  })
+}
+
+
+// 统计到货单 - 按箱
+export function wmsMobileMultiInGetCaseState(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInGetCaseState',
+    data
+  })
+}
+// 查询到货单 - 按箱
+export function wmsMobileMultiInQueryCase(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInQueryCase',
+    data
+  })
+}
+
+// 确认收货 - 按箱
+export function wmsMobileMultiInFastReceiveByCase(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInFastReceiveByCase',
+    data
+  })
+}
+
+
+// 获取统计数据 - 按托
+export function wmsMobileMultiInGetLpnState(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInGetLpnState',
+    data
+  })
+}
+
+// 查询到货单 - 按托
+export function wmsMobileMultiInQueryLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInQueryLpn',
+    data
+  })
+}
+
+// 整托盘预收 - 按托
+export function wmsMobileMultiInAdvanceReceiveByLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInAdvanceReceiveByLpn',
+    data
+  })
+}
+
+// 整托盘快收 - 按托
+export function wmsMobileMultiInFastReceiveByLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInFastReceiveByLpn',
+    data
+  })
+}
+
+
+// 统计到货单 - 按商品
+export function wmsMobileMultiInGetSkuState(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInGetSkuState',
+    data
+  })
+}
+
+// 查询到货单 - 按商品
+export function wmsMobileMultiInQuerySku(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInQuerySku',
+    data
+  })
+}
+
+// 查询商品列表
+export function wmsMobileMultiInGetSkuList(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInGetSkuList',
+    data
+  })
+}

package/src/views/wms/components/consoleAndPick/components/backOrderPopup.vue

@@ -0,0 +1,97 @@
+<!--
+  回单弹框
+  @author: 张文
+  @date: 2023-08-11
+-->
+<template>
+  <lw-popup
+    :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.backOrderPopup.hegzicaf', '提交回单')"
+    v-model="show"
+    :show-keyboard-placeholder="false"
+    @open="showImg=true"
+    @closed="backOrderPopupOff"
+  >
+
+    <div class="lw-global-flex-start-start">
+      <div
+        style="margin-right: 5px"
+        class="lw-global-title lw-global-required"
+      >
+        {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.backOrderPopup.eqvwfcdx', '回单图片') }}
+      </div>
+
+      <lw-img-upload
+        v-if="showImg"
+        v-model="imgList"
+      />
+    </div>
+
+    <template #button>
+
+      <lw-button @click="backOrderPopupConfirm">
+        {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.backOrderPopup.mpdltlbb', '提交') }}
+      </lw-button>
+
+    </template>
+
+  </lw-popup>
+</template>
+
+<script>
+
+import {projectWmsOutboundPDASoPickReceipt} from "../../../api/outbound/pickConsole/orderPick";
+
+export default {
+  name: "backOrderPopup",
+  props: {
+    value: Boolean,
+    soId: String
+  },
+  data() {
+    return {
+      showImg: false,
+      imgList: []
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    }
+  },
+  methods: {
+    // 提交回单 - 关闭
+    backOrderPopupOff() {
+      this.imgList = []
+      this.showImg = false
+    },
+    // 提交回单 - 确认提交
+    backOrderPopupConfirm() {
+      if (!this.imgList.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.backOrderPopup.awiqgvoh', '请上传回单图片')
+        )
+        return
+      }
+
+
+      projectWmsOutboundPDASoPickReceipt({
+        soId: this.soId,
+        receiptImages: this.imgList.join('|')
+      }).then(() => {
+        this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.backOrderPopup.upujtqjn', '已提交')
+        this.$emit('submitSuccess')
+        this.show = false
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/{page/outbound/pickConsole → components/consoleAndPick}/components/orderInfo.vue

@@ -25,14 +25,14 @@
     </div>
 
     <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.mopsjmlj','外部单号')"
+      :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.mauphkfa','外部单号')"
       :value="$lwCheckVal(item.extSoNo)"
       :is-row="false"
       val-bold
     />
 
     <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.hcgoklgw','货主')"
+      :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.qesxpxpw','货主')"
       :value="$lwCheckVal(item.ownerCode) +' / '+ $lwCheckVal(item.ownerName)"
       :is-row="false"
     />
@@ -43,15 +43,42 @@
       :is-row="false"
     />
 
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.kxuufvtv','订单类型')"
-      :value="$lwCheckVal(item.soType)"
-      :is-row="false"
-      val-bold
-    />
+    <div class="lw-global-flex-between lw-global-row">
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.svcymrew','订单类型')"
+        :value="$lwCheckVal(item.soType)"
+        :is-row="false"
+        val-bold
+      />
+
+      <template v-if="item.billStatus==='600'">
+        <lw-button
+          v-if="item.receiptStatus !== '200'"
+          mini
+          @click.stop="$emit('orderBack')"
+        >
+          {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.umvztbtp', '回单上传') }}
+        </lw-button>
+        <lw-button
+          v-else
+          mini
+          color="#888"
+          disabled
+        >
+          {{
+            $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.vkhtdame', '已回单')
+          }}
+        </lw-button>
+
+      </template>
+
+
+    </div>
+
 
     <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.embbbtsf','创建时间')"
+      :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.gkzvhxif','创建时间')"
       :value="$lwDate.format(item.createTime,'yyyy-MM-dd hh:mm:ss')"
       :is-row="false"
     />
@@ -59,14 +86,14 @@
     <div class="lw-global-flex-between">
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.iwqlhfmw','已拣选数量')"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.blharttr','已拣选数量')"
         :value="$lwCheckVal(item.pickQty)"
         :is-row="false"
         val-bold
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.orderInfo.bppvljdk','已拣托数')"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.components.orderInfo.ntzxitzx','已拣托数')"
         :value="$lwCheckVal(item.pickLpnCount)"
         :is-row="false"
         val-bold