From c8901fba0dbcf05406b1a689d3ebe4bb39d7fbcc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 10:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/plan/workorder.js | 12 +- src/layout/components/Navbar.vue | 4 +- src/views/plan/workorder/index.vue | 37 ++++-- src/views/plan/workorder/printID.vue | 181 +++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 12 deletions(-) create mode 100644 src/views/plan/workorder/printID.vue diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index 7d5a83e..298c59c 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -180,4 +180,14 @@ export function getProdLineList() { method: 'get', params: {} }); -} \ No newline at end of file +} +export function getIdCardList(workorderCode){ + const data={ + workorderCode + } + return request({ + url:'/plan/pro/workorder/getIdCardList', + method:'post', + data:data + }) + } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ef12da5..a438160 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - + /** //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - + **/ }, components: { Breadcrumb, diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 40af233..4d4defe 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -187,6 +187,18 @@ >批次编辑 + + 打印标识卡 + + @@ -719,6 +731,8 @@ 取 消 + + @@ -740,12 +754,16 @@ import { getProdLineList } from '@/api/plan/workorder' import moment from 'moment'; +import ItemPrintID from './printID.vue'; import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order' import {prototype} from "clipboard"; export default { name: "Workorder", dicts: ['product_type', 'workorder_type'], + components: { + ItemPrintID + }, data() { return { // 拆分车数换算值 @@ -1967,15 +1985,16 @@ export default { }, 222); }, - // @expand-change="getOpenNextLevel" - // 点击展开节点 - //getOpenNextLevel(row, column, event) { - // alert("1755getOpenNextLevel") - // getNextLevelWorkOrderList(tree.workorderCode).then((data) => { - // return resolve(data); - // }); - //} - + /**打印标识卡弹出框**/ + printIdCard() { + this.$refs.printID.printDialogVisible = true; + this.$refs.printID.init("20021221552"); + }, + //标识卡选择确认 + printIdFunc(obj) { + this.form.userName = obj.code; + this.form.nickName = obj.name; + }, } }; diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue new file mode 100644 index 0000000..1832859 --- /dev/null +++ b/src/views/plan/workorder/printID.vue @@ -0,0 +1,181 @@ + + + +