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

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

@@ -66,17 +66,33 @@
         </template>
       </lw-button>
 
-      <slot name="addButton"/>
     </div>
 
-    <!-- 切换语言 -->
-    <div class="lw-global-flex-center language" @click="language">
-      <img
-        class="language-img"
-        :src="require('./../../../assets/img/lwLoginModel/language.png')"
-        alt=""
-      >
-      <span>{{ $lwLanguage.get('wms_project.pda.model.loginModel.language', '切换语言') }} > </span>
+    <div class="lw-global-flex-center select-box">
+      <!-- 切换时区 -->
+      <div class="lw-global-flex-center select-menu" @click="timezone">
+        <img
+          class="language-img"
+          src="./../../../assets/img/lwLoginModel/timezone.png"
+          alt=""
+        >
+        <span>{{ $lwLanguage.get('wms_project.pda.page.common.timezone.change', '切换时区') }}</span>
+      </div>
+
+      <!-- 分割线 -->
+      <div class="select-cut">|</div>
+
+      <!-- 切换语言 -->
+      <div class="lw-global-flex-center select-menu" @click="language">
+        <img
+          class="language-img"
+          src="./../../../assets/img/lwLoginModel/language.png"
+          alt=""
+        >
+        <span>{{ $lwLanguage.get('wms_project.pda.model.loginModel.language', '切换语言') }}</span>
+      </div>
+
+
     </div>
 
     <!-- 底部插槽 -->
@@ -87,6 +103,8 @@
 <script>
 
 import {loginAndInit} from "../../../mixins/loginAndInit";
+import usernameImage from './../../../assets/img/lwLoginModel/username.png'
+import passwordImage from './../../../assets/img/lwLoginModel/password.png'
 
 export default {
   name: "lwLoginModule",
@@ -96,14 +114,14 @@ export default {
     usernameSrc: {
       type: null,
       default: () => {
-        return require('./../../../assets/img/lwLoginModel/username.png')
+        return usernameImage
       }
     },
     // 密码图标
     passwordSrc: {
       type: null,
       default: () => {
-        return require('./../../../assets/img/lwLoginModel/password.png')
+        return passwordImage
       }
     },
 
@@ -261,7 +279,7 @@ export default {
         // 登录成功后触发的事件
         this.$emit('success', res)
       }catch (err){
-        console.warn('登录出错：', err)
+        console.error('登录出错：', err)
       }
     },
 
@@ -270,6 +288,13 @@ export default {
       this.$router.push({
         path:'/lwLanguage'
       })
+    },
+
+    // 时区切换
+    timezone(){
+      this.$router.push({
+        path:'/lwTimezone'
+      })
     }
   }
 }
