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

package/src/views/wms/page/inner/materialApply/generate/index.vue

@@ -10,13 +10,13 @@
     <!--    中间内容-->
     <div class="lw-global-page-box">
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
         <!-- 领用类型 -->
         <lw-cell-popup-radio
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.type','领用类型')"
-            v-model="applyType"
-            required
-            dict-key="InnerMaterialApplyType"
+          :title="$lwLanguage.get('wms_project.pda.inner.materialApply.type','领用类型')"
+          v-model="applyType"
+          required
+          dict-key="InnerMaterialApplyType"
         />
 
         <!-- 业务类型 -->
@@ -47,81 +47,95 @@
 
         <!-- 业务编号3 -->
         <lw-input
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.bizNo3','业务单号3')"
-            v-model="bizNo3.value"
-            :get-focus.sync="bizNo3.focus"
-            input-align="right"
+          :title="$lwLanguage.get('wms_project.pda.inner.materialApply.bizNo3','业务单号3')"
+          v-model="bizNo3.value"
+          :get-focus.sync="bizNo3.focus"
+          input-align="right"
         />
 
         <!-- 货主 -->
-        <lw-cell-popup-radio
-            style="padding-bottom: 0 ; border-bottom: none"
-            :title="this.$lwLanguage.get('wms_project.pda.inner.materialApply.owner','货主')"
-            v-model="ownerId"
-            value-key="id"
-            label-key="name"
-            :columns="ownerList"
-            required
+        <lw-search-select-popup-module
+          ref="ownerSelect"
+          :title="this.$lwLanguage.get('wms_project.pda.inner.materialApply.owner','货主')"
+          v-model="ownerId"
+          :api="$lwApi.common.searchOwner"
+          required
+          input-align="right"
+          :disabled="!!submitLine.length"
+          @confirm="skuCode.focus=true"
         />
-      </div>
-
-      <!--      包材编码输入框-->
-      <div class="lw-global-model-box">
         <!-- 包材编码 -->
         <lw-input
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.skuCode','包材编码')"
-            v-model="skuCode.value"
-            :get-focus.sync="skuCode.focus"
-            input-align="right"
-            @confirm="getInvData"
+          :title="$lwLanguage.get('wms_project.pda.inner.materialApply.skuCode','包材编码')"
+          v-model="skuCode.value"
+          :get-focus.sync="skuCode.focus"
+          input-align="right"
+          rule-key="sku"
+          :create-rule="$lwScanRule.create('提交领用单-包材编码','SKU')"
+          :show-bottom-border="false"
+          required
+          @confirm="getInvData"
         />
       </div>
-      <!--      选择的包材的展示-->
-      <div
-        class="lw-global-model-box"
-        v-for="(i,k) in submitLine"
-        :key="k"
-      >
-        <!-- 包材头信息 -->
-        <div class="lw-global-row lw-global-flex-start-start">
 
-          <div class="lw-global-title">{{ $lwLanguage.get('wms_project.pda.inner.materialApply.packMaterial', '包材') }}</div>
 
-          <div class="lw-global-value">
-            <div class="lw-global-value-bold">{{i.skuCode}}</div>
-            <div>{{i.type}}</div>
-          </div>
+      <template v-if="submitLine.length">
+        <!--      选择的包材的展示-->
+        <div
+          style="margin: 10px 0"
+          class="lw-global-title"
+        >
+          {{ $lwLanguage.get('', '领用列表') }}
         </div>
+        <div
+          class="lw-global-model-box"
+          v-for="(i,k) in submitLine"
+          :key="k"
+        >
+          <!-- 包材头信息 -->
+          <div class="lw-global-row-start lw-global-flex-start-start">
+
+            <div class="lw-global-title">{{
+                $lwLanguage.get('wms_project.pda.inner.materialApply.packMaterial', '包材')
+              }}
+            </div>
+
+            <div class="lw-global-value">
+              <div class="lw-global-value-bold">{{ i.skuCode }}</div>
+              <div>{{ i.type }}</div>
+            </div>
+          </div>
 
-        <div class="lw-global-row lw-global-flex-between">
+          <div class="lw-global-row-end lw-global-flex-between">
 
 
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.locCode', '库位') "
-            :value="i.locationCode"
-            val-bold
-            :is-row="false"
-          />
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','领取量')"
-            :value="i.applyQty"
-            val-bold
-            val-red
-            :is-row="false"
-          />
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.inner.materialApply.locCode', '库位') "
+              :value="i.locationCode"
+              val-bold
+              :is-row="false"
+            />
 
-          <lw-button
-            round
-            mini
-            @click="del(k)"
-          >{{ $lwLanguage.get('wms_project.pda.inner.materialApply.del','删除') }}</lw-button>
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','领取量')"
+              :value="i.applyQtyLabel"
+              val-bold
+              val-red
+              :is-row="false"
+            />
 
