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

package/dist/taskGroup.2c4598f8.mjs

@@ -0,0 +1,26 @@
+import { n as t } from "./index.70beee59.mjs";
+import "vue";
+const r = {
+  name: "taskGroup",
+  data() {
+    return {};
+  },
+  methods: {}
+};
+var _ = function() {
+  var n = this, e = n._self._c;
+  return e("lw-vin-maintain-task-group");
+}, a = [], s = /* @__PURE__ */ t(
+  r,
+  _,
+  a,
+  !1,
+  null,
+  "e396402d",
+  null,
+  null
+);
+const c = s.exports;
+export {
+  c as default
+};

package/dist/taskGroupContent.417f6c0b.mjs

@@ -0,0 +1,26 @@
+import { n as t } from "./index.70beee59.mjs";
+import "vue";
+const o = {
+  name: "content",
+  data() {
+    return {};
+  },
+  methods: {}
+};
+var _ = function() {
+  var n = this, e = n._self._c;
+  return e("lw-vin-maintain-task-group-content");
+}, r = [], a = /* @__PURE__ */ t(
+  o,
+  _,
+  r,
+  !1,
+  null,
+  "d8befcef",
+  null,
+  null
+);
+const f = a.exports;
+export {
+  f as default
+};

package/dist/{timezone.6acff8c6.mjs → timezone.24c989b3.mjs}

