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

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

@@ -14,6 +14,7 @@
       >{{ item.abnormalNo }}</div>
 
       <lw-tag
+        v-if="item.handleStatusLabel"
         :type="tagType"
         plain
         round
@@ -79,17 +80,20 @@
 
     <div class="lw-global-row">
       <lw-tag
+        v-if="item.discoveryPointLabel"
         round
         plain
       >{{ item.discoveryPointLabel }}</lw-tag>
 
       <lw-tag
+        v-if="item.typeLabel"
         round
         plain
         type="danger"
       >{{ item.typeLabel }}</lw-tag>
 
       <lw-tag
+        v-if="item.subTypeLabel"
         round
         plain
         type="danger"
@@ -284,7 +288,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.skpztgoe','WMS单据类型')"
-        :value="item.bizOrderType || '-'"
+        :value="item.bizOrderTypeLabel || '-'"
         val-bold
         :is-row="false"
       />

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

@@ -1,229 +1,308 @@
-<!--
-  处理和备注弹框
-  @author: 张文
-  @date: 2022-06-24
--->
-<template>
-  <lw-popup
-    :title="title"
-    v-model="show"
-    @closed="closed"
-  >
-
-    <template v-if="showCom">
-      <!-- 处理方式 -->
-      <lw-cell-popup-radio
-        :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"
-      />
-      <!-- 处理数量 -->
-      <lw-input
-        v-if="isDispose"
-        :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.components.page.inner.disposeAbnormal.components.disposePopup.ibbyifxg','处理备注')"
-        v-model="inputData.handleRemark"
-        type="textarea"
-        :rows="4"
-        input-align="right"
-      />
-
-      <!-- 系统处理方式 -->
-      <lw-cell-popup-radio
-        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.setbpztp','系统处理备注')"
-        v-model="inputData.systemHandleRemark"
-        type="textarea"
-        :rows="4"
-        input-align="right"
-      />
-
-
-      <!-- 单据处理方式 -->
-      <lw-cell-popup-radio
-        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.kgpvsuig','单据处理备注')"
-        v-model="inputData.orderHandleRemark"
-        type="textarea"
-        :rows="4"
-        input-align="right"
-      />
-
-
-      <!-- 实物处理方式 -->
-      <lw-cell-popup-radio
-        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.azkgrpuz','实物处理备注')"
-        v-model="inputData.actualHandleRemark"
-        type="textarea"
-        :rows="4"
-        input-align="right"
-      />
-
-
-      <!-- 实物库存处理方式 -->
-      <lw-cell-popup-radio
-        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.oqeergzb','实物库存处理备注')"
-        v-model="inputData.inventoryHandleRemark"
-        type="textarea"
-        :rows="4"
-        input-align="right"
-      />
-    </template>
-
-    <template #button>
-      <lw-button @click="submit">
-        {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.qqzoyprv','提交') }}
-      </lw-button>
-    </template>
-  </lw-popup>
-</template>
-
-<script>
-
-export default {
-  name: "index",
-  props:{
-    // 是否显示弹框
-    value: {
-      type: Boolean,
-      default: false
-    },
-
-    // 显示的标题
-    title: String,
-
-    // 是否是处理
-    isDispose: Boolean,
-
-    // 待处理量
-    waitQty:{
-      type: Number,
-      required: true
-    }
-  },
-  computed:{
-    show:{
-      get(){
-        return this.value
-      },
-      set(v){
-        this.$emit('input', v)
-      }
-    }
-  },
-  watch:{
-    show:{
-      handler(n){
-        if (n){
-          this.showCom = true
-
-          if (this.isDispose){
-            this.inputData.handleQty = this.waitQty
-          }
-        }
-      }
-    }
-  },
-  data() {
-    return {
-      // 是否显示输入框主体
-      showCom: false,
-
-      // 输入数据
-      inputData:{
-        handleMethod:'',
-        handleQty:'',
-        handleRemark:'',
-        systemHandleMethod:'',
-        systemHandleRemark:'',
-        orderHandleMethod:'',
-        orderHandleRemark:'',
-        actualHandleMethod:'',
-        actualHandleRemark:'',
-        inventoryHandleMethod:'',
-        inventoryHandleRemark:'',
-      }
-    }
-  },
-  methods: {
-    // 弹框关闭后
-    closed(){
-      for (let i in this.inputData) {
-        this.inputData[i] = ''
-      }
-      this.showCom = false
-    },
-
-    // 必填校验
-    importdCheck(){
-      if (!this.isDispose) return true
-
-      if (!this.inputData.handleMethod){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.fepwtyil','处理方式不能为空')
-        )
-        return false
-      }
-
-
-      const qty = Number(this.inputData.handleQty ||0)
-
-      if (!qty){
-        this.$lwShowErrorMsg(
-          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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.ffkcnmxl','处理量不能大于待确认量')
-        )
-        return false
-      }
-
-      return true
-    },
-    // 确认提交
-    submit(){
-
-      this.importdCheck() && this.$emit('submit', this.inputData)
-
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  处理和备注弹框
+  @author: 张文
+  @date: 2022-06-24
+-->
+<template>
+  <lw-popup
+    :title="title"
+    v-model="show"
+    @closed="closed"
+  >
+
+    <template v-if="showCom">
+      <!-- 处理方式 -->
+      <lw-cell-popup-radio
+        :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"
+      />
+      <!-- 处理数量 -->
+      <lw-input
+        v-if="isDispose"
+        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.ibbyifxg','处理备注')"
+        v-model="inputData.handleRemark"
+        type="textarea"
+        :rows="4"
+        input-align="right"
+      />
+
+      <!-- 系统处理方式 -->
+      <lw-cell-popup-radio
+        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.setbpztp','系统处理备注')"
+        v-model="inputData.systemHandleRemark"
+        type="textarea"
+        :rows="4"
+        input-align="right"
+      />
+
+
+      <!-- 单据处理方式 -->
+      <lw-cell-popup-radio
+        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.kgpvsuig','单据处理备注')"
+        v-model="inputData.orderHandleRemark"
+        type="textarea"
+        :rows="4"
+        input-align="right"
+      />
+
+
+      <!-- 实物处理方式 -->
+      <lw-cell-popup-radio
+        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.azkgrpuz','实物处理备注')"
+        v-model="inputData.actualHandleRemark"
+        type="textarea"
+        :rows="4"
+        input-align="right"
+      />
+
+
+      <!-- 实物库存处理方式 -->
+      <lw-cell-popup-radio
+        :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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.oqeergzb','实物库存处理备注')"
+        v-model="inputData.inventoryHandleRemark"
+        type="textarea"
+        :rows="4"
+        input-align="right"
+      />
+    </template>
+
+    <template #button>
+      <lw-button @click="submit">
+        {{ $lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.qqzoyprv','提交') }}
+      </lw-button>
+    </template>
+  </lw-popup>
+</template>
+
+<script>
+
+import {projectMobileQueryInvSn} from "../../../../../../api/inner/disposeAbnormal/action";
+
+export default {
+  name: "index",
+  props:{
+    // 是否显示弹框
+    value: {
+      type: Boolean,
+      default: false
+    },
+
+    // 显示的标题
+    title: String,
+
+    // 是否是处理
+    isDispose: Boolean,
+
+    // 待处理量
+    waitQty:{
+      type: Number,
+      required: true
+    },
+    //异常数据
+    abnormal: {
+      type: Object,
+      required: true
+    },
+
+    //异常记录sn
+    snList: Array
+
+  },
+  computed:{
+    show:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    }
+  },
+  watch:{
+    show:{
+      handler(n){
+        if (n){
+          this.showCom = true
+
+          if (this.isDispose){
+            this.inputData.handleQty = this.waitQty
+            this.inputData.abnSnList = this.snList
+          }
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      // 是否显示输入框主体
+      showCom: false,
+
+      // 输入数据
+      inputData:{
+        handleMethod:'',
+        scanSn:{
+          focus: false,
+          value:''
+        },
+        abnSnList:[],
+        handleQty:'',
+        handleRemark:'',
+        systemHandleMethod:'',
+        systemHandleRemark:'',
+        orderHandleMethod:'',
+        orderHandleRemark:'',
+        actualHandleMethod:'',
+        actualHandleRemark:'',
+        inventoryHandleMethod:'',
+        inventoryHandleRemark:'',
+      }
+    }
+  },
+  methods: {
+    // 弹框关闭后
+    closed(){
+      for (let i in this.inputData) {
+        this.inputData[i] = ''
+      }
+      this.showCom = false
+    },
+
+    // 必填校验
+    importdCheck(){
+      if (!this.isDispose) return true
+
+      if (!this.inputData.handleMethod){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.fepwtyil','处理方式不能为空')
+        )
+        return false
+      }
+
+
+      const qty = Number(this.inputData.handleQty ||0)
+
+      if (!qty){
+        this.$lwShowErrorMsg(
+          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('wms_project.pda.components.page.inner.disposeAbnormal.components.disposePopup.ffkcnmxl','处理量不能大于待确认量')
+        )
+        return false
+      }
+
+      return true
+    },
+    // 确认提交
+    submit(){
+
+      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>
+
+<style scoped lang="less">
+
+</style>