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

package/src/components/page/receive/receipt/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 到货回单 - 起始页
-* @author: 张文
-* @date  2022-05-09
-* */
-
-import lwReceiveReceiptPage from "./index.vue";
-
-lwReceiveReceiptPage.install = Vue => Vue.component(lwReceiveReceiptPage.name, lwReceiveReceiptPage)
-
-export default lwReceiveReceiptPage
+/*
+* 到货回单 - 起始页
+* @author: 张文
+* @date  2022-05-09
+* */
+
+import lwReceiveReceiptPage from "./index.vue";
+
+lwReceiveReceiptPage.install = Vue => Vue.component(lwReceiveReceiptPage.name, lwReceiveReceiptPage)
+
+export default lwReceiveReceiptPage

package/src/components/page/receive/receipt/index/index.vue

@@ -44,7 +44,7 @@
         v-if="showReceiptBtn"
         @click="receiveOrder"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.receipt.waitOrder','收货回单') }}
+        {{ $lwLanguage.get('wms_project.pda.receive.receipt.qazwsxed','收货回单') }}
       </lw-button>
 
     </lw-bottom-bar>
@@ -100,7 +100,14 @@ export default {
     waitOrder(){
       if (!this.orderCheck()) return
 
-      console.warn('预收货回单按钮点击')
+      this.$router.push({
+        path:'/receive/receipt/lwReceiptConfirm',
+        query:{
+          lwOrder: this.order.value,
+          lwDate: this.date,
+          lwType: "advanceReceive"
+        }
+      })
     },
 
     // 收货回单按钮
@@ -111,7 +118,8 @@ export default {
         path:'/receive/receipt/lwReceiptConfirm',
         query:{
           lwOrder: this.order.value,
-          lwDate: this.date
+          lwDate: this.date,
+          lwType: "receive"
         }
       })
     }

package/src/components/ui/BottomBar/index.js

@@ -1,5 +1,5 @@
-import lwBottomBar from './index.vue'
-
-lwBottomBar.install = Vue => Vue.component(lwBottomBar.name, lwBottomBar)
-
-export default lwBottomBar
+import lwBottomBar from './index.vue'
+
+lwBottomBar.install = Vue => Vue.component(lwBottomBar.name, lwBottomBar)
+
+export default lwBottomBar

package/src/components/ui/BottomBar/index.vue

@@ -9,14 +9,19 @@
     <div
       class="lw-bottom-bar-copy"
       :style="{
-        height:height+'px'
+        height: heightClone
       }"
     ><!-- 占位用 --></div>
 
     <div
-      class="lw-global-flex-around lw-bottom-bar-copy lw-bottom-bar"
+      id="lwGlobalBottomBar"
+      :class="[
+        slotBtn ? 'lw-global-flex-around':'',
+        'lw-bottom-bar-copy',
+        'lw-bottom-bar'
+      ]"
       :style="{
-        height:height+'px'
+        height: heightVal
       }"
     >
       <slot></slot>
@@ -31,12 +36,33 @@ export default {
   props: {
     // 高度
     height:{
-      type: Number,
+      type: [Number, String],
       default: 50
+    },
+    // 插槽内容是否为按钮
+    slotBtn:{
+      type: Boolean,
+      default: true
     }
   },
+  computed:{
+    heightVal(){
+      if (typeof this.height === 'number'){
+        return this.height + 'px'
+      }
+
+      return this.height
+
+    },
+  },
   data() {
-    return {}
+    return {
+      heightClone:'0px'
+    }
+  },
+  mounted() {
+    // 获取显示高度
+    this.heightClone = document.getElementById('lwGlobalBottomBar').offsetHeight + 'px'
   },
   methods: {}
 }

package/src/components/ui/BottomBarBtnHidden/index.js

@@ -1,11 +1,11 @@
-/*
-* 底部按钮栏隐藏多余按钮
-* @author: 张文
-* @date  2022-06-25
-* */
-
-import lwBottomBarBtnHidden from "./index.vue";
-
-lwBottomBarBtnHidden.install = Vue => Vue.component(lwBottomBarBtnHidden.name, lwBottomBarBtnHidden)
-
-export default lwBottomBarBtnHidden
+/*
+* 底部按钮栏隐藏多余按钮
+* @author: 张文
+* @date  2022-06-25
+* */
+
+import lwBottomBarBtnHidden from "./index.vue";
+
+lwBottomBarBtnHidden.install = Vue => Vue.component(lwBottomBarBtnHidden.name, lwBottomBarBtnHidden)
+
+export default lwBottomBarBtnHidden

