修改bug

src/views/kc/kcTingke/KcTingke.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/kcTingke/kcTingke/list',
+  save='/kcTingke/kcTingke/add',
+  edit='/kcTingke/kcTingke/edit',
+  deleteOne = '/kcTingke/kcTingke/delete',
+  deleteBatch = '/kcTingke/kcTingke/deleteBatch',
+  importExcel = '/kcTingke/kcTingke/importExcel',
+  exportXls = '/kcTingke/kcTingke/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

src/views/kc/kcTingke/KcTingke.data.ts

@@ -0,0 +1,152 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '停课时间',
+    align: "center",
+    dataIndex: 'tingketime'
+  },
+  {
+    title: '检查时间',
+    align: "center",
+    dataIndex: 'jianchatime'
+  },
+  {
+    title: '课堂表ID（不是课程表ID）',
+    align: "center",
+    dataIndex: 'kechengbiaoid'
+  },
+  {
+    title: '账户',
+    align: "center",
+    dataIndex: 'userid'
+  },
+  {
+    title: '用户名',
+    align: "center",
+    dataIndex: 'username'
+  },
+  {
+    title: '用户单位名称',
+    align: "center",
+    dataIndex: 'userdwmc'
+  },
+  {
+    title: '用户听课身份1',
+    align: "center",
+    dataIndex: 'usertksf1'
+  },
+  {
+    title: '用户听课身份2',
+    align: "center",
+    dataIndex: 'usertksf2'
+  },
+  {
+    title: '用户听课身份编码',
+    align: "center",
+    dataIndex: 'usertksfcode'
+  },
+  {
+    title: '用户听课要求',
+    align: "center",
+    dataIndex: 'usertkyq'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "停课时间",
+    field: 'tingketime',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "检查时间",
+    field: 'jianchatime',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "课堂表ID（不是课程表ID）",
+    field: 'kechengbiaoid',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "账户",
+    field: 'userid',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "用户名",
+    field: 'username',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '停课时间',
+    field: 'tingketime',
+    component: 'Input',
+  },
+  {
+    label: '检查时间',
+    field: 'jianchatime',
+    component: 'Input',
+  },
+  {
+    label: '课堂表ID（不是课程表ID）',
+    field: 'kechengbiaoid',
+    component: 'Input',
+  },
+  {
+    label: '账户',
+    field: 'userid',
+    component: 'Input',
+  },
+  {
+    label: '用户名',
+    field: 'username',
+    component: 'Input',
+  },
+  {
+    label: '用户单位名称',
+    field: 'userdwmc',
+    component: 'Input',
+  },
+  {
+    label: '用户听课身份1',
+    field: 'usertksf1',
+    component: 'Input',
+  },
+  {
+    label: '用户听课身份2',
+    field: 'usertksf2',
+    component: 'Input',
+  },
+  {
+    label: '用户听课身份编码',
+    field: 'usertksfcode',
+    component: 'Input',
+  },
+  {
+    label: '用户听课要求',
+    field: 'usertkyq',
+    component: 'InputNumber',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];

src/views/kc/kcTingke/KcTingkeList.vue

@@ -0,0 +1,254 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="停课时间">
+              <a-input placeholder="请输入停课时间" v-model:value="queryParam.tingketime"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="检查时间">
+              <a-input placeholder="请输入检查时间" v-model:value="queryParam.jianchatime"></a-input>
+            </a-form-item>
+          </a-col>
+          <!--<template v-if="toggleSearchStatus">-->
+            <a-col :lg="8">
+              <a-form-item label="课堂表ID（不是课程表ID）">
+                <a-input placeholder="请输入课堂表ID（不是课程表ID）" v-model:value="queryParam.kechengbiaoid"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="账户">
+                <a-input placeholder="请输入账户" v-model:value="queryParam.userid"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="用户名">
+                <a-input placeholder="请输入用户名" v-model:value="queryParam.username"></a-input>
+              </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>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--<template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>-->
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <KcTingkeModal ref="registerModal" @success="handleSuccess"></KcTingkeModal>
+  </div>
+</template>
+
+<script lang="ts" name="kcTingke-kcTingke" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './KcTingke.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcTingke.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import KcTingkeModal from './components/KcTingkeModal.vue'
+
+  const queryParam = ref<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'kc_tingke',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "kc_tingke",
+      url: getExportUrl,
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  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);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+   
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/kc/kcTingke/components/KcTingkeForm.vue

