@logwire/logwire-wms-pda-ui 3.3.2 → 3.3.4

package/src/components/CellSearchSelectDel/index.vue

@@ -0,0 +1,413 @@
+<!--
+  行搜索选择删除组件
+  @author: 张文
+  @date: 2023-06-06
+-->
+<template>
+  <div
+    :class="[
+      (isRow && (!isRowStart && !isRowEnd)) && 'lw-global-row',
+      isRowStart && 'lw-global-row-start',
+      isRowEnd && 'lw-global-row-end',
+    ]"
+  >
+
+    <!-- 显示的行 -->
+    <div class="lw-global-flex-between" style="align-items: flex-start">
+
+      <div
+        :class="[
+          selectList.length ? 'lw-global-flex-start-start':'lw-global-flex-start'
+        ]"
+        style="flex: 1"
+      >
+
+        <!-- 标题 -->
+        <div
+          style="flex-shrink: 0;"
+          :class="[
+            'lw-global-title',
+            required && 'lw-global-required'
+          ]"
+        >
+          {{ title }}
+        </div>
+
+        <!-- 结果和输入框 -->
+        <div class="lw-global-flex-start" style="flex: 1;flex-wrap: wrap;margin-left: 5px">
+          <!-- 选中的结果 -->
+          <lw-tag
+            v-for="(i,k) in selectList"
+            :key="k"
+            :closeable="!i.disabled"
+            size="medium"
+            type="primary"
+            color="#888"
+            @close="delOption(k)"
+          >
+            {{ labelMsg(i) }}
+          </lw-tag>
+
+          <!-- 外部搜索框 -->
+          <lw-input
+            style="width: 100%;padding: 0;margin-left: 4px"
+            v-model="outSearch"
+            :get-focus.sync="outSearchFocus"
+            :placeholder="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.kwqsjoha','搜索关键字')"
+            :show-bottom-border="false"
+            :create-rule="createRule"
+            :rule-key="ruleKey"
+            @confirm="outSearchConfirm"
+          >
+
+            <template #button>
+
+              <van-icon
+                style="flex-shrink: 0"
+                :name="icon"
+                size="22"
+                :color="iconColor"
+                @click="popup.show = true"
+              />
+
+            </template>
+
+          </lw-input>
+        </div>
+
+      </div>
+
+    </div>
+
+    <!-- 弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.xhwwalvy','请选择') + title"
+      v-model="popup.show"
+      @open="popupOpen"
+      @closed="popupOff"
+    >
+      <!-- 搜索 -->
+      <lw-input
+        v-model="popup.search"
+        :placeholder="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.kwqsjoha','搜索关键字')"
+        :create-rule="createRule"
+        :rule-key="ruleKey"
+        @confirm="popupSearch"
+      >
+        <template #button>
+          <lw-button
+            mini
+            round
+            @click="popupSearch"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.rkerufrd', '搜索') }}
+          </lw-button>
+        </template>
+      </lw-input>
+
+      <div class="select-box">
+        <van-checkbox-group v-model="popup.result">
+          <van-checkbox
+            v-for="i in popup.list"
+            :key="i[valueKey]"
+            :name="i[valueKey]"
+          >
+            {{ labelMsg(i) }}
+          </van-checkbox>
+        </van-checkbox-group>
+      </div>
+
+      <lw-pagination
+        v-if="!!apiFn && needPage"
+        v-model="popup.pageNum"
+        :page-size.sync="popup.pageSize"
+        :page-total="popup.pageTotal"
+        @change="pageChange"
+      />
+
+      <lw-not-data
+        v-if="!popup.list.length"
+        :content="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.nepyjhvj','没有可供选择的数据')"
+      />
+
+
+      <template #button>
+        <lw-button
+          @click="popupConfirm"
+        >{{ $lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.ftjsrrcv', '确定') }}
+        </lw-button>
+      </template>
+    </lw-popup>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwCellSearchSelectDel",
+  props: {
+    // 标题
+    title: String,
+
+    // 选中的值
+    value: {
+      type: Array,
+      default: () => []
+    },
+
+    // 条码解析id
+    createRule: Object,
+    // 扫码解析规则
+    ruleKey: String,
+
+    // 按钮旁边的图标，仅支持 vant UI库图标
+    icon: {
+      type: String,
+      default: 'add-o'
+    },
+    // 按钮旁边的图标颜色
+    iconColor: {
+      type: String,
+      default: '#333333'
+    },
+    //是否必填
+    required: {
+      type: Boolean,
+      default: false
+    },
+    focus: {
+      type: Boolean,
+      default: false
+
+    },
+
+    // 是否显示行样式
+    isRow: {
+      type: Boolean,
+      default: true
+    },
+    // 是否是行起始
+    isRowStart: {
+      type: Boolean,
+      default: false
+    },
+    // 是否是行结尾
+    isRowEnd: {
+      type: Boolean,
+      default: false
+    },
+
+    // 获取数据的api 应当是异步函数，最优先
+    apiFn: Function,
+    // 提供选择的数据，优先
+    columns: Array,
+    // 字典键值，次优先
+    dictKey: String,
+
+    // 显示的键值名，允许使用多个key，用英文逗号隔开
+    labelKey: {
+      type: String,
+      default: 'label'
+    },
+    // 取值的键值名
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+    // 最大可选数
+    max: {
+      type: Number,
+      default: 0
+    },
+
+    // 是否需要分页，当 apiFn 为真时有效
+    needPage: Boolean,
+    // 函数调用时的数据取值key，needPage 为真时必填
+    apiDataKey: String,
+    // 函数调用时的总条数取值key，needPage 为真时必填
+    apiDataTotalKey: {
+      type: String,
+      default: 'total'
+    },
+  },
+  data() {
+    return {
+
+      // 外部输入框搜索
+      outSearch: '',
+
+      popup: {
+        show: false,
+        search: '',
+        result: [],
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      }
+    }
+  },
+  computed: {
+    selectList: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    },
+    outSearchFocus: {
+      get() {
+        return this.focus
+      },
+      set(v) {
+        this.$emit('update:focus', v)
+      }
+    },
+  },
+  methods: {
+
+    // 显示值格式化
+    labelMsg(item) {
+      const k = this.labelKey.split(',')
+      let msg = ''
+      k.forEach(i => {
+        msg += `/ ${item[i]}`
+      })
+      return msg.substring(2)
+    },
+
+    // 获取数据
+    getData(keyword) {
+
+      if (this.apiFn) {
+        return this.apiFn({
+          keyword,
+          pageNum: this.popup.pageNum,
+          pageSize: this.popup.pageSize
+        })
+      }
+
+      let data = []
+      if (this.columns && this.columns.length) {
+        data = this.columns
+      } else if (this.dictKey) {
+        data = this.$lwDict.get(this.dictKey)
+      }
+      return data.filter(item => this.labelMsg(item).includes(keyword))
+    },
+
+    // 删除已选择项
+    delOption(index) {
+      this.selectList.splice(index, 1)
+    },
+
+    // 校验是否超过最大可选值
+    checkMax(num, selectNum) {
+      if (this.max > 0 && num > this.max) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.ftjsrrcve', '超过最大可选量{num}，当前已选{selectNum}', {
+            num: this.max,
+            selectNum: selectNum || num
+          })
+        )
+        return false
+      }
+      return true
+    },
+
+    // 外部输入框搜索确认
+    async outSearchConfirm() {
+      if (!this.checkMax(this.selectList.length)) return
+
+      let res = await this.getData(this.outSearch)
+      if (this.apiFn && this.apiDataKey) {
+        res = res[this.apiDataKey]
+      }
+
+      if (res.length === 1) {
+        this.selectList.push(res[0])
+        this.outSearch = ''
+        return
+      }
+
+      this.popup.search = this.outSearch
+      this.popup.show = true
+
+    },
+
+    // 弹框 - 打开
+    popupOpen() {
+      this.popup.pageNum = 1
+      this.popup.pageSize = 10
+      this.pageChange()
+    },
+    // 弹框 - 搜索
+    popupSearch() {
+      this.popupOpen()
+    },
+    // 弹框 - 页码改变
+    async pageChange() {
+      this.popup.result = []
+      let res = await this.getData(this.popup.search)
+      if (this.apiFn && this.apiDataKey) {
+        this.needPage ? this.popup.pageTotal = res[this.apiDataTotalKey] : ''
+        res = res[this.apiDataKey]
+      }
+
+      this.popup.list = res
+    },
+    // 弹框 - 确认
+    popupConfirm() {
+
+      // 去重
+      for (let i = 0; i < this.selectList.length; i++) {
+        const k = this.popup.result.indexOf(this.selectList[i][this.valueKey])
+        if (k >= 0) {
+          this.popup.result.splice(k, 1)
+        }
+      }
+
+      const selectNum = this.selectList.length
+      if (!this.checkMax((selectNum + this.popup.result.length), selectNum)) return
+
+      this.popup.list.forEach(item => {
+        if (this.popup.result.includes(item[this.valueKey])) {
+          this.selectList.push(item)
+        }
+      })
+
+      this.popup.show = false
+    },
+    // 弹框 - 关闭
+    popupOff() {
+      this.outSearch = ''
+      this.outSearchFocus = true
+      this.popup.search = ''
+      this.popup.pageNum = 1
+      this.popup.pageSize = 10
+      this.popup.list = []
+      this.popup.result = []
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+@import "../../assets/css/var.less";
+
+.select-box {
+
+  /deep/ .van-checkbox {
+    padding: 5px;
+    font-size: 14px;
+
+    & + .van-checkbox {
+      //margin-top: 5px;
+      border-top: solid 1px @borderColor;
+    }
+  }
+
+}
+</style>

package/src/components/Pagination/index.vue

@@ -177,15 +177,22 @@ export default {
     },
 
     // 是否是最大页码
-    isMax(){
+    isMax() {
       return this.allPageNum <= this.num
     },
 
     // 是否是最小页码
-    isMin(){
+    isMin() {
       return this.num === 1
     }
   },
+  watch: {
+    allPageNum: {
+      handler() {
+        this.checkPageNum()
+      }
+    }
+  },
   data() {
     return {
       // 调整数据条数的弹框
@@ -196,20 +203,32 @@ export default {
     }
   },
   methods: {
+    // 判断当前页面是否符合当前最大页面
+    checkPageNum() {
+      
+      if (this.num === 1) return
+
+      if (this.allPageNum < this.num) {
+        this.num = this.allPageNum
+        this.pageChange()
+      }
+    },
+
+
     // 页码、分页大小发生改变
-    pageChange(){
-      this.$nextTick(()=>{
+    pageChange() {
+      this.$nextTick(() => {
         this.$emit('change', {
           pageSize: this.size,
           pageNum: this.num
         })
       })
 
-      if (this.scrollTop){
+      if (this.scrollTop) {
         const dom = document.querySelector(this.scrollElement)
         dom && dom.scrollIntoView({
           behavior: "smooth",
-          block:'start',
+          block: 'start',
         });
       }
 

package/src/components/PopupCheckbox/index.vue

@@ -102,7 +102,7 @@ export default {
     columns: Array,
     // 字典键值
     dictKey: String,
-    // 显示的键值名，运行使用多个key，用英文逗号隔开
+    // 显示的键值名，允许使用多个key，用英文逗号隔开
     labelKey: {
       type: String,
       default: 'label'

package/src/components/index.js

@@ -70,6 +70,8 @@ import lwButtonCheckbox from "./ButtonCheckbox";
 import lwSearchCellPopup from "./SearchCellPopup";
 // 键盘弹出占位
 import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
+// 行搜索选择删除组件
+import lwCellSearchSelectDel from "./CellSearchSelectDel";
 
 
 export default [
@@ -106,4 +108,5 @@ export default [
   lwButtonCheckbox,
   lwSearchCellPopup,
   lwKeyboardOpenPlaceholder,
+  lwCellSearchSelectDel,
 ]

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/utils/Utils.js

@@ -6,7 +6,11 @@
 export const Utils = {
 
   /**
-   * 配合卡片切换组件使用。用于计算当前显示页是否符合时间最大条数
+   * 配合卡片切换组件使用。用于计算当前显示页是否符合显示的最大条数
+   * 当 index 或 length 无法转换为数字时，直接返回 0
+   * 当 index 值大于 length 时，返回 index-1
+   * 当 length 为 0 时，返回 0
+   * 当 index 小于 length 时，返回 index
    * @author 张文
    * @date 2022-08-18
    * @param {Number} index 需要比较的值
@@ -17,11 +21,11 @@ export const Utils = {
     const i = Number(index)
     const l = Number(length)
     if (isNaN(i)) {
-      console.error('传入【index】无法转换为数字，值为：' + index)
+      console.error('数值比较方法，传入【index】无法转换为数字，值为：' + index)
       return 0
     }
     if (isNaN(l)) {
-      console.error('传入【length】无法转换为数字，值为：' + length)
+      console.error('数值比较方法，传入【length】无法转换为数字，值为：' + length)
       return 0
     }
 
@@ -30,5 +34,35 @@ export const Utils = {
     if ((i + 1) > l) return i - 1
 
     return i
+  },
+
+
+  /**
+   * 获取行样式
+   * @author 张文
+   * @date 2022-08-18
+   * @param {Number} index 当前索引
+   * @param {Number} length 数组长度
+   * @return {String} 行样式的 class 名
+   * */
+  getCellClass(index, length) {
+    const i = Number(index)
+    const l = Number(length)
+    if (isNaN(i)) {
+      console.error('获取行样式方法，传入【index】无法转换为数字，值为：' + index)
+      return 'lw-global-row-start'
+    }
+    if (isNaN(l)) {
+      console.error('获取行样式方法，传入【length】无法转换为数字，值为：' + length)
+      return 'lw-global-row-start'
+    }
+
+    if (l === 1) return ''
+
+    if (i === 0) return 'lw-global-row-start'
+
+    if ((i + 1) >= l) return 'lw-global-row-end'
+
+    return 'lw-global-row'
   }
 }

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

@@ -36,7 +36,7 @@
 import {loginAndInit} from "../../../../mixins/loginAndInit";
 
 export default {
-  name: "init",
+  name: "lwInit",
   mixins: [loginAndInit],
   data() {
     return {
@@ -147,22 +147,12 @@ export default {
           this.showLoading = false
         }, 1000)
 
-        console.error('初始化页面异常：', e)
+        console.warn('初始化页面异常：', e)
 
-        const api = [
-          'wmsGetAllChoices',
-          'wmsGetUserPermissions',
-          'wmsMobilePrintSelectedTemplate',
-          'commonWmsLoadAllComponentConfig'
-        ]
-        const url = e.config.url.split('/')
 
-        if (api.includes(url.pop())) {
-          this.$lwCloseErrorMsg()
-          this.$router.replace({
-            path: '/lwLogin'
-          })
-        }
+        this.$router.replace({
+          path: '/lwLogin'
+        })
       }
     },
 

package/src/views/vin/page/keyRoom/components/vinInfo.vue

@@ -27,11 +27,19 @@
     />
 
     <lw-title-value-cell
+      v-if="type==='over'"
       :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.components.vinInfo.fhcugifr','库位')"
       :value="$lwCheckVal(item.toActLocationCode || item.locationCode)"
       val-bold
       :is-row="false"
     />
+    <lw-title-value-cell
+      v-else
+      :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.components.vinInfo.fhcugifrV','VIN库位')"
+      :value="$lwCheckVal(item.vinActLocationCode)"
+      val-bold
+      :is-row="false"
+    />
 
     <slot name="footer"></slot>
 
@@ -51,6 +59,10 @@ export default {
     isModel: {
       type: Boolean,
       default: true
+    },
+    type: {
+      type: String,
+      default: 'over'
     }
   },
   data() {

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

@@ -151,6 +151,7 @@
                 v-for="i in noInLines"
                 :key="i.vin"
                 :item="i"
+                type="wait"
               />
               <lw-not-data v-if="!noInLines.length"/>
             </van-tab>