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

package/src/views/vin/views/maintain/task/countContent.vue

@@ -0,0 +1,23 @@
+<!--
+  维护统计 - 统计记录
+  @author: 张文
+  @date: 2023-04-13
+-->
+<template>
+  <lw-vin-maintain-count-content/>
+</template>
+
+<script>
+
+export default {
+  name: "countContent",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/index.vue

@@ -0,0 +1,23 @@
+<!--
+  维护任务 - 起始页
+  @author: 张文
+  @date: 2023-04-12
+-->
+<template>
+  <lw-vin-maintain-task-index/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/myTaskGroup.vue

@@ -0,0 +1,23 @@
+<!--
+  我的任务 - 任务组详情
+  @author: 张文
+  @date: 2023-04-13
+-->
+<template>
+  <lw-vin-maintain-my-task-group/>
+</template>
+
+<script>
+
+export default {
+  name: "myTaskGroup",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/myTaskGroupContent.vue

@@ -0,0 +1,23 @@
+<!--
+  我的任务组详情
+  @author: 张文
+  @date: 2023-04-23
+-->
+<template>
+  <lw-vin-maintain-my-task-group-content/>
+</template>
+
+<script>
+
+export default {
+  name: "myTaskContent",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/scan.vue

@@ -0,0 +1,23 @@
+<!--
+  扫描vin维护 - 起始页
+  @author: 张文
+  @date: 2023-04-13
+-->
+<template>
+  <lw-vin-maintain-scan-index/>
+</template>
+
+<script>
+
+export default {
+  name: "scanIndex",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/taskGroup.vue

@@ -0,0 +1,23 @@
+<!--
+  维护任务组
+  @author: 张文
+  @date: 2023-04-13
+-->
+<template>
+  <lw-vin-maintain-task-group/>
+</template>
+
+<script>
+
+export default {
+  name: "taskGroup",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/task/taskGroupContent.vue

@@ -0,0 +1,23 @@
+<!--
+  维护任务组 - 任务详情
+  @author: 张文
+  @date: 2023-04-13
+-->
+<template>
+  <lw-vin-maintain-task-group-content/>
+</template>
+
+<script>
+
+export default {
+  name: "content",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/maintain/wash/index.vue

@@ -0,0 +1,23 @@
+<!--
+  洗车 - 起始页
+  @author: 张文
+  @date: 2023-04-12
+-->
+<template>
+  <lw-vin-maintain-wash-index/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/quality/menu.js

@@ -0,0 +1,31 @@
+/*
+* 出库菜单
+* @author: 张文
+* @date  2023-03-08
+* */
+
+import quality from "../../../../assets/img/vin/menu/quality/quality.png";
+import register from "../../../../assets/img/vin/menu/quality/register.png";
+
+export const vinQuality = {
+  src: quality,
+  title: '质检管理',
+  titleKey: 'wms_project.pda.vin.menu.vinQuality.quality',
+  tip: 0,
+  hidden: false,
+  permissions: ['/wms/pda/vin/quality'],
+  children: {
+
+    // 质检登记
+    keyAllot: {
+      src: register,
+      title: '质检登记',
+      titleKey: 'wms_project.pda.vin.menu.vinQuality.register',
+      tip: 0,
+      hidden: false,
+      permissions: ['/wms/pda/vin/quality/register/lwIndex'],
+      path: '/vin/quality/register/lwIndex',
+    },
+
+  }
+}

package/src/views/vin/views/quality/register/action.vue

@@ -0,0 +1,23 @@
+<!--
+  质检登记 - 起始页
+  @author: 张文
+  @date: 2023-04-18
+-->
+<template>
+  <lw-vin-quality-register-action/>
+</template>
+
+<script>
+
+export default {
+  name: "action",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/quality/register/addEdit.vue

@@ -0,0 +1,23 @@
+<!--
+  质检登记 - 新增编辑
+  @author: 张文
+  @date: 2023-04-18
+-->
+<template>
+  <lw-vin-quality-register-add-edit/>
+</template>
+
+<script>
+
+export default {
+  name: "addEdit",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/quality/register/index.vue

@@ -0,0 +1,23 @@
+<!--
+  质检登记 - 起始页
+  @author: 张文
+  @date: 2023-04-18
+-->
+<template>
+  <lw-vin-quality-register-index/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/views/quality/router.js

@@ -0,0 +1,29 @@
+/*
+* 出库页面路由
+* @author: 张文
+* @date  2023-03-07
+* */
+
+export default [
+
+  // 质检登记 - 起始页
+  {
+    path: "/vin/quality/register/lwIndex",
+    name: "lwVinQualityRegisterIndex",
+    component: () => import('./register/index.vue')
+  },
+  // 质检登记 - 执行页
+  {
+    path: "/vin/quality/register/lwAction",
+    name: "lwVinQualityRegisterAction",
+    component: () => import('./register/action.vue')
+  },
+  // 质检登记 - 新增编辑
+  {
+    path: "/vin/quality/register/lwAddEdit",
+    name: "lwVinQualityRegisterAddEdit",
+    component: () => import('./register/addEdit.vue')
+  },
+
+
+]

package/src/views/wms/api/inbound/receive.js

@@ -456,3 +456,12 @@ export const getInboundSkuQualityCard = (skuId, skuCode) => lwAxios.action({
   url: 'wmsMobileInboundGetSkuQualityCard',
   data: {skuId, skuCode}
 })
+
+// 获取asn单数据
+export function wmsMobileInboundGetAsnDetail(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundGetAsnDetail',
+    data
+  })
+}
+

package/src/views/wms/api/inventory/inventory.js

@@ -6,18 +6,34 @@
 
 import lwAxios from "../../../../utils/Axios";
 
+// 获取货主信息
+export function projectWmsQueryInventoryOwner(data) {
+  return lwAxios.action({
+    url: 'projectWmsQueryInventoryOwner',
+    data
+  })
+}
+
 // 通过商品查询库存货主信息
-export function projectWmsQueryInventoryOwnersBySku(data){
+export function projectWmsQueryInventoryOwnersBySku(data) {
+  return lwAxios.action({
+    url: 'projectWmsQueryInventoryOwnersBySku',
+    data
+  })
+}
+
+// 通过库位查询货主
+export function projectWmsQueryInventoryByLocation(data) {
   return lwAxios.action({
-    url:'projectWmsQueryInventoryOwnersBySku',
+    url: 'projectWmsQueryInventoryByLocation',
     data
   })
 }
 
 // 通过商品查询库存库位信息
-export function projectWmsQueryInventoryLocationBySku(data){
+export function projectWmsQueryInventoryLocationBySku(data) {
   return lwAxios.action({
-    url:'projectWmsQueryInventoryLocationBySku',
+    url: 'projectWmsQueryInventoryLocationBySku',
     data
   })
 }

package/src/views/wms/api/outbound/pickConsole/orderPick.js

@@ -52,7 +52,7 @@ export function projectWmsOutboundPDASoCreate(data) {
 }
 
 
-// 执行拣选
+// 执行拣选 - 整托
 export function projectWmsOutboundPDASoPick(data) {
   return lwAxios.action({
     url: 'projectWmsOutboundPDASoPick',
@@ -61,6 +61,15 @@ export function projectWmsOutboundPDASoPick(data) {
 }
 
 
+// 执行拣选 - 零散
+export function projectWmsOutboundPDASoSkuPick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoSkuPick',
+    data
+  })
+}
+
+
 // 取消出库单
 export function projectWmsOutboundPDASoCancel(data) {
   return lwAxios.action({
@@ -87,6 +96,14 @@ export function projectWmsOutboundPDASoCancelLpnPick(data) {
   })
 }
 
+// 零散撤销
+export function projectWmsOutboundPDASoCancelSkuPick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoCancelSkuPick',
+    data
+  })
+}
+
 
 // 查询出库单信息
 export function projectWmsOutboundPDASoLoadData(data) {
@@ -115,6 +132,15 @@ export function projectWmsOutboundPDASoPickShip(data) {
 }
 
 
+// 一键发运
+export function projectWmsOutboundPDASoDirectShip(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoDirectShip',
+    data
+  })
+}
+
+
 // 查询出库单
 export function projectWmsOutboundPDASoQueryUpdateInfo(data) {
   return lwAxios.action({
@@ -131,3 +157,21 @@ export function projectWmsOutboundPDASoSubmitUpdateInfo(data) {
     data
   })
 }
+
+
+// 获取可现实退货的数组
+export function projectWmsOutboundPDAGetReturnTypes(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDAGetReturnTypes',
+    data
+  })
+}
+
+
+// 获取商品可用量
+export function projectWmsOutboundPDAQuerySkuInvAbQty(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDAQuerySkuInvAbQty',
+    data
+  })
+}

package/src/views/wms/api/receive/console.js

@@ -32,3 +32,48 @@ export function wmsMobileInboundQueryAsnList(data) {
     data
   })
 }
