@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/module/Login//347/231/273/345/275/225/346/250/241/345/235/227.md

@@ -1 +1 @@
-# 登录功能模块 [查看文档](http://note.youdao.com/groupshare/?token=8D71B17260BC47FE8FA9E102FA32F4DA&gid=136361463)
+# 登录功能模块 [查看文档](https://www.yuque.com/docs/share/184fc73f-6c12-46bb-96b7-ce560ef67add)

package/src/components/module/Lot/index.js

@@ -1,11 +1,11 @@
-/*
-* 批次属性
-* @author: 张文
-* @date  2022-03-31
-* */
-
-import lwLotModule from "./index.vue";
-
-lwLotModule.install = Vue => Vue.component(lwLotModule.name, lwLotModule)
-
-export default lwLotModule
+/*
+* 批次属性
+* @author: 张文
+* @date  2022-03-31
+* */
+
+import lwLotModule from "./index.vue";
+
+lwLotModule.install = Vue => Vue.component(lwLotModule.name, lwLotModule)
+
+export default lwLotModule

package/src/components/module/Lot/index.vue

@@ -75,7 +75,7 @@ export default {
           return {
             ...item,
             component: 'lw-cell-popup-date',
-            value: item.default && this.$lwDate.format(item.default, item.format || 'yyyy-MM-dd'),
+            value: this.dateFormat(item),
             disabled: !item.enabled
           }
         },
@@ -86,7 +86,7 @@ export default {
           return {
             ...item,
             component: 'lw-cell-popup-date',
-            value: item.default,
+            value: this.$lwDate.format(item.default, 'hh:mm'),
             type:'time',
             disabled: !item.enabled,
             minHour: min[0] || 0,
@@ -106,6 +106,15 @@ export default {
           }
         },
       },
+      // 时间格式
+      dateFormatList:{
+        'date': 'yyyy-MM-dd',
+        'year-month': 'yyyy-MM',
+        'month-day': 'MM-dd',
+        'datehour': 'yyyy-MM-dd hh',
+        'datetime': 'yyyy-MM-dd hh:mm',
+        'time': 'hh:mm',
+      }
     }
   },
   mounted() {
@@ -126,11 +135,17 @@ export default {
         res = await this.$lwAxios({
           url: this.path,
           method: 'post',
-          data: this.query
+          data: {
+            ...this.query,
+            needHandleRequire:this.mustRequired
+          }
         })
 
       } else {
-        res = await this.$lwApi.lot.get(this.query)
+        res = await this.$lwApi.lot.get({
+          ...this.query,
+          needHandleRequire:this.mustRequired
+        })
       }
 
 
@@ -171,6 +186,15 @@ export default {
         success: true,
         data: obj
       }
+    },
+
+    // 时间格式化
+    dateFormat(item){
+      if(!item.default) return ''
+
+      let format = item.format || this.dateFormatList[item.type] || 'yyyy-MM-dd'
+
+      return this.$lwDate.format(item.default, format)
     }
   }
 }

package/src/components/module/Lot//346/211/271/346/254/241/345/261/236/346/200/247.md

@@ -1,2 +1,4 @@
-# 批次属性 [查看文档](http://note.youdao.com/groupshare/?token=A4BBA1A655844F82B1D4F95617F89777&gid=136361463)
-# 批次属性数据结构 [查看文档](http://note.youdao.com/groupshare/?token=DA1F7C5D34DB4F0CA8616044D69DC198&gid=136361463)
+# 批次属性 [查看文档](https://www.yuque.com/docs/share/1a716708-a13c-4271-bf4d-42e0c34574c0)
+
+
+# 批次属性数据结构 [查看文档](https://www.yuque.com/docs/share/b3bbea5c-da50-42e2-a1a9-0e293629656b)

package/src/components/module/LotLook/index.js

@@ -1,11 +1,11 @@
-/*
-* 批次组件数据查看
-* @author: 张文
-* @date  2022-06-09
-* */
-
-import lwLotLookModule from "./index.vue";
-
-lwLotLookModule.install = Vue => Vue.component(lwLotLookModule.name, lwLotLookModule)
-
-export default lwLotLookModule
+/*
+* 批次组件数据查看
+* @author: 张文
+* @date  2022-06-09
+* */
+
+import lwLotLookModule from "./index.vue";
+
+lwLotLookModule.install = Vue => Vue.component(lwLotLookModule.name, lwLotLookModule)
+
+export default lwLotLookModule

package/src/components/module/LotLook/index.vue

