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

package/src/components/NoticeBar/index.vue

@@ -8,20 +8,23 @@
   <div
     v-if="show"
     ref="notBox"
-    class="lw-global-flex-between not-box"
-    :style="{background,color,height}"
+    class="not-box"
+    :style="{background,color,height,zIndex:utils.getMaxZIndex()}"
   >
-    <div style="flex: 1">{{message}}</div>
+    <div class="lw-global-flex-between " style="padding: 10px">
+      <div style="flex: 1">{{ message }}</div>
 
-    <div
-      class="close-btn"
-      @click="close"
-    >×</div>
+      <div
+        class="close-btn"
+        @click="close"
+      >×
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-
+import {Utils} from "./../../utils/Utils";
 /* 注意此组件不能使用 this.$XXX 的方法，因为没有注册组件是通过指令调用的 */
 
 
@@ -33,19 +36,20 @@ export default {
   data() {
     return {
       // 是否显示
-      show:false,
+      show: false,
       // 提示信息
-      message:'',
+      message: '',
       // 背景颜色
-      background:'',
+      background: '',
       // 字体颜色
-      color:'',
+      color: '',
       // 显示时长
       showTime: '',
       // 定时器
-      timeOut:'',
+      timeOut: '',
       // 高度
-      height: ''
+      height: '',
+      utils: Utils
     }
   },
   watch:{
@@ -81,13 +85,15 @@ export default {
     },
 
     // 关闭弹框
-    close(){
+    close() {
       this.height = 0
 
-      this.dom.addEventListener('transitionend', ()=>{
-        this.show = false
-        this.timeOut && clearTimeout(this.timeOut)
-        window.lwWindowGlobalData.set('noticeBarDom',null)
+      this.dom.addEventListener('transitionend', () => {
+        this.$nextTick(() => {
+          this.show = false
+          this.timeOut && clearTimeout(this.timeOut)
+          window.lwWindowGlobalData.set('noticeBarDom', null)
+        })
       })
     },
 
@@ -99,15 +105,14 @@ export default {
 
 @import "../../assets/css/var.less";
 
-.not-box{
-  padding: 5px 10px;
+.not-box {
   position: fixed;
   top: 0;
   left: 0;
-  width: calc(100% - 20px);
+  width: 100%;
   height: auto;
-  z-index: 2147483584;
   transition: all .3s;
+  overflow: hidden;
 }
 
 .close-btn{

package/src/components/Pagination/index.vue

@@ -4,18 +4,22 @@
   @date: 2022-07-18
 -->
 <template>
-  <div v-if="pageTotal !== 0" class="lw-global-flex-between pagination-box">
+  <div
+    v-if="pageTotal !== 0"
+    class="lw-global-flex-center pagination-box"
+  >
 
     <!-- 统计信息 -->
     <div>
-      <span>{{ $lwLanguage.get('wms_project.pda.components.ui.Pagination.kzdeljrg','共') }}</span>
+      <span>{{ $lwLanguage.get('wms_project.pda.components.ui.Pagination.kzdeljrg', '共') }}</span>
       <span class="lw-global-value-bold">{{ pageTotal }}</span>
-      <span>{{ $lwLanguage.get('wms_project.pda.components.ui.Pagination.jckytjtx','条') }}</span>
+      <span>{{ $lwLanguage.get('wms_project.pda.components.ui.Pagination.jckytjtx', '条') }}</span>
     </div>
 
     <!-- 每页的数据条数 -->
     <div
       class="lw-global-click-style"
+      style="flex-shrink: 0;margin: 0 15px"
       @click="changSizePopupShow=true"
     >
       <span style="margin-right: 5px">{{ size }} {{ $lwLanguage.get('wms_project.pda.components.ui.Pagination.ymqlzcsc','条/页') }}</span>
@@ -23,29 +27,42 @@
     </div>
 
     <!-- 页码切换 -->
-    <div
-      class="lw-global-flex-between"
-      style="min-width: 40%"
-    >
+    <div class="lw-global-flex-between">
       <!-- 上一页 -->
       <div
         :class="[isMin ? 'no-click' : 'lw-global-click-style']"
-         @click="leftClick"
+        @click="leftClick"
       >
         <slot name="prevBtn">
           {{ prevText }}
-          <van-icon v-if="!prevText" name="arrow-left" />
+          <van-icon v-if="!prevText" name="arrow-left"/>
         </slot>
       </div>
 
       <!-- 页面指示 -->
-      <div
-        class="lw-global-click-style"
-        @click="pageNumPopupShow=true"
-      >
-        <span class="lw-global-value-bold-red">{{ num }}</span>
-        <span> / </span>
-        <span class="lw-global-value-bold">{{ allPageNum }}</span>
+      <div class="lw-global-flex-start" style="margin: 0 10px">
+        <lw-input
+          class="input-box"
+          style="width: 45px"
+          v-model="inputNum"
+          :get-focus.sync="inputFocus"
+          type="digit"
+          :placeholder="$lwLanguage.get('', '页码')"
+          input-align="center"
+          :show-clear="false"
+          :not-keyboard="false"
+          :show-scan-icon="false"
+          :save-focus-status="false"
+          @confirm="pageNumConfirm"
+          @blur="pageNumConfirm"
+        />
+        <div style="margin: 0 5px">/</div>
+        <div
+          class="lw-global-click-style lw-global-value-bold"
+          style="flex-shrink: 0"
+        >
+          {{ allPageNum }}
+        </div>
       </div>
 
       <!-- 下一页 -->
@@ -55,7 +72,7 @@
       >
         <slot name="nextBtn">
           {{ nextText }}
-          <van-icon v-if="!nextText" name="arrow" />
+          <van-icon v-if="!nextText" name="arrow"/>
         </slot>
       </div>
     </div>
@@ -70,14 +87,6 @@
       @confirm="confirmSize"
     />
 
-    <!-- 调整页码的弹框-->
-    <lw-popup-radio
-      :title="$lwLanguage.get('wms_project.pda.components.ui.Pagination.qijgqhla','快速跳转')"
-      v-model="pageNumPopupShow"
-      :columns="pageNumList"
-      @confirm="confirmNum"
-    />
-
 
   </div>
 </template>
@@ -154,18 +163,6 @@ export default {
       }
     },
 
-    // 总页码列表
-    pageNumList(){
-      let list = []
-      for (let i = 1; i <= this.allPageNum; i++) {
-        list.push({
-          value: i,
-          label: i
-        })
-      }
-      return list
-    },
-
     // 页面条数可选项列表
     pageSizeList(){
       return this.pageSizes.map(item=>{
@@ -189,6 +186,7 @@ export default {
   watch: {
     allPageNum: {
       handler() {
+        this.inputNum = this.num
         this.checkPageNum()
       }
     }
@@ -198,26 +196,30 @@ export default {
       // 调整数据条数的弹框
       changSizePopupShow: false,
 
-      // 调整页码的弹框
-      pageNumPopupShow: false
+      // 记录页面输入框获取焦点前的页码
+      inputNum: '',
+      inputFocus: false,
     }
   },
+  mounted() {
+    this.inputNum = this.num
+  },
   methods: {
     // 判断当前页面是否符合当前最大页面
     checkPageNum() {
-      
-      if (this.num === 1) return
+
+      if (this.num === 1 && this.allPageNum === 1) return
 
       if (this.allPageNum < this.num) {
-        this.num = this.allPageNum
+        this.num = this.allPageNum || 1
         this.pageChange()
       }
     },
 
-
     // 页码、分页大小发生改变
     pageChange() {
       this.$nextTick(() => {
+        this.inputNum = this.num
         this.$emit('change', {
           pageSize: this.size,
           pageNum: this.num
@@ -235,38 +237,45 @@ export default {
     },
 
     // 左边按钮点击
-    leftClick(){
+    leftClick() {
       if (this.isMin) return
       this.num--
       this.pageChange()
     },
 
+    // 页码确认
+    pageNumConfirm() {
+      this.inputFocus = false
+      if (!this.inputNum || Number(this.inputNum) === this.num) {
+        this.inputNum = this.num
+        return
+      }
+
+      if (this.inputNum > this.allPageNum) {
+        this.num = this.allPageNum
+      } else {
+        this.num = Number(this.inputNum)
+      }
+      this.$nextTick(() => {
+        this.pageChange()
+      })
+    },
+
+
     // 右边按钮点击
-    rightClick(){
+    rightClick() {
       if (this.isMax) return
       this.num++
       this.pageChange()
     },
 
     // 确认页面数据条数
-    confirmSize(item){
+    confirmSize(item) {
       this.size = item.value
 
-      this.$nextTick(()=>{
-        if (this.allPageNum < this.num){
-          this.num = this.allPageNum
-        }
-
-        this.pageChange()
-      })
+      this.$nextTick(() => this.pageChange())
     },
 
-    // 确认页面跳转页数
-    confirmNum(item){
-      this.num = item.value
-      this.pageChange()
-    }
-
 
   }
 }
@@ -274,19 +283,32 @@ export default {
 
 <style scoped lang="less">
 @import "../../assets/css/var.less";
-.pagination-box{
-  margin: 15px auto 5px;
-  max-width: 300px;
+
+.pagination-box {
+  margin: 15px 0 5px;
+  padding: 0 10px;
   font-size: 14px;
 
-  .lw-global-value-bold{
+  .lw-global-value-bold {
     display: inline-block;
     margin: 0 3px;
   }
 }
 
+// 输入框
+.input-box {
+  color: @baseColor;
+  font-weight: bold;
+  border-color: #ccc;
+
+  /deep/ .lw-input-input {
+    background: rgba(0, 0, 0, 0);
+    padding: 2px;
+  }
+}
+
 // 禁止点击
-.no-click{
+.no-click {
   cursor: no-drop;
   color: #c0c4cc;
 }

package/src/components/Popup/index.vue

@@ -243,7 +243,7 @@ export default {
   box-sizing: border-box;
   flex-shrink: 0;
 
-  :deep(*){
+  > :deep(*){
     flex: 1;
   }
 }

package/src/components/PopupCheckbox/index.vue

@@ -63,6 +63,7 @@
             v-for="i in selectDataList"
             :key="i[valueKey]"
             :name="i[valueKey]"
+            shape="square"
           >
             {{ labelMsg(i) }}
           </van-checkbox>

package/src/components/SearchCellPopup/index.vue

@@ -261,7 +261,7 @@ export default {
       if (res.length === 1) {
         this.resultItem = res[0]
         this.disabledInp = true
-        this.val = this.getCellMsg(res[0])
+        this.$nextTick(() => this.val = this.getCellMsg(res[0]))
         this.$emit('confirm', this.resultItem)
         return Promise.reject()
       }
@@ -325,7 +325,7 @@ export default {
       this.resultItem = list[result]
       this.popup.show = false
 
-      this.val = this.getCellMsg(list[result])
+      this.$nextTick(() => this.val = this.getCellMsg(list[result]))
       this.disabledInp = true
 
       this.$emit('confirm', this.resultItem)

package/src/components/TitleValueCell/index.vue

@@ -13,26 +13,33 @@
     ]"
     @click="$emit('click')"
   >
-    <span
-      :style="{
-        flexShrink: 0,
-        ...titleStyle,
-      }"
+    <div
+      v-if="title"
+      :style="titleStyleData"
       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,
-        flex:1,
-        textAlign: textAlign || 'left'
-      }"
-      v-html="value"
-    />
+    >
+      {{ title }}
+    </div>
+
+    <template v-if="value || value === 0">
+      <div
+        v-if="valueMore"
+        class="lw-global-flex-start lw-global-value"
+        :style="valStyleData"
+      >
+        <span class="lw-global-value-bold" v-html="value"/>
+        <span v-if="value2" style="margin: 0 5px">{{ separator || '/' }}</span>
+        <span v-html="value2"/>
+      </div>
+
+      <div
+        v-else
+        class="lw-global-value"
+        :style="valStyleData"
+        v-html="value"
+      />
+
+    </template>
   </div>
 </template>
 
@@ -41,11 +48,17 @@
 export default {
   name: "lwTitleValueCell",
   props: {
+    // 值是否显示多行
+    valueMore: Boolean,
     // 标题
     title: [String, Number],
 
     // 值
     value: [String, Number],
+    // 当 valueMore=true 时有效，第二个值
+    value2: [String, Number],
+    // 当 valueMore=true 时有效，分隔符
+    separator: [String, Number],
 
     // 值是否加粗
     valBold: Boolean,
@@ -84,18 +97,57 @@ export default {
 
     // 值样式
     valStyle: {
-      type: Object,
-      default: () => {
-      }
+      type: [Object, String],
+      default: ''
     },
 
     // 标题样式
     titleStyle: {
-      type: Object,
-      default: () => {
-      }
+      type: [Object, String],
+      default: ''
     }
   },
+  computed: {
+    // 标题样式的值
+    titleStyleData() {
+      if (typeof this.titleStyle === "object") {
+        return {
+          flexShrink: 0,
+          ...this.titleStyle
+        }
+      }
+      return `flex-shrink: 0;${this.titleStyle}`
+    },
+    // 数据样式的值
+    valStyleData() {
+      if (typeof this.valStyle === "object") {
+        return {
+          fontWeight: this.valBold ? 'bold' : '',
+          color: this.valRed ? '#D50000' : this.valColor,
+          fontSize: this.valSize && typeof this.valSize === 'number' ? this.valSize + 'px' : this.valSize,
+          flex: 1,
+          textAlign: this.textAlign || 'left',
+          ...this.valStyle
+        }
+      }
+
+      let str = 'flex:1;'
+      if (this.valBold) str += 'font-weight:bold;'
+      if (!this.valRed && this.valColor) str += `color:${this.valColor};`
+      if (this.valRed) str += 'color:#D50000;'
+      if (this.valSize) {
+        if (typeof this.valSize === 'number') {
+          str += `font-size:${this.valSize}px;`
+        } else {
+          str += `font-size:${this.valSize};`
+        }
+      }
+      if (this.textAlign) str += `text-align:${this.valSize || 'left'};`
+      this.fontWeight ? str += 'font-weight:bold;' : ''
+
+      return `${str};${this.valStyle}`
+    },
+  },
   data() {
     return {}
   },

package/src/components/index.js

@@ -72,6 +72,12 @@ import lwSearchCellPopup from "./SearchCellPopup";
 import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
 // 行搜索选择删除组件
 import lwCellSearchSelectDel from "./CellSearchSelectDel";
+// 标签、值显示组
+import lwLabelValueGroup from "./LabelValueGroup";
+// 编码、名称、数量显示行
+import lwCodeNameQtyRow from "./CodeNameQtyRow";
+// 编码、名称、数量显示行
+import lwCalendarPopup from "./CalendarPopup";
 
 
 export default [
@@ -109,4 +115,7 @@ export default [
   lwSearchCellPopup,
   lwKeyboardOpenPlaceholder,
   lwCellSearchSelectDel,
+  lwLabelValueGroup,
+  lwCodeNameQtyRow,
+  lwCalendarPopup,
 ]

package/src/mixins/loginAndInit/index.js

@@ -23,8 +23,8 @@ export const loginAndInit = {
         list.push(this.$lwPrint.asyncGet(true))
         // 获取条码解析规则
         list.push(this.$lwBarcodeResolve.asyncInitRule())
-        // 仓库配置信息 仅VIN时需要
-        this.$lwNPMType.get().includes('vin') && list.push(this.$lwWarehouseConfig.asyncGet())
+        // 仓库配置信息
+        list.push(this.$lwWarehouseConfig.asyncGet())
       }
 
       return Promise.all(list)

package/src/router/index.js

@@ -6,105 +6,12 @@
 
 import wmsRouter from './../views/wms/router.js'
 import vinRouter from './../views/vin/router.js'
-
-const common = [
-  // 初始化页面
-  {
-    path: "/",
-    name: "LwNull",
-    component: () => import('./../views/common/views/home/index.vue')
-  },
-  // 初始化页面
-  {
-    path: "/lwInit",
-    name: "LwInit",
-    component: () => import('./../views/common/views/init/index.vue')
-  },
-  // 首页
-  {
-    path: "/lwHome",
-    name: "LwHome",
-    component: () => import('./../views/common/views/home/index.vue')
-  },
-  // 菜单页1
-  {
-    path: "/lwMenuOne",
-    name: "LwMenuOne",
-    component: () => import('./../views/common/views/menu/menuOne.vue')
-  },
-  // 菜单页2
-  {
-    path: "/lwMenuTwo",
-    name: "LwMenuTwo",
-    component: () => import('./../views/common/views/menu/menuTwo.vue')
-  },
-  // 我的管理页
-  {
-    path: "/lwMy",
-    name: "LwMy",
-    component: () => import('./../views/common/views/my/index.vue')
-  },
-  // 仓库选择
-  {
-    path: "/lwWarehouse",
-    name: "LwWarehouse",
-    component: () => import('./../views/common/views/my/warehouse.vue')
-  },
-  // 设备管理
-  {
-    path: "/lwDevice",
-    name: "LwDevice",
-    component: () => import('./../views/common/views/my/device.vue')
-  },
-  // 打印机管理
-  {
-    path: "/lwPrint",
-    name: "LwPrint",
-    component: () => import('./../views/common/views/my/print.vue')
-  },
-  // 消息
-  {
-    path: "/lwMsg",
-    name: "LwMsg",
-    component: () => import('./../views/common/views/my/msg.vue'),
-    meta: {keepAlive: true}
-  },
-  // 多语言
-  {
-    path: "/lwLanguage",
-    name: "LwLanguage",
-    component: () => import('./../views/common/views/my/language.vue')
-  },
-  // 时区
-  {
-    path: "/lwTimezone",
-    name: "LwTimezone",
-    component: () => import('./../views/common/views/my/timezone.vue')
-  },
-
-
-  // 任务
-  {
-    path: "/lwTask",
-    name: "LwTask",
-    component: () => import('./../views/common/views/task/index.vue'),
-  },
-  // 任务搜索
-  {
-    path: "/lwSearchTask",
-    name: "LwSearchTask",
-    component: () => import('./../views/common/views/task/search.vue'),
-  },
-  // 任务控制台
-  {
-    path: "/lwTaskConsole",
-    name: "LwTaskConsole",
-    component: () => import('./../views/common/views/taskConsole/index.vue'),
-  },
-]
+import commonRouter from './../views/common/router.js'
+import automateRouter from './../views/automate/router.js'
 
 export default {
-  common,
+  common: commonRouter,
   wms: wmsRouter,
-  vin: vinRouter
+  vin: vinRouter,
+  automate: automateRouter,
 }