diff --git a/src/api/labelSetting/label_type_management.js b/src/api/labelSetting/label_type_management.js new file mode 100644 index 0000000..fac3828 --- /dev/null +++ b/src/api/labelSetting/label_type_management.js @@ -0,0 +1,21 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +/** + * 标签类型管理API接口 + */ + +// 分页查询标签类型列表 +export const getLabelTypeManagementList = data => createAPI('/label/labelType/getList', 'POST', data) + +// 获取所有标签类型(用于下拉选择) +export const getAllLabelTypes = data => createAPI('/label/labelType/getAllList', 'POST', data) + +// 保存标签类型 +export const saveLabelType = data => createAPI('/label/labelType/save', 'POST', data) + +// 更新标签类型 +export const updateLabelType = data => createAPI('/label/labelType/update', 'POST', data) + +// 删除标签类型 +export const deleteLabelType = data => createAPI('/label/labelType/delete', 'POST', data) + diff --git a/src/views/modules/labelSetting/components/LabelTypeManagementDialog.vue b/src/views/modules/labelSetting/components/LabelTypeManagementDialog.vue new file mode 100644 index 0000000..cf73431 --- /dev/null +++ b/src/views/modules/labelSetting/components/LabelTypeManagementDialog.vue @@ -0,0 +1,414 @@ + + + + + + diff --git a/src/views/modules/labelSetting/default_label_setting.vue b/src/views/modules/labelSetting/default_label_setting.vue index 9321a93..4b4c41d 100644 --- a/src/views/modules/labelSetting/default_label_setting.vue +++ b/src/views/modules/labelSetting/default_label_setting.vue @@ -134,7 +134,7 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '标签类型', - columnWidth: 80, + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: true, @@ -192,17 +192,17 @@ export default { sortLv: 0, status: true, fixed: ''*/ - }, { + },{ userId: this.$store.state.user.name, functionId: 100008002, - serialNumber: '100008002LabelRemark', + serialNumber: '100008002LabelSubLabelFlag', tableId: '100008002Label', tableName: '默认标签列表', - columnProp: 'remark', + columnProp: 'subLabelFlag', headerAlign: 'center', align: 'left', - columnLabel: '备注', - columnWidth: 200, + columnLabel: '子报表', + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: false, @@ -212,14 +212,14 @@ export default { }, { userId: this.$store.state.user.name, functionId: 100008002, - serialNumber: '100008002LabelSubLabelFlag', + serialNumber: '100008002LabelParentLabelNo', tableId: '100008002Label', tableName: '默认标签列表', - columnProp: 'subLabelFlag', + columnProp: 'parentLabelNo', headerAlign: 'center', align: 'left', - columnLabel: '子报表', - columnWidth: 60, + columnLabel: '上级标签编号', + columnWidth: 150, columnHidden: false, columnImage: false, columnSortable: false, @@ -229,14 +229,14 @@ export default { }, { userId: this.$store.state.user.name, functionId: 100008002, - serialNumber: '100008002LabelParentLabelNo', + serialNumber: '100008002LabelRemark', tableId: '100008002Label', tableName: '默认标签列表', - columnProp: 'parentLabelNo', + columnProp: 'remark', headerAlign: 'center', align: 'left', - columnLabel: '上级标签编号', - columnWidth: 120, + columnLabel: '备注', + columnWidth: 300, columnHidden: false, columnImage: false, columnSortable: false, @@ -244,7 +244,7 @@ export default { status: true, fixed: '' }, - ], + ], queryTable: { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, diff --git a/src/views/modules/labelSetting/label_setting.vue b/src/views/modules/labelSetting/label_setting.vue index 6aa3948..33e4ea2 100644 --- a/src/views/modules/labelSetting/label_setting.vue +++ b/src/views/modules/labelSetting/label_setting.vue @@ -27,13 +27,18 @@ - {{ buttons.dataSourceManagementButton }} + {{ buttons.dataSourceManagementButton }} + + + + {{ buttons.labelTypeManagementButton }} - + - + @@ -95,6 +100,12 @@ @data-source-updated="handleDataSourceUpdated" /> + + + @@ -112,6 +123,7 @@ import comShowLabelParameter from "./com_show_label_parameter";/*打印参数维 import comShowLabelContent from "./com_show_label_content";/*打印内容定义数维护的組件*/ import PaperManagementDialog from "./components/PaperManagementDialog.vue";/*纸张管理对话框*/ import DataSourceManagementDialog from "./components/DataSourceManagementDialog.vue";/*数据源管理对话框*/ +import LabelTypeManagementDialog from "./components/LabelTypeManagementDialog.vue";/*标签类型管理对话框*/ /* 动态表头 */ import { saveTableDefaultList, @@ -186,6 +198,24 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '标签类型', + columnWidth: 120, + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '' + }, + { + userId: this.$store.state.user.name, + functionId: '100008001', + serialNumber: '100008001LabelLabelType', + tableId: '100008001Label', + tableName: '标签自定义列表', + columnProp: 'rfidFlag', + headerAlign: 'center', + align: 'center', + columnLabel: 'RFID标签', columnWidth: 100, columnHidden: false, columnImage: false, @@ -204,7 +234,7 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '打印方向', - columnWidth: 100, + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: true, @@ -240,7 +270,7 @@ export default { headerAlign: 'center', align: 'left', columnLabel: '备注', - columnWidth: 300, + columnWidth: 400, columnHidden: false, columnImage: false, columnSortable: false, @@ -270,6 +300,7 @@ export default { addButton: '新增', paperManagementButton: '纸张管理', dataSourceManagementButton: '数据源管理', + labelTypeManagementButton: '标签类型管理', }, queryButton: { functionId: functionId, @@ -303,6 +334,8 @@ export default { paperManagementVisible: false, // 数据源管理对话框状态 dataSourceManagementVisible: false, + // 标签类型管理对话框状态 + labelTypeManagementVisible: false, } }, @@ -313,6 +346,7 @@ export default { comShowLabelContent,/*标签打印内容定义*/ PaperManagementDialog,/*纸张管理对话框*/ DataSourceManagementDialog,/*数据源管理对话框*/ + LabelTypeManagementDialog,/*标签类型管理对话框*/ }, mounted() { @@ -497,6 +531,18 @@ export default { // 这里可以添加数据源更新后的处理逻辑 }, + /*打开标签类型管理对话框*/ + openLabelTypeManagement() { + this.labelTypeManagementVisible = true; + }, + + /*处理标签类型更新事件*/ + handleLabelTypeUpdated(event) { + console.log('标签类型数据已更新:', event); + // 这里可以添加标签类型更新后的处理逻辑 + // 比如刷新标签类型下拉列表等 + }, + /*一键复制标签确认*/ copyLabelConfirm(row) { this.$confirm(this.labels.sureCopyThisRecord, this.labels.tipsLabel, { diff --git a/src/views/modules/labelSetting/label_setting_printer.vue b/src/views/modules/labelSetting/label_setting_printer.vue index 94f01b8..3f6aeab 100644 --- a/src/views/modules/labelSetting/label_setting_printer.vue +++ b/src/views/modules/labelSetting/label_setting_printer.vue @@ -135,7 +135,7 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '用户ID', - columnWidth: 100, + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: true, @@ -152,7 +152,7 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '用户名', - columnWidth: 95, + columnWidth: 150, columnHidden: false, columnImage: false, columnSortable: true, @@ -169,41 +169,43 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '标签编号', - columnWidth: 95, + columnWidth: 150, columnHidden: false, columnImage: false, columnSortable: true, sortLv: 0, status: true, fixed: '' - }, { + }, + { userId: this.$store.state.user.name, functionId: 100008004, - serialNumber: '100008004LabelPrinterName', + serialNumber: '100008004LabelIpAddress', tableId: '100008004Label', tableName: '标签打印机列表', - columnProp: 'printerName', + columnProp: 'ipAddress', headerAlign: 'center', align: 'left', - columnLabel: '打印机', - columnWidth: 235, + columnLabel: 'IP地址', + columnWidth: 180, columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '' - }, { + }, + { userId: this.$store.state.user.name, functionId: 100008004, - serialNumber: '100008004LabelIpAddress', + serialNumber: '100008004LabelPrinterName', tableId: '100008004Label', tableName: '标签打印机列表', - columnProp: 'ipAddress', + columnProp: 'printerName', headerAlign: 'center', align: 'left', - columnLabel: 'IP地址', - columnWidth: 140, + columnLabel: '打印机', + columnWidth: 300, columnHidden: false, columnImage: false, columnSortable: false,