@@ -283,17 +308,23 @@ export default {
 
 @import "../../../assets/css/var.less";
 
-.language{
-  width: 100%;
-  text-align: center;
+.select-box{
+  margin-top: 10px;
   font-size: 14px;
   color: #999;
-  margin-top: 10px;
+
+  .select-cut{
+    margin: 0 10px;
+  }
+
+  .select-menu{
+    text-align: center;
 
 
-  .language-img{
-    width: 16px;
-    margin-right: 5px;
+    .language-img{
+      width: 16px;
+      margin-right: 5px;
+    }
   }
 }
 

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.vue

@@ -1,181 +1,205 @@
-<!--
-  批次属性
-  @author: 张文
-  @date: 2022-03-31
--->
-<template>
-  <div>
-    <component
-      v-for="(i,k) in list"
-      :key="k"
-      :is="i.component"
-      v-model="i.value"
-      v-bind="i"
-    />
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwLotModule",
-  props:{
-    // 请求批次组件数据接口(完整路径)
-    path: String,
-    // 请求时额外携带的参数
-    query: {
-      type: Object,
-      default: () => {}
-    },
-    // 批次组件的数据(权重高于接口请求)
-    lotList: Array,
-
-    // 是否严格校验必填项
-    mustRequired: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      // 结果
-      list:[],
-      // 映射数据
-      map:{
-        'lw-text': (item) => {
-          return {
-            ...item,
-            component: 'lw-input',
-            value: item.default,
-            disabled: !item.enabled,
-            inputAlign: 'right'
-          }
-        },
-        'lw-number': (item) => {
-          return {
-            ...item,
-            component: 'lw-input',
-            value: item.default,
-            type:'number',
-            disabled: !item.enabled,
-            inputAlign: 'right',
-            decimalScale: Number(item.decimalScale) || 0
-          }
-        },
-        'lw-select': (item) => {
-          return {
-            ...item,
-            component: 'lw-cell-popup-radio',
-            value: item.default,
-            disabled: !item.enabled,
-            dictKey: item.category
-          }
-        },
-        'lw-date': (item) => {
-          return {
-            ...item,
-            component: 'lw-cell-popup-date',
-            value: item.default && this.$lwDate.format(item.default, item.format || 'yyyy-MM-dd'),
-            disabled: !item.enabled
-          }
-        },
-        'lw-time': (item) => {
-          const min = item.pickerStart.split(':')
-          const max = item.pickerEnd.split(':')
-          const step = item.pickerStep.split(':').map(item=>Number(item))
-          return {
-            ...item,
-            component: 'lw-cell-popup-date',
-            value: item.default,
-            type:'time',
-            disabled: !item.enabled,
-            minHour: min[0] || 0,
-            maxHour: max[0] || 23,
-            minMinute: min[1] || 0,
-            maxMinute: max[1] || 59,
-            filter:(type, options)=>{
-              if (type === 'hour'){
-                return options.filter((option) => option % (step[0] || 1) === 0);
-              }
-              if (type === 'minute'){
-                return options.filter((option) => option % (step[1] || 1) === 0);
-              }
-
-              return options
-            }
-          }
-        },
-      },
-    }
-  },
-  mounted() {
-    this.getLotData()
-  },
-  methods: {
-    // 请求数据
-    async getLotData(){
-
-      let res = null
-
-      if (this.lotList && this.lotList.length) {
-
-        res = this.lotList
-
-      } else if (this.path) {
-
-        res = await this.$lwAxios({
-          url: this.path,
-          method: 'post',
-          data: this.query
-        })
-
-      } else {
-        res = await this.$lwApi.lot.get(this.query)
-      }
-
-
-
-      this.list = []
-
-      for (let i of res) {
-        i.attributes.required = i.attributes.enabled && i.attributes.required && this.mustRequired
-
-        this.list.push(this.map[i.use](i.attributes))
-      }
-    },
-
-    // 获取数据
-    getData(){
-      let obj = {}
-      for (let item of this.list) {
-        // 校验必填项，是否已经填写
-        if (
-          this.mustRequired &&
-          !item.disabled &&
-          item.required &&
-          !(item.value === 0 || item.value)
-        ){
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.module.lot.null','批次属性必填项不能为空') + ':' + item.title
-          )
-          return {
-            success:false,
-            data:{}
-          }
-        }
-
-        obj[item.name] = item.value
-      }
-
-      return {
-        success: true,
-        data: obj
-      }
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  批次属性
+  @author: 张文
+  @date: 2022-03-31
+-->
+<template>
+  <div>
+    <component
+      v-for="(i,k) in list"
+      :key="k"
+      :is="i.component"
+      v-model="i.value"
+      v-bind="i"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwLotModule",
+  props:{
+    // 请求批次组件数据接口(完整路径)
+    path: String,
+    // 请求时额外携带的参数
+    query: {
+      type: Object,
+      default: () => {}
+    },
+    // 批次组件的数据(权重高于接口请求)
+    lotList: Array,
+
+    // 是否严格校验必填项
+    mustRequired: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      // 结果
+      list:[],
+      // 映射数据
+      map:{
+        'lw-text': (item) => {
+          return {
+            ...item,
+            component: 'lw-input',
+            value: item.default,
+            disabled: !item.enabled,
+            inputAlign: 'right'
+          }
+        },
+        'lw-number': (item) => {
+          return {
+            ...item,
+            component: 'lw-input',
+            value: item.default,
+            type:'number',
+            disabled: !item.enabled,
+            inputAlign: 'right',
+            decimalScale: Number(item.decimalScale) || 0
+          }
+        },
+        'lw-select': (item) => {
+          return {
+            ...item,
+            component: 'lw-cell-popup-radio',
+            value: item.default,
+            disabled: !item.enabled,
+            dictKey: item.category
+          }
+        },
+        'lw-date': (item) => {
+          return {
+            ...item,
+            component: 'lw-cell-popup-date',
+            value: this.dateFormat(item),
+            disabled: !item.enabled
+          }
+        },
+        'lw-time': (item) => {
+          const min = item.pickerStart.split(':')
+          const max = item.pickerEnd.split(':')
+          const step = item.pickerStep.split(':').map(item=>Number(item))
+          return {
+            ...item,
+            component: 'lw-cell-popup-date',
+            value: this.$lwDate.format(item.default, 'hh:mm'),
+            type:'time',
+            disabled: !item.enabled,
+            minHour: min[0] || 0,
+            maxHour: max[0] || 23,
+            minMinute: min[1] || 0,
+            maxMinute: max[1] || 59,
+            filter:(type, options)=>{
+              if (type === 'hour'){
+                return options.filter((option) => option % (step[0] || 1) === 0);
+              }
+              if (type === 'minute'){
+                return options.filter((option) => option % (step[1] || 1) === 0);
+              }
+
+              return options
+            }
+          }
+        },
+      },
+      // 时间格式
+      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() {
+    this.getLotData()
+  },
+  methods: {
+    // 请求数据
+    async getLotData(){
+
+      let res = null
+
+      if (this.lotList && this.lotList.length) {
+
+        res = this.lotList
+
+      } else if (this.path) {
+
+        res = await this.$lwAxios({
+          url: this.path,
+          method: 'post',
+          data: {
+            ...this.query,
+            needHandleRequire:this.mustRequired
+          }
+        })
+
+      } else {
+        res = await this.$lwApi.lot.get({
+          ...this.query,
+          needHandleRequire:this.mustRequired
+        })
+      }
+
+
+
+      this.list = []
+
+      for (let i of res) {
+        i.attributes.required = i.attributes.enabled && i.attributes.required && this.mustRequired
+
+        this.list.push(this.map[i.use](i.attributes))
+      }
+    },
+
+    // 获取数据
+    getData(){
+      let obj = {}
+      for (let item of this.list) {
+        // 校验必填项，是否已经填写
+        if (
+          this.mustRequired &&
+          !item.disabled &&
+          item.required &&
+          !(item.value === 0 || item.value)
+        ){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.lot.null','批次属性必填项不能为空') + ':' + item.title
+          )
+          return {
+            success:false,
+            data:{}
+          }
+        }
+
+        obj[item.name] = item.value
+      }
+
+      return {
+        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)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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)