@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.3

package/src/views/wms/page/count/console/index/index.vue

@@ -32,25 +32,26 @@
       </div>
       <lw-data-look-bg type="bottom">
 
-        <div>
-          <div>{{ lookData.taskCount || 0 }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vlnvoocq','总任务') }}</div>
-        </div>
 
-        <div>
-          <div>{{ lookData.completeTaskCount || 0 }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.dqfbwpxb','已完成') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vlnvoocq','总任务')"
+          :value="lookData.taskCount || 0"
+        />
 
-        <div>
-          <div>{{ lookData.locationCount || 0 }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.nxhhtumh','库位数') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.dqfbwpxb','已完成')"
+          :value="lookData.completeTaskCount || 0"
+        />
 
-        <div>
-          <div>{{ lookData.spendTimeSecondStr }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.lpjncseu','工时') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.nxhhtumh','库位数')"
+          :value="lookData.locationCount || 0"
+        />
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.lpjncseu','工时')"
+          :value="lookData.spendTimeSecondStr"
+        />
 
       </lw-data-look-bg>
 
@@ -505,11 +506,11 @@ export default {
           tag: {}
         },
         overOption: [
-          {label: '全部复盘', value: 'RECOUNTALL'},
-          {label: '差异复盘', value: 'RECOUNTDIFF'},
-          {label: '差异终盘复盘', value: 'LASTRECOUNTDIFF'},
-          {label: '发布差异', value: 'PUBLISH'},
-          {label: '关闭盘点单', value: 'CANCEL'},
+          {label: this.$lwLanguage.get('wms_project.pda.count.console.index.clttkzvt', '全部复盘'), value: 'RECOUNTALL'},
+          {label: this.$lwLanguage.get('wms_project.pda.count.console.index.goylksof', '差异复盘'), value: 'RECOUNTDIFF'},
+          {label: this.$lwLanguage.get('wms_project.pda.count.console.index.jqrdxjci', '差异终盘复盘'), value: 'LASTRECOUNTDIFF'},
+          {label: this.$lwLanguage.get('wms_project.pda.count.console.index.krixdbzt', '发布差异'), value: 'PUBLISH'},
+          {label: this.$lwLanguage.get('wms_project.pda.count.console.index.evptzgzg', '关闭盘点单'), value: 'CANCEL'},
         ],
         value: '',
         // 是否盲盘
@@ -562,12 +563,19 @@ export default {
         })
 
         this.tabType.list.push({
-          name: this.$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vjjzcecv','随机盘点单'),
+          name: this.$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vjjzcecv', '随机盘点单'),
           type: 'random'
         })
 
-        this.tabType.active = this.tabType.list[0].type
-        this.taskTypeChange(this.tabType.list[0].type, 0)
+        this.tabType.active = this.tabType.active || this.tabType.list[0].type
+        let index = 0
+        for (let i = 0; i < this.tabType.list.length; i++) {
+          if (this.tabType.list[i].type === this.tabType.active) {
+            index = i
+          }
+        }
+
+        this.taskTypeChange(this.tabType.active, index)
       })
 
       // 获取控制台数据