@@ -4,17 +4,15 @@
   @date: 2022-06-09
 -->
 <template>
-  <div
-    :class="[hiddenLastBorder ? 'lw-lot-look-box' : '']"
-  >
-    <lw-cell
-      style="padding: 0 5px"
+  <div>
+    <lw-title-value-cell
       v-for="(i,k) in list"
       :key="k"
       :title="i[titleKey]"
-      :value="i[valueKey]"
-      :is-link="false"
-      :border="!hiddenBorder"
+      :value="formatVal(i[valueKey])"
+      :is-row="showRow"
+      :is-row-end="showRow && hiddenLastBorder && (k + 1) === list.length"
+      :is-row-start="showRow && hiddenFirstBorder && k === 0"
     />
   </div>
 </template>
@@ -39,14 +37,29 @@ export default {
       default: 'formatValue'
     },
 
-    // 通过接口请求数据时传递的参数 TODO 接口暂无
-    query: Object,
+    // 是否显示行样式
+    showRow: {
+      type: Boolean,
+      default: true
+    },
+
+    // 是否隐藏第一条数据的边框
+    hiddenFirstBorder: {
+      type: Boolean,
+      default: true
+    },
 
-    // 不显示下边框
-    hiddenBorder: Boolean,
+    // 是否隐藏最后一条数据的边框
+    hiddenLastBorder: {
+      type: Boolean,
+      default: true
+    },
 
-    // 不显示最后一条数据的边框
-    hiddenLastBorder: Boolean,
+    // 时间格式化
+    dateFormat:{
+      type: String,
+      default: 'yyyy-MM-dd hh:mm:ss'
+    }
   },
   computed:{
     list(){
@@ -63,18 +76,18 @@ export default {
 
     }
   },
-  methods: {}
+  methods: {
+    formatVal(val){
+      if (/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d+)?Z)/gm.test(val)){
+        return this.$lwDate.format(val, this.dateFormat)
+      }
+
+      return val
+    }
+  }
 }
 </script>
 
 <style scoped lang="less">
 
-
-.lw-lot-look-box{
-
-  &>.lw-cell-box:last-child{
-    border-bottom: none;
-  }
-}
-
 </style>

package/src/components/module/LotLook//346/225/260/346/215/256/346/237/245/347/234/213.md

@@ -0,0 +1,3 @@
+
+
+# 数据查看 [查看文档](https://www.yuque.com/docs/share/d4e28059-e6e0-4087-ab5e-66ff1e3e131b)

package/src/components/module/Menu/index.js

@@ -1,12 +1,12 @@
-/*
-* 菜单模块
-* @author: 张文
-* @date  2022-03-31
-* */
-
-
-import lwMenuModule from './index.vue'
-
-lwMenuModule.install = Vue => Vue.component(lwMenuModule.name, lwMenuModule)
-
-export default lwMenuModule
+/*
+* 菜单模块
+* @author: 张文
+* @date  2022-03-31
+* */
+
+
+import lwMenuModule from './index.vue'
+
+lwMenuModule.install = Vue => Vue.component(lwMenuModule.name, lwMenuModule)
+
+export default lwMenuModule

package/src/components/module/Menu/index.vue

