From ca6fdf71eb722a15fbf4d96f5bbbcae7fffbf7e9 Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Thu, 12 Jan 2023 13:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelSetting/com_copy_label_content.vue | 52 ++++++++++- .../com_label_content_serial_rule.vue | 92 +++++++++++++++++-- .../labelSetting/com_show_label_content.vue | 53 ++++++++++- .../labelSetting/com_show_label_parameter.vue | 63 +++++++++++-- .../com_show_label_serial_info.vue | 57 +++++++++++- .../labelSetting/customer_label_setting.vue | 2 +- .../labelSetting/default_label_setting.vue | 15 +-- .../modules/labelSetting/label_setting.vue | 18 +--- .../labelSetting/label_setting_printer.vue | 3 +- 9 files changed, 304 insertions(+), 51 deletions(-) diff --git a/src/views/modules/labelSetting/com_copy_label_content.vue b/src/views/modules/labelSetting/com_copy_label_content.vue index 452c0c7..b1a1888 100644 --- a/src/views/modules/labelSetting/com_copy_label_content.vue +++ b/src/views/modules/labelSetting/com_copy_label_content.vue @@ -54,6 +54,15 @@ import { copyLabelAllContentsWithOther, } from '@/api/labelSetting/com_copy_label_content.js'; +/* 动态表头 */ +import { + saveTableDefaultList, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from '@/api/table.js' + import { searchSysLanguagePackList, searchSysLanguageParam, @@ -140,6 +149,20 @@ export default { currentRow: {}, labelArrays: [], dataListLoading: false, + queryTable: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000048Label', + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000048Label', + status: true, + languageCode: this.$i18n.locale + }, buttons: { copyButton: '复制', refreshButton: '刷新', @@ -177,7 +200,9 @@ export default { //默认查询 this.searchFlag = 'Y'; //判断是否启用多语言 - this.getMultiLanguageList(); //刷新多语言的信息 + this.getMultiLanguageList(); + // 获取动态表头的信息 + this.getTableUserColumn(); //重置标题 this.titleCon = this.labels.titleCon; //刷新当前页面的table @@ -258,6 +283,31 @@ export default { }); }, + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data && data.code == 0 && data.rows.length > 0) { + // this.columnList = [] + this.columnList = data.rows + } else { + this.getColumnList() + } + }) + }, + + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (data && data.code == 0) { + // this.showDefault = false + this.columnList = data.rows + } else { + // this.showDefault = true + } + }) + }, + + }, mounted() { this.$nextTick(() => { diff --git a/src/views/modules/labelSetting/com_label_content_serial_rule.vue b/src/views/modules/labelSetting/com_label_content_serial_rule.vue index 5a973e0..1870da1 100644 --- a/src/views/modules/labelSetting/com_label_content_serial_rule.vue +++ b/src/views/modules/labelSetting/com_label_content_serial_rule.vue @@ -74,6 +74,16 @@ import { deleteLabelContentSerialRule, } from '@/api/labelSetting/com_label_content_serial_rule.js'; +/* 动态表头 */ +import { + saveTableDefaultList, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from '@/api/table.js' + +/*页面多语言*/ import { searchSysLanguagePackList, searchSysLanguageParam, @@ -108,8 +118,8 @@ export default { userId: this.$store.state.user.name, functionId: 'C10000049', serialNumber: 'C10000049LabelItemDesc', - tableId: 'C10000049Label', - tableName: '标签内容定义', + tableId: 'C10000049LabelContent', + tableName: '标签内容列表', columnProp: 'itemDesc', headerAlign: 'center', align: 'center', @@ -125,7 +135,7 @@ export default { userId: this.$store.state.user.name, functionId: 'C10000049', serialNumber: 'C10000049LabelObjectName', - tableId: 'C10000049Label', + tableId: 'C10000049LabelContent', tableName: '标签内容定义', columnProp: 'objectName', headerAlign: 'center', @@ -145,7 +155,7 @@ export default { userId: this.$store.state.user.name, functionId: 'C10000049', serialNumber: 'C10000049LabelObjectName', - tableId: 'C10000049Label', + tableId: 'C10000049LabelSerialRule', tableName: '规则内容列表', columnProp: 'objectName', headerAlign: 'center', @@ -162,7 +172,7 @@ export default { userId: this.$store.state.user.name, functionId: 'C10000049', serialNumber: 'C10000049LabelSeqNo', - tableId: 'C10000049Label', + tableId: 'C10000049LabelSerialRule', tableName: '规则内容列表', columnProp: 'seqNo', headerAlign: 'center', @@ -179,7 +189,7 @@ export default { userId: this.$store.state.user.name, functionId: 'C10000049', serialNumber: 'C10000049LabelObjectName', - tableId: 'C10000049Label', + tableId: 'C10000049LabelSerialRule', tableName: '规则内容列表', columnProp: 'objectName', headerAlign: 'center', @@ -198,6 +208,20 @@ export default { labelContentArrays: [], serialRuleArrays: [], dataListLoading: false, + queryTable: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: '', + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: '', + status: true, + languageCode: this.$i18n.locale + }, buttons: { copyButton: '复制', refreshButton: '刷新', @@ -232,6 +256,9 @@ export default { this.searchFlag = 'Y'; //判断是否启用多语言 this.getMultiLanguageList(); + // 获取动态表头的信息 + this.getTableUserColumn('C10000049LabelContent', 1); + this.getTableUserColumn('C10000049LabelSerialRule', 2); //重置标题 this.titleCon = this.labels.titleCon; //刷新页面的table @@ -318,6 +345,59 @@ export default { }); }, + // 获取 用户保存的 格式列 + async getTableUserColumn(tableId, tableNum) { + let queryTableUser = { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: tableId, + status: true, + languageCode: this.$i18n.locale + } + await getTableUserListLanguage(queryTableUser).then(({data}) => { + if (data.rows.length > 0) { + //this.columnList = [] + switch (tableNum) { + case 1: + this.labelContentList = data.rows + break; + case 2: + this.serialRuleList = data.rows + break; + + } + + } else { + this.getColumnList(tableId, tableNum) + } + }) + + }, + // 获取 tableDefault 列 + async getColumnList(tableId, tableNum) { + this.queryTable.tableId = tableId; + let queryTable= { + functionId: functionId, + tableId: tableId, + languageCode: this.$i18n.locale + } + await getTableDefaultListLanguage(queryTable).then(({data}) => { + if (!data.rows.length == 0) { + switch (tableNum) { + case 1: + this.labelContentList = data.rows + break; + case 2: + this.serialRuleList = data.rows + break; + } + } else { + // this.showDefault = true + } + }) + + }, + }, mounted() { this.$nextTick(() => { diff --git a/src/views/modules/labelSetting/com_show_label_content.vue b/src/views/modules/labelSetting/com_show_label_content.vue index a6c4db8..3a1abbf 100644 --- a/src/views/modules/labelSetting/com_show_label_content.vue +++ b/src/views/modules/labelSetting/com_show_label_content.vue @@ -100,6 +100,16 @@ import comAddUpdateLabel from "./com_add_update_label_content";/*新增或者修 import comCopyLabelAllContents from "./com_copy_label_content";/*复制报表内容的組件*/ import comLabelContentSerialRule from "./com_label_content_serial_rule";/*复制报表内容的組件*/ import comShowLabelSerialInfo from "./com_show_label_serial_info";/*标签内容流水号信息的組件*/ + +/* 动态表头 */ +import { + saveTableDefaultList, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from '@/api/table.js' + import { searchSysLanguagePackList, searchSysLanguageParam, @@ -257,6 +267,20 @@ export default { currentRow: {}, labelArrays: [], dataListLoading: false, + queryTable: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000046Label', + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000046Label', + status: true, + languageCode: this.$i18n.locale + }, buttons: { addButton: '新增', editButton: '修改', @@ -299,7 +323,9 @@ export default { //默认不查询 this.searchFlag = 'Y'; //判断是否启用多语言 - this.getMultiLanguageList(); //刷新多语言的信息 + this.getMultiLanguageList(); + // 获取动态表头的信息 + this.getTableUserColumn(); //重置标题 this.titleCon = this.labels.titleCon; //组合标签内容 @@ -440,6 +466,31 @@ export default { }); }, + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data && data.code == 0 && data.rows.length > 0) { + // this.columnList = [] + this.columnList = data.rows + } else { + this.getColumnList() + } + }) + }, + + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (data && data.code == 0) { + // this.showDefault = false + this.columnList = data.rows + } else { + // this.showDefault = true + } + }) + }, + + }, /*组件*/ components: { diff --git a/src/views/modules/labelSetting/com_show_label_parameter.vue b/src/views/modules/labelSetting/com_show_label_parameter.vue index 07bda16..911fc5b 100644 --- a/src/views/modules/labelSetting/com_show_label_parameter.vue +++ b/src/views/modules/labelSetting/com_show_label_parameter.vue @@ -72,6 +72,15 @@ import { /*引入組件*/ import comAddUpdateLabel from "./com_add_update_label_parameter";/*新增或者修改的組件*/ +/* 动态表头 */ +import { + saveTableDefaultList, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from '@/api/table.js' + import { searchSysLanguagePackList, searchSysLanguageParam, @@ -110,7 +119,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelItemNo', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'itemNo', headerAlign: 'center', align: 'center', @@ -127,7 +136,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelShowSeqNo', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'showSeqNo', headerAlign: 'center', align: 'center', @@ -144,7 +153,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelParameterDesc', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'parameterDesc', headerAlign: 'center', align: 'center', @@ -161,7 +170,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelParameterName', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'parameterName', headerAlign: 'center', align: 'left', @@ -178,7 +187,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelValueType', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'valueType', headerAlign: 'center', align: 'left', @@ -195,7 +204,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelOptionValue', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'optionValue', headerAlign: 'center', align: 'left', @@ -212,7 +221,7 @@ export default { functionId: 'C10000044', serialNumber: 'C10000044LabelDefaultValue', tableId: 'C10000044Label', - tableName: '标签参数定义', + tableName: '标签参数定义列表', columnProp: 'defaultValue', headerAlign: 'center', align: 'left', @@ -229,6 +238,20 @@ export default { currentRow: {}, labelArrays: [], dataListLoading: false, + queryTable: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000044Label', + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000044Label', + status: true, + languageCode: this.$i18n.locale + }, buttons: { addButton: '新增', editButton: '修改', @@ -272,6 +295,8 @@ export default { this.searchFlag = 'Y'; //判断是否启用多语言 this.getMultiLanguageList(); + // 获取动态表头的信息 + this.getTableUserColumn(); //重置标题 this.titleCon = this.labels.titleCon; //刷新当前页面的table @@ -385,6 +410,30 @@ export default { }); }, + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data && data.code == 0 && data.rows.length > 0) { + // this.columnList = [] + this.columnList = data.rows + } else { + this.getColumnList() + } + }) + }, + + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (data && data.code == 0) { + // this.showDefault = false + this.columnList = data.rows + } else { + // this.showDefault = true + } + }) + }, + }, /*组件*/ components: { diff --git a/src/views/modules/labelSetting/com_show_label_serial_info.vue b/src/views/modules/labelSetting/com_show_label_serial_info.vue index 10ea39c..c3a7645 100644 --- a/src/views/modules/labelSetting/com_show_label_serial_info.vue +++ b/src/views/modules/labelSetting/com_show_label_serial_info.vue @@ -68,6 +68,15 @@ import { /*引入組件*/ import comAddUpdateLabel from "./com_add_update_label_serial_info";/*新增或者修改的組件*/ +/* 动态表头 */ +import { + saveTableDefaultList, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from '@/api/table.js' + import { searchSysLanguagePackList, searchSysLanguageParam, @@ -106,7 +115,7 @@ export default { functionId: 'C10000050', serialNumber: 'C10000050LabelLabelNo', tableId: 'C10000050Label', - tableName: '标签参数定义', + tableName: '打印定义列表', columnProp: 'labelNo', headerAlign: 'center', align: 'center', @@ -123,7 +132,7 @@ export default { functionId: 'C10000050', serialNumber: 'C10000050LabelLastSeqNo', tableId: 'C10000050Label', - tableName: '标签参数定义', + tableName: '打印定义列表', columnProp: 'lastSeqNo', headerAlign: 'center', align: 'center', @@ -140,7 +149,7 @@ export default { functionId: 'C10000050', serialNumber: 'C10000050LabelItemNo', tableId: 'C10000050Label', - tableName: '标签参数定义', + tableName: '打印定义列表', columnProp: 'itemNo', headerAlign: 'center', align: 'center', @@ -157,7 +166,7 @@ export default { functionId: 'C10000050', serialNumber: 'C10000050LabelKeyInfo', tableId: 'C10000050Label', - tableName: '标签参数定义', + tableName: '打印定义列表', columnProp: 'keyInfo', headerAlign: 'center', align: 'left', @@ -174,6 +183,20 @@ export default { currentRow: {}, labelArrays: [], dataListLoading: false, + queryTable: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000050Label', + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: functionId, + tableId: 'C10000050Label', + status: true, + languageCode: this.$i18n.locale + }, buttons: { addButton: '新增', editButton: '修改', @@ -214,6 +237,8 @@ export default { this.searchFlag = 'Y'; //判断是否启用多语言 this.getMultiLanguageList(); + // 获取动态表头的信息 + this.getTableUserColumn(); //重置标题 this.titleCon = this.labels.titleCon; //组合标签内容 @@ -346,6 +371,30 @@ export default { }); }, + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data && data.code == 0 && data.rows.length > 0) { + // this.columnList = [] + this.columnList = data.rows + } else { + this.getColumnList() + } + }) + }, + + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (data && data.code == 0) { + // this.showDefault = false + this.columnList = data.rows + } else { + // this.showDefault = true + } + }) + }, + }, /*组件*/ components: { diff --git a/src/views/modules/labelSetting/customer_label_setting.vue b/src/views/modules/labelSetting/customer_label_setting.vue index a6cdb59..c46aa91 100644 --- a/src/views/modules/labelSetting/customer_label_setting.vue +++ b/src/views/modules/labelSetting/customer_label_setting.vue @@ -506,7 +506,7 @@ export default { // 不查询 this.refreshLabelSettingList(); // 获取动态表头的信息 - //this.getTableUserColumn() + this.getTableUserColumn() //获取按钮的权限 this.getButtonAuthData(); //刷新多语言的信息 diff --git a/src/views/modules/labelSetting/default_label_setting.vue b/src/views/modules/labelSetting/default_label_setting.vue index a02c998..7d9ca36 100644 --- a/src/views/modules/labelSetting/default_label_setting.vue +++ b/src/views/modules/labelSetting/default_label_setting.vue @@ -373,19 +373,6 @@ export default { this.currentRow = JSON.parse(JSON.stringify(row)) }, - // 打开页面设置 - userSetting() { - this.visible = true - let queryTable = { - userId: this.$store.state.user.name, - functionId: this.$route.meta.menuId, - tableId: '100008002Label', - languageCode: this.$i18n.locale - } - this.$nextTick(() => { - this.$refs.column.init(queryTable) - }) - }, // 获取 用户保存的 格式列 getTableUserColumn() { getTableUserListLanguage(this.queryTableUser).then(({data}) => { @@ -449,7 +436,7 @@ export default { // 不查询 this.refreshLabelSettingList(); // 获取动态表头的信息 - //this.getTableUserColumn() + this.getTableUserColumn() //获取按钮的权限 this.getButtonAuthData(); //刷新多语言的信息 diff --git a/src/views/modules/labelSetting/label_setting.vue b/src/views/modules/labelSetting/label_setting.vue index 891b106..f527573 100644 --- a/src/views/modules/labelSetting/label_setting.vue +++ b/src/views/modules/labelSetting/label_setting.vue @@ -63,8 +63,7 @@ - - + @@ -371,19 +370,6 @@ export default { this.currentRow = JSON.parse(JSON.stringify(row)) }, - // 打开页面设置 - userSetting() { - this.visible = true - let queryTable = { - userId: this.$store.state.user.name, - functionId: this.$route.meta.menuId, - tableId: '100008001Label', - languageCode: this.$i18n.locale - } - this.$nextTick(() => { - this.$refs.column.init(queryTable) - }) - }, // 获取 用户保存的 格式列 getTableUserColumn() { getTableUserListLanguage(this.queryTableUser).then(({data}) => { @@ -447,7 +433,7 @@ export default { // 不查询 this.refreshLabelSettingList(); // 获取动态表头的信息 - //this.getTableUserColumn() + this.getTableUserColumn() //获取按钮的权限 this.getButtonAuthData(); //刷新页面的多语言信息 diff --git a/src/views/modules/labelSetting/label_setting_printer.vue b/src/views/modules/labelSetting/label_setting_printer.vue index d528d42..a91669a 100644 --- a/src/views/modules/labelSetting/label_setting_printer.vue +++ b/src/views/modules/labelSetting/label_setting_printer.vue @@ -389,6 +389,7 @@ export default { this.$refs.column.init(queryTable) }) }, + // 获取 用户保存的 格式列 getTableUserColumn() { getTableUserListLanguage(this.queryTableUser).then(({data}) => { @@ -452,7 +453,7 @@ export default { // 不查询 this.refreshUserLabelPrinters(); // 获取动态表头的信息 - //this.getTableUserColumn() + this.getTableUserColumn() //获取按钮的权限 this.getButtonAuthData(); //刷新多语言的信息