@logwire/logwire-wms-pda-ui 3.1.1 → 3.1.2

package/src/components/page/inner/dead/components/taskItem.vue

@@ -556,6 +556,7 @@ export default {
         this.$toast.success(
           this.$lwLanguage.get('wms_project.pda.inner.deadCom.abnSuccess','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.$emit('abnSuccess', res)
       })
     },

package/src/components/page/inner/dead/large/index.vue

@@ -20,7 +20,7 @@
         :abn-qty="allTaskData.abnQty"
       />
 
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -84,7 +84,7 @@
             <lw-not-data v-if="!overLpnList.length"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/inner/dead/query/action/action.vue

@@ -8,9 +8,8 @@
     <lw-nav-bar :title="$lwLanguage.get('','呆滞品整理 - 打包查询')"/>
 
 
-    <div
+    <lw-tab-box
       style="margin-top: 10px"
-      class="lw-global-tab-box"
       v-if="haveDullInfo()"
     >
       <van-tabs
@@ -29,7 +28,11 @@
 
           <div >
             <div class="lw-global-model-box" >
-              <div class="lw-global-row-start" v-for="(bagInfo,index) in dullAdjustInfo.bagInfoList">
+              <div
+                class="lw-global-row-start"
+                v-for="(bagInfo,index) in dullAdjustInfo.bagInfoList"
+                :key="index"
+              >
 
                 <div class="lw-global-flex-between">
                   <lw-title-value-cell
@@ -126,6 +129,7 @@
           <div v-for=" (boxInfo,index) in  dullAdjustInfo.boxInfoList"
                style="padding: 5px 10px"
                class="lw-global-model-box lw-global-collapse-box"
+               :key="index"
           >
             <van-collapse
               v-model="boxInfo.pdaCollapse"
@@ -243,6 +247,7 @@
                 animationDelay: 50 * index + 'ms'
               }"
                class="lw-global-collapse-box lw-global-model-box lw-global-animation-out"
+               :key="index"
           >
             <van-collapse
               v-model="item.pdaCollapse"
@@ -363,21 +368,21 @@
       </van-tabs>
 
 
-      <!-- 装箱底部按钮 -->
-      <lw-bottom-bar v-if="tabActive==='box'" >
+    </lw-tab-box>
 
-        <lw-button @click="putBoxOpen">
-          {{ $lwLanguage.get('wms_project.pda.inner.deadSmall.box','装箱') }}
-        </lw-button>
+    <lw-not-data v-else/>
 
-      </lw-bottom-bar>
 
-    </div>
 
-    <lw-not-data v-else/>
 
+    <!-- 装箱底部按钮 -->
+    <lw-bottom-bar v-if="tabActive==='box'" >
 
+      <lw-button @click="putBoxOpen">
+        {{ $lwLanguage.get('wms_project.pda.inner.deadSmall.box','装箱') }}
+      </lw-button>
 
+    </lw-bottom-bar>
 
 
     <!-- 装箱弹框 -->
