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

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

@@ -41,104 +41,15 @@
       <div class="lw-global-value-bold">{{ location || '-' }}</div>
     </div>
 
-    <!-- 所属类型 -->
-    <div class="lw-global-row lw-global-flex-between">
-      <div class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.type','所属类型') }}
-      </div>
-
-      <div class="lw-global-value-bold">{{ type || '-' }}</div>
-    </div>
-
-    <!-- 作业环节 -->
-    <div class="lw-global-row lw-global-flex-between">
-      <div class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.abType','作业环节') }}
-      </div>
-
-      <div class="lw-global-value-bold">{{ abType || '-' }}</div>
-    </div>
-
-    <!-- 提供的插槽 -->
-    <slot name="projectItem"/>
-
-    <!-- 货品类型 -->
-    <lw-cell-popup-radio
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.skuType','货品类型')"
-      v-model="abnormal.abnSkuType"
-      required
-      dict-key="abnormal_sku_type_choice"
+    <lw-abnormal-input-module
+      ref="abnInput"
+      :qty="qty"
+      :type="type"
+      :ab-type="abType"
+      :abn-type-key="abnTypeKey"
+      :require-lpn="requireLpn"
     />
 
-    <!-- 异常类型 -->
-    <lw-cell-popup-radio
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.abnType','异常类型')"
-      v-model="abnormal.abnType"
-      required
-      :columns="abnTypeList"
-      @confirm="typeConfirm"
-      @clear="typeClear"
-    />
-
-    <!-- 异常子类型 -->
-    <lw-cell-popup-radio
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.subType','异常子类型')"
-      v-model="abnormal.abnSubType"
-      required
-      :columns="subTypeList"
-    />
-
-    <!-- 异常量 -->
-    <lw-input
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.abnQty','异常量')"
-      v-model="abnormal.abnQty"
-      :get-focus.sync="abnormalFocus.qty"
-      type="digit"
-      input-align="right"
-      required
-      @confirm="abnQtyConfirm"
-    />
-
-    <!-- 异常库位 -->
-    <lw-input
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.abn','异常库位')"
-      v-model="abnormal.abnLocationCode"
-      :get-focus.sync="abnormalFocus.local"
-      input-align="right"
-      required
-      rule-prefix="innerAbn"
-      rule-key="location"
-      @confirm="abnLocalConfirm"
-    />
-
-    <!-- 托盘号 -->
-    <lw-input
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.lpn','托盘号')"
-      v-model="abnormal.abnLpn"
-      :get-focus.sync="abnormalFocus.lpn"
-      input-align="right"
-      rule-prefix="innerAbn"
-      rule-key="lpn"
-      :required="requireLpn"
-      @confirm="abnormalFocus.remark=true"
-    />
-
-    <!-- 备注 -->
-    <lw-input
-      :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.remark','备注')"
-      v-model="abnormal.abnRemark"
-      :get-focus.sync="abnormalFocus.remark"
-      type="textarea"
-      input-align="right"
-      :rows="4"
-    />
-
-    <!-- 图片 -->
-    <div class="lw-global-title" style="padding: 8px 0">
-      {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.img','图片') }}
-    </div>
-    <lw-img-upload v-model="abnormal.abnImgArr"/>
-
 
 
   </div>
@@ -149,10 +60,10 @@
 export default {
   name: "lwInnerAbnormalModule",
   props:{
-    // 零件号
+    // 商品号
     skuCode: String,
 
-    // 零件名称
+    // 商品名称
     skuName: String,
 
     // 待处理量
@@ -182,176 +93,18 @@ export default {
   },
   data() {
     return {
-      // 异常录入数据
-      abnormal:{
-        // 商品类型
-        abnSkuType:'',
-        // 异常类型
-        abnType:'',
-        // 异常子类型
-        abnSubType:'',
-        // 异常量
-        abnQty:'',
-        // 异常库位
-        abnLocationCode:'',
-        // 异常托盘
-        abnLpn:'',
-        // 备注
-        abnRemark:'',
-        // 图片
-        abnImgArr:[],
-      },
-
-      // 异常输入框获取焦点
-      abnormalFocus:{
-        qty: false,
-        local: false,
-        lpn: false,
-        remark: false,
-      },
 
-      // 异常类型的选择框数据
-      abnTypeList: [],
-
-      // 异常子类型选择框
-      subTypeList:[]
     }
   },
   mounted() {
-    const abnTypeList = this.$lwDict.get('abnormal_type_choice')
 
-    if (this.abnTypeKey && Array.isArray(this.abnTypeKey)){
-      this.abnTypeList = abnTypeList.filter(item=>{
-        return this.abnTypeKey.includes(item.value)
-      })
-    }else {
-      this.abnTypeList = abnTypeList
-    }
   },
   methods: {
-    // 异常类型确认
-    typeConfirm({value}){
-      // 判断异常类型是否变化，变化了就要改子类型的值
-      if (!value || value !== this.abnormal.abnSubType.split('_')[0]){
-        this.abnormal.abnSubType = ''
-        const subType = this.$lwDict.get('abnormal_sub_type_choice')
-        this.subTypeList = subType.filter(item=>item.value.split('_')[0] === value)
-      }
-    },
-    // 清除异常类型
-    typeClear(){
-      this.abnormal.abnSubType = ''
-      this.subTypeList = []
-    },
-
-    // 异常量确认
-    abnQtyConfirm(){
-      if (this.abnQtyCheck()){
-        this.abnormalFocus.local = true
-      }
-    },
-    // 异常量校验
-    abnQtyCheck(){
-      const num = Number(this.abnormal.abnQty || 0)
-      if (!num){
-        this.abnormalFocus.qty = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuNull','异常量不能为空，且应当是大于0的整数')
-        )
-        this.abnormal.abnQty = ''
-        return false
-      }
-
-      // 异常类型为:单据异常(ORDER)、数量多件(QTY_MORE)，没有传入待处理量的均不校验数量
-      if (
-        this.abnormal.abnType !== 'ORDER' &&
-        this.abnormal.abnSubType !== 'QTY_MORE' &&
-        this.qty &&
-        num > this.qty
-      ){
-        this.abnormalFocus.qty = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuMore','异常量不能大于待处理量')
-        )
-        this.abnormal.abnQty = ''
-        return false
-      }
-
-      return true
-    },
-
-    // 异常库位确认
-    abnLocalConfirm(){
-      if(this.abnLocalCheck()){
-        this.abnormalFocus.lpn = true
-      }
-    },
-    // 异常库位校验
-    abnLocalCheck(){
-      if (!this.abnormal.abnLocationCode){
-        this.abnormalFocus.local = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.localNull','异常库位不能为空')
-        )
-        return false
-      }
-
-      return true
-    },
-    // 异常LPN校验
-    abnLpnCheck(){
-      if (this.requireLpn && !this.abnormal.abnLpn){
-        this.abnormalFocus.lpn = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.lpnNull','异常托盘号不能为空')
-        )
-        return false
-      }
-      return true
-    },
-
-    // 必填校验
-    requiredCheck(){
-      if (!this.abnormal.abnSkuType){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuTypeNull','货品类型不能为空')
-        )
-        return false
-      }
-
-      if (!this.abnormal.abnType){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnTypeNull','异常类型不能为空')
-        )
-        return false
-      }
-
-      if (!this.abnormal.abnSubType){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.subTypeNull','异常子类型不能为空')
-        )
-        return false
-      }
-
-      if (!this.abnQtyCheck())return
-
-      if (!this.abnLocalCheck()) return
-
-      if (!this.abnLpnCheck()) return
-
-      return true
-    },
     // 获取填写的异常数据
     getAbnormalData(){
-      if (this.requiredCheck()){
-        return {
-          success: true,
-          data: {
-            ...this.abnormal,
-            abnImg: this.abnormal.abnImgArr.join('|')
-          }
-        }
-      }
+      const obj = this.$refs.abnInput.getAbnormalInputData()
+
+      if (obj.success)  return obj
 
       return {
         success: false,

package/src/components/module/InnerAbnormal//345/234/250/345/272/223/345/274/202/345/270/270/346/250/241/345/235/227.md

@@ -0,0 +1 @@
+# 在库异常模块[查看文档](https://www.yuque.com/docs/share/600d868d-e50e-4ab3-91aa-513698933152)

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

@@ -34,6 +34,31 @@
       </template>
     </lw-input>
 
+    <!-- 验证码 -->
+    <div
+      v-if="showCaptcha"
+      class="lw-global-flex-start"
+    >
+      <lw-input
+        v-model="captcha"
+        type="password"
+        v-bind="inputStyle"
+        :placeholder="$lwLanguage.get('', '请输入验证码')"
+      >
+        <template #title>
+          <slot name="passwordTitle">
+            <img class="lw-login-model-img" :src="captchaSrc" alt="">
+          </slot>
+        </template>
+      </lw-input>
+      <img
+        class="captcha"
+        :src="'data:image/jpeg;base64,'+captchaData.captcha"
+        alt=""
+        @click="getCaptcha"
+      >
+    </div>
+
     <!-- 记住账号密码 -->
     <div class="lw-global-flex-start lw-login-checkbox">
       <van-checkbox
@@ -66,17 +91,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 +128,9 @@
 <script>
 
 import {loginAndInit} from "../../../mixins/loginAndInit";
+import usernameImage from './../../../assets/img/lwLoginModel/username.png'
+import passwordImage from './../../../assets/img/lwLoginModel/password.png'
+import captchaImage from './../../../assets/img/lwLoginModel/captcha.png'
 
 export default {
   name: "lwLoginModule",
@@ -96,14 +140,21 @@ 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
+      }
+    },
+    // 验证码图标
+    captchaSrc: {
+      type: null,
+      default: () => {
+        return captchaImage
       }
     },
 
@@ -157,11 +208,20 @@ export default {
       // 记住账号
       saveUsername: false,
       // 记住密码
-      savePassword: false
+      savePassword: false,
+
+      // 验证码
+      captcha:'',
+      // 是否显示验证码
+      showCaptcha: false,
+      // 验证码数据
+      captchaData:{}
     }
   },
   mounted() {
-    const loginInfo = this.$lwLocalStorag.get('lwLoginInfo') || {}
+    this.checkCaptcha()
+
+    const loginInfo = this.$lwLocalStorage.get('lwLoginInfo') || {}
     if (Object.keys(loginInfo).length) {
       loginInfo.password = atob(loginInfo.password)
       for (const i in loginInfo) {
@@ -170,6 +230,26 @@ export default {
     }
   },
   methods: {
+    // 检查是否需要验证码
+    checkCaptcha() {
+      this.$lwApi.common.checkCaptcha().then(res=>{
+        if(!res.required){
+          this.showCaptcha = false
+          return
+        }
+
+        this.getCaptcha()
+        this.showCaptcha = true
+
+      })
+    },
+    // 获取验证码信息
+    getCaptcha(){
+      this.$lwApi.common.getCaptcha().then(r=>{
+        this.captchaData = r
+      })
+    },
+
     // 记住账号复选框值变化
     saveUsernameChange(data) {
       !data ? this.savePassword = false : ''
@@ -204,7 +284,7 @@ export default {
       }
 
       // 在本地存入账号密码信息
-      this.$lwLocalStorag.set('lwLoginInfo', loginInfo)
+      this.$lwLocalStorage.set('lwLoginInfo', loginInfo)
     },
 
     // 登录
@@ -217,13 +297,25 @@ export default {
           return;
         }
 
+        if (this.showCaptcha && this.captcha === '') {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '请输入验证码')
+          )
+          return;
+        }
+
         this.saveNumPsw()
 
         const loginInfo = {
           username: this.username,
           password: this.password,
           saveUsername: this.saveUsername,
-          savePassword: this.savePassword
+          savePassword: this.savePassword,
+          captcha:{
+            captcha: this.captcha,
+            sign:this.captchaData.sign,
+            timestamp:this.captchaData.timestamp
+          }
         }
 
 
@@ -246,6 +338,8 @@ export default {
         // 储存token
         this.$lwApiUtils.setToken(res.token)
 
+        await this.$lwUUID.bound()
+
         await this.getSystemInitData()
 
         // 如果存在跳转页面就自动跳转
@@ -261,7 +355,8 @@ export default {
         // 登录成功后触发的事件
         this.$emit('success', res)
       }catch (err){
-        console.warn('登录出错：', err)
+        console.error('登录出错：', err)
+        this.checkCaptcha()
       }
     },
 
@@ -270,6 +365,13 @@ export default {
       this.$router.push({
         path:'/lwLanguage'
       })
+    },
+
+    // 时区切换
+    timezone(){
+      this.$router.push({
+        path:'/lwTimezone'
+      })
     }
   }
 }
@@ -283,17 +385,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;
+  }
 
-  .language-img{
-    width: 16px;
-    margin-right: 5px;
+  .select-menu{
+    text-align: center;
+
+
+    .language-img{
+      width: 16px;
+      margin-right: 5px;
+    }
   }
 }
 
@@ -320,5 +428,7 @@ export default {
   }
 }
 
-
+.captcha{
+  height: 36px;
+}
 </style>

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

@@ -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: item.default || '',
             disabled: !item.enabled
           }
         },
@@ -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
+        })
       }
 
 
@@ -145,7 +160,7 @@ export default {
     },
 
     // 获取数据
-    getData(){
+    getData(showError=true){
       let obj = {}
       for (let item of this.list) {
         // 校验必填项，是否已经填写
@@ -155,7 +170,7 @@ export default {
           item.required &&
           !(item.value === 0 || item.value)
         ){
-          this.$lwShowErrorMsg(
+          showError && this.$lwShowErrorMsg(
             this.$lwLanguage.get('wms_project.pda.module.lot.null','批次属性必填项不能为空') + ':' + item.title
           )
           return {
@@ -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'
+      console.log(this.$lwDate.format(item.default, format))
+      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)