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

package/src/components/page/{inbound → config}/newProject/index/index.vue

@@ -14,9 +14,9 @@
       <div class="lw-global-model-box">
         <lw-input
             v-model="skuCode.value"
-            title="零件编码"
+            title="商品编码"
             :show-bottom-border="false"
-            placeholder="请输入零件编码"
+            placeholder="请输入商品编码"
             @confirm="skuCodeConfirm"
         />
 
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import {wmsProjectMobileGetOwnerOfSku} from "../../../../../api/inner/newProject/index";
+import {wmsProjectMobileGetOwnerOfSku} from "../../../../../api/config/newProject";
 
 
 export default {
@@ -79,7 +79,7 @@ export default {
           let query={"lwSkuId":skuId,"lwOwnerId":ownerId}
           console.log("date",query)
 
-          this.$router.push({ path: '/inbound/newProject/lwAction',query })
+          this.$router.push({ path: '/config/newProject/lwAction',query })
 
 
         }
@@ -101,7 +101,7 @@ export default {
       let query={"lwSkuId":skuId,"lwOwnerId":ownerId}
       console.log("date",query)
 
-      this.$router.push({ path: '/inbound/newProject/lwAction', query: query })
+      this.$router.push({ path: '/config/newProject/lwAction', query: query })
 
 
     }
@@ -119,4 +119,4 @@ export default {
 <style scoped lang="less">
 
 
-</style>
+</style>

package/src/components/page/count/components/CountBoard.vue

@@ -2,31 +2,31 @@
   <div>
     <div v-if="data" class="count-task-board">
       <div class="count-task-board-top">
-        <div class="count-task-board-top-l1">盘点任务</div>
+        <div class="count-task-board-top-l1">{{$lwLanguage.get('wms_project.pda.components.page.count.components.tbjqqfwd', '盘点任务')}}</div>
         <div class="count-task-board-top-l2">{{ data.taskNo }}</div>
         <div class="count-task-board-top-l3">{{ $lwDict.getDictLabel('InnerCountReplayType', data.replayType) }}</div>
       </div>
       <div class="count-task-board-nums">
         <div>
           <div>{{ data.locCount }}</div>
-          <div>库位数</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.count.components.rhjvvmie', '库位数')}}</div>
         </div>
         <div>
           <div>{{ data.countedLineCount }}</div>
-          <div>已盘库位</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehper', '已盘库位')}}</div>
         </div>
         <div>
           <div>{{ data.skuCount || '-'}}</div>
-          <div>商品品种</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.count.components.oenbvbjn', '商品品种')}}</div>
         </div>
         <div class="lw-global-sv"></div>
         <div class="count-task-board-yellow">
           <div>{{ data.diffLines }}</div>
-          <div>差异行</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.count.components.jjlghjnc', '差异行')}}</div>
         </div>
       </div>
       <div v-if="showZones" class="count-task-board-bottom">
-        <div class="count-task-board-bottom-l1">库区</div>
+        <div class="count-task-board-bottom-l1">{{$lwLanguage.get('wms_project.pda.components.page.count.components.ohetcyor', '库区')}}</div>
         <div class="count-task-board-bottom-l2">{{ data.zoneCodes }}</div>
       </div>
     </div>
@@ -76,7 +76,7 @@ export default {
     justify-content: space-between;
     margin: 0 -10px;
     padding: 10px 15px;
-    background: #0f90dd;
+    background: #e44b51;
     color: white;
     text-align: center;
 

package/src/components/page/count/components/RandomCount.vue

@@ -1,154 +1,154 @@
-<template>
-  <lw-popup v-model="showPop" title="随机盘点" :show-off-btn="false">
-    <div>
-      <lw-input title="库位" v-model="data.loc.value" :get-focus.sync="data.loc.focus" @confirm="data.sku.focus = true"/>
-      <lw-input title="商品" v-model="data.sku.value" :get-focus.sync="data.sku.focus"/>
-      <lw-input title="托盘" v-model="data.lpn.value"
-                v-if="grading === 'LPN'"
-                :get-focus.sync="data.lpn.focus"/>
-      <lw-input title="箱号" v-model="data.caseNum.value"
-                v-if="['LPN', 'CASE'].includes(grading)"
-                :get-focus.sync="data.caseNum.focus"/>
-    </div>
-    <template #button>
-      <lw-button plain @click="close">关闭</lw-button>
-      <lw-button @click="submit()">确认</lw-button>
-    </template>
-    <lw-popup v-model="showOwners" title="选择货主" :show-off-btn="false">
-      <div class="lw-global-flex-between select-owner" v-for="o in owners" :key="o.id" @click="submit(o.id)">
-        <div>
-          <div>{{ o.code }}</div>
-          <div class="select-owner-name">{{ o.name }}</div>
-        </div>
-        <van-icon name="arrow"/>
-      </div>
-    </lw-popup>
-  </lw-popup>
-</template>
-
-<script>
-import { invCountLineCustom } from '../../../../api/inner/count'
-
-export default {
-  name: 'RandomCount',
-  props: {
-    grading: {
-      type: String,
-      default: 'LOC',
-    },
-    countTaskNo: {
-      type: String,
-      required: true,
-    },
-    warehouseId: String,
-  },
-  data () {
-    return {
-      sku: '',
-      showPop: false,
-      showOwners: false,
-      data: {
-        loc: {
-          value: '',
-          focus: false,
-        },
-        sku: {
-          value: '',
-          focus: false,
-        },
-        lpn: {
-          value: '',
-          focus: false,
-        },
-        caseNum: {
-          value: '',
-          focus: false,
-        }
-      },
-      owners: [],
-    }
-  },
-  methods: {
-    show () {
-      this.data.sku.value = ''
-      this.data.loc.value = ''
-      this.data.lpn.value = ''
-      this.data.caseNum.value = ''
-      this.showPop = true
-      this.data.loc.focus = true
-    },
-    submit (ownerId = null) {
-      if (!this.data.sku.value) {
-        this.data.sku.focus = true
-        return
-      }
-      if (!this.data.loc.value) {
-        this.data.loc.focus = true
-        return
-      }
-      invCountLineCustom({
-        skuCode: this.data.sku.value,
-        ownerId,
-        taskNo: this.countTaskNo,
-        locationCode: this.data.loc.value,
-        lpn: this.data.lpn.value,
-        caseNum: this.data.caseNum.value,
-      }).then(res => {
-        if (!ownerId && Array.isArray(res)) {
-          if (res.length === 1) {
-            this.submit(res[0].id)
-            return
-          }
-          if (res.length === 0) {
-            return this.$lwShowErrorMsg('获取商品货主信息失败')
-          }
-          this.owners = res
-          this.showOwners = true
-          return
-        }
-        if (!res.line) {
-          return this.$lwShowErrorMsg('获取商品货主信息失败')
-        }
-        this.success(res.line)
-      })
-    },
-    success (res) {
-      this.showPop = false
-      this.showOwners = false
-      if (['200', '300', '500'].includes(res.billStatus)) {
-        this.$dialog.confirm({
-          title: '提示',
-          message: `操作成功，是否跳转至该条任务？`,
-          confirmButtonText: '跳转'
-        }).then(() => {
-          this.$emit('jump', res)
-        })
-      } else {
-        const status = this.$lwDict.getDictLabel('InnerCountStatus', res.billStatus)
-        this.$dialog.alert({ title: '提示', message: `操作失败，该任务已存在，且状态为：${status}` })
-      }
-    },
-    close () {
-      this.showPop = false
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.select-owner {
-  line-height: 1.5em;
-  border-bottom: 1px solid #e3e3e3;
-  margin: 5px 0;
-  padding: 5px 0;
-
-  &:last-child {
-    border: none;
-  }
-
-  &-name {
-    font-size: 0.9em;
-    color: gray;
-  }
-}
-</style>
+<template>
+  <lw-popup v-model="showPop" :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bobkappg', '随机盘点')" :show-off-btn="false">
+    <div>
+      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.fdimjwgw', '库位')" v-model="data.loc.value" :get-focus.sync="data.loc.focus" @confirm="data.sku.focus = true"/>
+      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.gpgarbgi', '商品')" v-model="data.sku.value" :get-focus.sync="data.sku.focus"/>
+      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.ghmaydzj', '托盘')" v-model="data.lpn.value"
+                v-if="grading === 'LPN'"
+                :get-focus.sync="data.lpn.focus"/>
+      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bjorbmde', '箱号')" v-model="data.caseNum.value"
+                v-if="['LPN', 'CASE'].includes(grading)"
+                :get-focus.sync="data.caseNum.focus"/>
+    </div>
+    <template #button>
+      <lw-button plain @click="close">{{$lwLanguage.get('wms_project.pda.components.page.count.components.vmukrfob', '关闭')}}</lw-button>
+      <lw-button @click="submit()">{{$lwLanguage.get('wms_project.pda.components.page.count.components.cstbfjim', '确认')}}</lw-button>
+    </template>
+    <lw-popup v-model="showOwners" :title="$lwLanguage.get('wms_project.pda.components.page.count.components.udsejdvj', '选择货主')" :show-off-btn="false">
+      <div class="lw-global-flex-between select-owner" v-for="o in owners" :key="o.id" @click="submit(o.id)">
+        <div>
+          <div>{{ o.code }}</div>
+          <div class="select-owner-name">{{ o.name }}</div>
+        </div>
+        <van-icon name="arrow"/>
+      </div>
+    </lw-popup>
+  </lw-popup>
+</template>
+
+<script>
+import { invCountLineCustom } from '../../../../api/inner/count'
+
+export default {
+  name: 'RandomCount',
+  props: {
+    grading: {
+      type: String,
+      default: 'LOC',
+    },
+    countTaskNo: {
+      type: String,
+      required: true,
+    },
+    warehouseId: String,
+  },
+  data () {
+    return {
+      sku: '',
+      showPop: false,
+      showOwners: false,
+      data: {
+        loc: {
+          value: '',
+          focus: false,
+        },
+        sku: {
+          value: '',
+          focus: false,
+        },
+        lpn: {
+          value: '',
+          focus: false,
+        },
+        caseNum: {
+          value: '',
+          focus: false,
+        }
+      },
+      owners: [],
+    }
+  },
+  methods: {
+    show () {
+      this.data.sku.value = ''
+      this.data.loc.value = ''
+      this.data.lpn.value = ''
+      this.data.caseNum.value = ''
+      this.showPop = true
+      this.data.loc.focus = true
+    },
+    submit (ownerId = null) {
+      if (!this.data.sku.value) {
+        this.data.sku.focus = true
+        return
+      }
+      if (!this.data.loc.value) {
+        this.data.loc.focus = true
+        return
+      }
+      invCountLineCustom({
+        skuCode: this.data.sku.value,
+        ownerId,
+        taskNo: this.countTaskNo,
+        locationCode: this.data.loc.value,
+        lpn: this.data.lpn.value,
+        caseNum: this.data.caseNum.value,
+      }).then(res => {
+        if (!ownerId && Array.isArray(res)) {
+          if (res.length === 1) {
+            this.submit(res[0].id)
+            return
+          }
+          if (res.length === 0) {
+            return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.components.qvqheoig', '获取商品货主信息失败'))
+          }
+          this.owners = res
+          this.showOwners = true
+          return
+        }
+        if (!res.line) {
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.components.qvqheoig', '获取商品货主信息失败'))
+        }
+        this.success(res.line)
+      })
+    },
+    success (res) {
+      this.showPop = false
+      this.showOwners = false
+      if (['200', '300', '500'].includes(res.billStatus)) {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'),
+          message: this.$lwLanguage.get('wms_project.pda.components.page.count.components.vvbcytuy', '操作成功，是否跳转至该条任务？'),
+          confirmButtonText: this.$lwLanguage.get('wms_project.pda.components.page.count.components.kyucaquy', '跳转')
+        }).then(() => {
+          this.$emit('jump', res)
+        })
+      } else {
+        const status = this.$lwDict.getDictLabel('InnerCountStatus', res.billStatus)
+        this.$lwDialog.alert({ title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'), message: this.$lwLanguage.get('wms_project.pda.components.page.count.components.lpkcaheg', '操作失败，该任务已存在，且状态为：{status}', {status: status}) })
+      }
+    },
+    close () {
+      this.showPop = false
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.select-owner {
+  line-height: 1.5em;
+  border-bottom: 1px solid #e3e3e3;
+  margin: 5px 0;
+  padding: 5px 0;
+
+  &:last-child {
+    border: none;
+  }
+
+  &-name {
+    font-size: 0.9em;
+    color: gray;
+  }
+}
+</style>

package/src/components/page/count/inv/action/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <lw-nav-bar title="库存盘点"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.bpooelkv', '库存盘点')"/>
 
     <div class="lw-global-page-box">
       <!-- 任务信息板 -->
@@ -23,40 +23,40 @@
               <div style="color: gray; font-size: 0.9em;">{{ line.skuName }}</div>
             </div>
             <div style="text-align: center;">
-              <template v-if="!taskData.bline">
+              <template v-if="!taskData.blind">
                 <div style="font-weight: bold; color: red;">{{ line.systemQty }}</div>
-                <div style="color: gray; font-size: 0.9em;">系统数</div>
+                <div style="color: gray; font-size: 0.9em;">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.jagpcbcv', '系统数')}}</div>
               </template>
-              <lw-tag color="red" v-else>盲盘</lw-tag>
+              <lw-tag color="red" v-else>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.puvmklex', '盲盘')}}</lw-tag>
             </div>
           </div>
           <div class="lw-global-sh" style="margin-top: 10px;"></div>
-          <lw-input title="库位" v-model="inputData.locationCode.value"
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vkxvrczd', '库位')" v-model="inputData.locationCode.value"
                     :get-focus.sync="inputData.locationCode.focus"
                     @confirm="inputData.skuCode.focus = true"/>
-          <lw-input title="商品条码" v-model="inputData.skuCode.value"
-                    rule-key="sku" rule-value-key="skuCode"
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vqaqfdbr', '商品条码')" v-model="inputData.skuCode.value"
+                    rule-key="sku" @confirm="onSkuCodeConfirm"
                     :get-focus.sync="inputData.skuCode.focus"/>
           <div class="lw-global-props">
             <div>
-              <div>商品编码</div>
-              <div>{{ inputData.skuCode.value }}</div>
+              <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.neivvwdw', '商品编码')}}</div>
+              <div>{{ skuCode }}</div>
             </div>
           </div>
           <div class="lw-global-sh"/>
-          <lw-input title="数量" type="number" v-model="inputData.qty.value" :get-focus.sync="inputData.qty.focus"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vvzdquvr', '数量')" type="number" v-model="inputData.qty.value" :get-focus.sync="inputData.qty.focus"/>
         </div>
       </div>
     </div>
     <lw-bottom-bar>
-      <lw-button plain @click="$refs.randomPop.show()">随机盘点</lw-button>
-      <lw-button type="normal" @click="submitEmptyInv">无库存</lw-button>
-      <lw-button @click="submitCount">提交盘点</lw-button>
+      <lw-button plain @click="$refs.randomPop.show()">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.qumhrjua', '随机盘点')}}</lw-button>
+      <lw-button type="normal" @click="submitEmptyInv">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.lovcyuhd', '无库存')}}</lw-button>
+      <lw-button @click="submitCount">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fplnnpbb', '提交盘点')}}</lw-button>
     </lw-bottom-bar>
     <!-- 随机盘点 -->
     <random-count ref="randomPop" :count-task-no="this.taskNo" @jump="getLine"/>
     <!-- 批次选择器 -->
-    <lw-popup title="填写批次数量" v-model="showLotGroups" :show-off-btn="false">
+    <lw-popup :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.torlbkdh', '填写批次数量')" v-model="showLotGroups" :show-off-btn="false" @close="cancelLotGroup">
       <div v-if="lotGroups">
         <div v-for="g in lotGroups" :key="g.key">
           <div>
@@ -66,14 +66,14 @@
                 <div>{{item.value}}</div>
               </div>
             </div>
-            <lw-input title="数量" type="number" v-model="g.qty"/>
+            <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.afmzmvch', '数量')" type="number" v-model="g.qty"/>
           </div>
           <div class="lw-global-sh"></div>
         </div>
       </div>
       <template #button>
-        <lw-button plain @click="cancelLotGroup">取消</lw-button>
-        <lw-button @click="submitCount">提交</lw-button>
+        <lw-button plain @click="cancelLotGroup">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.rcunzcih', '取消')}}</lw-button>
+        <lw-button @click="submitCount">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.usoixwpz', '提交')}}</lw-button>
       </template>
     </lw-popup>
   </div>
@@ -89,7 +89,7 @@ import {
   invCountLineSubmit
 } from '../../../../../api/inner/count'
 import CountBoard from '../../components/CountBoard.vue'
-import RandomCount from '../../components/RandomCount'
+import RandomCount from '../../components/RandomCount.vue'
 
 export default {
   name: 'lwCountInvActionPage',
@@ -100,6 +100,7 @@ export default {
       lineId: null,
       taskData: null,
       line: null,
+      skuCode: '',
       inputData: {
         locationCode: {
           value: '',
@@ -121,7 +122,7 @@ export default {
   created () {
     const { taskNo, lineId } = this.$route.query
     if (!taskNo) {
-      return this.$lwShowErrorMsg('错误的盘点任务号')
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.nznibnkq', '错误的盘点任务号'))
     }
     this.taskNo = taskNo
     this.lineId = lineId
@@ -131,7 +132,7 @@ export default {
     getTaskUnCountDetails () {
       getCountTaskDetails({ taskNo: this.taskNo, isCounted: false, page: 0, size: 1 }).then(res => {
         if (res.data.type !== 'INV') {
-          return this.$lwShowErrorMsg('该盘点任务不是库位盘点，无法操作')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.xmhgxasv', '该盘点任务不是库位盘点，无法操作'))
         }
         if (res.countedLineCount != null) {
           res.data.countedLineCount = res.countedLineCount
@@ -153,7 +154,7 @@ export default {
     getLine (line = null) {
       if (line) {
         if (line.taskNo !== this.taskNo) {
-          return this.$lwShowErrorMsg('该盘点明细在任务 ' + line.taskNo + ' 中，无法跳转。')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.swsyiesz', '该盘点明细在任务 {taskNo} 中已存在，无法跳转。', {taskNo: line.taskNo}))
         }
         if (this.line && this.line.id === line.id) {
           return
@@ -169,13 +170,22 @@ export default {
     getPrevLine () {
       getPreviousCountLine(this.taskNo, this.lineId).then(this.initLine)
     },
+    onSkuCodeConfirm (sku, res) {
+      const skuCode = res.bizType === 'SKU' ? res.data.key : sku
+      if (skuCode) {
+        this.skuCode = skuCode
+        this.inputData.qty.focus = true
+      } else {
+        this.skuCode = ''
+      }
+    },
     submitEmptyInv () {
       if (!this.inputData.locationCode.value) {
-        return this.$lwShowErrorMsg('盘点库位不能为空')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.jpvypzfb', '盘点库位不能为空'))
       }
-      this.$dialog.confirm({
-        title: '确认空库位',
-        message: `当前库位 ${this.taskData.locationCode} 中商品 ${this.line.skuCode} 确认无库存？`
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.cfuqrgip', '确认空库位'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.cehchvqx', '当前库位 {locationCode} 中商品 {skuCode} 确认无库存？', {locationCode: this.line.locationCode, skuCode: this.line.skuCode})
       }).then(() => {
         this.inputData.skuCode.value = this.line.skuCode
         this.inputData.qty.value = 0
@@ -183,13 +193,24 @@ export default {
       })
     },
     submitCount () {
+      const qty = parseInt(this.inputData.qty.value)
       if (this.lotGroups) {
         const lotQty = this.lotGroups.map(i => parseInt(i.qty) || 0).reduce((a, b) => a + b, 0)
-        if (lotQty !== parseInt(this.inputData.qty.value)) {
-          return this.$lwShowErrorMsg('批次数量之和与盘点数量不符')
+        if (lotQty !== qty) {
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fyausstw', '批次数量之和与盘点数量不符'))
         }
       }
 
+      if (this.line.systemQty !== qty) {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.qjlvdnaj', '提示'),
+          message: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.siacfgjq', '当前盘点数量与系统数量不一致，确认提交吗？')
+        }).then(() => this.doSubmitCount())
+      } else {
+        this.doSubmitCount()
+      }
+    },
+    doSubmitCount () {
       invCountLineSubmit({
         countLineId: this.line.id,
         qty: this.inputData.qty.value,
@@ -204,11 +225,12 @@ export default {
         this.lotGroups = null
         this.showLotGroups = false
 
-        this.$toast('操作成功')
+        this.$toast(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fojagzah', '操作成功'))
         getCountTask(this.taskNo).then(res => {
+          this.taskData.diffLines = res.diffLines
           this.taskData.countedLineCount = res.countedLines
           if (res.unCountedLines === 0) {
-            this.$toast('当前盘点任务已经全部完成')
+            this.$toast(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.zrjpyigl', '当前盘点任务已经全部完成'))
             setTimeout(() => {
               history.go(-2)
             }, 1500)
@@ -269,4 +291,4 @@ export default {
   margin: 5px 0;
   padding: 2px 0;
 }
-</style>
+</style>