@@ -1,4 +1,4 @@
-import { n as t } from "./index.ee3a7453.mjs";
+import { n as t } from "./index.70beee59.mjs";
 import "vue";
 const _ = {
   name: "timezone",

package/dist/{warehouse.7edf58cd.mjs → warehouse.70eece5b.mjs}

@@ -1,4 +1,4 @@
-import { n as r } from "./index.ee3a7453.mjs";
+import { n as r } from "./index.70beee59.mjs";
 import "vue";
 const _ = {
   name: "warehouse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logwire/logwire-wms-pda-ui",
-  "version": "3.1.3-zc-beta",
+  "version": "3.3.2",
   "private": false,
   "author": "zhangwen",
   "description": "运匠科技wms-PDA基础组件库",

package/src/api/Common.js

@@ -8,14 +8,7 @@ import lwAxios from "./../utils/Axios";
 
 export const common = {
 
-  // 获取货主列表
-  getOwnerList() {
-    return lwAxios.action({
-      url: 'ownerList',
-    })
-  },
-
-  // 根据商品号和货主查询商品信息
+    // 根据商品号和货主查询商品信息
   fromSkuAndOwnerGetSkuInfo(data) {
     return lwAxios.action({
       url: 'wmsMobileQuerySku',
@@ -155,4 +148,17 @@ export const common = {
       }
     })
   },
+
+  // 更新token
+  getToken(code) {
+    return lwAxios.action({
+      url: 'baseWmsGetLoginToken',
+      data: {
+        code
+      },
+      config: {
+        errGetMe: true
+      }
+    })
+  },
 }

package/src/assets/css/global.less

@@ -38,6 +38,10 @@ button {
   .lw-global-flex();
 }
 
+.lw-global-flex-end {
+  .lw-global-flex(flex-end);
+}
+
 .lw-global-flex-start-start {
   .lw-global-flex(flex-start, flex-start);
 }

package/src/components/Button/index.vue

@@ -10,12 +10,12 @@
     :type="nativeType"
     :class="[
       'lw-button',
-      'lw-global-click-style',
       `lw-button-${type}`,
-      mini?'lw-mini-button':'',
-      round?'lw-button-round':'',
-      disabled?'lw-button-disabled':'',
-      plain?`lw-button-plain-${type}`:'',
+      !disabled && 'lw-global-click-style',
+      mini && 'lw-mini-button',
+      round && 'lw-button-round',
+      disabled && 'lw-button-disabled',
+      plain && `lw-button-plain-${type}`,
       autoBlurClass
     ]"
     :style="[
@@ -76,7 +76,7 @@ export default {
   },
   data() {
     return {
-      autoBlurClass:''
+      autoBlurClass: ''
     }
   },
   methods: {
@@ -87,9 +87,9 @@ export default {
 
         // 用于解决自动失焦后没有点击效果的问题
         this.autoBlurClass = 'lw-button-auto-blur-action'
-        setTimeout(()=>{
+        setTimeout(() => {
           this.autoBlurClass = ''
-        },200)
+        }, 200)
       }
       this.$emit('click', ev)
     }
@@ -112,18 +112,18 @@ export default {
   min-height: 30px;
   font-size: 14px;
 
-  &+.lw-button{
+  & + .lw-button {
     margin-left: 5px;
   }
 }
 
 // 自动失焦后的点击动画
-.lw-button-auto-blur-action:before{
+.lw-button-auto-blur-action:before {
   opacity: 0.1;
 }
 
 // mini按钮
-.lw-mini-button{
+.lw-mini-button {
   min-height: 20px;
   font-size: 12px;
 }
@@ -174,7 +174,7 @@ export default {
 }
 
 // 禁用
-.lw-button-disabled{
+.lw-button-disabled {
   cursor: no-drop;
   opacity: 0.5;
 }

package/src/components/Cell/index.vue

@@ -7,7 +7,7 @@
 <template>
   <div
     class="lw-global-flex-between lw-cell-box"
-    :style="{borderBottom: !border ? 'none' : ''}"
+    :style="{borderBottom: !border && 'none'}"
   >
 
     <div

package/src/components/CellPopupDate/index.vue

@@ -21,6 +21,7 @@
     <lw-popup
       v-model="show"
       height="auto"
+      :show-keyboard-placeholder="false"
       :title="dateTitle || (title || $lwLanguage.get('wms_project.pda.component.cellPopupDate.date','日期'))"
     >
 

package/src/components/CellPopupRadio/index.vue

@@ -27,6 +27,7 @@
       :dict-key="dictKey"
       :label-key="labelKey"
       :value-key="valueKey"
+      :null-msg="nullMsg"
       @confirm="popupConfirm"
     />
   </div>
@@ -36,15 +37,15 @@
 
 export default {
   name: "lwCellPopupRadio",
-  props:{
+  props: {
     // 递交的初始数据
-    value: String,
+    value: [String, Number],
     // 行的title
     title: String,
     // 行占位提示文字
     placeholder: String,
     // 是否禁用
-    disabled:{
+    disabled: {
       type: Boolean,
       default: false
     },
@@ -71,7 +72,7 @@ export default {
     dictKey: String,
     // 单选显示的值的key
     labelKey: {
-      type:String,
+      type: String,
       default: 'label'
     },
     // 单选选中的值的key
@@ -79,6 +80,8 @@ export default {
       type: String,
       default: 'value'
     },
+    // 当数据为空时的显示文字
+    nullMsg: String,
   },
   computed:{
     val:{
@@ -92,7 +95,7 @@ export default {
     // 右侧显示的数据
     label:{
       get(){
-        if (!this.val) return ''
+        if (!this.val && this.val !== 0) return ''
 
         if (this.columns) return this.getLabel(this.columns)
 

package/src/components/CellPopupSelect/index.vue

@@ -21,6 +21,7 @@
     <lw-popup
       v-model="show"
       height="auto"
+      :show-keyboard-placeholder="false"
       :title="title || $lwLanguage.get('wms_project.pda.component.cell.select','请选择')"
     >
       <div class="lw-popup-checkbox-body">

package/src/components/Input/index.vue

@@ -36,7 +36,7 @@
 
         <!-- 扫码 -->
         <img
-          v-if="!disabled && !readonly"
+          v-if="showScanIcon && !disabled && !readonly"
           class="lw-input-img"
           src="../../assets/img/lwInputIcon/scanIcon.png"
           alt="扫码"
@@ -51,7 +51,7 @@
           v-model="val"
           :name="name"
           :disabled="disabled"
-          :readonly="readonly"
+          :readonly="readonly || readonlyInp"
           :rows="rows"
           :maxlength="maxlength"
           :style="{
@@ -74,7 +74,7 @@
           :value="val"
           :maxlength="maxlength"
           :disabled="disabled"
-          :readonly="readonly"
+          :readonly="readonly || readonlyInp"
           :style="{
             textAlign:inputAlign
           }"
@@ -96,7 +96,7 @@
 
         <!-- 清除按钮 -->
         <van-icon
-          v-if="((showClear && !disabled && !readonly) || needShowClear ) && val"
+          v-if="((showClear && !disabled && !readonly && !readonlyInp) || needShowClear ) && val"
           class="lw-input-clear"
           name="clear"
           @click="clearClick"
@@ -244,10 +244,10 @@ export default {
       }
     },
 
-    // 是否通过双击键盘打开相机扫描功能
-    openCameraScan: {
+    // 是否显示扫描图标
+    showScanIcon: {
       type: Boolean,
-      default: false
+      default: true
     },
 
     // 输入完成后是否立刻失去焦点
@@ -321,6 +321,8 @@ export default {
   },
   data() {
     return {
+      // 用于禁止弹出键盘的临时标识
+      readonlyInp: false,
       // 是否通过点击键盘
       isClickKeyboard: false,
     }
@@ -372,12 +374,17 @@ export default {
     inputBlur() {
       if (this.val) this.val = this.val.toString().trim()
       this.focusVal = false
+      this.$emit('blur')
     },
 
     // 是否弹出键盘
     isOpenKeyboard() {
       if (this.notKeyboard) {
-        this.$lwAppPower.hideSoftInput(this)
+        this.readonlyInp = true
+        setTimeout(() => {
+          this.readonlyInp = false
+          this.$lwAppPower.hideSoftInput(this)
+        }, 200)
       }
     },
 

package/src/components/KeyboardOpenPlaceholder/index.js

@@ -0,0 +1,10 @@
+/*
+* 键盘弹出占位导出
+* @author: 张文
+* @date  2023-04-26
+* */
+import lwKeyboardOpenPlaceholder from './index.vue'
+
+lwKeyboardOpenPlaceholder.install = Vue => Vue.component(lwKeyboardOpenPlaceholder.name, lwKeyboardOpenPlaceholder)
+
+export default lwKeyboardOpenPlaceholder

package/src/components/KeyboardOpenPlaceholder/index.vue

@@ -0,0 +1,43 @@
+<!--
+  键盘弹出占位
+  @author: 张文
+  @date: 2023-04-26
+-->
+<template>
+  <div
+    class="lw-global-flex-center keyboard-placeholder"
+    :style="{ height: (height || keyboardHeight) + 'px' }"
+  >
+    <div style="margin-bottom: 50px">{{ msg || $lwLocalStorage.get('lwKeyboardMsg') }}</div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwKeyboardOpenPlaceholder",
+  props: {
+    height: Number,
+    msg: String
+  },
+  data() {
+    return {
+      keyboardHeight: 0
+    }
+  },
+  mounted() {
+    const viewH = document.documentElement.clientHeight
+    this.keyboardHeight = viewH * 0.4
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+.keyboard-placeholder {
+  width: 100%;
+  color: #ccc;
+  text-align: center;
+  font-size: 12px;
+}
+</style>

package/src/components/Pages/index.vue

@@ -178,7 +178,7 @@ export default {
 
   :deep(.van-pagination__page-desc){
     height: 30px;
-    border-bottom: solid 1px @baseColor;
+    //border-bottom: solid 1px @baseColor;
     box-sizing: border-box;
     margin: 0 10px;
   }

package/src/components/Popup/index.vue

@@ -31,6 +31,9 @@
 
       <div style="height: 10px" :id="anchor"><!-- 滚动到页面顶部的锚点 --></div>
       <slot></slot>
+
+      <!-- 键盘弹出占位符 -->
+      <lw-keyboard-open-placeholder v-if="showKeyboardPlaceholder"/>
     </div>
 
 
@@ -144,10 +147,16 @@ export default {
 
 
     // 是否显示底部操作栏
-    showBottomBar:{
+    showBottomBar: {
       type: Boolean,
       default: true
     },
+
+    // 是否显示键盘占位符
+    showKeyboardPlaceholder: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {

package/src/components/PopupCheckbox/index.vue

@@ -10,6 +10,7 @@
     v-model="show"
     :title="title"
     :height="height"
+    :show-keyboard-placeholder="false"
     :off-btn-text="$lwLanguage.get('wms_project.pda.common.cancel', '取消')"
   >
 

package/src/components/PopupRadio/index.vue

@@ -9,6 +9,7 @@
     v-model="show"
     :title="title"
     height="auto"
+    :show-keyboard-placeholder="false"
     :off-btn-text="$lwLanguage.get('wms_project.pda.common.cancel', '取消')"
   >
     <van-picker
@@ -19,7 +20,7 @@
       :visible-item-count="5"
       @confirm="pickerConfirm"
     />
-    <lw-not-data v-else/>
+    <lw-not-data :content="nullMsg" v-else/>
 
     <template #button>
       <lw-button
@@ -57,6 +58,8 @@ export default {
       type: String,
       default: 'value'
     },
+    // 当数据为空时的显示文字
+    nullMsg: String,
   },
   computed: {
     show: {

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
     }
 
   }