@logwire/logwire-wms-pda-ui 3.1.0 → 3.1.2

package/src/components/page/receive/putaway/lpnAction/index.vue

@@ -11,7 +11,7 @@
     <div class="lw-global-page-box">
 
       <!-- tab -->
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -26,7 +26,7 @@
             :title="i"
           />
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
       <!-- 托盘数据 -->
       <div class="lw-global-model-box" v-if="lpnTaskData">
@@ -42,27 +42,36 @@
         </div>
 
         <!-- 原库位、目标库位 -->
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位')"
+          :value="lpnTaskData.fromLocationCode"
+          val-bold
+        />
         <div class="lw-global-row lw-global-flex-between">
 
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位') }}
-            </span>
-            <span class="lw-global-value-bold">
-              {{ lpnTaskData.fromLocationCode }}
-            </span>
-          </div>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
+            :value="lpnTaskData.toLocationCode"
+            val-bold
+            :is-row="false"
+          />
 
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位') }}
-            </span>
-            <span class="lw-global-value-bold">
-              {{ lpnTaskData.toLocationCode }}
-            </span>
-          </div>
+          <lw-button
+            mini
+            round
+            @click="reloadLoc"
+          >
+            {{ $lwLanguage.get('','库位重新分配') }}
+          </lw-button>
 
         </div>
+        <lw-title-value-cell
+          v-if="lpnTaskData.secondToLocationCode"
+          :title="$lwLanguage.get('', '二次分配')"
+          :value="lpnTaskData.secondToLocationCode"
+          val-bold
+          val-red
+        />
 
         <!-- 总数量、行数 -->
         <div class="lw-global-row lw-global-flex-between">
@@ -103,6 +112,7 @@
           :show-abnormal="showSkuAbnormal"
           :location-code="lpnTaskData.fromLocationCode"
           :task-id="lpnTaskData.taskId"
+          :show-loc="false"
           @abnSuccess="tabChange"
         />
 
@@ -183,7 +193,7 @@ import SkuInfo from './../components/SkuInfo/index.vue'
 import CaseInfo from './../components/CaseInfo/index.vue'
 
 import {
-  wmsMobileGetPutawayTaskByWholeLpn,
+  wmsMobileGetPutawayTaskByWholeLpn, wmsMobileSecondAllocatePutawayByWholeLpn,
   wmsMobileSubmitPutawayByWholeLpn
 } from "../../../../../api/receive/putaway";
 
@@ -198,7 +208,7 @@ export default {
     showSkuAbnormal:{
       type: Boolean,
       default: true
-    }
+    },
 
   },
   data() {
@@ -352,6 +362,15 @@ export default {
         )
         history.go(this.backStep)
       })
+    },
+
+    // 库位重新分配
+    async reloadLoc(){
+      await wmsMobileSecondAllocatePutawayByWholeLpn({
+        fromLpn:this.lpnTaskData.lpn
+      })
+
+      this.tabChange()
     }
   }
 }

package/src/components/page/receive/putaway/lpnBatchAction/index.vue

@@ -17,7 +17,9 @@
         :key="k"
         :index="k"
         :item="i"
+        show-reload-loc
         @del="lpnDel(i,k)"
+        @reloadLoc="reloadLoc(i)"
       />
 
     </div>
@@ -59,9 +61,19 @@
           id="bottom-btn-box"
           :class="[
             'lw-global-row',
-            showAnimation ? 'lw-global-animation-rotate' : ''
+            showAnimation ? 'lw-global-animation-rotate' : '',
+            'lw-global-flex-between'
           ]"
         >
+          <lw-button
+            block
+            plain
+            type="last"
+            style="margin-right: 5px"
+            @click="locReloadAll"
+          >
+            {{ $lwLanguage.get('','库位全部重新分配') }}
+          </lw-button>
           <lw-button
             block
             @click="confirmAction"
@@ -81,6 +93,8 @@
 import lpnBatchItem from "../components/lpnBatchItem.vue";
 import {
   wmsMobileQueryPutawayTaskByWholeLpn,
+  wmsMobileSecondAllocatePutawayByWholeLpnBatch,
+  wmsMobileSecondAllocatePutawayByWholeLpn,
   wmsMobileSubmitPutawayByWholeLpnBatch
 } from "../../../../../api/receive/putaway";
 
@@ -201,6 +215,24 @@ export default {
       })
 
     },
