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 @@ + + + + diff --git a/src/views/collect/CollectOrderEndBlank.vue b/src/views/collect/CollectOrderEndBlank.vue new file mode 100644 index 00000000..40f5eca1 --- /dev/null +++ b/src/views/collect/CollectOrderEndBlank.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 29101ef6..e38afe2d 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -38,11 +38,11 @@ 更多功能 - 工位上货 - 工位退货 - 工位存量 - 待处理单 - 已完成单 + 工位上货 + 工位退货 + 工位存量 + 待处理单 + 已完成单 @@ -165,6 +165,7 @@ export default { return { //界面配置相关 //患者处方 + workplaceId: this.$route.query.workplaceId, loading: false, tableHeader: [], queryList: [], @@ -203,7 +204,12 @@ export default { addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PannelOrderBiz }, methods: { - + handleClick(blankName) { + // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId + let url = window.location.origin+`#/`+ blankName+`?workplaceId=`+ this.workplaceId + // this.$router.push( workplaceId) + window.open(url, '_blank'); + }, //界面配置相关------------ executeFuc(row, type, clickFuc, value) { return executeFuc(this, row, type, clickFuc, value); diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue new file mode 100644 index 00000000..e38afe2d --- /dev/null +++ b/src/views/collect/DealOrderBlank.vue @@ -0,0 +1,475 @@ + + + + + diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue new file mode 100644 index 00000000..a888628d --- /dev/null +++ b/src/views/collect/IoCreateOrderBlank.vue @@ -0,0 +1,1712 @@ + + + + + + + + + diff --git a/src/views/collect/ioSplitFifoCodeBlank.vue b/src/views/collect/ioSplitFifoCodeBlank.vue new file mode 100644 index 00000000..cc44e075 --- /dev/null +++ b/src/views/collect/ioSplitFifoCodeBlank.vue @@ -0,0 +1,39 @@ + + + + + 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);