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

package/src/components/page/inner/disposeAbnormal/components/disposePopup/index.vue

@@ -13,7 +13,7 @@
     <template v-if="showCom">
       <!-- 处理方式 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','处理方式')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.xwzharls','处理方式')"
         v-model="inputData.handleMethod"
         dict-key="abnormal_handle_method_choice"
         :required="isDispose"
@@ -21,15 +21,31 @@
       <!-- 处理数量 -->
       <lw-input
         v-if="isDispose"
-        :title="$lwLanguage.get('','处理数量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.pyfubvit','处理数量')"
         v-model="inputData.handleQty"
         type="digit"
         required
         input-align="right"
       />
+      <!-- 序列号 -->
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.sn','序列号')"
+        v-model="inputData.scanSn.value"
+        v-if="abnormal.subType !== 'QTY_LESS'"
+        :placeholder="$lwLanguage.get('输入/扫描商品序列号','输入/扫描商品序列号')"
+        :create-rule="$lwScanRule.create('异常记录-SN','SN')"
+        rule-key="sn"
+        @confirm="scanSnConfirm"
+      />
+      <!-- 序列号显示 -->
+      <lw-scan-data-list-module
+        :title="$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.scannedSn','已扫描序列号')"
+        v-model="inputData.abnSnList"
+        v-if="inputData.abnSnList.length"
+      />
       <!-- 处理备注 -->
       <lw-input
-        :title="$lwLanguage.get('','处理备注')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.ibbyifxg','处理备注')"
         v-model="inputData.handleRemark"
         type="textarea"
         :rows="4"
@@ -38,13 +54,13 @@
 
       <!-- 系统处理方式 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','系统处理方式')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.jirnyvka','系统处理方式')"
         v-model="inputData.systemHandleMethod"
         dict-key="abnormal_system_handle_method_choice"
       />
       <!-- 系统处理备注 -->
       <lw-input
-        :title="$lwLanguage.get('','系统处理备注')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.setbpztp','系统处理备注')"
         v-model="inputData.systemHandleRemark"
         type="textarea"
         :rows="4"
@@ -54,13 +70,13 @@
 
       <!-- 单据处理方式 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','单据处理方式')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.rfxhktpq','单据处理方式')"
         v-model="inputData.orderHandleMethod"
         dict-key="abnormal_order_handle_method_choice"
       />
       <!-- 单据处理备注 -->
       <lw-input
-        :title="$lwLanguage.get('','单据处理备注')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.kgpvsuig','单据处理备注')"
         v-model="inputData.orderHandleRemark"
         type="textarea"
         :rows="4"
@@ -70,13 +86,13 @@
 
       <!-- 实物处理方式 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','实物处理方式')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.oltahkaw','实物处理方式')"
         v-model="inputData.actualHandleMethod"
         dict-key="abnormal_actual_handle_method_choice"
       />
       <!-- 实物处理备注 -->
       <lw-input
-        :title="$lwLanguage.get('','实物处理备注')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.azkgrpuz','实物处理备注')"
         v-model="inputData.actualHandleRemark"
         type="textarea"
         :rows="4"
@@ -86,13 +102,13 @@
 
       <!-- 实物库存处理方式 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','实物库存处理方式')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.hdnffdou','实物库存处理方式')"
         v-model="inputData.inventoryHandleMethod"
         dict-key="abnormal_inventory_handle_method_choice"
       />
       <!-- 实物库存处理备注 -->
       <lw-input
-        :title="$lwLanguage.get('','实物库存处理备注')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.oqeergzb','实物库存处理备注')"
         v-model="inputData.inventoryHandleRemark"
         type="textarea"
         :rows="4"
@@ -102,7 +118,7 @@
 
     <template #button>
       <lw-button @click="submit">