+
+    // 重新分配库位
+    async reloadLoc(item){
+      await wmsMobileSecondAllocatePutawayByWholeLpn({
+        fromLpn: item.lpn
+      })
+
+      this.init()
+    },
+
+    // 库位全部重新分配
+    async locReloadAll(){
+      await wmsMobileSecondAllocatePutawayByWholeLpnBatch({
+        lpnList: this.lpnDataList.map(item=>item.lpn)
+      })
+
+      this.init()
+    }
   },
   deactivated() {
     this.bottomBtnBoxDom.removeEventListener("webkitAnimationEnd", this.bottomBtnAnimation)

package/src/components/page/receive/putaway/skuAction/index.vue

@@ -12,7 +12,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -131,6 +131,8 @@
               <sku-putaway-info
                 style="margin: 10px 0"
                 :item="skuListData[skuIndex]"
+                show-reload
+                @reload="locReload"
               />
 
               <!-- 输入框 -->
@@ -302,7 +304,7 @@
 
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -439,6 +441,7 @@ import {
   wmsMobileSubmitPutawayBySku,
   wmsMobileQueryPutawaySkuSn,
   wmsMobileSubmitPutawayBySkuSn,
+  wmsMobileSecondAllocatePutawayBySku,
 } from "../../../../../api/receive/putaway";
 import SnsList from '../../../inbound/components/SnsList.vue'
 import {scanUtils} from '../../../inbound/util/InboundUtils'
@@ -739,6 +742,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.receive.skuAction.abnSuccess','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.getData()
       })
     },
@@ -930,6 +934,18 @@ export default {
         this.getData()
       })
     },
+
+    // 库位二次分配
+    async locReload(){
+      const item = this.skuListData[this.skuIndex]
+      await wmsMobileSecondAllocatePutawayBySku({
+        taskId: item.task.taskId,
+        groupKey: item.groupKey,
+        skuCode: item.sku.code
+      })
+
+      this.getData()
+    }
   }
 }
 </script>

package/src/components/page/receive/receipt/action/index.vue

@@ -13,7 +13,7 @@
 
 
     <div class="lw-global-page-box">
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -122,6 +122,14 @@
 
             </div>
 
+            <div class="lw-global-model-box" style="padding-bottom: 5px">
+              <div class="lw-global-title" style="margin-bottom: 5px">
+                {{ $lwLanguage.get('','回单照片') }}
+              </div>
+              <lw-img-upload v-model="i.lwImages"/>
+
+            </div>
+
             <div
               class="lw-global-model-box"
               v-for="(item,key) in i.lines"
@@ -166,7 +174,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
 
     </div>
