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

package/src/views/wms/page/outbound/bale/baleChange/action/index.vue

@@ -42,7 +42,7 @@
       <container-sku-qty
         :box-no="baleData.boxNo"
         :type-count="baleData.skuTypeCount"
-        :pack-qty="baleData.packQty"
+        :pack-qty="baleData.packQtyLabel"
       />
 
       <lw-cell-popup-radio
@@ -66,6 +66,7 @@
         :get-focus.sync="openBoxPopup.container.focus"
         required
         rule-key="container"
+        :create-rule="$lwScanRule.create('捆包箱调整-执行页-撤回容器','CONTAINER')"
         @confirm="confirmOpen"
       />
 
@@ -98,7 +99,7 @@
       <container-sku-qty
         :box-no="baleData.boxNo"
         :type-count="baleData.skuTypeCount"
-        :pack-qty="baleData.packQty"
+        :pack-qty="baleData.packQtyLabel"
       />
 
       <lw-input
@@ -108,83 +109,73 @@
         required
         input-align="right"
         rule-key="delSku"
+        :create-rule="$lwScanRule.create('捆包箱调整-执行页-商品条码','SKU')"
+        :rule-serve-query="baleData"
         @confirm="delSkuConfirm"
       />
 
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.ujuyzxnj','序列号')"
-        v-if="delPopup.sn.show"
-        v-model="delPopup.sn.value"
-        :get-focus.sync="delPopup.sn.focus"
-        required
-        input-align="right"
-        rule-key="delSn"
-        @confirm="delSnConfirm"
-      />
-
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.karwdeyz','复核量')"
-        v-model="delPopup.qty.value"
-        :get-focus.sync="delPopup.qty.focus"
-        :disabled="delPopup.sn.show"
-        required
-        input-align="right"
-        type="digit"
-        @confirm="delQtyConfirm"
-      >
-
-        <template #button>
-          <lw-tag
-            v-if="delPopup.sn.show"
-            round
-            plain
-            type="danger"
-          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.oddishjw','不可修改') }}</lw-tag>
-        </template>
-
-      </lw-input>
-
-      <lw-sku-info-module
-        :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.xbgzckav','内装数')"
-        :sku-name="delPopup.skuInfo.skuName"
-        :sku-code="delPopup.skuInfo.skuCode"
-        :qty="delPopup.skuInfo.minSellQty"
-        is-row
-      />
-
-      <lw-cell-popup-radio
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.pdceyqdu','剔除原因')"
-        v-model="delPopup.reason"
-        :columns="delPopup.causeList"
-        required
-        value-key="label"
-      />
-
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.qxqqmjgi','剔除备注')"
-        v-model="delPopup.remark"
-        type="textarea"
-        input-align="right"
-        :rows="4"
-      />
-
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.ykfmzcdb','商品放入容器')"
-        v-model="delPopup.container.value"
-        :get-focus.sync="delPopup.container.focus"
-        required
-        :show-bottom-border="false"
-        input-align="right"
-        rule-key="delContainer"
-        @confirm="delConfirm"
-      />
+      <template v-if="Object.keys(delPopup.skuInfo).length">
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.ujuyzxnj','序列号')"
+          v-if="delPopup.sn.show"
+          v-model="delPopup.sn.value"
+          :get-focus.sync="delPopup.sn.focus"
+          required
+          input-align="right"
+          rule-key="delSn"
+          :create-rule="$lwScanRule.create('捆包箱调整-执行页-序列号','SN')"
+          :rule-serve-query="baleData"
+          @confirm="delSnConfirm"
+        />
+        <lw-get-qty-by-type
+          v-else
+          ref="qty"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.karwdeyz','复核量')"
+          :owner-id="delPopup.skuInfo.ownerId"
+          :sku-id="delPopup.skuInfo.skuId"
+          :auto-init="false"
+          @confirm="delQtyConfirm"
+        />
+        <lw-sku-info-module
+          :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.xbgzckav','内装数')"
+          :sku-name="delPopup.skuInfo.skuName"
+          :sku-code="delPopup.skuInfo.skuCode"
+          :qty="$lwCheckVal(delPopup.skuInfo.minSellQty)"
+          is-row
+        />
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.pdceyqdu','剔除原因')"
+          v-model="delPopup.reason"
+          :columns="delPopup.causeList"
+          required
+          value-key="label"
+        />
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.qxqqmjgi','剔除备注')"
+          v-model="delPopup.remark"
+          type="textarea"
+          input-align="right"
+          :rows="4"
+        />
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.ykfmzcdb','商品放入容器')"
+          v-model="delPopup.container.value"
+          :get-focus.sync="delPopup.container.focus"
+          required
+          :show-bottom-border="false"
+          input-align="right"
+          rule-key="delContainer"
+          :create-rule="$lwScanRule.create('捆包箱调整-执行页-放入容器','CONTAINER')"
+          @confirm="delConfirm"
+        />
 
+      </template>
 
 
       <template #button>
 
         <lw-button @click="delConfirm">
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.wmzwcveb','确认剔除') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.wmzwcveb', '确认剔除') }}
         </lw-button>
 
       </template>
