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

package/src/components/module/ReceiveAbnormal/index.js

@@ -1,11 +1,11 @@
-/*
-* 收货异常
-* @author: 张文
-* @date  2022-05-09
-* */
-
-import lwReceiveAbnormalModule from "./index.vue";
-
-lwReceiveAbnormalModule.install = Vue => Vue.component(lwReceiveAbnormalModule.name, lwReceiveAbnormalModule)
-
-export default lwReceiveAbnormalModule
+/*
+* 收货异常
+* @author: 张文
+* @date  2022-05-09
+* */
+
+import lwReceiveAbnormalModule from "./index.vue";
+
+lwReceiveAbnormalModule.install = Vue => Vue.component(lwReceiveAbnormalModule.name, lwReceiveAbnormalModule)
+
+export default lwReceiveAbnormalModule

package/src/components/module/ReceiveAbnormal/index.vue

@@ -9,14 +9,14 @@
     <div v-if="show">
 
       <!-- ERP单号 -->
-      <div class="lw-global-model-box lw-receive-abnormal-boss">
+      <div class="lw-global-model-box lw-receive-abnormal-boss" v-if="!moreAsnDisabled">
 
         <lw-input
           :title="this.$lwLanguage.get('wms_project.pda.module.receiveAbn.order','订单号')"
           v-model="abnormalInfo.orderNo"
           input-align="right"
-          required
-          disabled
+          :required="!!asnNo"
+          :disabled="!!asnNo"
           rule-prefix="receiveAbn"
           rule-key="orderNo"
         />
@@ -55,7 +55,7 @@
       </div>
 
       <!-- 更多单据信息 -->
-      <div class="lw-global-model-box lw-global-collapse-box">
+      <div class="lw-global-model-box lw-global-collapse-box" v-if="!moreInfoDisabled">
         <van-collapse
           v-model="moreInfoCollapse"
           :border="false"
@@ -132,7 +132,7 @@
         <lw-cell
           style="padding-top: 0"
           :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.type','所属类型')"
-          :value="belongType"
+          :value="belongType || $lwLanguage.get('wms_project.pda.module.receiveAbn.title', '收货')"
           value-align="right"
           :is-link="false"
         />
@@ -259,6 +259,14 @@
           :must-required="false"
         />
 
+        <!-- 待处理量 -->
+        <div class="lw-global-row lw-global-flex-between" v-if="qty>-1">
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.wait','待处理量') }}
+          </div>
+
+          <div class="lw-global-value-bold" style="color: #D50000">{{ qty }}</div>
+        </div>
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.anbQty','异常数量')"
@@ -287,6 +295,31 @@
           rule-key="lpn"
         />
 
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalLocal','原库位')"
+          v-if="originalLocationCode"
+          v-model="skuInfo.originalLocationCode"
+          input-align="right"
+          rule-prefix="receiveAbn"
+          rule-key="location"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalLpn','原托盘号')"
+          v-if="originalLpn"
+          v-model="skuInfo.originalLpn"
+          input-align="right"
+          rule-prefix="receiveAbn"
+          rule-key="lpn"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalCaseNum','原箱号')"
+          v-if="originalCaseNum"
+          v-model="skuInfo.originalCaseNum"
+          input-align="right"
+        />
+
         <!-- 处理方式 -->
         <lw-cell-popup-radio
           :title="this.$lwLanguage.get('wms_project.pda.module.receiveAbn.handleMethod','处理方式')"