@@ -600,10 +608,10 @@ export default {
 
     // 判断当前任务的子类型
     taskNextType(item) {
-
+      
       this.tabChild.list = this.getTaskSubType(item)
 
-      this.tabChild.active = this.tabChild.list[0].type
+      this.tabChild.active = this.tabChild.active || this.tabChild.list[0].type
 
       this.getChildData()
     },

package/src/views/wms/page/count/inv/action/index.vue

@@ -196,7 +196,7 @@ export default {
     },
     onLpnConfirm () {
       if (this.line.lpn !== this.inputData.lpn.value) {
-        return this.$lwShowErrorMsg('托盘号不正确')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.count.inv.action.nmxpydku', '托盘号不正确'))
       }
       if ('CASE' === this.taskData.grading) {
         this.inputData.caseNum.focus = true
@@ -206,7 +206,7 @@ export default {
     },
     onCaseNumConfirm () {
       if (this.line.caseNum !== this.inputData.caseNum.value) {
-        return this.$lwShowErrorMsg('箱号不正确')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.count.inv.action.vqbgbmxz', '箱号不正确'))
       }
       this.inputData.skuCode.focus = true
     },
@@ -214,7 +214,7 @@ export default {
       const skuCode = res.bizType === 'SKU' ? res.data.key : sku
       if (skuCode) {
         if (skuCode !== this.line.skuCode) {
-          this.$lwShowErrorMsg('商品编码不正确')
+          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.count.inv.action.hlwflrtr', '商品编码不正确'))
           this.inputData.skuCode.value = ''
           this.inputData.skuCode.focus = true
           return
@@ -239,9 +239,9 @@ export default {
       })
     },
     submitCount () {
-      const qty = parseInt(this.inputData.qty.value)
+      const qty = Number(this.inputData.qty.value)
       if (this.lotGroups) {
-        const lotQty = this.lotGroups.map(i => parseInt(i.qty) || 0).reduce((a, b) => a + b, 0)
+        const lotQty = this.lotGroups.map(i => Number(i.qty) || 0).reduce((a, b) => a + b, 0)
         if (lotQty !== qty) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fyausstw', '批次数量之和与盘点数量不符'))
         }
@@ -270,6 +270,7 @@ export default {
 
         this.lotGroups = null
         this.showLotGroups = false
+        this.skuCode = ''
 
         this.$toast(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fojagzah', '操作成功'))
         getCountTask(this.taskNo).then(res => {

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

@@ -39,27 +39,30 @@
     </div>
 
     <!-- 收货单数量 -->
-    <lw-data-look-bg :type="radius?'bottom':'not'">
-      <div>
-        <div>{{ asn.qty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.ooepssdd', '计划量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.receiveQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.gjpbpfhb', '已收量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.pendingQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.jmqngnfs', '待收量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.arrivalQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.mwgalrja', '到货量') }}</div>
-      </div>
-      <div class="count-task-board-yellow">
-        <div>{{ asn.qualityLossQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.rnruqkfc', '异常量') }}</div>
-      </div>
+    <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>
   </div>
 </template>
@@ -82,7 +85,13 @@ export default {
     },
 
     // 是否显示打印按钮
-    showPrint: Boolean
+    showPrint: Boolean,
+
+    // 是否显示看板
+    showDataLook: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     asn() {

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

@@ -31,26 +31,28 @@
 
     <!-- 收货单数量 -->
     <lw-data-look-bg :type="radius?'bottom':'not'">
-      <div>
-        <div>{{ asn.qty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.ooepssdd', '计划量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.receiveQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.gjpbpfhb', '已收量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.pendingQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.jmqngnfs', '待收量') }}</div>
-      </div>
-      <div>
-        <div>{{ asn.sortedQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.sortedQty', '分拣量') }}</div>
-      </div>
-      <div class="count-task-board-yellow">
-        <div>{{ asn.qualityLossQty }}</div>
-        <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.rnruqkfc', '异常量') }}</div>
-      </div>
+
+      <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.sortedQty', '分拣量')"
+        :value="asn.sortedQty"
+      />
+      <lw-data-look-item
+        color="#eeee20"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.rnruqkfc', '异常量')"
+        :value="asn.qualityLossQty"
+      />
     </lw-data-look-bg>
   </div>
 </template>

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

@@ -19,50 +19,53 @@
       />
 
       <lw-data-look-bg type="null">
-        <div>
-          <div style="color: #D50000">{{ skuInfo.skuMinSellQty || 1 }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.hjinkoxc','最小销售数') }}</div>
-        </div>
-        <div>
-          <div>{{ skuInfo.packIpQty || '0' }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.tdcfthdr','内装数') }}</div>
-        </div>
-        <div>
-          <div>{{ skuInfo.packCaseQty || '0' }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.wxgsivok','箱装数') }}</div>
-        </div>
-        <div>
-          <div>{{ skuInfo.packPalletQty || '0' }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.uekjfogw','托盘数') }}</div>
-        </div>
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.hjinkoxc','最小销售数')"
+          :value="skuInfo.skuMinSellQty || 1"
+          color="#D50000"
+        />
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.tdcfthdr','内装数')"
+          :value="skuInfo.packIpQty || '0'"
+        />
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.wxgsivok','箱装数')"
+          :value="skuInfo.packCaseQty || '0'"
+        />
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.uekjfogw','托盘数')"
+          :value="skuInfo.packPalletQty || '0'"
+        />
       </lw-data-look-bg>
 
       <lw-data-look-bg type="not">
 
-        <div>
-          <div>{{ skuInfo.qty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.stkfvszc','计划量') }}</div>
-        </div>
-
-        <div>
-          <div>{{ skuInfo.receiveQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.uxpgibyn','已收量') }}</div>
-        </div>
-
-        <div>
-          <div>{{ skuInfo.waitReceiveQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.nmcjpigc','待收量') }}</div>
-        </div>
-
-        <div>
-          <div>{{ skuInfo.arrivalQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.yntvqxtx','到货量') }}</div>
-        </div>
-
-        <div style="color:#eeee20;">
-          <div>{{ skuInfo.abnormalQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.components.printLabelPopup.cyoiblvo','异常量') }}</div>
-        </div>
+        <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>
 
 

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnBatchExecutePage.vue

@@ -57,6 +57,14 @@
                     <img src="../../../../../../assets/img/close_red.png" alt="">
                   </div>
                 </div>
+                <div style="margin-top: 5px" class="lw-global-flex-start-start">
+                  <div class="lw-global-title" style="margin-right: 5px">
+                    {{
+                      $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdci', '收货照片')
+                    }}
+                  </div>
+                  <lw-img-upload v-model="i.imgList"/>
+                </div>
               </div>
 
             </div>
@@ -301,7 +309,7 @@ export default {
         if (null == this.scanLpnList) {
           this.scanLpnList = []
         }
-        this.scanLpnList.push(res)
+        this.scanLpnList.push({...res, imgList: []})
         if (!this.receiveLoc.value) {
           this.receiveLoc.value = res.receiveLocationCode
         }
@@ -346,7 +354,10 @@ export default {
       }
       const lpns = []
       for (let i of this.scanLpnList) {
-        lpns.push(i.lpn)
+        lpns.push({
+          lpn: i.lpn,
+          images: i.imgList.join('|')
+        })
       }
       const data = {
         asnId: this.asn.id,

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnExecutePage.vue

@@ -7,21 +7,61 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.ecfopiep', '整托盘收货')"/>
     <div v-if="asn && lpn" class="lw-global-page-box">
-      <div>
-        <asn-info :data="asn" shrinkable radius/>
-      </div>
-      <div class="lw-global-model-box lw-global-flex-between" style="margin-top: 10px;">
-        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.ysdxwpxh', '托盘号：')}}<span>{{ lpn.lpn }}</span></div>
-        <div>{{ receiveType}}</div>
+
+      <asn-info :data="asn" shrinkable radius/>
+
+      <div class="lw-global-model-box" style="margin-top: 10px;">
+        <div class="lw-global-row-start lw-global-flex-between">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.ysdxwpxh', '托盘号')"
+            :value="lpn.lpn"
+            :is-row="false"
+          />
+
+          <lw-tag
+            round
+            plain
+          >
+            {{ receiveType }}
+          </lw-tag>
+        </div>
+        <div class="lw-global-row-end lw-global-flex-between">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '商品种类')"
+            :value="lpn.skuCount"
+            val-bold
+            val-red
+            :is-row="false"
+          />
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '商品数量')"
+            :value="lpn.qty"
+            val-bold
+            val-red
+            :is-row="false"
+          />
+
+        </div>
       </div>
       <template v-for="sku in lpn.skuList">
         <div class="lw-global-model-box" :key="sku.id">
           <asn-sku-info :data="sku">
             <template #extend>
               <div style="margin: 10px 0;">
-                <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.kfxdmeud', '数量')}}<b style="color: red; font-size: 1.1em;">{{' ' + sku.qty}}</b></div>
                 <div>
-                  <lw-button color="orange" @click="showAbnormalPop(sku)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.djlflewv', '收货异常')}}</lw-button>
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.kfxdmeud', '数量')
+                  }}<b
+                  style="color: red; font-size: 1.1em;">{{ ' ' + sku.qty }}</b></div>
+                <div>
+                  <lw-button color="orange" @click="showAbnormalPop(sku)">
+                    {{
+                      $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.djlflewv', '收货异常')
+                    }}
+                  </lw-button>
                 </div>
               </div>
             </template>
@@ -35,7 +75,16 @@
         </div>
       </template>
       <div class="lw-global-model-box">
-        <lw-input v-model="receiveLoc.value" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')" required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input v-model="receiveLoc.value"
+                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')"
+                  required :get-focus.sync="receiveLoc.focus"/>
+
+        <div class="lw-global-flex-start-start lw-global-row-end">
+          <div class="lw-global-title" style="margin-right: 5px">
+            {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdci', '收货照片') }}
+          </div>
+          <lw-img-upload v-model="imgList"/>
+        </div>
       </div>
     </div>
     <lw-bottom-bar>
@@ -93,6 +142,8 @@ export default {
         value: '',
         focus: false,
       },
+      // 收货照片
+      imgList: [],
       showAbnormal: false,
     }
   },
@@ -171,6 +222,7 @@ export default {
         printTemplate: null,
         warehouseId: this.asn.warehouseId,
         lines: items,
+        images: this.imgList.join('|')
       }
       const method = this.isAdvance ? submitAsnAdvanceReceiveForWholeLpn : submitAsnFastReceiveForWholeLpn
       method(data).then(res => {

package/src/views/wms/page/inbound/receive/receive-random/LwInboundReceiveRandomSkuExecutePage.vue

@@ -38,7 +38,13 @@
             <div>{{ t.code }}</div>
             <div>{{ t.qty }}</div>
             <div>
-              <lw-input required v-model="t.confirmQty" :get-focus.sync="tagFocus[t.code]" :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.wiinhthn', '请确认数量')"/>
+              <lw-input
+                required
+                type="digit"
+                v-model="t.confirmQty"
+                :get-focus.sync="tagFocus[t.code]"
+                :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.wiinhthn', '请确认数量')"
+              />
             </div>
           </div>
         </div>
@@ -142,7 +148,7 @@ export default {
   },
   computed: {
     tagsQty() {
-      return this.tags.map(i => parseInt(i.confirmQty)).reduce((a, b) => a + b, 0)
+      return this.tags.map(i => Number(i.confirmQty || 0)).reduce((a, b) => a + b, 0)
     },
     barcodeQuery() {
       if (this.receiveSku) {
@@ -193,16 +199,16 @@ export default {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.sku.no.same', '商品编码：{sku} 与当前商品：{currentSku} 不符',{sku:scanData.skuCode,currentSku:this.receiveSku.code}))
       }
 
-      const qty = parseInt(scanData.qty) || 0
+      const qty = Number(scanData.qty || 1)
       const tag = scanData.tag || '#'
       const otag = this.tags.find(i => i.code === tag)
       if (otag) {
         if (otag.code !== '#') {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ilebtytg', '重复箱号'))
         }
-        this.tagFocus[tag] = true
+        // this.tagFocus[tag] = true
         otag.qty = otag.qty + qty
-        otag.confirmQty = otag.confirmQty + qty
+        otag.confirmQty = Number(otag.confirmQty) + qty
       } else {
         this.tagFocus[tag] = true
         this.tags.unshift({