diff --git a/src/api/mes/print/labelCategory.js b/src/api/mes/print/labelCategory.js new file mode 100644 index 0000000..28ceaee --- /dev/null +++ b/src/api/mes/print/labelCategory.js @@ -0,0 +1,54 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function fetchList(query) { + return request({ + url: nlv_print('/label-category/page'), + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/label-category'), + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: nlv_print(`/label-category/${id}`), + method: 'get' + }) +} + +export function getByCode(code) { + return request({ + url: nlv_print(`/label-category/by-code?code=${code}`), + method: 'get' + }) +} + +export function delByCode(code) { + return request({ + url: nlv_print(`/label-category/delete-by-code?code=${code}`), + method: 'delete' + }) +} + +export function delObj(id) { + return request({ + url: nlv_print(`/label-category/${id}`), + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: nlv_print('/label-category'), + method: 'put', + data: obj + }) +} diff --git a/src/api/mes/print/labelfieldallocation.js b/src/api/mes/print/labelfieldallocation.js new file mode 100644 index 0000000..ac6bfea --- /dev/null +++ b/src/api/mes/print/labelfieldallocation.js @@ -0,0 +1,54 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function fetchList(query) { + return request({ + url: nlv_print('/label-field-allocation/page'), + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/label-field-allocation'), + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: nlv_print(`/label-field-allocation/${id}`), + method: 'get' + }) +} + +export function getByCode(code) { + return request({ + url: nlv_print(`/label-field-allocation/by-code?code=${code}`), + method: 'get' + }) +} + +export function delByCode(code) { + return request({ + url: nlv_print(`/label-field-allocation/delete-by-code?code=${code}`), + method: 'delete' + }) +} + +export function delObj(id) { + return request({ + url: nlv_print(`/label-field-allocation/${id}`), + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: nlv_print('/label-field-allocation'), + method: 'put', + data: obj + }) +} diff --git a/src/api/mes/print/print-label-template.js b/src/api/mes/print/print-label-template.js new file mode 100644 index 0000000..df5eb49 --- /dev/null +++ b/src/api/mes/print/print-label-template.js @@ -0,0 +1,40 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function fetchList(query) { + return request({ + url: nlv_print('/printlabeltemplate/page'), + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/printlabeltemplate'), + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: nlv_print(`/printlabeltemplate/${id}`), + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: nlv_print(`/printlabeltemplate/${id}`), + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: nlv_print('/printlabeltemplate'), + method: 'put', + data: obj + }) +} diff --git a/src/api/mes/print/printRuleMaintenance.js b/src/api/mes/print/printRuleMaintenance.js new file mode 100644 index 0000000..ca6c006 --- /dev/null +++ b/src/api/mes/print/printRuleMaintenance.js @@ -0,0 +1,33 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function getObj(obj) { + return request({ + url: nlv_print('/printRule/search'), + method: 'post', + params: obj + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/printRule/save'), + method: 'post', + data: obj + }) +} + +export function deleteObj(obj) { + return request({ + url: nlv_print('/printRule/delete'), + method: 'post', + data: obj + }) +} + +export function getTemplateCategoryList(site) { + return request({ + url: nlv_print(`/printRule/getLabelCategoryList/${site}`), + method: 'get', + }) +} diff --git a/src/api/mes/print/printer.js b/src/api/mes/print/printer.js new file mode 100644 index 0000000..018b088 --- /dev/null +++ b/src/api/mes/print/printer.js @@ -0,0 +1,56 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function fetchList(query) { + return request({ + url: nlv_print('/printer/page'), + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/printer'), + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: nlv_print(`/printer/${id}`), + method: 'get' + }) +} + +export function getByCode(param) { + return request({ + url: nlv_print('/printer/by-code'), + method: 'get', + params: param + }) +} + +export function delByCode(param) { + return request({ + url: nlv_print('/printer/delete-by-code'), + method: 'delete', + params: param + }) +} + +export function delObj(id) { + return request({ + url: nlv_print(`/printer/${id}`), + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: nlv_print('/printer'), + method: 'put', + data: obj + }) +} diff --git a/src/api/mes/print/systemfield.js b/src/api/mes/print/systemfield.js new file mode 100644 index 0000000..99d2bbb --- /dev/null +++ b/src/api/mes/print/systemfield.js @@ -0,0 +1,54 @@ +import request from '@/router/axios' +import {nlv_print} from "@/api/prefix"; + +export function fetchList(query) { + return request({ + url: nlv_print('/system-field/page'), + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: nlv_print('/system-field'), + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: nlv_print(`/system-field/${id}`), + method: 'get' + }) +} + +export function getByCode(code) { + return request({ + url: nlv_print(`/system-field/by-code?code=${code}`), + method: 'get' + }) +} + +export function delByCode(code) { + return request({ + url: nlv_print(`/system-field/delete-by-code?code=${code}`), + method: 'delete' + }) +} + +export function delObj(id) { + return request({ + url: nlv_print(`/system-field/${id}`), + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: nlv_print('/system-field'), + method: 'put', + data: obj + }) +} diff --git a/src/api/prefix.js b/src/api/prefix.js index 512c970..c6f2b7a 100644 --- a/src/api/prefix.js +++ b/src/api/prefix.js @@ -15,6 +15,7 @@ export const iepMsa = 'iep-msa' export const iepRpt = 'iep-rpt' export const iepDcc = 'iep-dcc' export const nlvWms = 'nlv-wms' +export const nlvPrint = 'nlv-print' export function iep(url) { return SLASH + iepApp + url @@ -47,10 +48,6 @@ export function wms(url) { return SLASH + iepWms + url } -export function nlv_wms(url) { - return SLASH + nlvWms + url -} - export function flow(url) { return SLASH + iepFlow + url } @@ -76,7 +73,15 @@ export function rpt(url) { export function dcc(url) { return SLASH + iepDcc + url - } +} + +export function nlv_wms(url) { + return SLASH + nlvWms + url +} + +export function nlv_print(url) { + return SLASH + nlvPrint + url +} export default { iep, @@ -93,5 +98,7 @@ export default { int, msa, rpt, - dcc + dcc, + nlv_wms, + nlv_print } diff --git a/src/components/dialog/input-multiple-select-checkbox-dialog.vue b/src/components/dialog/input-multiple-select-checkbox-dialog.vue new file mode 100644 index 0000000..da4428d --- /dev/null +++ b/src/components/dialog/input-multiple-select-checkbox-dialog.vue @@ -0,0 +1,220 @@ + + + + + 已选数据:{{ selectedData }} + + + + + + + + + + + + + + + + + + + + + 当页全选 + 清除选定 + + + + + 当页全选 + 清除选定 + + + + + + 确定 + + + + + + + + + diff --git a/src/components/dialog/input-multiple-select-dialog.vue b/src/components/dialog/input-multiple-select-dialog.vue new file mode 100644 index 0000000..e43f700 --- /dev/null +++ b/src/components/dialog/input-multiple-select-dialog.vue @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/const/website.js b/src/const/website.js index 33ba1bd..31e433b 100644 --- a/src/const/website.js +++ b/src/const/website.js @@ -3,7 +3,7 @@ import i18n from '@/i18n'; export default { title: 'iMES', subtitle: 'iMES', - copyright: 'Copyright 2020-2024 SEMI-TECH. All Rights Reserved.', + copyright: 'Copyright 2020-2024 NLINV. All Rights Reserved.', isFirstPage: true, // 配置首页不可关闭 key: 'mom', // 配置主键,目前用于存储 validateCode: false, //是否开启验证码校验 diff --git a/src/main.js b/src/main.js index 1a51f72..980ed73 100644 --- a/src/main.js +++ b/src/main.js @@ -23,6 +23,9 @@ import AvueFormDesign from 'pig-avue-form-design' import basicContainer from './components/basic-container/main' import inputSelectDialog from './components/dialog/input-select-dialog' import inputSelectCustDialog from './components/dialog/input-select-dialog-cust' +import inputMultipleSelectCheckboxDialog from './components/dialog/input-multiple-select-checkbox-dialog' +import inputMultipleSelectDialog from './components/dialog/input-multiple-select-dialog' + import topBar from './components/top-bar/main' import moment from 'moment' import AttachmentUpload from './components/attachment/index' @@ -132,6 +135,9 @@ Vue.component('attachment-upload', AttachmentUpload) // 注册公用input弹出框 Vue.component('input-select-dialog', inputSelectDialog) Vue.component('input-select-dialog-cust', inputSelectCustDialog) +// 多选项含checkBox的弹出框,多选后点击确定按钮回传选中的参数 +Vue.component('input-multiple-select-checkbox-dialog', inputMultipleSelectCheckboxDialog) +Vue.component('input-multiple-select-dialog', inputMultipleSelectDialog) // 注册公用固钉 Vue.component('c-top-bar', topBar) diff --git a/src/views/mes/print/labelCategory/index.vue b/src/views/mes/print/labelCategory/index.vue new file mode 100644 index 0000000..b291815 --- /dev/null +++ b/src/views/mes/print/labelCategory/index.vue @@ -0,0 +1,214 @@ + + + + + + 检索 + + 保存 + + 清除 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/print/labelFieldAllocation/index.vue b/src/views/mes/print/labelFieldAllocation/index.vue new file mode 100644 index 0000000..52ec0eb --- /dev/null +++ b/src/views/mes/print/labelFieldAllocation/index.vue @@ -0,0 +1,301 @@ + + + + + + + 检索 + + 保存 + + 清除 + + 删除 + + + + + + + + + + + + + + + + + + + + 新增 + + + + + + + + + + + + + + + + > + + + + + + + + + + + 删除 + + + + + + + + + + + + + diff --git a/src/views/mes/print/masterData/index.vue b/src/views/mes/print/masterData/index.vue new file mode 100644 index 0000000..2ea8d40 --- /dev/null +++ b/src/views/mes/print/masterData/index.vue @@ -0,0 +1,394 @@ + + + + + 检索 + + 保存 + + 清除 + + 删除 + + + + + + + + + + + + + + + 新增规则 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + + + + + + + + + + + + + 规则公式 + + + 打印次数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 取消 + + + + + + diff --git a/src/views/mes/print/printLabelTemplate/index.vue b/src/views/mes/print/printLabelTemplate/index.vue new file mode 100644 index 0000000..75358f6 --- /dev/null +++ b/src/views/mes/print/printLabelTemplate/index.vue @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/print/printer/index.vue b/src/views/mes/print/printer/index.vue new file mode 100644 index 0000000..bcfc476 --- /dev/null +++ b/src/views/mes/print/printer/index.vue @@ -0,0 +1,295 @@ + + + + + + + + 检索 + + 保存 + + 清除 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/print/systemField/index.vue b/src/views/mes/print/systemField/index.vue new file mode 100644 index 0000000..624224e --- /dev/null +++ b/src/views/mes/print/systemField/index.vue @@ -0,0 +1,315 @@ + + + + + + 检索 + + 保存 + + 清除 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ‘固定值’的默认值EMPTY代表空字符串,若要改成其他字符串,请先删除EMPTY,再输入具体的值,否则不需要动 + + + + 参考案例 + + + + + + + + + + + + + + + + + + + + + + + +