-        </div>
+            <lw-button
+              round
+              mini
+              @click="del(k)"
+            >{{ $lwLanguage.get('wms_project.pda.inner.materialApply.del', '删除') }}
+            </lw-button>
 
+          </div>
 
 
-      </div>
+        </div>
+      </template>
 
     </div>
     <!--    底部按钮-->
@@ -163,20 +177,19 @@
               :is-row="false"
           />
           <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.inner.materialApply.availableQty','可用库存')"
-              :value="i.availableQty"
-              val-bold
-              val-red
-              :is-row="false"
+            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.availableQty','可用库存')"
+            :value="i.availableQtyLabel"
+            val-bold
+            val-red
+            :is-row="false"
           />
 
         </div>
 
-        <lw-input
-            :title="$lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','领取量')"
-            type="digit"
-            @input="(val) => checkInvQty(val, i)"
-            v-model="i.applyQty"
+        <lw-get-qty-by-type
+          ref="applyQty"
+          :title="$lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','领取量')"
+          :sku-id="packMaterialInvData.skuId"
         />
 
       </div>
@@ -224,8 +237,6 @@ export default {
         value: '',
         focus: false
       },
-      // 货主的选择项目
-      ownerList: [],
 
       //包材库存数据
       packMaterialInvData: {
@@ -251,14 +262,7 @@ export default {
 
     }
   },
-  mounted() {
-    this.init()
-  },
   methods: {
-    init() {
-      // 获取货主信息
-      this.$lwApi.common.ownerList().then(res => this.ownerList = res)
-    },
 
     getInvData() {
       if (!this.skuCode.value) {
@@ -299,22 +303,38 @@ export default {
           })
         })
         this.popup.show = true
-      }).catch((e) => {
-        console.log(e)
       })
     },
 
     //库存选择弹窗确认
     confirmInv() {
-      this.packMaterialInvData.invList.forEach(item => {
-        if (Number(item.applyQty || 0) > 0) {
-          this.submitLine.push(item)
+      const refsList = this.$refs.applyQty
+      let applyList = []
+      for (let i = 0; i < this.packMaterialInvData.invList.length; i++) {
+        const item = this.packMaterialInvData.invList[i]
+        const obj = refsList[i].getInputData()
+        if (obj.eaQty) {
+          if (obj.eaQty > item.availableQty) {
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '存在领取数量大于库存数量的数据,请检查')
+            )
+            return
+          }
+          applyList.push({
+            ...item,
+            applyQty: obj.eaQty,
+            applyQtyLabel: obj.qtyLabel,
+          })
         }
-        this.popup.show = false
-        this.showBottomBar = this.submitLine.length
-      })
+      }
+
+      applyList.forEach(item => this.submitLine.push(item))
+
+      this.popup.show = false
+      this.showBottomBar = this.submitLine.length
       this.skuCode.focus = true
       this.skuCode.value = ''
+
     },
 
     //提交领用按钮
@@ -344,8 +364,6 @@ export default {
         setTimeout(()=>{
           history.go(-1)
         },2000)
-      }).catch(e => {
-        console.log(e)
       })
     },
 
@@ -363,14 +381,6 @@ export default {
         this.showBottomBar = this.submitLine.length
       }).catch(()=>{})
     },
-    //检查输入库存数
-    checkInvQty(val, obj){
-      if (Number(val || 0) > Number(obj.availableQty || 0)) {
-        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.inner.materialApply.invQtyMore','输入数量大于库存数量,请重新输入'));
-        obj.applyQty = ''
-      }
-
-    }
 
   },
 

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

@@ -13,17 +13,21 @@
           v-model="lpn.value"
           :get-focus.sync="lpn.focus"
           required
-          @confirm="lpnConfirm">
+          rule-key="container"
+          :create-rule="$lwScanRule.create('移动上架-容器号','CONTAINER')"
+          @confirm="lpnConfirm"
+        >
           <template #button>
             <lw-button
-                mini
-                @click="seoClick"
-            >{{ $lwLanguage.get('wms_project.pda.movePutAway.seo','查询') }}</lw-button>
+              mini
+              @click="seoClick"
+            >{{ $lwLanguage.get('wms_project.pda.movePutAway.seo', '查询') }}
+            </lw-button>
             <lw-button
-                mini
-                plain
-                type="last"
-                @click="resetClick"
+              mini
+              plain
+              type="last"
+              @click="resetClick"
             >{{ $lwLanguage.get('wms_project.pda.movePutAway.reset','重置') }}</lw-button>
           </template>
         </lw-input>