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

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,8 @@ import lwTip from "./Tip";
 import lwButtonCheckbox from "./ButtonCheckbox";
 // 行搜索弹框
 import lwSearchCellPopup from "./SearchCellPopup";
+// 键盘弹出占位
+import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
 
 
 export default [
@@ -103,4 +105,5 @@ export default [
   lwTip,
   lwButtonCheckbox,
   lwSearchCellPopup,
+  lwKeyboardOpenPlaceholder,
 ]

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/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
+  })
+}

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

@@ -0,0 +1,163 @@
+/*
+* 维护任务 - api
+* @author: 张文
+* @date  2023-04-23
+* */
+
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 维护任务组 - 首页tab获取数据
+export function wmsVinMobileMaintainQueryState(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainQueryState',
+    data
+  })
+}
+
+// 维护任务组 - 获取指定维护组列表数据
+export function wmsVinMobileMaintainGroupQueryState(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupQueryState',
+    data
+  })
+}
+
+// 维护任务组 - 通过库区领取任务
+export function wmsVinMobileMaintainReceiveTaskByBatch(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainReceiveTaskByBatch',
+    data
+  })
+}
+
+// 维护任务组 - 获取组+员工的未领取数据
+export function wmsVinMobileMaintainGroupQueryTaskNoReceived(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupQueryTaskNoReceived',
+    data
+  })
+}
+
+// 维护任务组 - 获取组+员工+库区的未领取数据
+export function wmsVinMobileMaintainGroupZoneQueryTaskNoReceived(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupZoneQueryTaskNoReceived',
+    data
+  })
+}
+
+// 维护任务组 - 获取组的已领取数据
+export function wmsVinMobileMaintainGroupQueryTaskByReceived(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupQueryTaskByReceived',
+    data
+  })
+}
+
+// 维护任务组 - 获取组+库区的已领取数据
+export function wmsVinMobileMaintainGroupZoneQueryTaskByReceived(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupZoneQueryTaskByReceived',
+    data
+  })
+}
+
+// 维护任务组 - 通过vin领取任务
+export function wmsVinMobileMaintainReceiveTask(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainReceiveTask',
+    data
+  })
+}
+
+
+// 获取我的任务 - 列表数据
+export function wmsVinMobileMaintainQueryStateByProgress(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainQueryStateByProgress',
+    data
+  })
+}
+
+// 获取我的任务 - 通过组获取数据
+export function wmsVinMobileMaintainGroupQueryStateByProgress(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupQueryStateByProgress',
+    data
+  })
+}
+
+// 获取我的任务 - 通过组获取信息数据
+export function wmsVinMobileMaintainGroupQueryTaskByProgress(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupQueryTaskByProgress',
+    data
+  })
+}
+
+// 获取我的任务 - 通过组+库区获取信息数据
+export function wmsVinMobileMaintainGroupZoneQueryTaskByProgress(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGroupZoneQueryTaskByProgress',
+    data
+  })
+}
+
+
+// 获取维护统计列表数据
+export function wmsVinMobileMaintainLogQueryState(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainLogQueryState',
+    data
+  })
+}
+
+// 获取维护统计数据 - 详情
+export function wmsVinMobileMaintainLogQueryTask(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainLogQueryTask',
+    data
+  })
+}
+
+// 通过VIN 获取任务详情
+export function wmsVinMobileMaintainGetTask(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGetTask',
+    data
+  })
+}
+
+// 获取问题列表
+export function wmsVinMobileMaintainQueryProblem(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainQueryProblem',
+    data
+  })
+}
+
+// 完成任务
+export function wmsVinMobileMaintainSubmitTask(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainSubmitTask',
+    data
+  })
+}
+
+// 通过我的任务执行维护
+export function wmsVinMobileMaintainRecommendTask(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainRecommendTask',
+    data
+  })
+}
+
+// 获取维护任务详情
+export function wmsVinMobileMaintainGetRecommendTaskDetail(data) {
+  return lwAxios.action({
+    url: 'wmsVinMobileMaintainGetRecommendTaskDetail',
+    data
+  })
+}

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

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