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

package/src/views/wms/page/inbound/components/AsnInfo.vue

@@ -1,10 +1,39 @@
 <template>
   <div class="asn-info-bg">
     <!-- 收货单信息 -->
-    <div class="asn-info" :class="{shrink: isShrink}">
+    <div
+      v-if="data.contentList && data.contentList.length"
+      class="lw-global-model-box lw-global-model-top-radius"
+    >
+      <lw-label-value-group
+        :list="data.contentList"
+      />
+      <div
+        v-if="showPrint"
+        style="text-align: right"
+        class="lw-global-row-end btn-box"
+      >
+        <lw-button
+          style="width: 25%"
+          small
+          type="last"
+          @click="$emit('print')"
+        >
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnInfo.cheknhil', '商品补码') }}
+        </lw-button>
+
+      </div>
+    </div>
+
+    <div v-else class="asn-info" :class="{shrink: isShrink}">
       <div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.niivrnjg', '到货通知单') }}</div>
-        <div><b>{{ asn.asnNo }}</b></div>
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.niivrnjg', '到货通知单')"
+          :value="asn.asnNo"
+          :is-row="false"
+          val-bold
+        />
         <lw-button
           v-if="showPrint"
           style="flex-shrink: 0"
@@ -12,7 +41,7 @@
           round
           @click="$emit('print')"
         >