@@ -207,6 +198,7 @@
         v-model="addPopup.container.value"
         :get-focus.sync="addPopup.container.focus"
         rule-key="addContainer"
+        :create-rule="$lwScanRule.create('捆包箱调整-执行页-拣选容器号','CONTAINER')"
         @confirm="addAction"
       />
 
@@ -277,38 +269,39 @@ export default {
       },
 
       // 剔除商品
-      delPopup:{
+      delPopup: {
         show: false,
 
-        sku:{
-          value:'',
+        sku: {
+          value: '',
           focus: false
         },
 
-        qty:{
-          value:'',
+        qty: {
+          value: '',
           focus: false
         },
 
-        sn:{
-          value:'',
+        sn: {
+          value: '',
           focus: false,
-          show: false
+          show: false,
+          qty: 0
         },
 
-        skuInfo:{},
+        skuInfo: {},
 
-        reason:'',
+        reason: '',
         causeList: [
-          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.hdydbzgl','正常')},
-          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.dsuwlskh','品质 - 破损')},
-          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.iqstifbe','排查 - 品质 - 破损')}
+          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.hdydbzgl', '正常')},
+          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.dsuwlskh', '品质 - 破损')},
+          {label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.iqstifbe', '排查 - 品质 - 破损')}
         ],
 
-        remark:'',
+        remark: '',
 
-        container:{
-          value:'',
+        container: {
+          value: '',
           focus: false
         },
 
@@ -342,12 +335,13 @@ export default {
     // 点击打印箱票
     async printBox(){
       // 判断当前是否配置了打印机
-      if (!Object.keys(this.printData).length){
-        const {success,printData} = this.$lwPrint.test(
+      if (!this.printData.printId) {
+        const {success, printData} = this.$lwPrint.test(
           'OUTBOUND_BOX_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.index.titunbpa','出库箱票标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.index.titunbpa', '出库箱票标签'),
+          true
         )
-        if (!success)return false
+        if (!success) return false
         this.printData = printData
       }
 
@@ -420,7 +414,6 @@ export default {
 
           this.delPopup.sn.value = ''
           this.delPopup.sn.show = false
-          this.delPopup.qty.value = ''
 
           // 判断是否需要sn
           if (this.delPopup.skuInfo.needHandleSn){
@@ -439,8 +432,8 @@ export default {
             return
           }
 
-          this.delPopup.qty.value = data.qty || ''
-          this.delPopup.qty.focus = true
+          this.$nextTick(() => this.$refs.qty.init(data.qty || 0, true))
+
           return
         }
       }
@@ -467,7 +460,7 @@ export default {
       for (let i of this.baleData.packSnList) {
 
         if (i.sn === sn && i.skuId === this.delPopup.skuInfo.skuId){
-          this.delPopup.qty.value = i.qty
+          this.delPopup.sn.qty = i.qty
           this.delPopup.container.focus = true
           return
         }
@@ -480,11 +473,11 @@ export default {
     },
     // 剔除商品 - 复核量确认、校验
     delQtyConfirm(){
-      const qty = Number(this.delPopup.qty.value || 0)
+      const qty = this.$refs.qty?.getQty() || 0
       if (!qty){
-        this.delPopup.qty.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.whoelfgg','剔除数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.whoelfgg', '剔除数量不能为空，且应当是大于0的整数')
         )
         return false
       }
@@ -492,29 +485,32 @@ export default {
       return true
     },
     // 剔除商品 - 确认剔除
-    delConfirm(){
+    delConfirm() {
 
-      if (!Object.keys(this.delPopup.skuInfo).length){
+      if (!Object.keys(this.delPopup.skuInfo).length) {
         this.delPopup.sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.jzedpkny','请扫描需要剔除的商品')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.jzedpkny', '请扫描需要剔除的商品')
         )
         return
       }
 
-      if (this.delPopup.sn.show && !this.delPopup.sn.value){
-        this.delPopup.sn.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.rkbuuqju','请扫描需要剔除商品的序列号')
-        )
-        return
+      if (this.delPopup.sn.show) {
+        if (!this.delPopup.sn.value) {
+          this.delPopup.sn.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.rkbuuqju', '请扫描需要剔除商品的序列号')
+          )
+          return
+        }
+      } else {
+        if (!this.delQtyConfirm()) return
       }
 
-      if (!this.delQtyConfirm()) return
 
-      if (!this.delPopup.reason){
+      if (!this.delPopup.reason) {
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.swoalsos','剔除原因不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.action.swoalsos', '剔除原因不能为空')
         )
         return
       }
@@ -539,9 +535,9 @@ export default {
         remark: this.delPopup.remark,
         snList:[{
           sn: this.delPopup.sn.value,
-          qty: this.delPopup.qty.value
+          qty: this.delPopup.sn.qty
         }],
-        currentDeleteQty: this.delPopup.qty.value
+        currentDeleteQty: this.$refs.qty?.getQty() || 0
       }).then(res=>{
         if (res.boxDelAll){
           this.$lwToast.success(
@@ -556,14 +552,13 @@ export default {
       })
     },
     // 剔除商品 - 弹框关闭
-    delPopupOff(){
+    delPopupOff() {
       this.delPopup.sku.value = ''
-      this.delPopup.skuInfo = {}
-      this.delPopup.qty.value = ''
       this.delPopup.sn.value = ''
       this.delPopup.reason = ''
       this.delPopup.remark = ''
       this.delPopup.container.value = ''
+      this.$nextTick(() => this.delPopup.skuInfo = {})
     },
 
     // 追加商品 - 打开弹框

package/src/views/wms/page/outbound/bale/baleChange/index/index.vue

@@ -10,14 +10,16 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
 
         <lw-input
-         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.index.ymmsseyz','捆包箱号')"
-         v-model="boxNo"
-         :get-focus.sync="boxNoFocus"
-         rule-key="box"
-         @confirm="boxNoConfirm"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.index.ymmsseyz','捆包箱号')"
+          v-model="boxNo"
+          :get-focus.sync="boxNoFocus"
+          rule-key="box"
+          :create-rule="$lwScanRule.create('捆包箱调整-起始页-捆包箱号','CASE')"
+          :show-bottom-border="false"
+          @confirm="boxNoConfirm"
         />
 
       </div>

package/src/views/wms/page/outbound/bale/baleChange/skuCheck/index.vue

@@ -18,6 +18,8 @@
           :get-focus.sync="sku.focus"
           auto-clear-val
           rule-key="sku"
+          :create-rule="$lwScanRule.create('捆包箱调整-复核-商品条码','SKU')"
+          :rule-serve-query="pickData"
           @confirm="skuConfirm"
         />
 
@@ -28,37 +30,32 @@
             v-model="sn.value"
             :get-focus.sync="sn.focus"
             rule-key="sn"
+            :create-rule="$lwScanRule.create('捆包箱调整-复核-序列号','SN')"
+            :rule-serve-query="pickData"
             @confirm="snConfirm"
           />
-
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.pokuhrxx','复核数量')"
-            v-model="qty.value"
-            :get-focus.sync="qty.focus"
-            type="digit"
-            :disabled="sn.show"
+          <lw-get-qty-by-type
+            v-else
+            ref="qty"
+            :sku-id="skuInfo.skuId"
             @confirm="qtyConfirm"
           >
-
             <template #button>
 
-              <lw-tag
-                v-if="sn.show"
-                round
-                plain
-                type="danger"
-              >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.jegcsbgc','不可修改') }}</lw-tag>
-
               <lw-button
-                v-else
                 round
                 mini
                 @click="qtyConfirm"
-              >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.jpvtcsrv','确认复核') }}</lw-button>
+              >
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.jpvtcsrv', '确认复核')
+                }}
+              </lw-button>
 
             </template>
 
-          </lw-input>
+          </lw-get-qty-by-type>
+
 
           <lw-sku-info-module
             :sku-code="skuInfo.skuCode"
@@ -79,7 +76,7 @@
 
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.tjtibend','数量')"
-              :value="skuInfo.waitQty"
+              :value="skuInfo.waitQtyLabel"
               val-bold
               val-red
               :is-row="false"
@@ -102,7 +99,7 @@
         <lw-sku-info-module
           :sku-name="i.skuName"
           :sku-code="i.skuCode"
-          :qty="i.totalQty"
+          :qty="i.totalQtyLabel"
         />
       </div>
 
@@ -186,18 +183,19 @@ export default {
     clearSkuInfo(){
       this.sku.value = ''
       this.sn.value = ''
-      this.qty.value = ''
       this.skuInfo = {}
       this.sku.focus = true
+
+
     },
     // 校验是否需要处理sn
     checkNeedSn(data) {
 
       if (this.skuInfo.needHandleSn){
         this.sn.show = true
-        if (data.sn){
+        if (data.sn) {
           this.sn.value = data.sn
-          this.snConfirm(data.sn,{data})
+          this.snConfirm(data.sn, {data})
           return
         }
         this.sn.focus = true
@@ -205,7 +203,8 @@ export default {
       }
 
       this.sku.focus = true
-      this.qty.value = Number(this.qty.value || 0) + Number(data.qty || 0)
+
+      this.$refs.qty.setQty(this.$refs.qty?.getQty() || 0 + Number(data.qty || 0))
     },
     // 商品号确认
     skuConfirm(val,{data}){
@@ -280,7 +279,7 @@ export default {
           ...this.skuInfo,
           ...res
         }
-        this.qty.value = res.qty
+        this.sn.show ? '' : this.$refs.qty.setQty(res.qty)
         this.qtyConfirm()
       })
 
@@ -289,10 +288,9 @@ export default {
     // 复核量确认
     qtyConfirm(){
 
-      const qty = Number(this.qty.value || 0)
+      const qty = this.$refs.qty?.getQty() || 0
 
       if (!qty){
-        this.qty.focus = true
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.baleChange.skuCheck.gowmhnsk','复核数量不能为空，且应当是大于0的整数')
         )