-        {{ $lwLanguage.get('','提交') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.qqzoyprv','提交') }}
       </lw-button>
     </template>
   </lw-popup>
@@ -110,6 +126,8 @@
 
 <script>
 
+import {projectMobileQueryInvSn} from "../../../../../../api/inner/disposeAbnormal/action";
+
 export default {
   name: "index",
   props:{
@@ -129,7 +147,16 @@ export default {
     waitQty:{
       type: Number,
       required: true
-    }
+    },
+    //异常数据
+    abnormal: {
+      type: Object,
+      required: true
+    },
+
+    //异常记录sn
+    snList: Array
+
   },
   computed:{
     show:{
@@ -149,6 +176,7 @@ export default {
 
           if (this.isDispose){
             this.inputData.handleQty = this.waitQty
+            this.inputData.abnSnList = this.snList
           }
         }
       }
@@ -162,6 +190,11 @@ export default {
       // 输入数据
       inputData:{
         handleMethod:'',
+        scanSn:{
+          focus: false,
+          value:''
+        },
+        abnSnList:[],
         handleQty:'',
         handleRemark:'',
         systemHandleMethod:'',
@@ -185,12 +218,12 @@ export default {
     },
 
     // 必填校验
-    requiredCheck(){
+    importdCheck(){
       if (!this.isDispose) return true
 
       if (!this.inputData.handleMethod){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','处理方式不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.fepwtyil','处理方式不能为空')
         )
         return false
       }
@@ -200,14 +233,14 @@ export default {
 
       if (!qty){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','处理数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.quwjaetl','处理数量不能为空，且应当是大于0的整数')
         )
         return false
       }
 
       if (qty > this.waitQty){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','处理量不能大于待确认量')
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.ffkcnmxl','处理量不能大于待确认量')
         )
         return false
       }
@@ -217,9 +250,55 @@ export default {
     // 确认提交
     submit(){
 
-      this.requiredCheck() && this.$emit('submit', this.inputData)
+      this.importdCheck() && this.$emit('submit', this.inputData)
 
-    }
+    },
+
+    // 扫描序列号输入框确认
+    scanSnConfirm(val, {data}){
+
+      if (!data || !data.key){
+        this.inputData.scanSn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.snNotNull','序列号不能为空')
+        )
+        return
+      }
+
+      if (this.inputData.abnSnList.some(item=>item.sn === data.key)) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.snExist','当前sn已存在于sn列表中')
+        )
+        return
+      }
+
+      const abnQty = this.abnormal.qty
+      const inputSnQty = this.inputData.abnSnList.map(i => parseInt(i.qty) || 0).reduce((a, b) => a + b, 0)
+
+      projectMobileQueryInvSn({
+        recordId: this.abnormal.id,
+        ownerId: this.abnormal.ownerId,
+        skuId: this.abnormal.skuId,
+        sn: data.key
+      }).then((res)=>{
+
+        if(inputSnQty + res.snQty > abnQty){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.snMore','sn数量不能超过异常数量')
+          )
+          return
+        }
+
+        this.inputData.abnSnList.unshift({
+          snId: null,
+          sn: data.key,
+          qty: res.snQty
+        })
+
+
+      })
+
+    },
   }
 }
 </script>

package/src/components/page/inner/disposeAbnormal/components/listItem/index.vue

@@ -24,26 +24,26 @@
           v-if="item.hasPhysical"
           round
           plain
-        >{{ $lwLanguage.get('','有实物') }}</lw-tag>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.nueqothx','有实物') }}</lw-tag>
         <lw-tag
           v-else
           round
           plain
           color="#ccc"
-        >{{ $lwLanguage.get('','无实物') }}</lw-tag>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.ftqhiokz','无实物') }}</lw-tag>
 
         <lw-tag
           v-if="item.systemOut"
           round
           plain
           type="success"
-        >{{ $lwLanguage.get('','系统外') }}</lw-tag>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.tpitnrfa','系统外') }}</lw-tag>
         <lw-tag
           v-else
           round
           plain
           type="danger"
-        >{{ $lwLanguage.get('','系统内') }}</lw-tag>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.xbfmolga','系统内') }}</lw-tag>
 
       </div>
 
@@ -61,7 +61,7 @@
           style="flex-shrink: 0"
           class="lw-global-title"
         >
