From f2aa6ceba5f157d83e70ebba1af5a0d4446367f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Sun, 24 Nov 2024 11:44:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=8D=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/pro/procard.js | 44 ++ src/api/mes/pro/procardprocess.js | 44 ++ src/api/mes/pro/prosnprocess.js | 44 ++ src/views/mes/pro/procard/index.vue | 317 ++++++++++++++ src/views/mes/pro/procard/process.vue | 109 +++++ src/views/mes/pro/procard/snprocess.vue | 474 +++++++++++++++++++++ src/views/mes/pro/schedule/process.vue | 131 ++++++ src/views/mes/pro/schedule/progress.vue | 288 +++++++++++++ src/views/mes/pro/workorder/index.vue | 1 - src/views/print/printtemplate/panel.bak.js | 307 +++++++++++++ 10 files changed, 1758 insertions(+), 1 deletion(-) create mode 100644 src/api/mes/pro/procard.js create mode 100644 src/api/mes/pro/procardprocess.js create mode 100644 src/api/mes/pro/prosnprocess.js create mode 100644 src/views/mes/pro/procard/index.vue create mode 100644 src/views/mes/pro/procard/process.vue create mode 100644 src/views/mes/pro/procard/snprocess.vue create mode 100644 src/views/mes/pro/schedule/process.vue create mode 100644 src/views/mes/pro/schedule/progress.vue create mode 100644 src/views/print/printtemplate/panel.bak.js diff --git a/src/api/mes/pro/procard.js b/src/api/mes/pro/procard.js new file mode 100644 index 0000000..39bee84 --- /dev/null +++ b/src/api/mes/pro/procard.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工序流转卡列表 +export function listProcard(query) { + return request({ + url: '/mes/pro/procard/list', + method: 'get', + params: query + }) +} + +// 查询工序流转卡详细 +export function getProcard(cardId) { + return request({ + url: '/mes/pro/procard/' + cardId, + method: 'get' + }) +} + +// 新增工序流转卡 +export function addProcard(data) { + return request({ + url: '/mes/pro/procard', + method: 'post', + data: data + }) +} + +// 修改工序流转卡 +export function updateProcard(data) { + return request({ + url: '/mes/pro/procard', + method: 'put', + data: data + }) +} + +// 删除工序流转卡 +export function delProcard(cardId) { + return request({ + url: '/mes/pro/procard/' + cardId, + method: 'delete' + }) +} diff --git a/src/api/mes/pro/procardprocess.js b/src/api/mes/pro/procardprocess.js new file mode 100644 index 0000000..94516fc --- /dev/null +++ b/src/api/mes/pro/procardprocess.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工序流转卡-工序信息列表 +export function listProcardprocess(query) { + return request({ + url: '/mes/pro/procardprocess/list', + method: 'get', + params: query + }) +} + +// 查询工序流转卡-工序信息详细 +export function getProcardprocess(recordId) { + return request({ + url: '/mes/pro/procardprocess/' + recordId, + method: 'get' + }) +} + +// 新增工序流转卡-工序信息 +export function addProcardprocess(data) { + return request({ + url: '/mes/pro/procardprocess', + method: 'post', + data: data + }) +} + +// 修改工序流转卡-工序信息 +export function updateProcardprocess(data) { + return request({ + url: '/mes/pro/procardprocess', + method: 'put', + data: data + }) +} + +// 删除工序流转卡-工序信息 +export function delProcardprocess(recordId) { + return request({ + url: '/mes/pro/procardprocess/' + recordId, + method: 'delete' + }) +} diff --git a/src/api/mes/pro/prosnprocess.js b/src/api/mes/pro/prosnprocess.js new file mode 100644 index 0000000..4e43b13 --- /dev/null +++ b/src/api/mes/pro/prosnprocess.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询SN流转-工序信息列表 +export function listProsnprocess(query) { + return request({ + url: '/mes/pro/prosnprocess/list', + method: 'get', + params: query + }) +} + +// 查询SN流转-工序信息详细 +export function getProsnprocess(recordId) { + return request({ + url: '/mes/pro/prosnprocess/' + recordId, + method: 'get' + }) +} + +// 新增SN流转-工序信息 +export function addProsnprocess(data) { + return request({ + url: '/mes/pro/prosnprocess', + method: 'post', + data: data + }) +} + +// 修改SN流转-工序信息 +export function updateProsnprocess(data) { + return request({ + url: '/mes/pro/prosnprocess', + method: 'put', + data: data + }) +} + +// 删除SN流转-工序信息 +export function delProsnprocess(recordId) { + return request({ + url: '/mes/pro/prosnprocess/' + recordId, + method: 'delete' + }) +} diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue new file mode 100644 index 0000000..57f14e8 --- /dev/null +++ b/src/views/mes/pro/procard/index.vue @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + {{scope.row.cardCode}} + + + + + + + + + + + + 打印 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工序 + + + + + + + + + diff --git a/src/views/mes/pro/procard/process.vue b/src/views/mes/pro/procard/process.vue new file mode 100644 index 0000000..8681b58 --- /dev/null +++ b/src/views/mes/pro/procard/process.vue @@ -0,0 +1,109 @@ + + + + + + + + + + {{ parseTime(scope.row.inputTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + {{ parseTime(scope.row.outputTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + + + + + + + + + + + diff --git a/src/views/mes/pro/procard/snprocess.vue b/src/views/mes/pro/procard/snprocess.vue new file mode 100644 index 0000000..0dd0f01 --- /dev/null +++ b/src/views/mes/pro/procard/snprocess.vue @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + + + + + + + + + + + + + + + {{ parseTime(scope.row.inputTime, '{y}-{m}-{d}') }} + + + + + {{ parseTime(scope.row.outputTime, '{y}-{m}-{d}') }} + + + + + + + + + + + + + + + + 修改 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/pro/schedule/process.vue b/src/views/mes/pro/schedule/process.vue new file mode 100644 index 0000000..c979662 --- /dev/null +++ b/src/views/mes/pro/schedule/process.vue @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/mes/pro/schedule/progress.vue b/src/views/mes/pro/schedule/progress.vue new file mode 100644 index 0000000..55b17ea --- /dev/null +++ b/src/views/mes/pro/schedule/progress.vue @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + {{scope.row.workorderCode}} + + + + + + + + + + + + + + + {{ task.processName }} + + - + + + + + + + {{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index e478125..8ec4d47 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -214,7 +214,6 @@ size="mini" type="text" icon="el-icon-printer" - v-if="scope.row.parentId =='0'" @click="handlePreview(scope.row)" >预览 diff --git a/src/views/print/printtemplate/panel.bak.js b/src/views/print/printtemplate/panel.bak.js new file mode 100644 index 0000000..0445ded --- /dev/null +++ b/src/views/print/printtemplate/panel.bak.js @@ -0,0 +1,307 @@ +export default { + "panels": [{ + "index": 0, + "height": 297, + "width": 210, + "paperHeader": 49.5, + "paperFooter": 780, + "watermarkOptions": { + "content": "vue-plugin-hiprint", + "rotate": 25, + "timestamp": true, + "format": "YYYY-MM-DD HH:mm" + }, + "printElements": [{ + "options": { + "left": 175.5, + "top": 10.5, + "height": 27, + "width": 259, + "title": "苦糖果标签打印测试", + "fontSize": 19, + "fontWeight": "600", + "textAlign": "center", + "lineHeight": 26, + "coordinateSync": true, + "widthHeightSync": true, + "draggable": false, + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 27, "height": 13, "width": 52, "title": "页眉线", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 25.5, "top": 57, "height": 705, "width": 9, "fixed": true, "borderStyle": "dotted"}, + "printElementType": {"type": "vline"} + }, { + "options": {"left": 60, "top": 61.5, "height": 48, "width": 87, "src": "", "fit": "contain"}, + "printElementType": {"title": "图片", "type": "image"} + }, { + "options": { + "left": 153, + "top": 64.5, + "height": 39, + "width": 276, + "title": "二维码以及条形码均采用svg格式打印。不同打印机打印不会造成失真。图片打印:不同DPI打印可能会导致失真,", + "fontFamily": "微软雅黑", + "textAlign": "center", + "lineHeight": 18 + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 457.5, + "top": 79.5, + "height": 13, + "width": 120, + "title": "姓名", + "field": "name", + "testData": "古力娜扎", + "color": "#f00808", + "textDecoration": "underline", + "textAlign": "center", + "fields": [{"text":'id',"field":'id'},{"text":'姓名',"field":'name'},{"text":'性别',"field":'gender'},{"text":'数量',"field":'count'}], + }, "printElementType": {"title": "文本", "type": "text"} + }, { + "options": { + "left": 483, + "top": 124.5, + "height": 43, + "width": 51, + "title": "123456789", + "textType": "qrcode" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 285, + "top": 130.5, + "height": 34, + "width": 175, + "title": "123456789", + "fontFamily": "微软雅黑", + "textAlign": "center", + "textType": "barcode" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 60, + "top": 132, + "height": 19, + "width": 213, + "title": "所有打印元素都可已拖拽的方式来改变元素大小", + "fontFamily": "微软雅黑", + "textAlign": "center", + "lineHeight": 18 + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 153, + "top": 189, + "height": 13, + "width": 238, + "title": "单击元素,右侧可自定义元素属性", + "textAlign": "center", + "fontFamily": "微软雅黑" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 190.5, "height": 13, "width": 51, "title": "横线", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 415.5, + "top": 190.5, + "height": 13, + "width": 164, + "title": "可以配置各属性的默认值", + "textAlign": "center", + "fontFamily": "微软雅黑" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 214.5, "height": 10, "width": 475.5}, + "printElementType": {"title": "横线", "type": "hline"} + }, { + "options": { + "left": 235.5, + "top": 220.5, + "height": 32, + "width": 342, + "title": "自定义表格:用户可左键选中表头,右键查看可操作项,操作类似Excel,双击表头单元格可进行编辑。内容:title#field", + "fontFamily": "微软雅黑", + "textAlign": "center", + "lineHeight": 15 + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 156, + "top": 265.5, + "height": 13, + "width": 94, + "title": "表头列大小可拖动", + "fontFamily": "微软雅黑", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 60, + "top": 265.5, + "height": 13, + "width": 90, + "title": "红色区域可拖动", + "fontFamily": "微软雅黑", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 60, + "top": 285, + "height": 56, + "width": 511.5, + "field": "table", + "tableFooterRepeat": "", + "fields": [{"text":'id',"field":'id'},{"text":'姓名',"field":'name'},{"text":'性别',"field":'gender'},{"text":'数量',"field":'count'}], + "columns": [[{"width": 85.25, "colspan": 1, "rowspan": 1, "checked": true}, { + "title": "性别", + "field": "gender", + "width": 85.25, + "colspan": 1, + "rowspan": 1, + "checked": false + }, { + "title": "姓名", + "field": "name", + "width": 85.25, + "align": "center", + "colspan": 1, + "rowspan": 1, + "checked": true, + "tableSummary": "count" + }, { + "title": "数量", + "field": "count", + "width": 85.25, + "align": "center", + "colspan": 1, + "rowspan": 1, + "checked": true, + "tableSummary": "sum" + }, { + "width": 85.25, + "colspan": 1, + "rowspan": 1, + "checked": true + }, {"width": 85.25, "colspan": 1, "rowspan": 1, "checked": true}]] + }, "printElementType": { + "title": "表格", "type": "table", + // editable: true, + // columnDisplayEditable: true,//列显示是否能编辑 + // columnDisplayIndexEditable: true,//列顺序显示是否能编辑 + // columnTitleEditable: true,//列标题是否能编辑 + // columnResizable: true, //列宽是否能调整 + // columnAlignEditable: true,//列对齐是否调整 + // isEnableEditField: true, //编辑字段 + // isEnableContextMenu: true, //开启右键菜单 默认true + // isEnableInsertRow: true, //插入行 + // isEnableDeleteRow: true, //删除行 + // isEnableInsertColumn: true, //插入列 + // isEnableDeleteColumn: true, //删除列 + // isEnableMergeCell: true, //合并单元格 + } + }, { + "options": { + "left": 21, + "top": 346.5, + "height": 61.5, + "width": 15, + "title": "装订线", + "lineHeight": 18, + "fixed": true, + "contentPaddingTop": 3.75, + "backgroundColor": "#ffffff" + }, "printElementType": {"type": "text"} + }, { + "options": { + "left": 225, + "top": 355, + "height": 13, + "width": 346.5, + "title": "自定义模块:主要为开发人员设计,能够快速,简单,实现自己功能", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 370.5, "height": 18, "width": 79, "title": "配置项表格", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 225, + "top": 385.5, + "height": 38, + "width": 346.5, + "title": "配置模块:主要为客户使用,开发人员可以配置属性,字段,标题等,客户直接使用,配置模块请参考实例2", + "fontFamily": "微软雅黑", + "lineHeight": 15, + "textAlign": "center", + "color": "#d93838" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 60, + "top": 487.5, + "height": 13, + "width": 123, + "title": "长文本会自动分页", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 507, "height": 40, "width": 511.5, "field": "longText"}, + "printElementType": {"title": "长文", "type": "longText"} + }, { + "options": {"left": 475.5, "top": 565.5, "height": 100, "width": 100}, + "printElementType": {"title": "矩形", "type": "rect"} + }, { + "options": {"left": 174, "top": 568.5, "height": 13, "width": 90, "title": "竖线", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 60, "top": 574.5, "height": 100, "width": 10}, + "printElementType": {"title": "竖线", "type": "vline"} + }, { + "options": {"left": 210, "top": 604.5, "height": 13, "width": 120, "title": "横线", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 130.5, "top": 625.5, "height": 10, "width": 277}, + "printElementType": {"title": "横线", "type": "hline"} + }, { + "options": { + "left": 364.5, + "top": 649.5, + "height": 13, + "width": 101, + "title": "矩形", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 525, "top": 784.5, "height": 13, "width": 63, "title": "页尾线", "textAlign": "center"}, + "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": {"left": 12, "top": 786, "height": 49, "width": 49}, + "printElementType": {"title": "html", "type": "html"} + }, { + "options": { + "left": 75, + "top": 790.5, + "height": 13, + "width": 137, + "title": "红色原型是自动定义的Html", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }, { + "options": { + "left": 334.5, + "top": 810, + "height": 13, + "width": 205, + "title": "页眉线已上。页尾下以下每页都会重复打印", + "textAlign": "center" + }, "printElementType": {"title": "自定义文本", "type": "text"} + }], + "paperNumberLeft": 565.5, + "paperNumberTop": 819 + }] +}