Merge remote-tracking branch 'origin/master'

master
王家东 2 weeks ago
commit 26e0f596dc
  1. 28
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java
  2. 3
      jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts
  3. 302
      jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue

@ -116,6 +116,34 @@ public class AppointmentRecordController extends JeecgController<AppointmentReco
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* 分页列表查询
*
* @param appointmentRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "仪器预约审核记录表-分页列表查询")
@ApiOperation(value="仪器预约审核记录表-分页列表查询", notes="仪器预约审核记录表-分页列表查询")
@GetMapping(value = "/list2")
public Result<IPage<AppointmentRecord>> queryPageList2(AppointmentRecord appointmentRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
//LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为:LIKE_WITH_OR
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<AppointmentRecord> queryWrapper = QueryGenerator.initQueryWrapper(appointmentRecord, req.getParameterMap(),customeRuleMap);
//queryWrapper.eq("affiliated_unit",loginUser.getOrgId());
Page<AppointmentRecord> page = new Page<AppointmentRecord>(pageNo, pageSize);
IPage<AppointmentRecord> pageList = appointmentRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/** /**
* 添加 * 添加
* *

@ -6,6 +6,7 @@ const { createConfirm } = useMessage();
enum Api { enum Api {
list = '/appointmentrecord/appointmentRecord/list', list = '/appointmentrecord/appointmentRecord/list',
list1 = '/appointmentrecord/appointmentRecord/list1', list1 = '/appointmentrecord/appointmentRecord/list1',
list2 = '/appointmentrecord/appointmentRecord/list2',
save='/appointmentrecord/appointmentRecord/add', save='/appointmentrecord/appointmentRecord/add',
edit='/appointmentrecord/appointmentRecord/edit', edit='/appointmentrecord/appointmentRecord/edit',
edit1='/appointmentrecord/appointmentRecord/edit1', edit1='/appointmentrecord/appointmentRecord/edit1',
@ -53,6 +54,8 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
*/ */
export const list1 = (params) => defHttp.get({ url: Api.list1, params }); export const list1 = (params) => defHttp.get({ url: Api.list1, params });
export const list2 = (params) => defHttp.get({ url: Api.list2, params });
/** /**
* 删除单个 * 删除单个
* @param params * @param params

@ -0,0 +1,302 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="instrumentName">
<template #label><span title="仪器名称">仪器名称</span></template>
<a-input placeholder="请输入仪器名称" v-model:value="queryParam.instrumentName" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="appointmentUnit">
<template #label><span title="预约单位">预约单位</span></template>
<j-select-dept placeholder="请选择预约单位" v-model:value="queryParam.appointmentUnit" checkStrictly allow-clear />
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6">
<a-form-item name="affiliatedUnit">
<template #label><span title="仪器所属单位">仪器所属</span></template>
<j-select-dept placeholder="请选择仪器所属单位" v-model:value="queryParam.affiliatedUnit" checkStrictly allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status">
<template #label><span title="预约审核状态">预约审核</span></template>
<j-select-multiple placeholder="请选择预约审核状态" v-model:value="queryParam.status" dictCode="appointment_status" allow-clear />
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
&lt;!&ndash; 高级查询 &ndash;&gt;
<super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<AppointmentRecordModal ref="registerModal" @success="handleSuccess"></AppointmentRecordModal>
<AppointmentRecordModal1 ref="registerModal1" @success="handleSuccess"></AppointmentRecordModal1>
</div>
</template>
<script lang="ts" name="appointmentrecord-appointmentRecord" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './AppointmentRecord.data';
import { list2, deleteOne, batchDelete, getImportUrl, getExportUrl,tgyy,jsyy } from './AppointmentRecord.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import AppointmentRecordModal from './components/AppointmentRecordModal.vue'
import AppointmentRecordModal1 from './components/AppointmentRecordModal1.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const registerModal1 = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '仪器预约审核记录表',
api: list2,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 180,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "仪器预约审核记录表",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 通过事件
*/
async function tgcz(record) {
await tgyy({id: record.id}, handleSuccess);
}
/**
* 拒绝事件
*/
function handleReject(record: Recordable) {
registerModal1.value.disableSubmit = false;
registerModal1.value.edit(record);
}
/**
* 结束事件
*/
async function jscz(record) {
await jsyy({id: record.id}, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
const actions = [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}
];
return actions;
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>
Loading…
Cancel
Save