-          {{ $lwLanguage.get('','商品') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.afocaiue','商品') }}
         </div>
 
         <div style="flex: 1;margin-left: 10px">
@@ -82,7 +82,7 @@
 
     <!-- 数量 -->
     <lw-title-value-cell
-      :title="$lwLanguage.get('','数量')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.zyyrsbfu','数量')"
       :value="item.qty"
       val-bold
       val-red
@@ -90,7 +90,7 @@
 
     <!-- 货主 -->
     <lw-title-value-cell
-      :title="$lwLanguage.get('','货主')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.kbgfbyrh','货主')"
       :value="item.ownerCode + '-' + item.ownerName"
       val-bold
     />
@@ -104,7 +104,7 @@
       >
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','上报数量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.osbchiqv','上报数量')"
           :value="item.qty"
           val-bold
           :is-row="false"
@@ -112,7 +112,7 @@
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','确认数量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.itkreqsg','确认数量')"
           :value="item.confirmQty"
           val-bold
           val-red
@@ -121,7 +121,7 @@
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','处理数量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.cfrdfzzx','处理数量')"
           :value="item.handleQty"
           val-bold
           :is-row="false"
@@ -158,14 +158,14 @@
       class="lw-global-flex-between"
     >
       <lw-title-value-cell
-        :title="$lwLanguage.get('','处理时间')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.vmiaobfw','处理时间')"
         :value="$lwDate.format(item.handleTime,'yyyy-MM-dd hh:mm')"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','处理人')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.uqsrawwd','处理人')"
         :value="item.handleOpName || '-'"
         val-bold
         :is-row="false"

package/src/components/page/inner/disposeAbnormal/components/searchBar/index.vue

@@ -12,7 +12,7 @@
         v-if="!showMore"
         style="flex: 1"
         v-model="searchBox"
-        :placeholder="$lwLanguage.get('','通过异常编号、商品条码、库位编码')"
+        :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.whpmtmge','通过异常编号、商品条码、库位编码')"
         rule-key="order"
         @confirm="searchBoxClick"
         @clear="searchBoxClear"
@@ -25,7 +25,7 @@
             round
             @click="searchBoxClick"
           >
-            {{ $lwLanguage.get('','搜索') }}
+            {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.ucwufyca','搜索') }}
           </lw-button>
 
         </template>
@@ -37,7 +37,7 @@
         v-else
         class="lw-global-row lw-global-value"
         style="flex: 1;padding: 9px 0 10px 0"
-      >{{ $lwLanguage.get('','条件搜索') }}</div>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.irojazsx','条件搜索') }}</div>
 
       <!-- 指示箭头 -->
       <van-icon
@@ -63,7 +63,7 @@
 
       <!-- 异常编号 -->
       <lw-input
-        :title="$lwLanguage.get('','异常编号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.ihkdwtes','异常编号')"
         v-model="moreSearchInput.abnormalNo"
         input-align="right"
         rule-key="abnormalNo"
@@ -71,7 +71,7 @@
 
       <!-- 商品条码 -->
       <lw-input
-        :title="$lwLanguage.get('','商品条码')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.flmydqjb','商品条码')"
         v-model="moreSearchInput.skuCode"
         input-align="right"
         rule-key="sku"
@@ -79,7 +79,7 @@
 
       <!-- 库位编码 -->
       <lw-input
-        :title="$lwLanguage.get('','库位编码')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.ssvstvhp','库位编码')"
         v-model="moreSearchInput.locationCode"
         input-align="right"
         rule-key="location"
@@ -87,7 +87,7 @@
 
       <!-- 异常类型 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','异常类型')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.rtstcfsd','异常类型')"
         v-model="moreSearchInput.type"
         dict-key="abnormal_type_choice"
         @confirm="typeConfirm"
@@ -96,21 +96,21 @@
 
       <!-- 异常子类型 -->
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','异常子类型')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.tsthtewu','异常子类型')"
         v-model="moreSearchInput.subType"
         :columns="subTypeList"
       />
 
       <!-- 开始时间 -->
       <lw-cell-popup-date
-        :title="$lwLanguage.get('','开始时间')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.prrkztfp','开始时间')"
         v-model="moreSearchInput.startTime"
         type="datetime"
       />
 
       <!-- 结束时间 -->
       <lw-cell-popup-date
-        :title="$lwLanguage.get('','结束时间')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.kstlwflm','结束时间')"
         v-model="moreSearchInput.endTime"
         type="datetime"
       />
@@ -118,7 +118,7 @@
       <!-- 已调异常区 -->
       <lw-cell
         v-if="showAbnArea"
-        :title="$lwLanguage.get('', '已调异常区')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.qdzmqfhb','已调异常区')"
         :is-link="false"
       >
         <template #value>
@@ -139,13 +139,13 @@
           plain
           block
           @click="moreClearInput"
-        >{{ $lwLanguage.get('','重置条件') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.veibndip','重置条件') }}</lw-button>
 
         <lw-button
           style="margin-left: 10px"
           block
           @click="moreSearchClick"
-        >{{ $lwLanguage.get('','搜索') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.ucwufyca','搜索') }}</lw-button>
 
       </div>
 

package/src/components/page/inner/disposeAbnormal/index/index.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','异常处理')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.wqyvhgxl','异常处理')"/>
 
     <div class="lw-global-page-box">
 
@@ -22,7 +22,7 @@
           <!-- 待确认 -->
           <van-tab
             name="waitConfirm"
-            :title="$lwLanguage.get('','待确认')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.bkllmgey','待确认')"
           >
 
             <search-bar @search="waitConfirmSearch"/>
@@ -49,7 +49,7 @@
           <!-- 待处理 -->
           <van-tab
             name="waitDispose"
-            :title="$lwLanguage.get('','待处理')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.lzeywoay','待处理')"
           >
 
             <search-bar
@@ -79,14 +79,25 @@
           <!-- 已处理 -->
           <van-tab
             name="dispose"
-            :title="$lwLanguage.get('','已处理')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.sufcnbxb','已处理')"
           >
 
             <search-bar @search="disposeSearch"/>
 
             <template v-if="dispose.list.length">
+              <list-item
+                v-for="(i,k) in dispose.list"
+                :key="i.id"
+                :item="i"
+                :index="k"
+              />
 
-
+              <lw-pages
+                v-model="dispose.pageNum"
+                :page-total="dispose.total"
+                force-ellipses
+                @change="getDisposeData"
+              />
 
             </template>
             <lw-not-data v-else/>

package/src/components/page/inner/fragQuickMove/action/index.js

@@ -0,0 +1,11 @@
+/*
+*
+* @author: 张文
+* @date: 2022-02-25
+* */
+
+import lwInnerFragQuickMoveAction from "./index.vue";
+
+lwInnerFragQuickMoveAction.install = Vue => Vue.component(lwInnerFragQuickMoveAction.name, lwInnerFragQuickMoveAction)
+
+export default lwInnerFragQuickMoveAction