@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.3

package/src/components/SearchCellPopup/index.vue

@@ -28,7 +28,7 @@
             name="arrow"
             size="18"
             color="#cdcdcd"
-            @click="popup.show = true"
+            @click="iconClick"
           />
         </slot>
       </template>
@@ -39,6 +39,7 @@
       :title="popupTitle || title"
       v-model="popup.show"
       height="70%"
+      :show-keyboard-placeholder="false"
       @open="popupSearch"
       @closed="popupOff"
     >
@@ -78,6 +79,14 @@
 
       <lw-not-data v-if="!popup.list.length"/>
 
+      <lw-pagination
+        v-if="hasPage"
+        v-model="pageNum"
+        :page-total="pageTotal"
+        :page-size.sync="pageSize"
+        @change="getData"
+      />
+
 
       <template #button>
 
@@ -160,7 +169,20 @@ export default {
     initAutoSelect: {
       type: Boolean,
       default: true
-    }
+    },
+
+    // 是否需要分页，默认关闭
+    hasPage: Boolean,
+    // 如果需要分页数据，获取数据的key，分页开启有效
+    dataKey: {
+      type: String,
+      default: 'datas'
+    },
+    // 如果需要分页数据，总条数
+    pageTotalKey: {
+      type: String,
+      default: 'total'
+    },
   },
   computed: {
     focus: {
@@ -179,10 +201,15 @@ export default {
         show: false,
         search: '',
         result: '',
-        list: []
+        list: [],
+        isIconOpen: false
       },
       resultItem: {},
       disabledInp: false,
+
+      pageNum: 1,
+      pageTotal: 0,
+      pageSize: 10,
     }
   },
   mounted() {
@@ -195,26 +222,42 @@ export default {
         this.disabledInp = true
         return
       }
-      this.initAutoSelect && this.getDataSelect()
+      this.initAutoSelect && this.getDataSelect(false)
     },
 
     // 获取数据
