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

package/src/views/wms/page/inner/caseQuickMove/index/index.vue

@@ -9,30 +9,38 @@
 
     <!--  -->
     <div class="lw-global-page-box">
+
       <div class="lw-global-model-box">
 
-        <div class="lw-global-flex-between">
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.loc','库位')"
-            v-model="head.loc.value"
-            :get-focus.sync="head.loc.focus"
-            required
-            @confirm="locConfirm"
-          />
-          <lw-button
-            mini
-            @click="switchLoc"
-          >{{ $lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.switch.loc','切换库位') }}</lw-button>
-        </div>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.loc','库位')"
+          v-model="head.loc.value"
+          :get-focus.sync="head.loc.focus"
+          required
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('随机快速移动-整箱-库位','LOCATION')"
+          @confirm="locConfirm"
+        >
+          <template #button>
+            <lw-button
+              mini
+              @click="switchLoc"
+            >
+              {{ $lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.switch.loc', '切换库位') }}
+            </lw-button>
+          </template>
+        </lw-input>
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.lpn','托盘号')"
           v-model="head.lpn.value"
           :get-focus.sync="head.lpn.focus"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('随机快速移动-整箱-托盘号','LPN')"
           @confirm="lpnConfirm"
         />
 
-        <div class="lw-global-flex-between">
+        <div class="lw-global-flex-between lw-global-row-end">
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.boxQty', '扫描箱数')"
             :value="head.boxQty"
@@ -57,74 +65,64 @@
           v-model="box.value"
           :get-focus.sync="box.focus"
           required
+          rule-key="case"
+          :create-rule="$lwScanRule.create('随机快速移动-整箱-托盘号','CASE')"
           @confirm="caseConfirm"
         />
 
-        <div
-          v-for="(i,k) in box.boxList"
-          v-if="box.boxList.length"
-          :key="k"
-        >
-          <lw-cell
-            :title="i.boxNo"
-            :value="i.skuQty"
-            @click="showBox(k)"
-          />
-<!--          <div class="lw-global-flex-between">-->
-<!--            <lw-title-value-cell-->
-<!--              :value="i.box"-->
-<!--              :is-row="true"-->
-<!--              val-bold-->
-<!--              val-red-->
-<!--            />-->
-
-<!--            <lw-title-value-cell-->
-<!--              :value="i.qty"-->
-<!--              :is-row="true"-->
-<!--              val-bold-->
-<!--              val-red-->
-<!--            />-->
-<!--          </div>-->
-        </div>
+        <template v-for="(i,k) in box.boxList">
+          <div
+            v-if="box.boxList.length"
+            :key="k"
+          >
+            <lw-cell
+              :title="i.boxNo"
+              :value="i.skuQtyLabel"
+              @click="showBox(k)"
+            />
+          </div>
+        </template>
       </div>
 
-      <!-- 目标库位 底部栏 -->
-      <lw-bottom-bar height="auto" v-if="bottomBar.show">
-        <div style="padding: 10px 0;width: 100%">
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLoc','目标库位')"
-            v-model="bottomBar.toLoc.value"
-            :get-focus.sync="bottomBar.toLoc.focus"
-            required
-            rule-key="location"
-            :create-rule="$lwScanRule.create('随机快速移动-整箱-库位','LOCATION')"
-            @confirm="toLocConfirm"
-          />
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLpn','目标托盘')"
-            :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLpn.placeholder','请扫描或输入目标托盘,不填写则为空')"
-            v-model="bottomBar.toLpn.value"
-            :get-focus.sync="bottomBar.toLpn.focus"
-            @confirm="toLpnConfirm"
-          />
-<!--          <lw-input-->
-<!--            :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetCase','目标箱号')"-->
-<!--            :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetCase.placeholder','请扫描或输入目标箱号,不填写则为原箱号')"-->
-<!--            v-model="bottomBar.toCase.value"-->
-<!--            :get-focus.sync="bottomBar.toCase.focus"-->
-<!--            @confirm="toCaseConfirm"-->
-<!--          />-->
-
-          <lw-button
-            block
-            @click="move">
-            {{ $lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.move','执行移动') }}
-          </lw-button>
+    </div>
 
-        </div>
-      </lw-bottom-bar>
+    <!-- 目标库位 底部栏 -->
+    <lw-bottom-bar height="auto" v-if="bottomBar.show">
+      <div style="padding: 10px 0;width: 100%">
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLoc','目标库位')"
+          v-model="bottomBar.toLoc.value"
+          :get-focus.sync="bottomBar.toLoc.focus"
+          required
+          rule-key="toLocation"
+          :create-rule="$lwScanRule.create('随机快速移动-整箱-库位','LOCATION')"
+          @confirm="toLocConfirm"
+        />
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLpn','目标托盘')"
+          :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLpn.placeholder','请扫描或输入目标托盘,不填写则为空')"
+          v-model="bottomBar.toLpn.value"
+          :get-focus.sync="bottomBar.toLpn.focus"
+          rule-key="toLpn"
+          :create-rule="$lwScanRule.create('随机快速移动-整箱-目标托盘','LPN')"
+          @confirm="toLpnConfirm"
+        />
+        <!--          <lw-input-->
+        <!--            :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetCase','目标箱号')"-->
+        <!--            :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetCase.placeholder','请扫描或输入目标箱号,不填写则为原箱号')"-->
+        <!--            v-model="bottomBar.toCase.value"-->
+        <!--            :get-focus.sync="bottomBar.toCase.focus"-->
+        <!--            @confirm="toCaseConfirm"-->
+        <!--          />-->
+
+        <lw-button
+          block
+          @click="move">
+          {{ $lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.move', '执行移动') }}
+        </lw-button>
 
-    </div>
+      </div>
+    </lw-bottom-bar>
 
     <!-- 箱明细弹窗 -->
     <lw-popup
@@ -133,7 +131,7 @@
       :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.cas','箱')"
     >
       <div class="lw-global-row-start">
-        <div  class="lw-global-flex-between">
+        <div class="lw-global-flex-between">
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.caseNum', '箱号')"
             :value="box.boxList[boxPop.boxIndex].boxNo"
@@ -141,7 +139,9 @@
             val-bold
             val-red
           />
-          <lw-tag round plain style="flex-shrink: 0">{{$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.label','整箱')}}</lw-tag>
+          <lw-tag round plain style="flex-shrink: 0">
+            {{ $lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.label', '整箱') }}
+          </lw-tag>
         </div>
       </div>
       <div class="lw-global-row">
@@ -155,7 +155,7 @@
           />
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.qty', '数量')"
-            :value="box.boxList[boxPop.boxIndex].skuQty"
+            :value="box.boxList[boxPop.boxIndex].skuQtyLabel"
             :is-row="false"
             val-bold
             val-red
@@ -168,24 +168,25 @@
         :key="k"
         class="lw-global-row"
       >
-        <div class="lw-global-flex-between">
-          <div>
-            <div class="lw-global-value-bold">{{ i.skuCode }}</div>
-            <div>{{ i.skuName }}</div>
-          </div>
-          <lw-tag round plain style="flex-shrink: 0">{{ i.sizeTypeLabel }}</lw-tag>
-        </div>
+        <lw-sku-info-module
+          :sku-code="i.skuCode"
+          :sku-name="i.skuName"
+        >
+          <template>
+            <lw-tag round plain style="flex-shrink: 0">{{ i.sizeTypeLabel }}</lw-tag>
+          </template>
+        </lw-sku-info-module>
         <div class="lw-global-flex-between">
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.qty', '数量')"
-            :value="i.qty"
+            :value="i.qtyLabel"
             :is-row="false"
             val-bold
             val-red
           />
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLoc', '目标库位')"
-            :value="bottomBar.toLoc.value"
+            :value="$lwCheckVal(bottomBar.toLoc.value)"
             :is-row="false"
             val-bold
             val-red
@@ -312,31 +313,33 @@ export default {
         })
       }
     },
-    caseCheck(){
+    caseCheck() {
       if (this.box.value) return true
 
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.caseNum.null','箱号不能为空')
+        this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.caseNum.null', '箱号不能为空')
       )
       this.box.focus = true
       return false
     },
 
-    toLocConfirm(){
-      this.toLocCheck()
+    toLocConfirm() {
+      if (this.toLocCheck()) {
+        this.bottomBar.toLpn.focus = true
+      }
     },
-    toLocCheck(){
-      if (this.bottomBar.toLoc.value) {this.bottomBar.toLpn.focus = true; return true}
+    toLocCheck() {
+      if (this.bottomBar.toLoc.value) return true
 
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLoc.null','目标库位不能为空')
+        this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.targetLoc.null', '目标库位不能为空')
       )
       this.bottomBar.toLoc.focus = true
       return false
     },
 
 
-    toLpnConfirm(){
+    toLpnConfirm() {
       this.move()
     },
 
@@ -344,7 +347,7 @@ export default {
     // 执行移动
     move(){
 
-      this.boxListCheck()
+      if (!this.boxListCheck() || !this.toLocCheck()) return
 
       this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.warn','警告'),
@@ -356,11 +359,11 @@ export default {
           toLpn: this.bottomBar.toLpn.value,
           fromLocId: this.head.fromLocId,
           boxList: this.box.boxList.map(item => item.boxNo)
-        }).then(res =>{
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.move.success','移动成功'))
-          setTimeout(()=>{
+        }).then(() => {
+          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.move.success', '移动成功'))
+          setTimeout(() => {
             this.cleanData()
-          },2000)
+          }, 2000)
         }).catch(()=>{})
 
       }).catch(()=>{})
@@ -418,8 +421,8 @@ export default {
       this.boxPop.index = 0
 
       this.bottomBar.show = false
-      this.bottomBar.toLoc = ''
-      this.bottomBar.toLpn = ''
+      this.bottomBar.toLoc.value = ''
+      this.bottomBar.toLpn.value = ''
     }
 
   }