diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts index 0b2f7833..a1b4eb65 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts @@ -6,8 +6,8 @@ enum Api { edit = '/feeApi/FeeCustTemplate/Edit', info = '/feeApi/FeeCustTemplate/Edit', delete = '/feeApi/FeeCustTemplate/Delete', - GenerateFees = '/feeApi/FeeCustTemplate/GenerateFees', GetColumns = '/mainApi/Common/GetColumnsByClient', + DeleteDetails = '/feeApi/FeeCustTemplate/DeleteDetails', } // 根据表明 查询数据 export function getColumns(query: { id: string }) { @@ -50,10 +50,10 @@ export function ApiDel(data: PageRequest) { }) } -// 生成订单费用 (Auth) -export function ApiGenerateFees(data: PageRequest) { +// 根据ID删除明细 (Auth) +export function DeleteDetails(data: PageRequest) { return request({ - url: Api.GenerateFees, + url: Api.DeleteDetails, method: 'post', data }) diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue index abab2f96..32c1f0eb 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue @@ -11,7 +11,7 @@ 添加 - + @@ -56,7 +56,7 @@ } from 'vue' // 下拉框数据接口 import { GetFeeCodeSelectList, GetFeeCurrencySelectList } from '/@/api/common' - import { getColumns } from './api' + import { getColumns, DeleteDetails } from './api' // import { GetFeeTemplateDetailList, BatchDelFeeTemplateDetail } from '../api' // 引入计费标准字典 import { feeUnitDict } from '/@/hooks/dict/index' @@ -796,23 +796,28 @@ ) // 删除行 const deleteRow = async () => { - // const ids = [] + // list.value.forEach((item: any, index) => { + // if (item.selected) { + // list.value.splice(index, 1) + // } + // }) + const ids = [] list.value.forEach((item: any, index) => { if (item.selected) { - list.value.splice(index, 1) + ids.push(item.id) } }) - // if (ids.length) { - // loading.value = true - // const data = await BatchDelFeeTemplateDetail({ ids }) - // loading.value = false - // createMessage.success(data.message) - // } - // const res = list.value.filter((item) => { - // return !item.selected - // }) - // list.value = res - // hotTb.value.hotInstance.loadData(res) + if (ids.length) { + loading.value = true + const data = await DeleteDetails({ ids }) + loading.value = false + createMessage.success(data.message) + } + const res = list.value.filter((item) => { + return !item.selected + }) + list.value = res + hotTb.value.hotInstance.loadData(res) } // 如果有id通过id查询表格 // watch( diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx index fb0d3629..6cdd6e4f 100644 --- a/src/views/system/user/columns.tsx +++ b/src/views/system/user/columns.tsx @@ -9,7 +9,7 @@ import { getCountryList, } from '/@/api/common' import { GetTablesByClient } from '/@/views/baseinfo/clientflowtemplate/api' -import { getTables, getColumns, getClientPermissionList } from '/@/api/system/role' +import { getColumns, getClientPermissionList } from '/@/api/system/role' import { Tag } from 'ant-design-vue' import { useOptionsStore } from '/@/store/modules/options' import { checkPermissions } from '/@/hooks/Permissions/index' @@ -878,3 +878,34 @@ export const infoformSchema: FormSchema[] = [ }, }, ] + +export const indexcolumns: BasicColumn[] = [ + { + title: '权限描述', + dataIndex: 'description', + width: 200, + }, + { + title: '排序号', + dataIndex: 'orderNo', + width: 150, + }, + { + title: '状态', + dataIndex: 'status', + width: 100, + customRender: ({ text }) => { + if (text === 0) { + return 启用 + } else if (text === 1) { + return 禁用 + } + return text + }, + }, + { + title: '备注', + dataIndex: 'note', + width: 150, + }, +] diff --git a/src/views/system/user/dataruleIndex.vue b/src/views/system/user/dataruleIndex.vue index 7fc7c8bf..42a11165 100644 --- a/src/views/system/user/dataruleIndex.vue +++ b/src/views/system/user/dataruleIndex.vue @@ -18,7 +18,7 @@