+
+
+// 创建、修改到货单
+export function wmsMobileEditAsnBySku(data) {
+  return lwAxios.action({
+    url: 'wmsMobileEditAsnBySku',
+    data
+  })
+}
+
+
+// 获取到货通知单数据
+export function wmsMobileInboundGetAsnDetailByNew(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundGetAsnDetailByNew',
+    data
+  })
+}
+
+
+// 获取需要显示退货原因的key
+export function wmsMobileGetAsnReturnType(data) {
+  return lwAxios.action({
+    url: 'wmsMobileGetAsnReturnType',
+    data
+  })
+}
+
+
+// 取消到货通知单
+export function wmsMobileCancelAsn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileCancelAsn',
+    data
+  })
+}
+
+
+// 确认到货通知单
+export function wmsMobileAutoConfirmAsn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileAutoConfirmAsn',
+    data
+  })
+}

package/src/views/wms/menu.js

@@ -266,7 +266,7 @@ export default {
       console: {
         src: receiveConsole,
         title: '收货控制台',
-        titleKey: '',
+        titleKey: 'wms_project.pda.menu.receiveConsole',
         tip: 0,
         hidden: false,
         permissions: ['/wms/pda/receive/console/lwIndex'],
@@ -713,7 +713,7 @@ export default {
       pickConsole: {
         src: outboundReprintImg,
         title: '按单拣选控制台',
-        titleKey: '',
+        titleKey: 'wms_project.pda.menu.pickConsole',
         tip: 0,
         hidden: false,
         permissions: ['/wms/pda/outbound/pickConsole/lwIndex'],

package/src/views/wms/module/Lot/index.vue

@@ -155,13 +155,14 @@ export default {
       for (let i of res) {
         i.attributes.required = i.attributes.enabled && i.attributes.required && this.mustRequired
 
+        i.attributes.title = i.attributes.title || ''
         const key = i.use || 'lw-text'
         this.list.push(this.map[key](i.attributes))
       }
     },
 
     // 获取数据
-    getData(showError = true) {
+    getData(showError = true, message) {
       let obj = {}
       for (let item of this.list) {
         // 校验必填项，是否已经填写
@@ -171,9 +172,8 @@ export default {
           item.required &&
           !(item.value === 0 || item.value)
         ) {
-          showError && this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.module.lot.null', '批次属性必填项不能为空') + ':' + item.title
-          )
+          const msg = message || this.$lwLanguage.get('wms_project.pda.module.lot.null', '批次属性必填项不能为空')
+          showError && this.$lwShowErrorMsg(msg + ' - ' + item.title)
           return {
             success: false,
             data: {}
@@ -194,7 +194,6 @@ export default {
       if (!item.default) return ''
 
       let format = item.format || this.dateFormatList[item.type] || 'yyyy-MM-dd'
-      console.log(this.$lwDate.format(item.default, format))
       return this.$lwDate.format(item.default, format)
     }
   }

package/src/views/wms/module/ReceiveAbnormal/index.vue

@@ -581,7 +581,7 @@ export default {
       try{
 
         // 获取货主信息
-        this.ownerList = await this.$lwApi.common.getOwnerList()
+        this.ownerList = await this.$lwApi.common.ownerList()
         if(this.asnNo){
           const asnData = await wmsMobileFoundAsn({
             asnNo: this.asnNo

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

@@ -2,32 +2,43 @@
   <div>
     <div v-if="data" class="count-task-board">
       <div class="count-task-board-top">
-        <div class="count-task-board-top-l1">{{$lwLanguage.get('wms_project.pda.components.page.count.components.tbjqqfwd', '盘点任务')}}</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>{{$lwLanguage.get('wms_project.pda.components.page.count.components.rhjvvmie', '库位数')}}</div>
-        </div>
-        <div>
-          <div>{{ data.countedLineCount }}</div>
-          <div v-if="type === 'inv'">{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehpev', '已盘明细')}}</div>
-          <div v-else>{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehper', '已盘库位')}}</div>
-        </div>
-        <div>
-          <div>{{ data.skuCount || '-'}}</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>{{$lwLanguage.get('wms_project.pda.components.page.count.components.jjlghjnc', '差异行')}}</div>
-        </div>
-      </div>
+      <lw-data-look-bg type="none">
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.count.components.rhjvvmie', '库位数')"
+          :value="data.locCount || 0"
+        />
+
+        <lw-data-look-item
+          :title="type === 'inv'?
+            $lwLanguage.get('wms_project.pda.components.page.count.components.vcyehpev', '已盘明细'):
+            $lwLanguage.get('wms_project.pda.components.page.count.components.vcyehper', '已盘库位')"
+          :value="data.countedLineCount || 0"
+        />
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.count.components.oenbvbjn', '商品品种')"
+          :value="data.skuCount || 0"
+        />
+
+        <lw-data-look-item
+          color="#eeee20"
+          :title="$lwLanguage.get('wms_project.pda.components.page.count.components.jjlghjnc', '差异行')"
+          :value="data.diffLines || 0"
+        />
+
+      </lw-data-look-bg>
+
       <div v-if="showZones" class="count-task-board-bottom">
-        <div class="count-task-board-bottom-l1">{{$lwLanguage.get('wms_project.pda.components.page.count.components.ohetcyor', '库区')}}</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>