From 3f6a01eac137ae12a3d6a9f18cd4ee06699e4655 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 14 Aug 2024 20:06:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 27 +-
src/views/collect/CollectOrderAllotBlank.vue | 464 +++++
src/views/collect/CollectOrderEndBlank.vue | 40 +
src/views/collect/DealOrder.vue | 18 +-
src/views/collect/DealOrderBlank.vue | 475 +++++
src/views/collect/IoCreateOrderBlank.vue | 1712 ++++++++++++++++++
src/views/collect/ioSplitFifoCodeBlank.vue | 39 +
src/views/index.vue | 47 +-
8 files changed, 2814 insertions(+), 8 deletions(-)
create mode 100644 src/views/collect/CollectOrderAllotBlank.vue
create mode 100644 src/views/collect/CollectOrderEndBlank.vue
create mode 100644 src/views/collect/DealOrderBlank.vue
create mode 100644 src/views/collect/IoCreateOrderBlank.vue
create mode 100644 src/views/collect/ioSplitFifoCodeBlank.vue
diff --git a/src/router/index.js b/src/router/index.js
index d8e35873..04760f3e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -61,6 +61,31 @@ export const constantRoutes = [
component: (resolve) => require([`@/views/error/401`],resolve),
hidden: true
},
+ {
+ path: '/tagCodeBlank',
+ component: (resolve) => require([`@/views/collect/DealOrderBlank`],resolve),
+ hidden: true
+ },
+ {
+ path: '/CollectOrderAllotBlank',
+ component: (resolve) => require([`@/views/collect/CollectOrderAllotBlank`],resolve),
+ hidden: true
+ },
+ {
+ path: '/CollectOrderEndBlank',
+ component: (resolve) => require([`@/views/collect/CollectOrderEndBlank`],resolve),
+ hidden: true
+ },
+ {
+ path: '/IoCreateOrderBlank',
+ component: (resolve) => require([`@/views/collect/IoCreateOrderBlank`],resolve),
+ hidden: true
+ },
+ {
+ path: '/ioSplitFifoCodeBlank',
+ component: (resolve) => require([`@/views/collect/ioSplitFifoCodeBlank`],resolve),
+ hidden: true
+ },
{
path: '',
component: Layout,
@@ -87,7 +112,7 @@ export const constantRoutes = [
meta: { title: '个人中心', icon: 'user' }
}
]
- }
+ },
]
// 动态路由，基于用户权限动态去加载
diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue
new file mode 100644
index 00000000..ffe15a7c
--- /dev/null
+++ b/src/views/collect/CollectOrderAllotBlank.vue
@@ -0,0 +1,464 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+
+ 查询
+
+ 绑定工位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.lableRuleObj[scope.row[item.columnName]]
+ }}
+
+
+
+
+
+ {{
+ item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+ }}
+
+
+
+
+
+ {{ buttonItem.name }}
+
+
+
+
+
+ {{
+ scope.row[item.columnName]
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一单据
+
+ 选入单据
+
+ 单据挂起
+
+ 处理完成
+
+
+
+
+ 更多功能
+
+
+ 工位上货
+ 工位退货
+ 工位存量
+ 待处理单
+ 已完成单
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+ {{ formData.code }}
+ {{ formData.busType }}
+ {{ formData.fromCorp }}
+ {{ formData.billTime }}
+ {{ formData.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上货完成
+
+ 退货完成
+
+ 打印二维码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.warehouseName
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.workplaceName }}
+ {{
+ item.workplaceId
+ }}
+
+
+
+
+
+
+
+ 拆零上货
+ 整取上货
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+ 扫码快捷设置
+
+
+
+
+
+
拆零上货
+
+
+
整取上货
+
+
+
工位上货
+
+
+
工位退货
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index.vue b/src/views/index.vue
index 148e6437..20a52c45 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -5,6 +5,20 @@
+
+
+ {{ card.workplaceName }}
+
+
+
+
+
@@ -217,6 +231,7 @@ import invSvg from "@/assets/svg/库存预警.svg"
import certSvg from "@/assets/svg/资质预警.svg"
import {getInvRemindMsgList} from "../api/system/invRemindMsg";
import {getUdiInfos} from "../api/basic/udiRelevance";
+import {listPage} from "@/api/basic/sysWorkplaceManage.js";
import {getSupCertgetCount, getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
export default {
@@ -239,9 +254,16 @@ export default {
orderTotal: 0,
orderList: [],
// =======================================================================
+ // 假设这是你的卡片数据
+ stationList: [
+
+ ],
+ baseUrl: process.env.VUE_APP_BASE_API,
};
},
created() {
+ //获取工位list
+ this.getStationList()
this.getProductCount()
this.getInvMsgCount()
this.getCertMsgCount()
@@ -249,6 +271,20 @@ export default {
this.getOrderList()
},
methods: {
+ handleClick(index) {
+ let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
+ // this.$router.push( workplaceId)
+ window.open(url, '_blank');
+ },
+ getStationList(){
+ let param = {
+ page: 1,
+ limit: 200
+ }
+ listPage(param).then(res => {
+ this.stationList = res.data?.list || []
+ })
+ },
getProductCount() {
let param = {
page: 1,
@@ -353,6 +389,13 @@ export default {
}
}
+.grid-itemCard {
+ /* 确保卡片是正方形，并且有一定的间距 */
+ margin: 10px;
+ background-color: #f9f9f9;
+ box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
+}
+
.grid-item {
height: 100%;
padding: 15px;
@@ -385,9 +428,11 @@ export default {
.grid-container1 {
grid-template-columns: repeat(1, 1fr);
-
+ padding: 10px;
}
+
+
.grid-container2 {
grid-template-columns: repeat(2, 1fr);