diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue index 8ca4988..ffbb017 100644 --- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue +++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue @@ -1,21 +1,18 @@ +// update-begin--author:liaozhiyang---date:20230110---for:【QQYUN-7799】字典组件(原生组件除外)加上颜色配置 +.colorText { + display: inline-block; + height: 20px; + line-height: 20px; + padding: 0 6px; + border-radius: 8px; + background-color: red; + color: #fff; + font-size: 12px; +} + +// update-begin--author:liaozhiyang---date:20230110---for:【QQYUN-7799】字典组件(原生组件除外)加上颜色配置 diff --git a/src/views/config/directiveTag/DirectiveTagList.vue b/src/views/config/directiveTag/DirectiveTagList.vue index d193bcc..839c86a 100644 --- a/src/views/config/directiveTag/DirectiveTagList.vue +++ b/src/views/config/directiveTag/DirectiveTagList.vue @@ -8,7 +8,7 @@ - + @@ -95,8 +95,13 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ columns, canResize: false, useSearchForm: false, + pagination: { + current: 1, + pageSize: 50, + pageSizeOptions: ['50', '70', '100'], + }, actionColumn: { - width: 120, + width: 160, fixed: 'right', }, beforeFetch: async (params) => { @@ -195,16 +200,7 @@ function getTableAction(record) { { label: '编辑', onClick: handleEdit.bind(null, record) - }, - ]; -} - -/** - * 下拉操作栏 - */ -function getDropDownAction(record) { - return [ - { + }, { label: '详情', onClick: handleDetail.bind(null, record), }, { @@ -215,6 +211,15 @@ function getDropDownAction(record) { placement: 'topLeft', } } + ]; +} + +/** + * 下拉操作栏 + */ +function getDropDownAction(record) { + return [ + ] } diff --git a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue index 211609f..8028233 100644 --- a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue +++ b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue @@ -95,7 +95,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ canResize: false, useSearchForm: false, actionColumn: { - width: 120, + width: 160, fixed: 'right', }, beforeFetch: async (params) => { @@ -195,6 +195,18 @@ function getTableAction(record) { label: '编辑', onClick: handleEdit.bind(null, record) }, + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, + { + label: '删除', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + placement: 'topLeft', + } + } ]; } @@ -203,17 +215,7 @@ function getTableAction(record) { */ function getDropDownAction(record) { return [ - { - label: '详情', - onClick: handleDetail.bind(null, record), - }, { - label: '删除', - popConfirm: { - title: '是否确认删除', - confirm: handleDelete.bind(null, record), - placement: 'topLeft', - } - } + ] } diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts index 612d117..0140b46 100644 --- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts @@ -26,7 +26,7 @@ export const columns: BasicColumn[] = [ }, }, { - title: '指令标签', + title: '分类标签', align: 'center', dataIndex: 'instructionTagId_dictText', width: 100, @@ -133,9 +133,9 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { - categoryId: { title: '服务类别id', order: 0, view: 'list', type: 'string', dictCode: '' }, - typeId: { title: '服务类型id', order: 1, view: 'list', type: 'string', dictCode: '' }, - instructionTagId: { title: '指令标签id', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, + categoryId: { title: '服务类别', order: 0, view: 'list', type: 'string', dictCode: '' }, + typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' }, + instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, directiveName: { title: '服务指令名称', order: 3, view: 'text', type: 'string' }, tollPrice: { title: '收费价格', order: 4, view: 'number', type: 'number' }, comPrice: { title: '提成价格', order: 5, view: 'number', type: 'number' }, diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue index c360aa1..b2ee88e 100644 --- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue @@ -9,7 +9,7 @@ @@ -17,7 +17,7 @@ @@ -32,7 +32,7 @@ - +