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

package/src/views/wms/page/receive/receipt/action/index.vue

@@ -9,7 +9,8 @@
     <lw-nav-bar
       :title="receive ?
         $lwLanguage.get('wms_project.pda.receive.receipt.title','收货回单') :
-        $lwLanguage.get('wms_project.pda.advance.receive.return.title','预收货回单')"/>
+        $lwLanguage.get('wms_project.pda.advance.receive.return.title','预收货回单')"
+    />
 
     <lw-page-body-module>
       <lw-tab-box>
@@ -28,6 +29,20 @@
           />
         </van-tabs>
       </lw-tab-box>
+      <!-- 卸货运单数据 -->
+      <div
+        style="margin-bottom: 10px"
+        class="lw-global-model-box lw-global-border-2px"
+        v-if="asnData.unloadDeliveryContentList?.length"
+      >
+        <div class="lw-global-row-start lw-global-title lw-global-title-left-line">
+          {{ $lwLanguage.get('', '卸货运单数据') }}
+        </div>
+        <lw-label-value-group
+          :list="asnData.unloadDeliveryContentList"
+          :show-row-style="false"
+        />
+      </div>
       <!-- 单头数据 -->
       <lw-label-value-group
         :list="asnData.contentList"
@@ -35,27 +50,84 @@
       />
       <!-- 回单图片 -->
       <div class="lw-global-model-box" style="padding-bottom: 5px">
-        <div class="lw-global-title" style="margin-bottom: 5px">
-          {{
-            $lwLanguage.get('wms_project.pda.components.page.receive.receipt.action.index.ekdftitf', '回单照片')
-          }}
+        <div class="lw-global-flex-start" style="margin-bottom: 5px">
+          <div class="lw-global-title">
+            {{
+              $lwLanguage.get('wms_project.pda.components.page.receive.receipt.action.index.ekdftitf', '回单照片')
+            }}
+          </div>
+          <div class="tip-msg">
+            {{ $lwLanguage.get('', '需上传卸货开始，卸货中，卸货完成照片') }}
+          </div>
         </div>
         <lw-img-upload v-model="images"/>
 
       </div>
-      <!-- 商品信息 -->
-      <lw-label-value-group
-        v-for="(item,key) in skuData.list"
-        :key="key"
-        :list="item.contentList"
-        show-model-style
-      />
-      <lw-pagination
-        v-model="skuData.pageNum"
-        :page-size.sync="skuData.pageSize"
-        :page-total="skuData.pageTotal"
-        @change="getSkuData"
-      />
+
+
+      <lw-tab-box style="margin-top: 10px">
+        <van-tabs
+          type="card"
+          animated
+          v-model="skuTabActive"
+          @change="skuTabChange"
+        >
+
+          <!-- 商品信息 -->
+          <van-tab
+            name="sku"
+            :title="$lwLanguage.get('', '收货商品')"
+          >
+            <lw-label-value-group
+              v-for="(item,key) in skuData.list"
+              :key="key"
+              :list="item.contentList"
+              show-model-style
+            />
+            <lw-pagination
+              v-model="skuData.pageNum"
+              :page-size.sync="skuData.pageSize"
+              :page-total="skuData.pageTotal"
+              @change="getSkuData"
+            />
+            <lw-not-data v-if="!skuData.pageTotal"/>
+          </van-tab>
+
+          <!-- 容器信息 -->
+          <van-tab
+            name="container"
+            :title="$lwLanguage.get('', '收货容器')"
+          >
+
+            <div style="margin-bottom: 10px;text-align: right">
+              <lw-button
+                small
+                type="last"
+                @click="containerReceive"
+              >
+                {{ $lwLanguage.get('', '容器收货') }}
+              </lw-button>
+            </div>
+
+            <lw-label-value-group
+              v-for="(item,key) in containerData.list"
+              :key="key"
+              :list="item.contentList"
+              show-model-style
+            />
+            <lw-pagination
+              v-model="containerData.pageNum"
+              :page-size.sync="containerData.pageSize"
+              :page-total="containerData.pageTotal"
+              @change="getContainerData"
+            />
+            <lw-not-data v-if="!containerData.pageTotal"/>
+          </van-tab>
+
+        </van-tabs>
+
+      </lw-tab-box>
+
     </lw-page-body-module>
 
     <lw-bottom-bar>