@@ -0,0 +1,181 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="停课时间" v-bind="validateInfos.tingketime">
+            <a-input v-model:value="formData.tingketime" placeholder="请输入停课时间" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="检查时间" v-bind="validateInfos.jianchatime">
+            <a-input v-model:value="formData.jianchatime" placeholder="请输入检查时间" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="课堂表ID（不是课程表ID）" v-bind="validateInfos.kechengbiaoid">
+            <a-input v-model:value="formData.kechengbiaoid" placeholder="请输入课堂表ID（不是课程表ID）" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户" v-bind="validateInfos.userid">
+            <a-input v-model:value="formData.userid" placeholder="请输入账户" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户名" v-bind="validateInfos.username">
+            <a-input v-model:value="formData.username" placeholder="请输入用户名" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户单位名称" v-bind="validateInfos.userdwmc">
+            <a-input v-model:value="formData.userdwmc" placeholder="请输入用户单位名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户听课身份1" v-bind="validateInfos.usertksf1">
+            <a-input v-model:value="formData.usertksf1" placeholder="请输入用户听课身份1" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户听课身份2" v-bind="validateInfos.usertksf2">
+            <a-input v-model:value="formData.usertksf2" placeholder="请输入用户听课身份2" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户听课身份编码" v-bind="validateInfos.usertksfcode">
+            <a-input v-model:value="formData.usertksfcode" placeholder="请输入用户听课身份编码" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户听课要求" v-bind="validateInfos.usertkyq">
+	          <a-input-number v-model:value="formData.usertkyq" placeholder="请输入用户听课要求" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../KcTingke.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    tingketime: '',
+    jianchatime: '',
+    kechengbiaoid: '',
+    userid: '',
+    username: '',
+    userdwmc: '',
+    usertksf1: '',
+    usertksf2: '',
+    usertksfcode: '',
+    usertkyq: undefined,
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>

src/views/kc/kcTingke/components/KcTingkeModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <KcTingkeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></KcTingkeForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import KcTingkeForm from './KcTingkeForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

src/views/site/index.vue

@@ -103,11 +103,11 @@
         let width = fullWidth; // 宽
         if(width<600){
           maxClassName.value = {width:"100%"}
-        }else if(width>=500&&width<1370){
+        }else if(width>=500&&width<1070){
           width = width-300
           maxClassName.value = {width:width+"px"}
         }else{
-          width = 1370
+          width = 1070
           maxClassName.value = {width:width+"px"}
         }
       })()