@@ -456,9 +461,6 @@ import {
 import {
 
   wmsDullSkuMoveTaskCompleteBag,
-  wmsDullSkuMoveTaskCompletedBagList,
-  wmsDullSkuMoveTaskCompletedBoxList,
-  wmsDullSkuMoveTaskUncompletedBagList,
   wmsDullSkuMoveTaskPrintBag,
   wmsDullSkuMoveTaskPrintBox,
   wmsDullSkuQueryCompleteBox,
@@ -616,7 +618,7 @@ export default {
         "deviceId": this.printData.printId,
       }
 
-      wmsDullSkuMoveTaskCompleteBag(data).then(res => {
+      wmsDullSkuMoveTaskCompleteBag(data).then(() => {
         this.$lwToast.success(
           this.$lwLanguage.get('', '完成封袋')
         )
@@ -668,7 +670,7 @@ export default {
         "deviceId": this.printData.printId,
       }
 
-      wmsDullSkuMoveTaskCompleteLpn(data).then(res=>{
+      wmsDullSkuMoveTaskCompleteLpn(data).then(()=>{
 
         this.$lwToast.success(
           this.$lwLanguage.get('','已打托')
@@ -765,7 +767,7 @@ export default {
       wmsDullSkuQueryCompleteBox({
         deviceId: this.printData.printId,
         bagNumList: this.putBoxPopup.list.map(item=>item.bagNum)
-      }).then(res=>{
+      }).then(()=>{
         this.$lwToast.success(
           this.$lwLanguage.get('','装箱成功')
         )

package/src/components/page/inner/dead/small/index.vue

@@ -20,10 +20,7 @@
         :abn-qty="allTaskData.abnQty"
       />
 
-      <div
-        style="margin-top: 10px"
-        class="lw-global-tab-box"
-      >
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -113,7 +110,7 @@
             <lw-not-data v-if="!boxList.length"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
 
     </div>

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

@@ -10,7 +10,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -27,7 +27,7 @@
             <abn-info :item="i"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -74,7 +74,7 @@
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.sn','序列号')"
         v-model="abnConfirm.sn.value"
-        v-if="this.abnDataObj[this.tabActive].subType !== 'QTY_LESS'"
+        v-if="this.abnDataObj.length && this.abnDataObj[this.tabActive].subType !== 'QTY_LESS'"
         :get-focus.sync="abnConfirm.sn.focus"
         :placeholder="$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.inputSn','输入/扫描商品序列号')"
         :create-rule="$lwScanRule.create('异常记录-SN','SN')"
@@ -82,7 +82,6 @@
         @confirm="scanSnConfirm"
       />
 
-
       <lw-scan-data-list-module
         v-if="abnSnList.length"
         :title="$lwLanguage.get('wms_project.pda.inner.disposeAbnormal.scannedSn','已扫描序列号')"
@@ -206,7 +205,8 @@ import {
   wmsProjectMobileAbnormalRecordLock,
   wmsProjectMobileAbnormalRecordRemarkAbnormal,
   projectMobileQueryInvSn,
-  projectMobileGetAbnormalRecordSn
+  projectMobileGetAbnormalRecordSn,
+  projectMobileAbnormalPrintLabel
 } from "../../../../../api/inner/disposeAbnormal/action";
 
 export default {
@@ -318,7 +318,10 @@ export default {
         // 是否是处理
         isDispose: false,
         title: ''
-      }
+      },
+
+      // 打印机数据
+      printData:{}
     }
   },
   mounted() {
@@ -381,6 +384,14 @@ export default {
           break;
       }
 
+      // 只要系统内且有实物才能打印
+      if (!item.systemOut && item.hasPhysical) {
+        this.btnList.push({
+          text: this.$lwLanguage.get('', '补打异常标识卡'),
+          click: this.printLabel
+        })
+      }
+
     },
 
     // 反馈异常点击
@@ -553,7 +564,6 @@ export default {
     },
     // 处理或备注提交
     disposeRemarkSubmit(data){
-      console.log(data)
       const api = this.disposeRemark.isDispose ?
         wmsProjectMobileAbnormalRecordHandleAbnormal :
         wmsProjectMobileAbnormalRecordRemarkAbnormal
@@ -624,6 +634,27 @@ export default {
       this.abnConfirm.sn.value=''
       this.abnConfirm.sn.focus=true
 
+    },
+
+    // 补打异常标识卡
+    printLabel(){
+      if(!Object.keys(this.printData).length){
+        const {success, printData} = this.$lwPrint.test(
+          'ABNORMAL_RECORD_LABEL',
+          this.$lwLanguage.get('','异常标识卡')
+        )
+        if(!success) return
+        this.printData = printData
+      }
+
+      projectMobileAbnormalPrintLabel({
+        recordId:this.abnDataObj[this.tabActive].id
+      }).then(res=>{
+        if (!res.length) return
+        this.$lwPrint.bluetoothPrint({
+          taskId: res[0].id
+        })
+      })
     }
   },
 }

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

@@ -52,21 +52,33 @@
     <!-- 商品信息 -->
     <div class="lw-global-row">
 
-      <div
-        style="margin-bottom: 5px"
-        class="lw-global-flex-start-start"
-      >
+      <div class="lw-global-flex-between">
 
         <div
-          style="flex-shrink: 0"
-          class="lw-global-title"
+          style="margin-bottom: 5px"
+          class="lw-global-flex-start-start"
         >
-          {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.afocaiue','商品') }}
+
+          <div
+            style="flex-shrink: 0"
+            class="lw-global-title"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.afocaiue','商品') }}
+          </div>
+
+          <div style="flex: 1;margin-left: 10px">
+            <div class="lw-global-value-bold">{{ item.skuCode }}</div>
+            <div class="lw-global-title">{{ item.skuName }}</div>
+          </div>
+
         </div>
 
-        <div style="flex: 1;margin-left: 10px">
-          <div class="lw-global-value-bold">{{ item.skuCode }}</div>
-          <div class="lw-global-title">{{ item.skuName }}</div>
+        <div
+          v-if="type==='waitConfirm'"
+          style="flex-shrink: 0;text-align: center"
+        >
+          <div class="lw-global-value-bold-red" style="font-size: 16px">{{item.qty}}</div>
+          <div class="lw-global-title">{{$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.zyyrsbfu','数量')}}</div>
         </div>
 
       </div>
@@ -80,14 +92,6 @@
 
     </div>
 
-    <!-- 数量 -->
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.zyyrsbfu','数量')"
-      :value="item.qty"
-      val-bold
-      val-red
-    />
-
     <!-- 货主 -->
     <lw-title-value-cell
       :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.kbgfbyrh','货主')"
@@ -99,6 +103,7 @@
     <div class="lw-global-row">
 
       <div
+        v-if="type !== 'waitConfirm'"
         style="margin-bottom: 5px"
         class="lw-global-flex-between"
       >
@@ -121,6 +126,7 @@
         />
 
         <lw-title-value-cell
+          v-if="type==='dispose'"
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.cfrdfzzx','处理数量')"
           :value="item.handleQty"
           val-bold
@@ -128,6 +134,15 @@
           val-size="16px"
         />
 
+        <lw-title-value-cell
+          v-if="type === 'waitDispose'"
+          :title="$lwLanguage.get('','问题区数量')"
+          :value="item.abnormalQty"
+          val-bold
+          :is-row="false"
+          val-size="16px"
+        />
+
       </div>
 
       <lw-tag
@@ -152,8 +167,53 @@
 
     </div>
 
-    <!-- 处理人 -->
+    <!-- 待确认 -->
+    <div
+      v-if="type === 'waitConfirm'"
+      style="margin-top: 8px"
+      class="lw-global-flex-between"
+    >
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','上报时间')"
+        :value="$lwDate.format(item.discoveryTime,'yyyy-MM-dd hh:mm')"
+        val-bold
+        :is-row="false"
+      />
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','上报人')"
+        :value="item.discoveryOpName || '-'"
+        val-bold
+        :is-row="false"
+      />
+
+    </div>
+
+    <!-- 待处理 -->
+    <div
+      v-if="type === 'waitDispose'"
+      style="margin-top: 8px"
+      class="lw-global-flex-between"
+    >
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','确认时间')"
+        :value="$lwDate.format(item.confirmTime,'yyyy-MM-dd hh:mm')"
+        val-bold
+        :is-row="false"
+      />
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','确认人')"
+        :value="item.confirmName || '-'"
+        val-bold
+        :is-row="false"
+      />
+
+    </div>
+
+    <!-- 已处理 -->
     <div
+      v-if="type === 'dispose'"
       style="margin-top: 8px"
       class="lw-global-flex-between"
     >
@@ -188,6 +248,12 @@ export default {
     index:{
       type: Number,
       default: 0
+    },
+
+    // 是否显示数量
+    type: {
+      type: String,
+      default: ''
     }
   },
   data() {

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

@@ -10,7 +10,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -33,6 +33,7 @@
                 :key="i.id"
                 :item="i"
                 :index="k"
+                type="waitConfirm"
               />
 
               <lw-pages
@@ -63,6 +64,7 @@
                 :key="i.id"
                 :item="i"
                 :index="k"
+                type="waitDispose"
               />
 
               <lw-pages
@@ -90,6 +92,7 @@
                 :key="i.id"
                 :item="i"
                 :index="k"
+                type="dispose"
               />
 
               <lw-pages
@@ -106,7 +109,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 

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

@@ -236,7 +236,7 @@ export default {
 
     // 任务被点击
     taskItemClick(item){
-      if (!item || !item.content){
+      if (!item){
         this.$lwShowErrorMsg(
             this.$lwLanguage.get('wms_project.pda.common.task.taskNull','任务详情数据为空，请确保数据配置正确！')
         )

package/src/components/page/inner/quality/action/index.vue

@@ -75,7 +75,7 @@
       </div>
 
       <!-- tab信息 -->
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
 
         <van-tabs
           type="card"
@@ -201,7 +201,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/inner/quality/sample/index.vue

@@ -12,7 +12,7 @@
 
       <look-data :item="taskData"/>
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -155,7 +155,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 

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

@@ -9,7 +9,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -49,7 +49,7 @@
         </van-tabs>
 
 
-      </div>
+      </lw-tab-box>
 
 
     </div>

package/src/components/page/inner/reportAbnormal/action/index.vue

@@ -229,6 +229,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.reportAbn.action.submitSuccess','上报成功')
         )
+        this.$refs.abnormal.printLabel()
 
         this.abnPopup.show = false
         this.getData()

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

@@ -63,7 +63,7 @@
       </div>
 
       <!-- tab -->
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -526,7 +526,7 @@
 
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -1140,6 +1140,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.abnSuccess','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
 
         this.abnormalPopup.show = false
         this.abnormalPopup.comShow = false

package/src/components/page/inner/taskMove/whole/MoveRandomWholeCase.vue

@@ -4,7 +4,7 @@
 
     <div class="lw-global-page-box">
       <!-- tab -->
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs type="card" animated v-model="tabActive">
           <!-- 下架 -->
           <van-tab name="down" :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.down','下架')">
@@ -44,7 +44,7 @@
                 <lw-title-value-cell title="总商品数" :value="toUp.toUpQty || 0" val-bold val-red :is-row="false" />
               </div>
             </div>
-            
+
             <!-- Tab -->
             <div v-if="toUp.cases.length > 0" class="lw-global-tab-box" style="margin-top: 10px">
               <van-tabs type="card" animated v-model="upTabActive">
@@ -86,7 +86,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
 
     <lw-bottom-bar height="auto">
@@ -96,7 +96,7 @@
           <lw-button block @click="doWholeCaseDown">整箱下架</lw-button>
         </div>
       </div>
-      
+
       <div v-if="tabActive==='up' && toUpScanCases.length > 0" style="padding: 10px 0; width: 100%;">
         <lw-cell style="padding: 0"
           :title="$lwLanguage.get('wms_project.pda.receive.skuAction.rely','接力上架')"
@@ -112,7 +112,7 @@
         </div>
       </div>
     </lw-bottom-bar>
-    
+
     <!-- 箱详情弹窗 -->
     <lw-popup title="箱" v-if="boxPop.data" v-model="boxPop.show">
       <div class="box-popup">
@@ -152,10 +152,10 @@
 </template>
 
 <script>
-import { 
+import {
   wmsGetRandomMoveWholeCase,
-  wmsRandomWholeCaseDown, 
-  wmsGetWholeLpnMoveTaskInfo, 
+  wmsRandomWholeCaseDown,
+  wmsGetWholeLpnMoveTaskInfo,
   wmsRandomWholeCaseUp,
 } from '../../../../../api/inner/move/taskMove'
 
@@ -456,4 +456,4 @@ export default {
     }
   }
 }
-</style>
+</style>

package/src/components/page/inner/taskMove/whole/MoveTaskWholeCaseDown.vue

@@ -24,7 +24,7 @@
       </div>
 
       <!-- Tab -->
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <!-- 扫描箱 -->
           <van-tab name="scan" title="当前扫描箱">
@@ -61,7 +61,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
     <lw-bottom-bar height="auto">
 

package/src/components/page/inner/taskMove/whole/MoveTaskWholeCaseUp.vue

@@ -24,7 +24,7 @@
       </div>
 
       <!-- Tab -->
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <!-- 扫描箱 -->
           <van-tab name="scan" title="当前扫描箱">
@@ -61,7 +61,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
     <lw-bottom-bar height="auto">
       <div style="padding: 10px 0; width: 100%;">
@@ -169,7 +169,7 @@ export default {
         if (!cases.length) {
           this.$lwToast.success('当前托盘已没有可以整托上架的任务')
           this.$router.back()
-          return  
+          return
         }
         lpnData.wholeCase = false
         for (const c of cases) {
@@ -279,4 +279,4 @@ export default {
     line-height: 22px;
   }
 }
-</style>
+</style>