@@ -1,118 +1,122 @@
-<!--
-  @name: 菜单模块
-  @description: -
-  @author 张文
-  @date: 2022-02-24
--->
-<template>
-  <div class="lw-global-flex-start lw-menu-model">
-    <lw-menu-item
-      v-for="(i,k) in Object.keys(menuList)"
-      :key="k"
-      :time="k"
-      :move="menuList[i].move === undefined ? move : menuList[i].move"
-      v-bind="menuList[i]"
-      :tip="tipNum(menuList[i])"
-      :background="menuList[i].background || background"
-      :max-tip="menuList[i].tipMax || tipMax"
-      @click="click(menuList[i],i)"
-    />
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwMenuModule",
-  props: {
-    // 需要渲染的菜单
-    menu: Array,
-
-    // 菜单索引
-    menuKey:{
-      type: String,
-      default: ''
-    },
-
-    // 是否需要进入动画
-    move:{
-      type:Boolean,
-      default: true
-    },
-
-    // 项目的统一背景颜色
-    background: String,
-
-    // 角标数据最大可显示数
-    tipMax: {
-      type: Number,
-      default: 9
-    },
-
-    // 需要更新的角标数据
-    tip:Array
-  },
-  data() {
-    return {
-      // 菜单数据
-      menuList:[]
-    }
-  },
-  watch:{
-    tip(){
-      this.updateMenu()
-    }
-  },
-  mounted() {
-    this.updateMenu()
-  },
-  methods: {
-    // 更新菜单数据
-    updateMenu(){
-      this.menuList = []
-
-      if (this.menu){
-        this.menuList = this.menu
-        return
-      }
-
-      this.menuList = this.$lwMenu.get(this.menuKey)
-    },
-
-    // 角标数据
-    tipNum(i){
-      if(!this.tip) return i.tip || ''
-
-      const list = this.tip.filter(item=>{
-        if (item.path && item.path === i.path){
-          return item
-        }
-      })
-
-      if (!list.length) return i.tip || ''
-
-      return list[0].tip || ''
-    },
-
-    // 点击
-    click(item,key) {
-      const top = this.$route.query.lwMenuKey || ''
-      this.$emit('click', {item, key:top+`${key}.children`})
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-/*
-* 菜单项
-*/
-
-
-.lw-menu-model{
-  flex-wrap: wrap;
-}
-
-
-</style>
+<!--
+  @name: 菜单模块
+  @description: -
+  @author 张文
+  @date: 2022-02-24
+-->
+<template>
+  <div class="lw-global-flex-start lw-menu-model">
+    <lw-menu-item
+      v-for="(i,k) in Object.keys(menuList)"
+      :key="k"
+      :time="k"
+      :move="menuList[i].move === undefined ? move : menuList[i].move"
+      v-bind="menuList[i]"
+      :tip="tipNum(menuList[i])"
+      :background="menuList[i].background || background"
+      :max-tip="menuList[i].tipMax || tipMax"
+      @click="click(menuList[i],i)"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwMenuModule",
+  props: {
+    // 需要渲染的菜单
+    menu: [Array, Object],
+
+    // 菜单索引
+    menuKey:{
+      type: String,
+      default: ''
+    },
+
+    // 是否需要进入动画
+    move:{
+      type:Boolean,
+      default: true
+    },
+
+    // 项目的统一背景颜色
+    background: String,
+
+    // 角标数据最大可显示数
+    tipMax: {
+      type: Number,
+      default: 9
+    },
+
+    // 需要更新的角标数据
+    tip:Array
+  },
+  data() {
+    return {
+      // 菜单数据
+      menuList:[]
+    }
+  },
+  watch:{
+    tip(){
+      this.updateMenu()
+    }
+  },
+  mounted() {
+    this.updateMenu()
+  },
+  methods: {
+    // 更新菜单数据
+    updateMenu(){
+      this.menuList = []
+
+      if (this.menu){
+        this.menuList = this.menu
+        return
+      }
+      const menus = this.$lwMenu.get(this.menuKey)
+      if (menus.children) {
+        this.menuList = menus.children
+      } else {
+        this.menuList = menus
+      }
+    },
+
+    // 角标数据
+    tipNum(i){
+      if(!this.tip) return i.tip || ''
+
+      const list = this.tip.filter(item=>{
+        if (item.path && item.path === i.path){
+          return item
+        }
+      })
+
+      if (!list.length) return i.tip || ''
+
+      return list[0].tip || ''
+    },
+
+    // 点击
+    click(item,key) {
+      const top = this.$route.query.lwMenuKey || ''
+      this.$emit('click', {item, key:top + key})
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+/*
+* 菜单项
+*/
+
+
+.lw-menu-model{
+  flex-wrap: wrap;
+}
+
+
+</style>

package/src/components/module/Menu//350/217/234/345/215/225/346/240/217.md

@@ -1 +1 @@
-# 菜单栏 [查看文档](https://note.youdao.com/share/?token=238356430A584438ADE13DA53308D199&gid=136361463)
+# 菜单栏 [查看文档](https://www.yuque.com/docs/share/a82e1b28-9091-4d12-9587-41900c68de24)

package/src/components/module/MsgItem/index.js

@@ -1,11 +1,11 @@
-/*
-* 消息列表及分页模块
-* @author: 张文
-* @date  2022-02-25
-* */
-
-import lwMsgItemModule from "./index.vue";
-
-lwMsgItemModule.install = Vue => Vue.component(lwMsgItemModule.name, lwMsgItemModule)
-
-export default lwMsgItemModule
+/*
+* 消息列表及分页模块
+* @author: 张文
+* @date  2022-02-25
+* */
+
+import lwMsgItemModule from "./index.vue";
+
+lwMsgItemModule.install = Vue => Vue.component(lwMsgItemModule.name, lwMsgItemModule)
+
+export default lwMsgItemModule

package/src/components/module/MsgItem/index.vue

@@ -12,7 +12,7 @@
         v-for="(item,k) in msgList"
         :key="item.id"
         :style="{animationDelay: k * 50 + 'ms'}"
-        @click="$emit('click', item, type)"
+        @click="$emit('click', item)"
       >
         <div class="lw-global-flex-between">
           <div class="lw-msg-item-model-title">{{ item.title }}</div>
@@ -23,13 +23,11 @@
       </div>
 
       <!-- 分页 -->
-      <lw-pages
-        class="lw-global-animation-out"
-        :style="{animationDelay: msgList.length * 50 + 'ms'}"
+      <lw-pagination
         v-model="pageNum"
         :page-total="pageTotal"
-        :page-size="pageSize"
-        @change="getMsg"
+        :page-size.sync="size"
+        @change="pageChange"
       />
     </template>
     <lw-not-data v-else/>
@@ -41,41 +39,58 @@
 export default {
   name: "lwMsgItemModule",
   props:{
-    // 消息类型
-    type:{
-      type: String,
-      default: ''
+    // 类型
+    msgList: {
+      type: Array,
+      default: () => []
+    },
+    // 当前页
+    value: {
+      type: Number,
+      default: 1
     },
     // 每页显示的数据条数
     pageSize: {
       type: Number,
       default: 10
+    },
+    // 总条数
+    pageTotal: {
+      type: Number,
+      default: 0
+    },
+  },
+  computed:{
+    // 当前页
+    pageNum:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    },
+    // 每页显示的数据条数
+    size:{
+      get(){
+        return this.pageSize
+      },
+      set(v){
+        this.$emit('update:pageSize', v)
+      }
     }
   },
   data() {
     return {
-      // 消息
-      msgList:[],
-      // 当前页
-      pageNum: 1,
-      // 数据总条数
-      pageTotal: 0
+
     }
   },
   mounted() {
-    this.getMsg()
+
   },
   methods: {
-    // 获取数据
-    getMsg(){
-      this.$lwApi.msg.getList({
-        pageNum:this.pageNum - 1,
-        pageSize:this.pageSize,
-        flag: this.type === 'unread' ? 0 : 1
-      }).then(res=>{
-        this.msgList = res.messages || []
-        this.pageTotal = res.messageCount || 0
-      })
+    pageChange(obj){
+      this.$emit('change', obj)
     }
   }
 }

package/src/components/module/MsgItem//346/266/210/346/201/257/345/210/227/350/241/250/345/217/212/345/210/206/351/241/265/346/250/241/345/235/227.md

@@ -1 +1 @@
-# 消息列表及分页模块 [查看文档](http://note.youdao.com/groupshare/?token=6F58D80E8DFB4A0F867BBB2E8E3BAF3D&gid=136361463)
+# 消息列表及分页模块 [查看文档](https://www.yuque.com/docs/share/063251fd-826f-4ec4-b993-7dec990cc689)

package/src/components/module/OnLine/index.js

@@ -1,11 +1,11 @@
-/*
-* 上下线管理模块
-* @author: 张文
-* @date  2022-03-04
-* */
-
-import lwOnLineModule from "./index.vue";
-
-lwOnLineModule.install = Vue => Vue.component(lwOnLineModule.name, lwOnLineModule)
-
-export default lwOnLineModule
+/*
+* 上下线管理模块
+* @author: 张文
+* @date  2022-03-04
+* */
+
+import lwOnLineModule from "./index.vue";
+
+lwOnLineModule.install = Vue => Vue.component(lwOnLineModule.name, lwOnLineModule)
+
+export default lwOnLineModule

package/src/components/module/OnLine/index.vue

@@ -185,7 +185,7 @@ export default {
 
 .lw-on-line-model-box{
 
-  /deep/.van-switch--on{
+  .van-switch--on{
     background-color: #D50000;
   }
 }

package/src/components/module/OnLine//344/270/212/344/270/213/347/272/277/347/256/241/347/220/206/346/250/241/345/235/227.md

@@ -1 +1 @@
-# 上下线管理模块 [查看文档](http://note.youdao.com/groupshare/?token=DDAAF929AD7E43D5981DF5C8CABFDA3D&gid=136361463)
+# 上下线管理模块 [查看文档](https://www.yuque.com/docs/share/a83a001b-d68b-4b59-8b6e-537754203301)