@@ -216,6 +224,9 @@ export default {
 
       if (this.receiptData.length) {
         this.tabActive = 0
+        this.receiptData.forEach(item=>{
+          item.lwImages= item.images ? item.images.split('|') : []
+        })
         return
       }
 
@@ -247,15 +258,19 @@ export default {
     },
     // 确认收货回单
     confirmReceive() {
+      const data = this.receiptData[this.tabActive]
       wmsMobileReturnReceiptOrder({
-        id: this.receiptData[this.tabActive].id
+        id: data.id,
+        images: data.lwImages.join('|')
       }).then(() => {
         this.onConfirmAfter()
       })
     },
     confirmAdvanceReceive() {
+      const data = this.receiptData[this.tabActive]
       wmsMobileReturnAdvanceReceiptOrder({
-        id: this.receiptData[this.tabActive].id
+        id: data.id,
+        images: data.lwImages.join('|')
       }).then(() => {
         this.onConfirmAfter()
       })

package/src/components/ui/CarPlate/index.vue

@@ -12,6 +12,7 @@
       :is-edit="isEdit"
       :is-link="isEdit"
       :required="required"
+      :border="border"
       @click="openPopup"
     >
 
@@ -212,12 +213,20 @@ export default {
       type: Boolean,
       default: false
     },
+    // 是否显示下划线
+    border:{
+      type: Boolean,
+      default: true
+    },
 
     // 是否隐藏手动输入选项
     hiddenHandInput:{
       type: Boolean,
       default: false
-    }
+    },
+
+    // 点击确认后的回调函数支持异步，返回false时将不关闭弹框
+    confirmFn: Function
   },
   computed: {
     // 触发input事件的计算值
@@ -396,7 +405,7 @@ export default {
     },
 
     // 确认
-    confirm(){
+    async confirm(){
       let num = this.carPlateList.join('')
       if (this.carType === 'old' && num.length !== 7){
         this.$lwShowErrorMsg(
@@ -415,6 +424,9 @@ export default {
       if (this.carType === 'handInput') num = this.handInput.value
 
       this.num = num
+      if (this.confirmFn && typeof this.confirmFn === 'function'){
+        if(!await this.confirmFn(num)) return
+      }
       this.showPopup = false
     },
 

package/src/components/ui/ErrorMsg/index.js

@@ -10,7 +10,9 @@ export default lwErrorMsg*/
 
 // 手动挂载加载框
 const errorMsg = Vue.extend(lwErrorMsg)
+
 let errorMsgNew = null
+
 // 挂载加载框
 const lwErrorMsgDom = ({message,background,color}) => {
   errorMsgNew = new errorMsg({
@@ -29,7 +31,7 @@ const lwErrorMsgDom = ({message,background,color}) => {
  * 打开错误提示弹框
  * @param {Object|String} obj {message-错误信息，background-背景颜色，color-字体颜色}
  */
-export const lwShowErrorMsg = (obj) => {
+const show = (obj) => {
   let data = {}
   if (typeof obj === 'object'){
     data = obj
@@ -37,23 +39,25 @@ export const lwShowErrorMsg = (obj) => {
     data.message = obj
   }
 
+  errorMsgNew = window.lwWindowGlobalData.get('errorMsgDom')
 
   if (errorMsgNew){
-    errorMsgNew.message = data.message
-
-    if (typeof obj === 'object'){
-      errorMsgNew.background = data.background
-      errorMsgNew.color = data.color
-    }
-
+    errorMsgNew.showDom(data)
     return
   }
 
   lwErrorMsgDom(data)
+  window.lwWindowGlobalData.set('errorMsgDom', errorMsgNew)
 }
 
 // 关闭错误提示弹框
-export const lwCloseErrorMsg = () => {
-  errorMsgNew.close()
-  errorMsgNew = null
+const close = () => {
+  const dom = window.lwWindowGlobalData.get('errorMsgDom')
+  dom ? dom.close() : console.log('调用关闭错误弹框失败，没有可以关闭的弹框', dom)
+}
+
+
+export const lwErrMsg = {
+  close,
+  show
 }

package/src/components/ui/ErrorMsg/index.vue

@@ -13,23 +13,24 @@
 
     <div
       :style="{
-        background:background,
-        color:color
+        background,
+        color
       }"
       class="lw-error-msg-body"
     >
       <div class="lw-error-msg-content">{{ message }}</div>
     </div>
 
-    <div class="lw-global-flex-center lw-error-msg-close" @click="offError">
-      <img src="../../../assets/img/off.png" alt="">
+    <div class="lw-global-flex-center lw-error-msg-close" @click="close">
+<!--      <img src="../../../assets/img/off.png" alt="">-->
+      <div class="lw-global-flex-center close">×</div>
     </div>
 
   </div>
 </template>
 
 <script>
-import {lwCloseErrorMsg} from "./index";
+// import {lwErrMsg} from "./index";
 
 /* 注意此组件不能使用 this.$XXX 的方法，因为没有注册组件是通过指令调用的 */
 
@@ -61,9 +62,11 @@ export default {
     },5)
   },
   methods: {
-    // 通过点击关闭按钮关闭弹窗
-    offError(){
-      lwCloseErrorMsg()
+    // 显示
+    showDom({message, background, color}){
+      this.message = message
+      this.background = background
+      this.color = color
     },
 
     // 关闭弹框
@@ -74,6 +77,7 @@ export default {
         // 让原输入框获取焦点
         this.getInput('focus')
         this.show=false
+        window.lwWindowGlobalData.set('errorMsgDom', null)
       })
       this.$emit('close')
     },
@@ -129,8 +133,13 @@ export default {
   left: 50%;
   transform: translateX(-50%);
 
-  >img{
-    width: 40px;
+  .close{
+    width: 26px;
+    height: 26px;
+    border: solid 2px #ffffff;
+    border-radius: 50%;
+    color: #ffffff;
+    font-size: 26px;
   }
 }
 

package/src/components/ui/ImgUpload/index.vue

@@ -56,7 +56,6 @@ export default {
         })
       })
     })
-
   },
   methods: {
     // 文件上传选择完成
@@ -88,9 +87,12 @@ export default {
           uploadContentType: res.uploadContentType
         })
 
-        this.fileListChange.push(`${file.file.name}=${res.objectName || img.data.objectName}`)
+        const name = `${file.file.name}=${res.objectName || img.data.objectName}`
+        this.fileListChange.push(name)
         file.status = 'none';
 
+        this.$emit('uploadSuccess', name, this.fileListChange)
+
       }catch (err){
 
         console.error('图片上传异常：', err)
@@ -103,13 +105,17 @@ export default {
     // 删除文件
     deleteFn(file){
       const name = file.objectName || file.file.name
-      const index = file.file?0:1
+      const index = file.file ? 0 : 1
+      let fileName = ''
       this.fileListChange.forEach((i,k)=>{
         const item=i.split('=')[index]
         if (item===name){
           this.fileListChange.splice(k,1)
+          fileName = i
         }
       })
+
+      this.$emit('del', fileName, this.fileListChange)
     }
   },
 }

package/src/components/ui/ImgUpload/request.js

@@ -1,5 +1,5 @@
-import axios from 'axios'
 
+import {axios} from "@bundled-es-modules/axios";
 // create an axios instance
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_URL, // url = base url + request url

package/src/components/ui/Loading/index.js

@@ -1,15 +1,11 @@
-import lwLoading from './index.vue'
+import lwLoadingVue from './index.vue'
 import Vue from "vue";
 
-/*lwLoading.install = Vue => Vue.component(lwLoading.name, lwLoading)
-
-export default lwLoading*/
-
 
 
 
 // 手动挂载加载框
-const toastCom = Vue.extend(lwLoading)
+const toastCom = Vue.extend(lwLoadingVue)
 let toastNew
 // 挂载加载框
 const lwLoadingDom = (msg) => {
@@ -26,7 +22,7 @@ const lwLoadingDom = (msg) => {
 * 打开加载框
 * @param {String} msg 加载文字，默认“加载中...”
 * */
-export const lwShowLoading = (msg='加载中...') => {
+const show = (msg='加载中...') => {
   if (toastNew){
     toastNew.loading++
     toastNew.msg = msg
@@ -36,7 +32,7 @@ export const lwShowLoading = (msg='加载中...') => {
 }
 
 // 关闭加载框
-export const lwCloseLoading = () => {
+const close = () => {
   try{
     if (toastNew){
       toastNew.loading--
@@ -47,3 +43,8 @@ export const lwCloseLoading = () => {
     console.error('关闭加载框出错', err)
   }
 }
+
+export const lwLoading = {
+  show,
+  close
+}

package/src/components/ui/NotData/index.vue

@@ -75,6 +75,7 @@ export default {
 
   .lw-none-data-content{
     margin-bottom: 10px;
+    text-align: center;
   }
 }
 

package/src/components/ui/NoticeBar/index.js

@@ -1,5 +1,5 @@
 import Vue from "vue";
-import lwNoticeBar from './index.vue'
+import lwNoticeBarVue from './index.vue'
 import {AppPower} from "../../../utils/AppPower";
 
 /*lwErrorMsg.install = Vue => Vue.component(lwErrorMsg.name, lwErrorMsg)
@@ -8,7 +8,7 @@ export default lwErrorMsg*/
 
 
 // 手动挂载加载框
-const noticeBar = Vue.extend(lwNoticeBar)
+const noticeBar = Vue.extend(lwNoticeBarVue)
 let noticeNew = null
 // 挂载加载框
 const lwNoticeBarDom = (obj) => {
@@ -35,7 +35,7 @@ const lwNoticeBarDom = (obj) => {
  * showTime-显示时长（0不自动关闭）,
  * }
  */
-export const lwShowNoticeBar = (obj) => {
+const show = (obj) => {
   const isObj = typeof obj === 'object'
   let data = {}
 
@@ -65,24 +65,34 @@ export const lwShowNoticeBar = (obj) => {
   data.background = data.background || background
   data.color = data.color || color
 
+
+  noticeNew = window.lwWindowGlobalData.get('noticeBarDom')
+
   if (noticeNew){
-    noticeNew.message = data.message
+    /*noticeNew.message = data.message
 
     if (isObj){
       noticeNew.background = data.background
       noticeNew.color = data.color
       noticeNew.type = data.type
       noticeNew.showTime = data.showTime
-    }
-
+    }*/
+    noticeNew.showDom(data)
     return
   }
 
   lwNoticeBarDom(data)
+  window.lwWindowGlobalData.set('noticeBarDom', noticeNew)
 }
 
 // 关闭错误提示弹框
-export const lwCloseNoticeBar = () => {
-  noticeNew.close()
-  noticeNew = null
+const close = () => {
+  const dom = window.lwWindowGlobalData.get('noticeBarDom')
+  dom ? dom.close() : console.log('调用关闭顶部消息栏失败，没有可以关闭的消息', dom)
+}
+
+
+export const lwNoticeBar = {
+  show,
+  close
 }