package/src/components/ui/BottomBarBtnHidden/index.vue

@@ -72,7 +72,7 @@ export default {
         return
       }
 
-      console.warn('底部按钮隐藏多余按钮点击调用方法错误，传入点击事件不是可调用的函数', fn)
+      console.error('底部按钮隐藏多余按钮点击调用方法错误，传入点击事件不是可调用的函数', fn)
     }
   }
 }

package/src/components/ui/BottomBarBtnHidden//345/272/225/351/203/250/346/214/211/351/222/256/346/240/217/351/232/220/350/227/217/345/244/232/344/275/231/346/214/211/351/222/256.md

@@ -0,0 +1 @@
+# 底部固定栏隐藏多余按钮[查看文档](https://www.yuque.com/docs/share/6162734a-c117-4ea5-bc43-e4038249af9b)

package/src/components/ui/Button/index.js

@@ -1,5 +1,5 @@
-import lwButton from "./index.vue";
-
-lwButton.install = Vue => Vue.component(lwButton.name, lwButton)
-
-export default lwButton
+import lwButton from "./index.vue";
+
+lwButton.install = Vue => Vue.component(lwButton.name, lwButton)
+
+export default lwButton

package/src/components/ui/Button/index.vue

@@ -103,14 +103,14 @@ export default {
 
 // 常规按钮
 .lw-button {
-  border-radius: @buttonBorderRadius;
+  border-radius: 4px;
   font-weight: 400;
   padding: 0 10px;
   border: none;
   transition: opacity 0.2s;
   position: relative;
-  min-height: @buttonHeight;
-  font-size: @buttonFontSize;
+  min-height: 30px;
+  font-size: 14px;
 
   &+.lw-button{
     margin-left: 5px;
@@ -124,8 +124,8 @@ export default {
 
 // mini按钮
 .lw-mini-button{
-  min-height: @miniButtonHeight;
-  font-size: @miniButtonFontSize;
+  min-height: 20px;
+  font-size: 12px;
 }
 
 // 圆角样式
@@ -142,7 +142,7 @@ export default {
 
 // 主要按钮朴素样式
 .lw-button-plain-main {
-  background: @plainButtonBackgroundColor;
+  background: #fff;
   color: @baseColor;
   border: 1px solid @baseColor;
 }
@@ -156,7 +156,7 @@ export default {
 
 // 正常按钮朴素样式
 .lw-button-plain-normal {
-  background: @plainButtonBackgroundColor;
+  background: #fff;
   color: @normalButtonBackgroundColor;
 }
 
@@ -169,7 +169,7 @@ export default {
 
 // 次要按钮朴素样式
 .lw-button-plain-last {
-  background: @plainButtonBackgroundColor;
+  background: #fff;
   color: @lastButtonBackgroundColor;
 }
 

package/src/components/ui/CarPlate/index.js

@@ -1,11 +1,11 @@
-/*
-* 车牌号输入组件
-* @author: 张文
-* @date  2022-06-06
-* */
-
-import lwCarPlate from "./index.vue";
-
-lwCarPlate.install = Vue => Vue.component(lwCarPlate.name, lwCarPlate)
-
-export default lwCarPlate
+/*
+* 车牌号输入组件
+* @author: 张文
+* @date  2022-06-06
+* */
+
+import lwCarPlate from "./index.vue";
+
+lwCarPlate.install = Vue => Vue.component(lwCarPlate.name, lwCarPlate)
+
+export default lwCarPlate

package/src/components/ui/CarPlate/index.vue

@@ -24,12 +24,8 @@
           <!-- 车牌 -->
           <div
             v-if="num"
-            :class="[
-                'lw-car-plate',
-                num.length===8 ? 'lw-car-plate-new' : '',
-                num[6]==='挂' ? 'lw-car-plate-big' : ''
-              ]"
-          >{{ carPlate }}</div>
+            :class="['lw-car-plate',...carPlate.class]"
+          >{{ carPlate.plate }}</div>
 
         </div>
 
@@ -41,7 +37,7 @@
     <lw-popup
       :title="titleText"
       v-model="showPopup"
-      height="330px"
+      height="370px"
     >
       <!-- 车牌类型 -->
       <div style="font-size: 14px;">
@@ -50,119 +46,144 @@
           direction="horizontal"
           @change="carTypeChange"
         >
-          <van-radio name="old">普通车牌</van-radio>
+
+          <van-radio
+            style="margin-bottom: 8px"
+            name="old"
+          >{{ $lwLanguage.get('wms_project.pda.components.ui.CarPlate.rnmtzvrt','普通车牌') }}</van-radio>
+
           <van-radio
             :disabled="carPlateList[6]==='挂'"
             name="new"
-          >新能源车牌</van-radio>
+            style="margin-bottom: 8px"
+          >{{ $lwLanguage.get('wms_project.pda.components.ui.CarPlate.rvwizyjh','新能源车牌') }}</van-radio>
+
+          <van-radio
+            v-if="!hiddenHandInput"
+            style="margin-bottom: 8px"
+            name="handInput"
+          >{{ $lwLanguage.get('wms_project.pda.components.ui.CarPlate.phheorwz','手动输入') }}</van-radio>
+
         </van-radio-group>
       </div>
 
-      <!-- 车牌显示部分 -->
-      <div class="lw-global-flex-around lw-car-plate-box">
+      <template v-if="carType === 'handInput'">
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.ui.CarPlate.natiejjr','车牌号')"
+          v-model="handInput.value"
+          :get-focus.sync="handInput.focus"
+          :not-keyboard="false"
+          @confirm="handInputConfirm"
+        />
+      </template>
+      <template v-else>
+        <!-- 车牌显示部分 -->
+        <div class="lw-global-flex-around lw-car-plate-box">
 
-        <!-- 省份和市区 -->
-        <div
-          v-for="i in 2"
-          :key="i-1"
-          :class="[
+          <!-- 省份和市区 -->
+          <div
+            v-for="i in 2"
+            :key="i-1"
+            :class="[
             'lw-car-plate-num-item',
             carPlateItemIndex === (i-1) ? 'lw-car-plat-num-item-action' : ''
           ]"
-          @click="carPlateItemClick(i-1)"
-        >{{ carPlateList[i - 1] || '' }}
-        </div>
+            @click="carPlateItemClick(i-1)"
+          >{{ carPlateList[i - 1] || '' }}
+          </div>
 
-        <!-- 分割点 -->
-        <div class="lw-car-plate-num-dot"></div>
+          <!-- 分割点 -->
+          <div class="lw-car-plate-num-dot"></div>
 
-        <!-- 车牌号 -->
-        <div
-          v-for="i in 5"
-          :key="i+1"
-          :class="[
+          <!-- 车牌号 -->
+          <div
+            v-for="i in 5"
+            :key="i+1"
+            :class="[
             'lw-car-plate-num-item',
             carPlateItemIndex === (i+1) ? 'lw-car-plat-num-item-action' : ''
           ]"
-          @click="carPlateItemClick(i+1)"
-        >{{ carPlateList[i + 1] || '' }}
-        </div>
+            @click="carPlateItemClick(i+1)"
+          >{{ carPlateList[i + 1] || '' }}
+          </div>
 
-        <!-- 新能源 -->
-        <div
-          v-if="carType==='new'"
-          :class="[
+          <!-- 新能源 -->
+          <div
+            v-if="carType==='new'"
+            :class="[
             'lw-car-plate-num-item',
             carPlateItemIndex === 7 ? 'lw-car-plat-num-item-action' : ''
           ]"
-          @click="carPlateItemClick(7)"
-        >{{ carPlateList[7] || '' }}
+            @click="carPlateItemClick(7)"
+          >{{ carPlateList[7] || '' }}
+          </div>
         </div>
-      </div>
 
-      <!-- 省份输入键盘 -->
-      <div
-        v-if="carPlateItemIndex===0"
-        class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
-      >
+        <!-- 省份输入键盘 -->
         <div
-          class="lw-car-plate-keyboard"
-          v-for="(i,k) in province"
-          :key="k"
-          @click="inputClick(i)"
-        >{{ i }}
+          v-if="carPlateItemIndex===0"
+          class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
+        >
+          <div
+            class="lw-car-plate-keyboard"
+            v-for="(i,k) in province"
+            :key="k"
+            @click="inputClick(i)"
+          >{{ i }}
+          </div>
         </div>
-      </div>
 
-      <!-- 数字输入键盘 -->
-      <div
-        v-if="carPlateItemIndex > 1"
-        class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
-      >
+        <!-- 数字输入键盘 -->
         <div
-          class="lw-car-plate-keyboard"
-          v-for="(i,k) in number"
-          :key="k"
-          @click="inputClick(i)"
-        >{{ i }}
+          v-if="carPlateItemIndex > 1"
+          class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
+        >
+          <div
+            class="lw-car-plate-keyboard"
+            v-for="(i,k) in number"
+            :key="k"
+            @click="inputClick(i)"
+          >{{ i }}
+          </div>
         </div>
-      </div>
 
-      <!-- 字母键盘 -->
-      <div
-        v-if="carPlateItemIndex !==0"
-        class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
-      >
-        <div
-          class="lw-global-click-style lw-car-plate-keyboard"
-          v-for="(i,k) in letter"
-          :key="k"
-          @click="inputClick(i)"
-        >{{ i }}
-        </div>
+        <!-- 字母键盘 -->
         <div
-          :style="
+          v-if="carPlateItemIndex !==0"
+          class="lw-global-flex-between lw-global-animation-rotate lw-car-plate-keyboard-box"
+        >
+          <div
+            class="lw-global-click-style lw-car-plate-keyboard"
+            v-for="(i,k) in letter"
+            :key="k"
+            @click="inputClick(i)"
+          >{{ i }}
+          </div>
+          <div
+            :style="
             carType==='old' && carPlateItemIndex===6 ?
             {} :
             {background:'#f0f0f0',color:'#ccc'}
           "
-          class="lw-global-click-style lw-car-plate-keyboard"
-          @click="carType==='old' && carPlateItemIndex===6 ? inputClick('挂') : '' "
-        >挂
+            class="lw-global-click-style lw-car-plate-keyboard"
+            @click="carType==='old' && carPlateItemIndex===6 ? inputClick('挂') : '' "
+          >挂
+          </div>
         </div>
-      </div>
+      </template>
 
 
       <!-- 按钮操作区 -->
       <template #button>
         <lw-button
+          v-if="carType !== 'handInput'"
           type="last"
           @click="del"
         >
-          {{ $lwLanguage.get('', '删除') }}
+          {{ $lwLanguage.get('wms_project.pda.components.ui.CarPlate.del', '删除') }}
         </lw-button>
         <lw-button @click="confirm">
-          {{ $lwLanguage.get('', '确定') }}
+          {{ $lwLanguage.get('wms_project.pda.components.ui.CarPlate.confirm', '确定') }}
         </lw-button>
       </template>
     </lw-popup>
@@ -184,6 +205,12 @@ export default {
     isEdit:{
       type: Boolean,
       default: true
+    },
+
+    // 是否隐藏手动输入选项
+    hiddenHandInput:{
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -198,15 +225,39 @@ export default {
     },
     // 标题
     titleText() {
-      return this.title || this.$lwLanguage.get('', '车牌号')
+      return this.title || this.$lwLanguage.get('wms_project.pda.components.ui.CarPlate.natiejjr', '车牌号')
     },
     // 用于显示的车牌号
     carPlate() {
-      return this.num.replace(/(^[\u4e00-\u9fa5][A-Z])/, "$1·")
+      const data = {
+        plate: this.num,
+        class: []
+      }
+
+      const length = this.num.length
+
+      if (length === 7 || length === 8){
+        data.class.push('lw-car-plate-old')
+        data.plate = this.num.replace(/(^[\u4e00-\u9fa5][A-Z])/, "$1·")
+      }
+      if (length === 8){
+        data.class.push('lw-car-plate-new')
+      }
+      if (this.num[6] === '挂'){
+        data.class.push('lw-car-plate-big')
+      }
+
+      return data
     }
   },
   data() {
     return {
+      // 手动输入
+      handInput:{
+        value: '',
+        focus: false
+      },
+
       // 弹框显示的车牌
       carPlateList: [],
 
@@ -237,19 +288,75 @@ export default {
         'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
         'W', 'X', 'Y', 'Z',
       ],
+
+      // 显示车牌的样式
+      valClass: []
     }
   },
   methods: {
     // 打开弹出框
     openPopup() {
-      this.carType = this.num.length === 8 ? 'new' : 'old'
-      this.carPlateList = this.num.split('')
-      this.carPlateItemIndex = 0
+
+      // 根据预设语言或系统语言判断是否是国内，不是国内的就默认为输入框
+      const lang = this.$lwLocalStorag.get('lwLanguage') || this.$lwLanguage.getKey() || navigator.language
+      const isChina = /zh|zH|Zh|ZH/.test(lang)
+
+      // 如果语言是国内就判断当前车牌是否符合国内车牌规则
+      if (isChina){
+        // 根据车牌长度确定时否是新能源或燃油车
+        switch (this.num.length) {
+          case 0:
+          case 7:
+            this.carType = 'old'
+            break;
+          case 8 :
+            this.carType = 'new'
+            break;
+          default:
+            if (this.hiddenHandInput){
+              this.carType = 'old'
+            }else {
+              this.carType = 'handInput'
+            }
+        }
+      }else {
+        this.carType = 'handInput'
+      }
+
+
+
+      if (this.carType === 'handInput'){
+        this.handInput.value = this.num
+      }else {
+        this.carPlateList = this.num.split('')
+        this.carPlateItemIndex = 0
+      }
+
       this.showPopup = true
     },
 
     // 车牌类型改变
     carTypeChange(){
+
+      // 切换到手动输入就要清空输入框 同时清空预设键盘输入框
+      if(this.carType === 'handInput'){
+        this.handInput.focus = true
+        this.handInput.value = this.carPlateList.join('')
+        this.carPlateList = []
+        this.carPlateItemIndex = 0
+        return
+      }
+
+      // 如果不是手动输入，就判断车牌列表是否为空，且输入框是否满足回填条件，满足就回填车牌
+      if(
+        this.carPlateList.length === 0 &&
+        /^[\u4e00-\u9fa5][A-Z][A-Z|0-9]{5,6}/.test(this.handInput.value)
+      ){
+        this.carPlateList = this.handInput.value.split('')
+      }
+
+
+      // 判断是否是燃油车牌，如果是就把第8为字符设为空
       if (this.carType === 'old'){
         this.carPlateList[7] = ''
       }
@@ -284,23 +391,30 @@ export default {
 
     // 确认
     confirm(){
-      const num = this.carPlateList.join('')
+      let num = this.carPlateList.join('')
       if (this.carType === 'old' && num.length !== 7){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','车牌输入不正确，请核对')
+          this.$lwLanguage.get('wms_project.pda.components.ui.CarPlate.mzlqxuiq','车牌输入不正确，请核对')
         )
         return
       }
 
       if (this.carType === 'new' && num.length !== 8){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','车牌输入不正确，请核对')
+          this.$lwLanguage.get('wms_project.pda.components.ui.CarPlate.mzlqxuiq','车牌输入不正确，请核对')
         )
         return
       }
 
+      if (this.carType === 'handInput') num = this.handInput.value
+
       this.num = num
       this.showPopup = false
+    },
+
+    // 手动输入确认
+    handInputConfirm(){
+      this.confirm()
     }
   }
 }
@@ -313,6 +427,9 @@ export default {
 .lw-car-plate{
   text-align: center;
   padding: 3px 5px;
+}
+
+.lw-car-plate-old{
   border-radius: 3px;
   letter-spacing: 1px;
   background: #052fc2;

package/src/components/ui/CarPlate//350/275/246/347/211/214/345/217/267.md

@@ -1 +1 @@
-# 按钮[查看文档](https://www.yuque.com/docs/share/5e6c1f5b-41ac-426c-917d-066604373c9e)
+# 按钮[查看文档](https://www.yuque.com/docs/share/5e6c1f5b-41ac-426c-917d-066604373c9e)