-          {{$lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnInfo.cheknhil','商品补码')}}
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnInfo.cheknhil', '商品补码') }}
         </lw-button>
         <div>
           <lw-tag v-if="!isNaN(asn.delayTime) && asn.delayTime > 0" type="danger" plain>
@@ -42,28 +71,11 @@
     <lw-data-look-bg
       v-if="showDataLook"
       :type="radius?'bottom':'not'"
-    >
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.ooepssdd', '计划量')"
-        :value="asn.qty"
-      />
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.gjpbpfhb', '已收量')"
-        :value="asn.receiveQty"
-      />
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.jmqngnfs', '待收量')"
-        :value="asn.pendingQty"
-      />
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.mwgalrja', '到货量')"
-        :value="asn.arrivalQty"
-      />
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.rnruqkfc', '异常量')"
-        :value="asn.qualityLossQty"
-      />
-    </lw-data-look-bg>
+      :data="data.qtyList"
+      value-key="qtyLabel"
+      title-key="label"
+      :show-end-line="false"
+    />
   </div>
 </template>
 
@@ -98,23 +110,24 @@ export default {
       const data = this.data
       if (data) {
         if (data.ownerCode) {
-          data.owner = data.ownerCode + ' - ' + data.ownerName
+          data.owner = this.$lwCheckVal(data.ownerCode, '') + ' / ' + this.$lwCheckVal(data.ownerName, '')
         }
         if (data.supplierCode) {
-          data.supplier = data.supplierCode + ' - ' + data.supplierName
+          data.supplier = this.$lwCheckVal(data.supplierCode, '') + ' / ' + this.$lwCheckVal(data.supplierName, '')
           if (data.supplierAddress) {
             data.supplier += ('\n' + data.supplierAddress)
           }
         }
         if (data.carrierCode) {
-          data.carrier = data.carrierCode + ' - ' + data.carrierName
+          data.carrier = this.$lwCheckVal(data.carrierCode, '') + ' / ' + this.$lwCheckVal(data.carrierName, '')
         }
         if (data.allocWarehouseCode) {
-          data.allocWarehouse = data.allocWarehouseCode + ' - ' + data.allocWarehouseName
+          data.allocWarehouse = this.$lwCheckVal(data.allocWarehouseCode, '') + ' / ' + this.$lwCheckVal(data.allocWarehouseName, '')
         }
       }
-      data.pendingQty = data.qty - data.receiveQty
-      if(data.pendingQty<0){
+      const {qualityLossQty, qty, arrivalQty} = data
+      data.pendingQty = Number(qty || 0) + Number(qualityLossQty || 0) - Number(arrivalQty || 0)
+      if (data.pendingQty < 0) {
         data.pendingQty = 0
       }
       return data
@@ -191,6 +204,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import "./../../../../../assets/css/var.less";
 .btn-shrink {
   padding: 5px;
 
@@ -264,4 +278,9 @@ export default {
     }
   }
 }
+
+.btn-box {
+  border-top: 1px solid @borderColor;
+  margin-top: 5px;
+}
 </style>

package/src/views/wms/page/inbound/components/AsnSkuInfo.vue

@@ -1,22 +1,30 @@
 <template>
-  <div v-if="data && data.sku" class="sku-info" :class="'bottom'===type?'sku-info-bottom': ('not'===type?'sku-info-not':'sku-info-round')">
-    <div>
-      <div style="color: red; font-size: 1.1em;"><b>{{data.sku.code}}</b></div>
-      <div>
-        <lw-tag plain color="red" v-if="data.sku.new">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.hfesgrpm', '新品')}}</lw-tag>
-        <lw-tag plain color="red">{{ data.sku.skuUrgencyLabel }}</lw-tag>
+  <div
+    v-if="data && data.sku"
+    :class="getBoxClass"
+  >
+    <div class="lw-global-row-start">
+      <div class="lw-global-flex-between">
+        <div class="lw-global-value-bold-red">{{ data.sku.code }}</div>
+        <div>
+          <lw-tag plain color="red" v-if="data.sku.new">
+            {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.hfesgrpm', '新品') }}
+          </lw-tag>
+          <lw-tag plain color="red">{{ data.sku.skuUrgencyLabel }}</lw-tag>
+        </div>
       </div>
+      <div class="lw-global-title">{{ data.sku.name }}</div>
     </div>
-    <div>
-      <div>{{data.sku.name}}</div>
-    </div>
-    <div>
-      <div>
-        {{$lwLanguage.get('wms_project.pda.components.page.inbound.components.dtapgpqz', '异常率')}}
-        <b style="color: red; font-size: 1.1em;">
-          {{' ' + data.sku.abnormalRate}}</b>
-        %
-      </div>
+
+    <div class="lw-global-flex-between lw-global-row">
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.dtapgpqz', '异常率')"
+        :value="data.sku.abnormalRate + '%'"
+        val-red
+        val-bold
+        :is-row="false"
+      />
+
       <div>
         <lw-button
           v-if="showPrint"
@@ -24,7 +32,7 @@
           round
           @click="$emit('printClick')"
         >
-          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnSkuInfo.bitwuvok','补码') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnSkuInfo.bitwuvok', '补码') }}
         </lw-button>
 
         <lw-button
@@ -34,11 +42,17 @@
           round
           @click="$emit('containerPrint')"
         >
-          {{$lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnSkuInfo.jtbuadug','打印容器号')}}
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.AsnSkuInfo.jtbuadug', '打印容器号') }}
         </lw-button>
-        <lw-tag plain color="red">{{data.sku.qualityTypeLabel}}</lw-tag>
+        <lw-tag plain color="red">{{ data.sku.qualityTypeLabel }}</lw-tag>
       </div>
     </div>
+
+    <lw-label-value-group
+      :list="data.groupContentList"
+      :show-model-style="false"
+    />
+
     <slot name="extend"/>
     <slot name="extend2"/>
   </div>
@@ -49,7 +63,7 @@ export default {
   name: 'AsnSkuInfo',
   props: {
     data: Object,
-    type:{
+    type: {
       type: String,
       default: 'not'
     },
@@ -58,37 +72,21 @@ export default {
     // 是否显示容器打印按钮
     showContainerPrint: Boolean
   },
-}
-</script>
-
-<style lang="less" scoped>
-.sku-info {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  background: #fff;
-  padding: 10px;
-
-  & > div {
-    display: flex;
-    align-items: center;
-
-    & > div:first-child {
-      flex-grow: 1;
-      color: gray;
+  computed: {
+    getBoxClass() {
+      switch (this.type) {
+        case 'bottom':
+          return 'lw-global-model-bottom-radius'
+        case 'not':
+          return 'lw-global-model-not-radius'
+        default:
+          return 'lw-global-model-box'
+      }
     }
   }
 }
+</script>
 
-.sku-info-bottom {
-  border-bottom-left-radius: 8px;
-  border-bottom-right-radius: 8px;
-}
-
-.sku-info-not {
-}
+<style lang="less" scoped>
 
-.sku-info-round {
-  margin: 10px 0 0;
-  border-radius: 8px;
-}
 </style>

package/src/views/wms/page/inbound/components/QualityCard.vue

@@ -15,9 +15,9 @@
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.xxllqyjv', '品检卡')"
       class="abnormal-popup-bg"
-      position="center"
       @clickCloseBtn="hideCard"
-      v-model="showDialog">
+      v-model="showDialog"
+    >
 
       <div>
         <lw-title-value-cell

package/src/views/wms/page/inbound/components/QualityTaskInfo.vue

@@ -39,19 +39,19 @@
     <!-- 数字板 -->
     <div class="lw-global-board-nums">
       <div>
-        <div>{{data.canQualityQty}}</div>
+        <div>{{ data.canQualityQtyLabel }}</div>
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.gypojjwp', '待检量')}}</div>
       </div>
       <div>
-        <div>{{data.qualityQty}}</div>
+        <div>{{ data.qualityQtyLabel }}</div>
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.fwqychhx', '已检量')}}</div>
       </div>
       <div>
-        <div>{{data.receiveQty}}</div>
+        <div>{{ data.receiveQtyLabel }}</div>
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.nkanulec', '正品量')}}</div>
       </div>
       <div style="color: yellow;">
-        <div>{{data.qualityLossQty}}</div>
+        <div>{{ data.qualityLossQtyLabel }}</div>
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.dstmavxr', '异常量')}}</div>
       </div>
       <div class="lw-global-sv"></div>

package/src/views/wms/page/inbound/components/SortingAsnInfo.vue

@@ -34,24 +34,24 @@
 
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.ooepssdd', '计划量')"
-        :value="asn.qty"
+        :value="asn.qtyLabel"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.gjpbpfhb', '已收量')"
-        :value="asn.receiveQty"
+        :value="asn.receiveQtyLabel"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.jmqngnfs', '待收量')"
-        :value="asn.pendingQty"
+        :value="asn.canReceiveQtyLabel"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.sortedQty', '分拣量')"
-        :value="asn.sortedQty"
+        :value="asn.sortedQtyLabel"
       />
       <lw-data-look-item
         color="#eeee20"
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.rnruqkfc', '异常量')"
-        :value="asn.qualityLossQty"
+        :value="asn.qualityLossQtyLabel"
       />
     </lw-data-look-bg>
   </div>

package/src/views/wms/page/inbound/components/SortingBoxInfo.vue

@@ -2,11 +2,11 @@
   <div class="so-box" :class="{active: active, 'lw-global-model-box': modelBox}">
     <div class="so-box-name">
       <div>
-        <span class="so-box-name-title">箱号</span>
+        <span class="so-box-name-title">{{ $lwLanguage.get('', '箱号') }}</span>
         <span class="so-box-name-no">{{ data.group.caseNum }}</span>
       </div>
       <div>
-        <span class="so-box-name-title">分拣位</span>
+        <span class="so-box-name-title">{{ $lwLanguage.get('', '分拣位') }}</span>
         <span class="so-box-name-index">{{ data.group.sortingNo }}</span>
       </div>
     </div>
@@ -15,24 +15,24 @@
         <div class="lw-global-value-bold">{{ data.group.sortingGroupCode }}</div>
         <div>{{ data.group.sortingGroupName }}</div>
       </div>
-      <lw-button v-if="resetAble" @click="$emit('reset', data)">重新分拣</lw-button>
+      <lw-button v-if="resetAble" @click="$emit('reset', data)">{{ $lwLanguage.get('', '重新分拣') }}</lw-button>
     </div>
     <div class="so-box-values">
       <div>
-        <div>计划量</div>
-        <div>{{ data.qty }}</div>
+        <div>{{ $lwLanguage.get('', '计划量') }}</div>
+        <div>{{ data.qtyLabel }}</div>
       </div>
       <div>
-        <div>已收货</div>
-        <div>{{ data.receiveQty }}</div>
+        <div>{{ $lwLanguage.get('', '已收货') }}</div>
+        <div>{{ data.receiveQtyLabel }}</div>
       </div>
       <div>
-        <div>待分拣</div>
-        <div>{{ data.canSortingQty }}</div>
+        <div>{{ $lwLanguage.get('', '待分拣') }}</div>
+        <div>{{ data.canSortingQtyLabel }}</div>
       </div>
       <div>
-        <div>当前扫描量</div>
-        <div>{{ data.sortingQty }}</div>
+        <div>{{ $lwLanguage.get('', '当前扫描量') }}</div>
+        <div>{{ data.sortingQtyLabel }}</div>
       </div>
     </div>
   </div>

package/src/views/wms/page/inbound/components/printLabelPopup.vue

@@ -12,65 +12,48 @@
     >
 
       <lw-sku-info-module
-        :sku-code="skuInfo.skuCode"
-        :sku-name="skuInfo.skuName"
+        :sku-code="skuInfo.sku.code"
+        :sku-name="skuInfo.sku.name"
         is-row-first
         :show-right="false"
       />
 
-      <lw-data-look-bg type="null">
+      <lw-data-look-bg
+        type="null"
+        need-show
+      >
 
         <lw-data-look-item
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.hjinkoxc','最小销售数')"
-          :value="skuInfo.skuMinSellQty || 1"
+          :value="skuInfo.sku.minSellQty || 1"
           color="#D50000"
         />
         <lw-data-look-item
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.tdcfthdr','内装数')"
-          :value="skuInfo.packIpQty || '0'"
+          :value="skuInfo.pack.innerQty || '0'"
         />
         <lw-data-look-item
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.wxgsivok','箱装数')"
-          :value="skuInfo.packCaseQty || '0'"
+          :value="skuInfo.pack.caseQty || '0'"
         />
         <lw-data-look-item
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.uekjfogw','托盘数')"
-          :value="skuInfo.packPalletQty || '0'"
+          :value="skuInfo.pack.palletQty || '0'"
         />
       </lw-data-look-bg>
 
-      <lw-data-look-bg type="not">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.stkfvszc','计划量')"
-          :value="skuInfo.qty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.uxpgibyn','已收量')"
-          :value="skuInfo.receiveQty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.nmcjpigc','待收量')"
-          :value="skuInfo.waitReceiveQty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.yntvqxtx','到货量')"
-          :value="skuInfo.arrivalQty"
-        />
-
-        <lw-data-look-item
-          color="#eeee20"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.cyoiblvo','异常量')"
-          :value="skuInfo.abnormalQty"
-        />
-      </lw-data-look-bg>
+      <lw-data-look-bg
+        type="not"
+        :data="skuInfo.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+        need-show
+      />
 
 
       <lw-cell
-        v-if="Number(skuInfo.packCaseQty || 0) > 0"
+        v-if="Number(skuInfo.pack.caseQty || 0) > 0"
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.pztrclxk','打印箱装')"
         :is-edit="false"
         :is-link="false"
@@ -84,7 +67,7 @@
       </lw-cell>
 
       <lw-cell
-        v-if="Number(skuInfo.packPalletQty || 0) > 0"
+        v-if="Number(skuInfo.pack.palletQty || 0) > 0"
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.flrpvfxc','打印托装')"
         :is-edit="false"
         :is-link="false"
@@ -170,7 +153,7 @@
       </div>
 
       <lw-lot-module
-        v-if="skuInfo.needGenerateSnInventory"
+        v-if="skuInfo.sku.needGenerateSnInventory"
         ref="lotModule"
         :query="lotQuery"
       />
@@ -189,7 +172,7 @@
 
 import {
   wmsMobileInboundAsnSkuExecutePrint,
-  wmsMobileInboundGetAsnSkuPrintData
+  wmsMobileInPrintGetAsnSkuV2
 } from "../../../api/inbound/printLabel";
 
 export default {
@@ -209,14 +192,17 @@ export default {
   },
   data() {
     return {
-      boxPrint:false,
-      lpnPrint:false,
-      printNum:'',
+      boxPrint: false,
+      lpnPrint: false,
+      printNum: '',
       printNumFocus: false,
 
-      skuInfo:{},
+      skuInfo: {
+        sku: {},
+        pack: {}
+      },
 
-      lotQuery:{}
+      lotQuery: {}
     }
   },
   computed:{
@@ -242,17 +228,17 @@ export default {
 
       if (!num) return obj
 
-      const mini = Number(this.skuInfo.skuMinSellQty || 1)
+      const mini = Number(this.skuInfo.sku.minSellQty || 1)
       obj.sku = Math.floor(num / mini)
       obj.skuMore = num % mini
 
-      const boxQty = Number(this.skuInfo.packCaseQty || 0)
+      const boxQty = Number(this.skuInfo.pack.caseQty || 0)
       if (boxQty > 0){
         obj.boxNum = Math.floor(num / boxQty)
         obj.boxMore = num % boxQty
       }
 
-      const lpnQty = Number(this.skuInfo.packPalletQty || 0)
+      const lpnQty = Number(this.skuInfo.pack.palletQty || 0)
       if (lpnQty > 0){
         obj.lpnNum = Math.floor(num / lpnQty)
         obj.lpnMore = num % lpnQty
@@ -271,14 +257,14 @@ export default {
   methods: {
     // 获取商品信息
     getSkuInfo(){
-      wmsMobileInboundGetAsnSkuPrintData({
+      wmsMobileInPrintGetAsnSkuV2({
         asnId: this.asnId,
         skuId: this.skuId
       }).then(res=>{
-        if (res.needGenerateSnInventory){
-          this.lotQuery={
+        if (res.sku.needGenerateSnInventory) {
+          this.lotQuery = {
             header: res.header,
-            line:res.line
+            line: res.line
           }
         }
         this.skuInfo = res
@@ -297,11 +283,17 @@ export default {
 
     // 打印
     async printClick(){
+      if (!this.printData.printId) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '打印机未配置，请先配置打印机')
+        )
+        return
+      }
 
       const qty = Number(this.printNum || 0)
-      if (!qty){
+      if (!qty) {
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.ojnyjrzh','打印商品量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.ojnyjrzh', '打印商品量不能为空，且应当是大于0的整数')
         )
         return
       }
@@ -309,20 +301,20 @@ export default {
       let obj = {
         asnId: this.asnId,
         skuId: this.skuId,
-        packId: this.skuInfo.packId,
+        packId: this.skuInfo.pack.id,
         qty,
         printCase: this.boxPrint,
         printPallet: this.lpnPrint,
         printDeviceId: this.printData.printId,
         printTemplateId: this.printData.templateId,
-        needHandleSn: this.skuInfo.needHandleSn,
-        needGenerateSnInventory: this.skuInfo.needGenerateSnInventory,
-        snLotAttributes:'',
+        needHandleSn: this.skuInfo.sku.needSn,
+        needGenerateSnInventory: this.skuInfo.sku.needGenerateSnInventory,
+        snLotAttributes: '',
       }
 
-      if (this.skuInfo.needGenerateSnInventory){
-        const {success,data} = this.$refs.lotModule.getData()
-        if (!success)return
+      if (this.skuInfo.sku.needGenerateSnInventory) {
+        const {success, data} = this.$refs.lotModule.getData()
+        if (!success) return
         obj.snLotAttributes = data
       }