-    async getData(key) {
-      let res = await this.apiFn(key)
-      if (!res || !Array.isArray(res) || res.length === 0) {
-        this.$lwShowErrorMsg(
+    async getData(showMsg = true) {
+
+
+      const res = await this.apiFn(
+        this.popup.search,
+        {
+          search: this.popup.search,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize
+        }
+      )
+
+      let datas = []
+      if (this.hasPage) {
+        this.pageTotal = res[this.pageTotalKey]
+        datas = res[this.dataKey]
+      } else {
+        datas = res || []
+      }
+
+      if (datas.length === 0) {
+        showMsg && this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.SearchCellPopup.index.zkblxfsi', '没有搜索到任何符合条件的数据')
         )
-        return Promise.reject(res)
+        return Promise.reject(datas)
       }
-
-      return res
+      return datas
     },
 
     // 获取数据并默认选择第一项
-    async getDataSelect(s) {
-      const res = await this.getData(s)
-
+    async getDataSelect(showMsg = true) {
+      const res = await this.getData(showMsg)
       if (res.length === 1) {
         this.resultItem = res[0]
         this.disabledInp = true
@@ -223,15 +266,13 @@ export default {
         return Promise.reject()
       }
 
-      return res
     },
 
     // 输入框确认
-    async inputConfirm(val, {data}) {
-      const s = data.key || val
+    async inputConfirm() {
       try {
-        await this.getDataSelect(s)
-        this.popup.search = s
+        this.popup.search = this.val
+        await this.getDataSelect()
         this.popup.show = true
       } catch {
         () => {
@@ -247,9 +288,16 @@ export default {
 
     // 弹出 - 输入框搜索、打开
     async popupSearch() {
+      this.pageNum = 1
       let data = []
+
+      // 判断是否是用户手动触发打开的
+      if (this.popup.isIconOpen) {
+        this.popup.search = ''
+        this.popup.isIconOpen = false
+      }
       try {
-        data = await this.getData(this.popup.search)
+        data = await this.getData(false)
       } catch (e) {
         console.warn('【行搜索弹框】回调函数返回的数据不是数组或长度为0，返回数据为：', e)
       } finally {
@@ -284,8 +332,14 @@ export default {
     },
     // 弹框 - 关闭
     popupOff() {
-      this.popup.seatch = ''
+      this.popup.search = ''
       this.popup.result = ''
+    },
+
+    // 点击右侧图标打开
+    iconClick() {
+      this.popup.isIconOpen = true
+      this.popup.show = true
     }
 
   }

package/src/components/TitleValueCell/index.vue

@@ -14,13 +14,17 @@
     @click="$emit('click')"
   >
     <span
-      style="flex-shrink: 0"
+      :style="{
+        flexShrink: 0,
+        ...titleStyle,
+      }"
       class="lw-global-title"
     >{{ title }}</span>
 
     <span
       class="lw-global-value"
       :style="{
+        ...valStyle,
         fontWeight: valBold ? 'bold' : '',
         color: valRed ? '#D50000' : valColor,
         fontSize: valSize && typeof valSize === 'number' ? valSize+ 'px' : valSize,
@@ -76,7 +80,21 @@ export default {
     },
 
     // 值对齐方式
-    textAlign: String
+    textAlign: String,
+
+    // 值样式
+    valStyle: {
+      type: Object,
+      default: () => {
+      }
+    },
+
+    // 标题样式
+    titleStyle: {
+      type: Object,
+      default: () => {
+      }
+    }
   },
   data() {
     return {}

package/src/components/index.js

@@ -68,6 +68,10 @@ import lwTip from "./Tip";
 import lwButtonCheckbox from "./ButtonCheckbox";
 // 行搜索弹框
 import lwSearchCellPopup from "./SearchCellPopup";
+// 键盘弹出占位
+import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
+// 行搜索选择删除组件
+import lwCellSearchSelectDel from "./CellSearchSelectDel";
 
 
 export default [
@@ -103,4 +107,6 @@ export default [
   lwTip,
   lwButtonCheckbox,
   lwSearchCellPopup,
+  lwKeyboardOpenPlaceholder,
+  lwCellSearchSelectDel,
 ]

package/src/utils/Axios.js

@@ -13,6 +13,7 @@ import {lwLoading} from "../components/Loading";
 import {Language} from "./Language";
 import {LocalStorage} from "./LocalStorage";
 import {Timezone} from "./Timezone";
+import {lwToast} from "./Toast"
 
 // 用于自定义处理http报错的问题，为false时候不显示报错信息，直接返回错误信息，通过catch接收
 let errGetMe = false
@@ -156,25 +157,30 @@ lwAxios.interceptors.response.use(
 
     let resp = error.response
 
-    if (resp){
+    if (resp) {
+
+      if (errGetMe) {
+        errGetMe = false
+        return Promise.reject(resp)
+      }
+
       if (resp.status === 401) {
         ApiUtils.setToken(undefined)
-        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
+        lwToast.fail({
+          message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录'),
+          onClose: () => {
+            history.go(0)
+          }
+        })
         ApiUtils.delToken()
-        history.go(0)
         return Promise.reject(resp)
       }
 
-      if (resp.status === 404){
+      if (resp.status === 404) {
         lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
         return Promise.reject(resp)
       }
 
-      if (errGetMe){
-        errGetMe = false
-        return Promise.reject(resp)
-      }
-
       if (resp.data) {
         lwErrMsg.show({
           message: resp.data && resp.data.message ?

package/src/utils/Init.js

@@ -6,7 +6,10 @@
 
 
 export function Init(that) {
-  that.$router.push({
-    path: '/lwInit',
-  })
+  if (!window.location.href.includes('/lwInit')) {
+    that.$router.push({
+      path: '/lwInit',
+    })
+  }
+
 }

package/src/views/common/module/PageBody/index.js

@@ -0,0 +1,11 @@
+/*
+* 页面主体
+* @author: 张文
+* @date  2023-05-30
+* */
+
+import lwPageBodyModule from "./index.vue";
+
+lwPageBodyModule.install = Vue => Vue.component(lwPageBodyModule.name, lwPageBodyModule)
+
+export default lwPageBodyModule

package/src/views/common/module/PageBody/index.vue

@@ -0,0 +1,25 @@
+<!--
+  页面主体
+  @author: 张文
+  @date: 2023-05-30
+-->
+<template>
+  <div class="lw-global-page-box">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwPageBodyModule",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/module/index.js

@@ -15,7 +15,9 @@ import lwSystemInfoModule from './SystemInfo/index.js'
 // 消息列表及分页模块
 import lwMsgItemModule from './MsgItem/index.js'
 // 下线理由弹框
-import lwOffLinePopupModule from "./OffLinePopup";
+import lwOffLinePopupModule from "./OffLinePopup/index.js";
+// 页面主体
+import lwPageBodyModule from "./PageBody/index.js";
 
 export default [
   lwLoginModule,
@@ -24,4 +26,5 @@ export default [
   lwSystemInfoModule,
   lwMsgItemModule,
   lwOffLinePopupModule,
+  lwPageBodyModule,
 ]

package/src/views/common/page/Home/index.vue

@@ -95,6 +95,16 @@ export default {
   data() {
     return {}
   },
+  mounted() {
+    const lwAutoJumpPageData = JSON.parse(window.sessionStorage.getItem('lwAutoJumpPageData') || '{}')
+    if (Object.keys(lwAutoJumpPageData).length) {
+      window.sessionStorage.setItem('lwAutoJumpPageData', '{}')
+      this.$router.push({
+        path: lwAutoJumpPageData.__path,
+        query: lwAutoJumpPageData
+      })
+    }
+  },
   methods: {
     // 系统信息下线按钮被点击
     systemClick(ev) {

package/src/views/common/page/Task/components/lookTaskContentPopup.vue

@@ -10,6 +10,7 @@
       :show-off-btn="false"
       height="auto"
       :title="$lwLanguage.get('wms_project.pda.components.page.common.Task.components.lookTaskContentPopup.qxzikdoq','任务详情')"
+      :show-keyboard-placeholder="false"
       @open="$emit('open')"
       @closed="$emit('closed')"
     >

package/src/views/common/views/init/index.vue

@@ -72,8 +72,26 @@ export default {
           console.warn('设置APP退出路由失败', e)
         }
 
+        try {
+          const token = await this.$lwApi.common.getToken()
+          this.$lwApiUtils.setToken(token)
+        } catch {
+          console.warn('未获取到token')
+        }
+
+        const token = this.$lwApiUtils.getToken()
+
+        const routerData = this.$route.query
+
+        // 提交后台完成设置仓库
+        if (token && routerData.__whCode) {
+          const warehouse = await this.$lwApi.warehouse.selectConfirm(routerData.__whCode)
+          this.$lwWarehouse.set(warehouse)
+        }
+
+
         // 如果没有 token 或者 没有仓库就去登录
-        if (!this.$lwApiUtils.getToken() || !this.$lwWarehouse.get().id) {
+        if (!token || !this.$lwWarehouse.get().id) {
 
           this.$router.replace({
             path: '/lwLogin'
@@ -92,6 +110,16 @@ export default {
         // 获取当前用户的登录数据
         await this.$lwUserInfo.asyncGet()
 
+
+        if (routerData.__path) {
+          window.sessionStorage.setItem('lwAutoJumpPageData', JSON.stringify(routerData))
+          this.$router.replace({
+            path: '/lwHome'
+          })
+
+          return
+        }
+
         if (self === top) {
           history.go(-1)
         } else {
@@ -100,6 +128,14 @@ export default {
           })
         }
 
+        setTimeout(() => {
+          if (location.href.includes('/lwInit')) {
+            this.$router.replace({
+              path: '/lwHome'
+            })
+          }
+        }, 200)
+
         // 如果没有跳转就显示等待超时
         setTimeout(() => {
           this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.time', '等待超时')

package/src/views/vin/api/inner/count.js

@@ -0,0 +1,116 @@
+/*
+* 盘点
+* @author: 张文
+* @date  2023-05-17
+* */
+
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 查询盘点单
+export function projectVinCountPDAPageQuery(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAPageQuery',
+    data
+  })
+}
+
+
+// 获取盘点单详情
+export function projectVinCountPDAQueryDetail(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAQueryDetail',
+    data
+  })
+}
+
+
+// 整单完成盘点
+export function projectVinCountPDAWholeFinish(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAWholeFinish',
+    data
+  })
+}
+
+
+// 获取盘点库区信息
+export function projectVinCountPDAZoneTaskQuery(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAZoneTaskQuery',
+    data
+  })
+}
+
+
+// 获取已盘数据
+export function projectVinCountPDAFinishLinePageQuery(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAFinishLinePageQuery',
+    data
+  })
+}
+
+
+// 获取盘点任务详情
+export function projectVinCountPDALoadSuggestTask(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDALoadSuggestTask',
+    data
+  })
+}
+
+
+// 获取vin数据
+export function projectVinCountPDAScanVinLoadData(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAScanVinLoadData',
+    data
+  })
+}
+
+
+// 提交vin盘点数据
+export function projectVinCountPDASubmit(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDASubmit',
+    data
+  })
+}
+
+
+// 查询待盘明细
+export function projectVinCountPDAZoneWaitData(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAZoneWaitData',
+    data
+  })
+}
+
+
+// 查询待盘明细
+export function projectVinCountPDAZoneCountedData(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAZoneCountedData',
+    data
+  })
+}
+
+
+// 查询当前库位所属的库区
+export function projectVinPDAQueryLoc(data) {
+  return lwAxios.action({
+    url: 'projectVinPDAQueryLoc',
+    data
+  })
+}
+
+
+// 完成当前库区盘点
+export function projectVinCountPDAZoneFinish(data) {
+  return lwAxios.action({
+    url: 'projectVinCountPDAZoneFinish',
+    data
+  })
+}

package/src/views/vin/api/maintain/move.js

@@ -0,0 +1,44 @@
+/*
+* 移位api
+* @author: 张文
+* @date  2023-04-27
+* */
+
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 获取车辆信息
+export function wmsVinMobileMaintainGetVIN(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGetVIN',
+    data
+  })
+}
+
+
+// 获取车辆维护批次信息
+export function wmsVinMobileMaintainGetItemFields(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGetItemFields',
+    data
+  })
+}
+
+
+// 获取移位维护项目
+export function wmsVinMobileMaintainQueryItemByMove(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainQueryItemByMove',
+    data
+  })
+}
+
+
+// 提交数据
+export function wmsVinMobileMaintainSubmitByCharge(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainSubmitByCharge',
+    data
+  })
+}

package/src/views/vin/api/maintain/recharge.js

@@ -0,0 +1,26 @@
+/*
+* 充电api
+* @author: 张文
+* @date  2023-04-27
+* */
+
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 获取充电维护项目
+export function wmsVinMobileMaintainQueryItemByCharge(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainQueryItemByCharge',
+    data
+  })
+}
+
+
+// 提交数据
+export function wmsVinMobileMaintainSubmitByCharge(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainSubmitByCharge',
+    data
+  })
+}