diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts index 226a004..27f2f9d 100644 --- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts +++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts @@ -32,6 +32,8 @@ enum Api { frozenBatch = '/sys/user/frozenBatch', forceLogoutByUsername = '/sys/online/forceLogoutByUsername', + + flbqList = '/services/instructionTag/list', } /** @@ -50,6 +52,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const flbqList = (params) => defHttp.get({ url: Api.flbqList, params }); export const qyList = (params) => defHttp.get({ url: Api.qyList, params }); export const getEmployeesServiceTags = (params) => defHttp.get({ url: Api.getEmployeesServiceTags, params }); export const getEmployeesList = (params) => defHttp.get({ url: Api.getEmployeesList, params }); diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts index 7760099..357f4cd 100644 --- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts +++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts @@ -264,18 +264,22 @@ export const superQuerySchema = { }; //列表数据 -export const serviceTagcolumns: BasicColumn[] = [ +export const flbqColums: BasicColumn[] = [ { - title: '指令标签名称', + title: '分类标签', align: 'center', - dataIndex: 'tagName', - width: '50%', + dataIndex: 'instructionName', }, { - title: '备注', + title: '是否启用', align: 'center', - dataIndex: 'description', + dataIndex: 'izEnabled_dictText', }, + // { + // title: '备注', + // align: 'center', + // dataIndex: 'description', + // }, ]; //列表数据 @@ -295,7 +299,7 @@ export const employeesTagcolumns: BasicColumn[] = [ }, }, { - title: '标签/指令名称', + title: '分类标签/指令名称', align: 'center', dataIndex: 'tagName', }, diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue index 160ee20..002ca64 100644 --- a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue +++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue @@ -6,7 +6,7 @@
- +