@@ -373,10 +406,7 @@ export default {
     asnNo: String,
 
     // 所属类型
-    belongType: {
-      type: String,
-      default: '收货'
-    },
+    belongType: String,
 
     // 是否允许多条保存
     multiple:{
@@ -389,9 +419,34 @@ export default {
       type: Boolean,
       default: false
     },
+    moreInfoDisabled:{
+      type: Boolean,
+      default: false
+    },
+    moreAsnDisabled:{
+      type: Boolean,
+      default: false
+    },
 
     // 商品号
     skuCode: String,
+    ownerId: String ,
+    qty:{
+      type: Number,
+      default: -1
+    },
+    originalLocationCode:{
+      type: Boolean,
+      default: false
+    },
+    originalLpn:{
+      type: Boolean,
+      default: true
+    },
+    originalCaseNum:{
+      type: Boolean,
+      default: true
+    },
 
     // 是否显示底部导航栏模块
     showBottomBar:{
@@ -469,19 +524,22 @@ export default {
       // 商品信息
       skuInfo:{
         skuCode:'',
-        // 当前扫描零件得到的零件基础信息
+        // 当前扫描商品得到的商品基础信息
         sku:{
           skuName:''
         },
         abnQty:'',
         abnLocationCode:'',
         abnLpn:'',
+        originalLocationCode:'',
+        originalLpn:'',
+        originalCaseNum:'',
         handleMethod:'',
         remark:'',
         imagesArr:[],
       },
 
-      // 零件信息获取焦点
+      // 商品信息获取焦点
       skuInfoFocus:{
         skuCode: false,
         qty: false,
@@ -505,7 +563,7 @@ export default {
   watch:{
     'skuInfo.skuCode':{
       handler(n){
-        // 如果零件信息为空就清除批次数据、零件数据
+        // 如果商品信息为空就清除批次数据、商品数据
         if (!n){
           this.skuInfo.sku = {}
           this.lot.show = false
@@ -515,9 +573,7 @@ export default {
     }
   },
   mounted() {
-
     this.init()
-
   },
   methods: {
     // 初始化
@@ -526,27 +582,30 @@ export default {
 
         // 获取货主信息
         this.ownerList = await this.$lwApi.common.getOwnerList()
-        const asnData = await wmsMobileFoundAsn({
-          asnNo: this.asnNo
-        })
+        if(this.asnNo){
+          const asnData = await wmsMobileFoundAsn({
+            asnNo: this.asnNo
+          })
+          this.asnData = asnData || {}
+        } else {
+          this.asnData = {}
+        }
 
-        this.asnData = asnData || {}
-        this.abnormalInfo.orderNo = this.asnData.asnNo || ''
         this.skuInfo.skuCode = this.skuCode || ''
+
+        this.abnormalInfo.orderNo = this.asnData.asnNo || this.asnNo
         this.abnormalInfo.extNo = this.asnData.erpOrderNo || ''
         this.abnormalInfo.supplierCode = this.asnData.supplierCode || ''
         this.abnormalInfo.supplierName = this.asnData.supplierName || ''
         this.abnormalInfo.carrierCode = this.asnData.carrierCode || ''
         this.abnormalInfo.carrierName = this.asnData.carrierName || ''
         this.abnormalInfo.carrierPlateNum = this.asnData.plateNumber || ''
-        this.abnormalType.ownerId = this.asnData.ownerId || ''
+        this.abnormalType.ownerId = this.asnData.ownerId || this.ownerId || ''
         /*this.abnormalInfo.bizOrderNo = this.asnData.bizOrderNo || ''
         this.abnormalInfo.bizOrderLineNo = this.asnData.bizOrderLineNo || ''*/
 
-
         // 是否存在商品数据，如果存在就获取商品信息
-        if (this.skuInfo.skuCode){
-
+        if(this.skuInfo.skuCode){
           await this.skuCodeConfirm(true)
         }
 
@@ -556,7 +615,6 @@ export default {
         console.error('收货异常模块初始化失败：', err)
       }
     },
-
     // 异常类型确认
     typeConfirm({value}){
 
@@ -575,6 +633,7 @@ export default {
 
     // 商品号确认
     async skuCodeConfirm(first = false){
+
       if (!this.skuInfo.skuCode){
         this.skuInfoFocus.skuCode = true
         this.$lwShowErrorMsg(
@@ -595,19 +654,24 @@ export default {
         skuCode: this.skuInfo.skuCode
       }
 
+      console.log(this.asnData)
+      console.log(this.abnormalType)
+
       if (this.asnData.ownerId){
         query.asnId = this.asnData.id
       }else {
         query.ownerId = this.abnormalType.ownerId
       }
 
+      console.log(query)
+
       const res = await wmsMobileFoundAsnLineSku(query)
 
       this.skuInfo.sku = {
         ...res,
         skuCode: res.sku.code,
         skuName: res.sku.name,
-        skuOwner: res.sku.owner,
+        skuOwner: res.sku.ownerId,
         skuId: res.sku.id,
       }
 
@@ -718,14 +782,20 @@ export default {
         return false
       }
 
-      // 校验异常量是否大于商品可用量
-      /*if (this.skuInfo.abnQty > this.skuInfo.sku.qty){
+      const num = Number(this.skuInfo.abnQty || 0)
+      if (
+        this.abnormalType.abnType !== 'ORDER' &&
+        this.abnormalType.abnSubType !== 'QTY_MORE' &&
+        !this.multiple && this.qty>-1 &&
+        num > this.qty
+      ){
         this.skuInfoFocus.qty = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.qtyMore','异常量不能大于商品可用量')
+          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.skuMore','异常量不能大于待处理量')
         )
+        this.skuInfo.abnQty = ''
         return false
-      }*/
+      }
 
       // 校验是否输入异常库位
       if (!this.skuInfo.abnLocationCode){
@@ -767,15 +837,15 @@ export default {
       return true
     },
 
-    // 增加零件信息按钮被点击
+    // 增加商品信息按钮被点击
     addSku(){
       this.showAddBtn = false
       this.skuInfoFocus.skuCode = true
     },
 
-    // 删除零件按钮被点击
+    // 删除商品按钮被点击
     delSku(index){
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.module.receiveAbn.warning','警告'),
         message: this.$lwLanguage.get('wms_project.pda.module.receiveAbn.del','确认删除该商品？')
       }).then(()=>{
@@ -821,6 +891,27 @@ export default {
       }
     },
 
+    getAllAbnormalData(){
+      const {success, data} = this.getAbnormalData()
+
+      if (!success) {
+        return {
+          success: false,
+          data: []
+        }
+      }
+
+      return {
+        success: true,
+        data: {
+          order: this.abnormalInfo,
+          lines: data,
+          ...this.abnormalType,
+          asnId: this.asnData.id
+        }
+      }
+    },
+
     // 确认上报
     confirm(){
       const {success, data} = this.getAbnormalData()

package/src/components/module/ReceiveAbnormal//346/224/266/350/264/247/345/274/202/345/270/270/346/250/241/345/235/227.md

@@ -0,0 +1 @@
+# 收货异常模块 [查看文档](https://www.yuque.com/docs/share/f0577748-6aac-431a-ba05-46318d8ab23e)

package/src/components/module/ScanDataList/index.js

@@ -1,11 +1,11 @@
-/*
-* 扫描数据显示及删除模块
-* @author: 张文
-* @date  2022-06-13
-* */
-
-import lwScanDataListModule from "./index.vue";
-
-lwScanDataListModule.install = Vue => Vue.component(lwScanDataListModule.name, lwScanDataListModule)
-
-export default lwScanDataListModule
+/*
+* 扫描数据显示及删除模块
+* @author: 张文
+* @date  2022-06-13
+* */
+
+import lwScanDataListModule from "./index.vue";
+
+lwScanDataListModule.install = Vue => Vue.component(lwScanDataListModule.name, lwScanDataListModule)
+
+export default lwScanDataListModule

package/src/components/module/ScanDataList/index.vue

@@ -10,12 +10,12 @@
     <div class="lw-global-flex-between">
 
       <div class="lw-global-title" style="flex-shrink: 0">
-        {{ title || $lwLanguage.get('', '扫描统计') }}
+        {{ title || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.scan', '扫描统计') }}
       </div>
 
       <div>
         <span class="lw-global-value">
-          {{ $lwLanguage.get('','行数') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.imabkbcr','行数') }}
         </span>
         <span class="lw-global-value-bold-red">
           {{ scanList.length }}
@@ -24,7 +24,7 @@
 
       <div>
         <span class="lw-global-value">
-          {{ $lwLanguage.get('','总数量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.bmldqjbt','总数量') }}
         </span>
         <span class="lw-global-value-bold-red">
           {{ total }}
@@ -43,15 +43,15 @@
       <div class="lw-global-row lw-global-flex-between">
 
         <div class="lw-global-title lw-scan-data-list-title">
-          {{ $lwLanguage.get('','箱号/序列号') }}
+          {{ rowTitle ||  $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
         </div>
 
         <div class="lw-global-title lw-scan-data-list-num">
-          {{ $lwLanguage.get('','数量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
         </div>
 
         <div class="lw-global-title lw-scan-data-list-btn">
-          {{ $lwLanguage.get('','操作') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
         </div>
 
       </div>
@@ -68,13 +68,19 @@
         <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
 
         <div class="lw-scan-data-list-btn">
-          <lw-button
+          <van-icon
+            name="clear"
+            color="#d50000"
+            size="20px"
+            @click="del(k)"
+          />
+<!--          <lw-button
             mini
             round
             @click="del(k)"
           >
-            {{ $lwLanguage.get('','删除') }}
-          </lw-button>
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.ihocngtf','删除') }}
+          </lw-button>-->
         </div>
 
       </div>
@@ -84,7 +90,7 @@
         class="lw-global-click-style lw-scan-data-list-look-edit"
         @click="lookEdit"
       >
-        {{ $lwLanguage.get('', '查看全部 / 编辑') }}
+        {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.edit', '查看全部 / 编辑') }}
         <van-icon name="arrow" />
       </div>
 
@@ -93,14 +99,14 @@
     <!-- 更多弹出列表 -->
     <lw-popup
       v-model="popup.show"
-      :title="$lwLanguage.get('','查看更多')"
+      :title="$lwLanguage.get('wms_project.pda.components.module.ScanDataList.fywkkruh','查看更多')"
       height="70%"
       @closed="popupOff"
     >
 
       <!-- 搜索输入框 -->
       <lw-input
-        :title="$lwLanguage.get('','箱号/序列号')"
+        :title="rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号')"
         v-model="popup.seoVal"
         @confirm="seoConfirm"
         @clear="seoClear"
@@ -110,7 +116,7 @@
             mini
             round
             @click="seoConfirm"
-          >{{ $lwLanguage.get('','搜索') }}</lw-button>
+          >{{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.wbncqmzx','搜索') }}</lw-button>
         </template>
       </lw-input>
 
@@ -119,15 +125,15 @@
         <div class="lw-global-row lw-global-flex-between">
 
           <div class="lw-global-title lw-scan-data-list-title">
-            {{ $lwLanguage.get('','箱号/序列号') }}
+            {{ rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
           </div>
 
           <div class="lw-global-title lw-scan-data-list-num">
-            {{ $lwLanguage.get('','数量') }}
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
           </div>
 
           <div class="lw-global-title lw-scan-data-list-btn">
-            {{ $lwLanguage.get('','操作') }}
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
           </div>
 
         </div>
@@ -143,13 +149,12 @@
           <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
 
           <div class="lw-scan-data-list-btn">
-            <lw-button
-              mini
-              round
+            <van-icon
+              name="clear"
+              color="#d50000"
+              size="20px"
               @click="popupDel(i,k)"
-            >
-              {{ $lwLanguage.get('','删除') }}
-            </lw-button>
+            />
           </div>
 
         </div>
@@ -159,7 +164,7 @@
       <!-- 确认按钮 -->
       <template #button>
         <lw-button @click="popupConfirm">
-          {{ $lwLanguage.get('','确认') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.ibopntwx','确认') }}
         </lw-button>
       </template>
 
@@ -175,6 +180,8 @@ export default {
   props:{
     // 标题
     title: String,
+    // 列标题
+    rowTitle: String,
 
     // 扫描的数据
     value:{
@@ -240,12 +247,12 @@ export default {
     del(index){
 
       const sn = this.scanList[index][this.snKey]
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('','警告'),
-        message: this.$lwLanguage.get('','确认删除') + ':' + sn,
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.vwfdbaxc','警告'),
+        message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm','确认删除') + ':' + sn,
       }).then(()=>{
         this.scanList.splice(index, 1)
-        this.$lwToast.success(this.$lwLanguage.get('','删除成功'))
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea','删除成功'))
       }).catch(()=>{})
     },
 

package/src/components/module/ScanDataList//346/211/253/346/217/217/346/225/260/346/215/256/345/261/225/347/244/272/345/217/212/345/210/240/351/231/244.md

@@ -0,0 +1,2 @@
+
+# 扫描数据展示及删除 [查看文档](https://www.yuque.com/docs/share/f925a9c2-4ef2-4f9a-9784-71289538df27)

package/src/components/module/SkuInfo/index.js

@@ -1,11 +1,11 @@
-/*
-* 商品信息
-* @author: 张文
-* @date  2022-06-16
-* */
-
-import lwSkuInfoModule from "./index.vue";
-
-lwSkuInfoModule.install = Vue => Vue.component(lwSkuInfoModule.name, lwSkuInfoModule)
-
-export default lwSkuInfoModule
+/*
+* 商品信息
+* @author: 张文
+* @date  2022-06-16
+* */
+
+import lwSkuInfoModule from "./index.vue";
+
+lwSkuInfoModule.install = Vue => Vue.component(lwSkuInfoModule.name, lwSkuInfoModule)
+
+export default lwSkuInfoModule

package/src/components/module/SkuInfo/index.vue

@@ -7,8 +7,9 @@
   <div
     :class="[
       'lw-global-flex-start-start',
-      isRow && !isLast ? 'lw-global-row' : '',
-      isRow && isLast ? 'lw-global-row-end' : ''
+      isRowFirst ? 'lw-global-row-start' : '',
+      isRow && (!isRowLast && !isRowFirst) ? 'lw-global-row' : '',
+      isRowLast ? 'lw-global-row-end' : ''
     ]"
   >
     <div style="flex: 1">
@@ -43,8 +44,10 @@ export default {
     qty: [String, Number],
     // 是否使用全局行样式
     isRow: Boolean,
+    // 是否是组的第一行，必须开启行
+    isRowFirst: Boolean,
     // 是否是组的最后一行，必须开启行
-    isLast: Boolean,
+    isRowLast: Boolean,
     // 数量的描述文字
     qtyText: String,
     // 是否显示右边数据栏

package/src/components/module/SkuInfo//346/237/245/347/234/213/345/225/206/345/223/201/344/277/241/346/201/257.md

@@ -0,0 +1,4 @@
+
+
+
+# 收货异常模块 [查看文档](https://www.yuque.com/docs/share/fc1246b8-baa5-4755-ab1d-9e142f0a9867)

package/src/components/module/SystemInfo/index.js

@@ -1,11 +1,11 @@
-/*
-* 系统信息
-* @author: 张文
-* @date  2022-03-01
-* */
-
-import lwSystemInfoModule from "./index.vue";
-
-lwSystemInfoModule.install = Vue => Vue.component(lwSystemInfoModule.name, lwSystemInfoModule)
-
-export default lwSystemInfoModule
+/*
+* 系统信息
+* @author: 张文
+* @date  2022-03-01
+* */
+
+import lwSystemInfoModule from "./index.vue";
+
+lwSystemInfoModule.install = Vue => Vue.component(lwSystemInfoModule.name, lwSystemInfoModule)
+
+export default lwSystemInfoModule