@@ -68,6 +140,29 @@
       </lw-button>
     </lw-bottom-bar>
 
+    <!-- 确认码的弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.pdwcuzrj', '确认回单')"
+      v-model="confirmCodePopup.show"
+      @opened="confirmCodePopup.focus=true"
+      @closed="confirmCodePopup.code=''"
+    >
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.wuismspe', '确认码')"
+        v-model="confirmCodePopup.code"
+        :get-focus.sync="confirmCodePopup.focus"
+        required
+        rule-key="staff"
+        :create-rule="$lwScanRule.create('收货回单-执行页-确认码','STAFF')"
+        @confirm="confirmCodePopupConfirm"
+      />
+
+      <template #button>
+        <lw-button @click="confirmCodePopupConfirm">
+          {{ $lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.qezhwxyr', '确认') }}
+        </lw-button>
+      </template>
+    </lw-popup>
   </div>
 </template>
 
@@ -78,7 +173,8 @@ import {
   wmsMobileReturnReceiptOrder,
   wmsMobileReturnAdvanceReceiptOrder,
   wmsMobileExtInGetReturnOrder,
-  wmsMobileExtInQueryReturnOrderSku
+  wmsMobileExtInQueryReturnOrderSku,
+  wmsMobileExtInReturnContainerPageList
 } from "../../../../api/receive/receipt";
 
 export default {
@@ -100,26 +196,49 @@ export default {
         pageTotal: 0,
         list: []
       },
+      // 容器数据
+      containerData: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        list: []
+      },
 
       // 回单数据
       receiptData: [],
       // 是否是收货回单
       receive: true,
+
+      // 确认码的弹框
+      confirmCodePopup: {
+        show: false,
+        code: '',
+        focus: false
+      },
+
+      // 商品信息tab
+      skuTabActive: 'sku'
     }
   },
   computed: {
     nowAsnData() {
       if (!this.receiptData.length) return {}
       return this.receiptData[this.oldTabActive]
+    },
+    // 收货类型
+    receiveType() {
+      return this.receive ? 'advance_receive' : 'advance'
     }
   },
   mounted() {
+
     const {lwOrder, lwDate, lwType} = this.$route.query
     this.receive = "receive" === lwType
 
     wmsMobileExtInQueryReturnOrder({
       no: lwOrder,
-      time: lwDate
+      time: lwDate,
+      type: this.receiveType
     }).then(res => {
 
       this.receiptData = res || []
@@ -145,10 +264,14 @@ export default {
     clearData() {
       this.images = []
       this.skuData.pageSize = 10
-      this.skuData.pageNum = 10
-      this.skuData.pageTotal = 0
+      this.skuData.pageNum = 1
       this.skuData.list = []
 
+      this.containerData.pageSize = 10
+      this.containerData.pageNum = 1
+      this.containerData.list = []
+      this.skuTabActive = 'sku'
+
       this.getAsnData()
     },
 
@@ -157,8 +280,8 @@ export default {
       if (this.images.length) {
         this.$lwDialog.confirm({
           type: 'warning',
-          title: this.$lwLanguage.get('', '警告'),
-          message: this.$lwLanguage.get('', '切换后当前页面数据将会被清空')
+          title: this.$lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.bmpkkrjs', '警告'),
+          message: this.$lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.quzfkgpj', '切换后当前页面数据将会被清空')
         }).then(() => {
           this.oldTabActive = this.tabActive
           this.clearData()
@@ -173,10 +296,22 @@ export default {
 
     },
 
-    // 获取订单信息X
+    // 商品tab切换
+    skuTabChange() {
+      if (this.skuTabActive === 'sku') {
+        !this.skuData.list.length && this.getSkuData()
+      } else {
+        !this.containerData.list.length && this.getContainerData()
+      }
+    },
+
+    // 获取订单信息
     getAsnData() {
 
-      wmsMobileExtInGetReturnOrder({id: this.nowAsnData.id}).then(res => {
+      wmsMobileExtInGetReturnOrder({
+        id: this.nowAsnData.id,
+        type: this.receiveType
+      }).then(res => {
         this.asnData = res
         this.images = res.images ? res.images.split('|') : []
       })
@@ -189,22 +324,69 @@ export default {
       wmsMobileExtInQueryReturnOrderSku({
         pageNum: this.skuData.pageNum,
         pageSize: this.skuData.pageSize,
-        id: this.nowAsnData.id
+        id: this.nowAsnData.id,
+        type: this.receiveType
       }).then(res => {
-        this.skuData.pageTotal = res.total
-        this.skuData.list = res.datas
+        this.skuData.pageTotal = res.total || 0
+        this.skuData.list = res.datas || []
       })
     },
+    // 获取容器数据
+    getContainerData() {
+      wmsMobileExtInReturnContainerPageList({
+        pageNum: this.containerData.pageNum,
+        pageSize: this.containerData.pageSize,
+        orderId: this.nowAsnData.id,
+      }).then(res => {
+        this.containerData.pageTotal = res.total || 0
+        this.containerData.list = res.datas || []
+      })
+    },
+    // 容器收货
+    containerReceive() {
+      this.$router.push({
+        path: '/receive/byContainer/lwIndex',
+        query: {
+          asnId: this.asnData.asnId
+        }
+      })
+    },
+
 
-    // 确认收货、预收货回单
+    // 确认收货、预收货回单 - 底部按钮点击
     confirmReceive() {
+
+      // 判断是否需要确认码
+      if (this.$lwWarehouseConfig.get('systemConfig.INBOUND_RETURN_ORDER_CONFIRM') === 'true') {
+        this.confirmCodePopup.show = true
+        return
+      }
+
+      this.confirmReceiveSubmit()
+    },
+    // 确认回单弹框确认
+    confirmCodePopupConfirm() {
+      if (this.confirmCodePopup.code) {
+        this.confirmReceiveSubmit()
+        return
+      }
+
+      this.confirmCodePopup.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.wms.page.receive.receipt.action.index.qovnkgey', '确认码不能为空')
+      )
+
+    },
+    // 确认收货回单提交
+    confirmReceiveSubmit() {
       const api = this.receive ?
         wmsMobileReturnReceiptOrder :
         wmsMobileReturnAdvanceReceiptOrder
 
       api({
         id: this.nowAsnData.id,
-        images: this.images.join('|')
+        images: this.images.join('|'),
+        confirmCode: this.confirmCodePopup.code,
       }).then(() => {
         // 删除当前提交的数据
         this.receiptData.splice(this.tabActive, 1)
@@ -217,6 +399,7 @@ export default {
           this.$lwToast.success(
             this.$lwLanguage.get('wms_project.pda.receive.receipt.changeSuccess', '操作成功')
           )
+          this.confirmCodePopup.show = false
           return
         }
 
@@ -225,18 +408,17 @@ export default {
         )
         history.go(-1)
       })
-    },
+    }
   }
 }
 </script>
 
 <style scoped lang="less">
 
-
-.lw-receive-receipt-title {
-  display: inline-block;
-  width: 85px;
-  text-align: right;
+.tip-msg {
+  font-size: 0.85rem;
+  color: #999;
+  margin-left: 10px;
 }
 
 </style>

package/src/views/wms/router.js

@@ -11,61 +11,10 @@ import {outboundRouter} from "./views/outbound/router";
 import {processRouter} from "./views/process/router";
 import {innerRouter} from "./views/inner/router";
 import {dataAnalysisRouter} from "./views/dataAnalysis/router";
+import {receiveRouter} from "./views/receive/router";
 
 
-const receiveRouter = [
-  // 入库上架
-  {
-    path: "/receive/putaway/lwIndex",
-    name: "LwReceivePutaway",
-    component: () => import('./views/receive/putaway/index.vue')
-  },
-  {
-    path: "/receive/putaway/lwLpnAction",
-    name: "LwReceivePutawayLpnAction",
-    component: () => import('./views/receive/putaway/lpnAction.vue')
-  },
-  {
-    path: "/receive/putaway/lwSkuAction",
-    name: "LwReceivePutawaySkuAction",
-    component: () => import('./views/receive/putaway/skuAction.vue')
-  },
-  {
-    path: "/receive/putaway/lwLpnBatchAction",
-    name: "LwReceivePutawayLpnBatchAction",
-    component: () => import('./views/receive/putaway/lpnBatchAction.vue')
-  },
-  {
-    path: "/receive/putaway/lwCaseAction",
-    name: "LwReceivePutawayCaseAction",
-    component: () => import('./views/receive/putaway/caseAction.vue')
-  },
-
-  // 收货回单
-  {
-    path: "/receive/receipt/lwIndex",
-    name: "LwReceipt",
-    component: () => import('./views/receive/receipt/index.vue')
-  },
-  {
-    path: "/receive/receipt/lwReceiptConfirm",
-    name: "lwReceiptConfirm",
-    component: () => import('./views/receive/receipt/action.vue')
-  },
-
-  // 收货异常
-  {
-    path: "/receive/abnormal/lwIndex",
-    name: "LwReceiveAbnormal",
-    component: () => import('./views/receive/abnormal/index.vue')
-  },
-  {
-    path: "/receive/abnormal/lwAction",
-    name: "LwReceiveAbnormalAction",
-    component: () => import('./views/receive/abnormal/action.vue')
-  },
-
-
+const receiveRouterOther = [
   // 库存查询 - 首页
   {
     path: "/inventory/queryInventory/lwIndex",
@@ -112,6 +61,7 @@ const receiveRouter = [
     name: "lwPrintLabel",
     component: () => import('./views/inbound/receive/printLabel.vue')
   },
+
   { // 按商品收货扫描
     path: "/inbound/receive/sku/scan",
     name: "LwInboundReceiveSkuScan",
@@ -127,6 +77,7 @@ const receiveRouter = [
     name: "LwInboundReceiveSkuDirect",
     component: () => import('./views/inbound/receive/sku/InboundReceiveSkuDirectView.vue')
   },
+
   { // 按托盘收货扫描
     path: "/inbound/receive/lpn/scan",
     name: "LwInboundReceiveLpnScan",
@@ -228,63 +179,13 @@ const receiveRouter = [
     name: "lwInboundUnloadAction",
     component: () => import('./views/inbound/unload/action.vue')
   },
-  { // 收货 - 收货控制台
-    path: "/receive/console/lwIndex",
-    name: "lwReceiveConsoleIndex",
-    component: () => import('./views/receive/console/index.vue')
-  },
-  { // 收货 - 收货控制台 - 查看收货信息
-    path: "/receive/console/lwLook",
-    name: "lwReceiveConsoleLook",
-    component: () => import('./views/receive/console/look.vue')
-  },
-  { // 收货 - 收货控制台 - 创建、修改收货单
-    path: "/receive/console/lwCreateEditOrder",
-    name: "lwReceiveConsoleCreateEditOrder",
-    component: () => import('./views/receive/console/createEditOrder.vue')
-  },
 
-  { // 收货 - 多单收货 - 起始页
-    path: "/receive/moreOrder/lwIndex",
-    name: "lwReceiveMoreOrderIndex",
-    component: () => import('./views/receive/moreOrder/index.vue')
-  },
-  { // 收货 - 多单收货 - 选择收货方式
-    path: "/receive/moreOrder/lwSelectType",
-    name: "lwReceiveMoreOrderSelectType",
-    component: () => import('./views/receive/moreOrder/selectType.vue')
-  },
-  { // 收货 - 多单收货 - 按托盘收货
-    path: "/receive/moreOrder/lwLpn",
-    name: "lwReceiveMoreOrderLpn",
-    component: () => import('./views/receive/moreOrder/lpn.vue')
-  },
-  { // 收货 - 多单收货 - 按商品收货
-    path: "/receive/moreOrder/lwSku",
-    name: "lwReceiveMoreOrderSku",
-    component: () => import('./views/receive/moreOrder/sku.vue')
-  },
-  { // 收货 - 多单收货 - 按箱收货
-    path: "/receive/moreOrder/lwBox",
-    name: "lwReceiveMoreOrderBox",
-    component: () => import('./views/receive/moreOrder/box.vue')
-  },
-
-  { // 收货 - 混合收货 - 起始页
-    path: "/receive/mixture/lwAction",
-    name: "lwReceiveMixtureAction",
-    component: () => import('./views/receive/mixture/action.vue')
-  },
-  { // 收货 - 混合收货 - 执行页
-    path: "/receive/mixture/lwIndex",
-    name: "lwReceiveMixtureIndex",
-    component: () => import('./views/receive/mixture/index.vue')
-  },
 ]
 
 export default [
   // 收货
   ...receiveRouter,
+  ...receiveRouterOther,
 
   // 在库
   ...innerRouter,

package/src/views/wms/views/config/menu.js

@@ -3,10 +3,13 @@
 * @author: 张文
 * @date  2023-11-24
 * */
-import mainDataImg from "./../../../../assets/img/menu/mainData.png";
-import newConfigImg from "./../../../../assets/img/menu/newConfig.png";
-import mainLocImg from "./../../../../assets/img/menu/mainLoc.png";
-import mainLocSearchImg from "./../../../../assets/img/menu/mainLocSearch.png";
+import mainDataImg from "./../../../../assets/img/wms/menu/config/mainData.png";
+import newConfigImgMaster from "./../../../../assets/img/wms/menu/config/newConfig/master.png";
+import newConfigImgSecond from "./../../../../assets/img/wms/menu/config/newConfig/second.png";
+import mainLocImgMaster from "./../../../../assets/img/wms/menu/config/mainLoc/master.png";
+import mainLocImgSecond from "./../../../../assets/img/wms/menu/config/mainLoc/second.png";
+import mainLocSearchImgMaster from "./../../../../assets/img/wms/menu/config/mainLocSearch/master.png";
+import mainLocSearchImgSecond from "./../../../../assets/img/wms/menu/config/mainLocSearch/second.png";
 
 export const configMenu = {
   src: mainDataImg,
@@ -20,7 +23,10 @@ export const configMenu = {
 
     // 商品配置
     newProject: {
-      src: newConfigImg,
+      childSrc: {
+        master: newConfigImgMaster,
+        second: newConfigImgSecond
+      },
       title: '商品配置',
       titleKey: 'wms_project.pda.menu.newProject',
       tip: 0,
@@ -31,7 +37,10 @@ export const configMenu = {
 
     // 库位分配
     masterLocationConfig: {
-      src: mainLocImg,
+      childSrc: {
+        master: mainLocImgMaster,
+        second: mainLocImgSecond
+      },
       title: '库位分配',
       titleKey: 'wms_project.pda.menu.mainLoc',
       tip: 0,
@@ -41,7 +50,10 @@ export const configMenu = {
     },
     // 主库位查询
     masterLocationQuery: {
-      src: mainLocSearchImg,
+      childSrc: {
+        master: mainLocSearchImgMaster,
+        second: mainLocSearchImgSecond
+      },
       title: '主库位查询',
       titleKey: 'wms_project.pda.menu.mainLocSearch',
       tip: 0,

package/src/views/wms/views/container/menu.js

@@ -4,12 +4,17 @@
 * @date  2023-11-24
 * */
 
-import container from "./../../../../assets/img/menu/container/container.png";
-import containerBack from "./../../../../assets/img/menu/container/containerBack.png";
-import repairRegister from "./../../../../assets/img/menu/container/repairRegister.png";
-import repairBack from "./../../../../assets/img/menu/container/repairBack.png";
-import rentBack from "./../../../../assets/img/menu/container/rentBack.png";
-import scrapRecord from "./../../../../assets/img/menu/container/scrapRecord.png";
+import container from "./../../../../assets/img/wms/menu/container/container.png";
+import containerBackMaster from "./../../../../assets/img/wms/menu/container/containerBack/master.png";
+import containerBackSecond from "./../../../../assets/img/wms/menu/container/containerBack/second.png";
+import repairRegisterMaster from "./../../../../assets/img/wms/menu/container/repairRegister/master.png";
+import repairRegisterSecond from "./../../../../assets/img/wms/menu/container/repairRegister/second.png";
+import repairBackMaster from "./../../../../assets/img/wms/menu/container/repairBack/master.png";
+import repairBackSecond from "./../../../../assets/img/wms/menu/container/repairBack/second.png";
+import rentBackMaster from "./../../../../assets/img/wms/menu/container/rentBack/master.png";
+import rentBackSecond from "./../../../../assets/img/wms/menu/container/rentBack/second.png";
+import scrapRecordMaster from "./../../../../assets/img/wms/menu/container/scrapRecord/master.png";
+import scrapRecordSecond from "./../../../../assets/img/wms/menu/container/scrapRecord/second.png";
 
 export const containerMenu = {
   src: container,
@@ -21,7 +26,10 @@ export const containerMenu = {
   children: {
     // 容器归还
     containerBack: {
-      src: containerBack,
+      childSrc: {
+        master: containerBackMaster,
+        second: containerBackSecond
+      },
       title: '容器归还',
       titleKey: 'wms_project.pda.menu.container.containerBack',
       tip: 0,
@@ -31,7 +39,10 @@ export const containerMenu = {
     },
     // 报修登记
     repairRegister: {
-      src: repairRegister,
+      childSrc: {
+        master: repairRegisterMaster,
+        second: repairRegisterSecond
+      },
       title: '报修登记',
       titleKey: 'wms_project.pda.menu.container.repairRegister',
       tip: 0,
@@ -41,7 +52,10 @@ export const containerMenu = {
     },
     // 维修归还
     repairBack: {
-      src: repairBack,
+      childSrc: {
+        master: repairBackMaster,
+        second: repairBackSecond
+      },
       title: '维修归还',
       titleKey: 'wms_project.pda.menu.container.repairBack',
       tip: 0,
@@ -51,7 +65,10 @@ export const containerMenu = {
     },
     // 租赁归还
     rentBack: {
-      src: rentBack,
+      childSrc: {
+        master: rentBackMaster,
+        second: rentBackSecond
+      },
       title: '租赁归还',
       titleKey: 'wms_project.pda.menu.container.rentBack',
       tip: 0,
@@ -61,7 +78,10 @@ export const containerMenu = {
     },
     // 报废登记
     scrapRecord: {
-      src: scrapRecord,
+      childSrc: {
+        master: scrapRecordMaster,
+        second: scrapRecordSecond
+      },
       title: '报废登记',
       titleKey: 'wms_project.pda.menu.container.scrapRecord',
       tip: 0,

package/src/views/wms/views/dataAnalysis/menu.js

@@ -4,7 +4,7 @@
 * @date  2023-11-28
 * */
 
-import dataAnalysis from "./../../../../assets/img/menu/dataAnalysis/dataAnalysis.png";
+import dataAnalysis from "./../../../../assets/img/wms/menu/dataAnalysis/dataAnalysis.png";
 
 export const dataAnalysisMenu = {