@@ -117,11 +117,11 @@
   onMounted(() => {
     var width = window.screen.width * window.devicePixelRatio;
     console.log(`🚀 ~ file: index.vue:104 ~ onMounted ~ width:`, width)
-    if(width<1370){
+    if(width<1070){
       width = width-200
       maxClassName.value = {width:width+"px"}
     }else{
-      width = 1370
+      width = 1070
       maxClassName.value = {width:width+"px"}
     }
 

src/views/site/jingCaiGongKaiKe/index.vue

@@ -106,9 +106,16 @@ function classFun(index){
   return stylecss;
 }
 function jrkt(item){
+  console.log(`🚀 ~ file: index.vue:109 ~ jrkt ~ item:`, item)
   const format = 'yyyy-MM-dd hh:mm:ss';
+  let kssj = Date.parse(item.rq+" "+item.kssj+":00");
+  let jssj = Date.parse(item.rq+" "+item.jssj+":00");
+  let dqsj = Date.parse(dateFormat(new Date(), format));
+  console.log(`🚀 ~ file: index.vue:114 ~ jrkt ~ dqsj:`, kssj,dqsj,jssj)
+  if(kssj<=dqsj && jssj>= dqsj){
     var par = {usercode:userStore?.getUserInfo?.username,username:userStore?.getUserInfo?.realname,shijian: dateFormat(new Date(), format),gkkid:item.id}
     saveOrUpdate(par, false) .then((res) => { }) 
+  }
 }
 const saveOrUpdate = (params, isUpdate) => {
   let url = isUpdate ? Api.edit : Api.save;

src/views/site/tingKeZuJi/components/viewForm.vue

@@ -69,6 +69,7 @@ const { createMessage } = useMessage();
 const route = useRoute();
 
 function view(record){
+  console.log(`🚀 ~ file: viewForm.vue:72 ~ view ~ record:`, record)
   console.log(route.query);
 
   let params = { pageSize: -1, status: 0, column: 'ordernum', order: 'asc' }

src/views/site/tingKeZuJi/list.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> -->
-  <a-list item-layout="horizontal" :data-source="list">
+  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList">
     <template #renderItem="{ item }">
       <a-list-item>
         <a-list-item-meta>
@@ -50,6 +50,7 @@
       </a-list-item>
     </template>
   </a-list>
+  <a-pagination v-model="current" :total="total" show-less-items @change="handlePageChange" v-if="props.flagPage" style="text-align: right;" :hideOnSinglePage="true"/>
   <addModalPage ref="tingKeZuJiAddModal"/>
   <viewModalPage ref="viewModal"/>
   <fwdtModalPage ref="fwdtModal"/>
@@ -58,6 +59,7 @@
 import { ref, onMounted, watch, createVNode,h } from 'vue';
 import { TeamOutlined, FormOutlined } from '@ant-design/icons-vue';
 import { getUserId,getSysConfig } from '/@/views/site/utils/index';
+  import { Input, Popover, Pagination, Empty } from 'ant-design-vue';
 
 import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
 import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
@@ -66,17 +68,22 @@ import { defHttp } from '/@/utils/http/axios';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined,CheckOutlined,CloseOutlined } from '@ant-design/icons-vue';
 enum Api {
-  list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId',
+  list = '/kcTingke/kcTingke/indexListPage',
-  
   listTkjl = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
 }
 
 const tingKeZuJiAddModal = ref();
 const viewModal = ref();
 const fwdtModal = ref();
+const current = ref<number>(0);
+const total = ref<number>(2);
+const loadingList = ref<boolean>(false);
+  
+const APagination = Pagination;
 
 const props = defineProps({
   queryParam: { type: Object, default: () => ({}) },
+  flagPage: { type:Boolean,default:false}
 });
 
 /**
@@ -130,14 +137,29 @@ function txpjFun(item){
 }
 
 function init() {
-  console.log('init');
+  loadData()
-  listApi({ userid: getUserId(), tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {
+}
-    list.value = res ?? [];
+function loadData(){
+  loadingList.value = true
+  console.log(`🚀 ~ file: list.vue:139 ~ listApi ~ props.queryParam:`, props.queryParam)
+  listApi({ userid: getUserId(),  ...props.queryParam }).then(res => {
+    total.value = res.total;
+    current.value = res.current;
+    list.value = res.records
+  loadingList.value = false
+    // props.queryParam.value = res.total;
   });
 }
 
+function handlePageChange(record){
+  console.log(`🚀 ~ file: list.vue:150 ~ handlePageChange ~ record:`, record)
+  props.queryParam.pageNo=record
+  loadData();
+}
+
+
 function onSearch() {
-  init();
+  loadData();
 }
 
 defineExpose({

src/views/site/tingKeZuJi/more.vue

@@ -40,7 +40,7 @@
             <a-divider class="divider"/>
             <a-row>
               <a-col :span="24">
-                <listPage ref="listRef" :queryParam="queryParam"/>
+                <listPage ref="listRef" :queryParam="queryParam" flagPage/>
               </a-col>
             </a-row>
           </a-card>
@@ -60,7 +60,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
 import { getSysConfig } from '/@/views/site/utils/index';
 import { dateFormat } from '/@/utils/common/compUtils';
 
-const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '', pj: '', pageSize: -1 });
+const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '', pj: '', pageSize: 10,pageNo:1 });
 
 //进入就加载
 onMounted(() => {