From 0376d010293f9d947e5e9728e839f29b24a303a7 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 6 Nov 2024 17:55:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E3=80=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=97=A5=E5=BF=97=20=E5=8A=9F=E8=83=BD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=2011.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectController.java |  17 +-
 .../projectAudit4CaiZhengList.vue             |  11 +-
 .../productAudit/projectAudit4FaRenList.vue   |  12 +-
 .../productAudit/projectAudit4KejijuList.vue  |  11 +-
 .../productAudit/projectAudit4QuXianList.vue  |  12 +-
 .../src/views/projectLog/ProjectLog.data.ts   |  10 +-
 .../views/projectLog/ProjectLogBasicModal.vue | 233 +++--------
 .../src/views/projectLog/ProjectLogList.vue   | 386 +++++++++---------
 8 files changed, 311 insertions(+), 381 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
index 8234ee7..6c4ee57 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
@@ -122,8 +122,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
     }
 
     /**
-     * @description:
-     * //('科技主管部门待提交', '1');
+     * @description: //('科技主管部门待提交', '1');
      * //('科技主管部门已提交', '2');
      * //('不受理', '3');
      * //('已受理', '4');
@@ -170,19 +169,19 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //申请单位数据
         if ("faren_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
-            queryWrapper.in("project_status", 6,1,7,8,9,10);
+            queryWrapper.in("project_status", 6, 1, 7, 8, 9, 10);
 
         }
         // 区/县管理员数据
         if ("quxian_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
-            queryWrapper.in("project_status", 1,7,8,9,10);
+            queryWrapper.in("project_status", 1, 7, 8, 9, 10);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("project_status", 7,8,9,10);
+            queryWrapper.in("project_status", 7, 8, 9, 10);
         }
         if ("caizheng_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 8,9,10);
+            queryWrapper.in("budget_status", 8, 9, 10);
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -471,7 +470,11 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         log.setOperationTime(new Date());
         log.setProjectStatus("5");
         log.setBudgetStatus("5");
-        log.setOperationMark("审核取回");
+        if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
+            log.setOperationMark("申请人取回项目书，申请人取回预算书");
+        } else {
+            log.setOperationMark("审核驳回");
+        }
         iProjectLogService.save(log);
         return Result.OK("操作成功！");
     }
diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue
index f7b8e3d..329342b 100644
--- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue
@@ -211,7 +211,12 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
-    }];
+    },
+    {
+      label: '日志查询',
+      onClick: go_projectLog.bind(null, record),
+    }
+    ];
   //单位法人审核
   if (record.budgetStatus == 9) {
     actions.unshift({
@@ -236,6 +241,10 @@ function getTableAction(record) {
   return actions;
 }
 
+function go_projectLog(record) {
+  // go('/comp/jeecg/basic?id=' +'666');
+  go('/projectLog/projectLogList?id='+record.id);
+}
 
 </script>
 
diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue
index df49f88..d9ac2e0 100644
--- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue
@@ -211,7 +211,12 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
-    }];
+    },
+    {
+      label: '日志查询',
+      onClick: go_projectLog.bind(null, record),
+    }
+    ];
   //单位法人审核
   if (record.projectStatus == 6) {
     actions.unshift({
@@ -235,7 +240,10 @@ function getTableAction(record) {
   //('市科技局已提交', '8');
   return actions;
 }
-
+function go_projectLog(record) {
+  // go('/comp/jeecg/basic?id=' +'666');
+  go('/projectLog/projectLogList?id='+record.id);
+}
 
 </script>
 
diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue
index cfaa11a..b076208 100644
--- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue
@@ -211,7 +211,12 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
-    }];
+    },
+    {
+      label: '日志查询',
+      onClick: go_projectLog.bind(null, record),
+    }
+  ];
   //单位法人审核
   if (record.projectStatus == 7) {
     actions.unshift({
@@ -236,6 +241,10 @@ function getTableAction(record) {
   return actions;
 }
 
+function go_projectLog(record) {
+  // go('/comp/jeecg/basic?id=' +'666');
+  go('/projectLog/projectLogList?id='+record.id);
+}
 
 </script>
 
diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue
index 38b9960..170d059 100644
--- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue
@@ -211,7 +211,12 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
-    }];
+    },
+    {
+      label: '日志查询',
+      onClick: go_projectLog.bind(null, record),
+    }
+    ];
   if (record.projectStatus == 1) {
     actions.unshift({
         label: '通过',
@@ -235,7 +240,10 @@ function getTableAction(record) {
   return actions;
 }
 
-
+function go_projectLog(record) {
+  // go('/comp/jeecg/basic?id=' +'666');
+  go('/projectLog/projectLogList?id='+record.id);
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts b/jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts
index 8431f5c..9c609d7 100644
--- a/jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts
+++ b/jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts
@@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'projectName'
    },
+   {
+    title: '操作人名称',
+    align:"center",
+    dataIndex: 'operatorName'
+   },
    {
     title: '操作说明',
     align:"center",
@@ -20,11 +25,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'operationTime'
    },
-   {
-    title: '操作人名称',
-    align:"center",
-    dataIndex: 'operatorName'
-   },
    {
     title: '项目书状态',
     align:"center",
diff --git a/jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue b/jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue
index afc229c..7aecaaf 100644
--- a/jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue
+++ b/jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue
@@ -1,190 +1,61 @@
 <template>
-  <div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" 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 v-auth="'projectLog:project_log:deleteBatch'">批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal>
-  </div>
+  <BasicModal @register="registerProjectLogModal" title="日志" width="1024px" @ok="onOk">
+    <a-card :current="2" title="流程进度" :bordered="true">
+      <a-steps size="small">
+        <a-step title="申请人提交"/>
+        <a-step title="申请单位提交"/>
+        <a-step title="科技主管提交"/>
+        <a-step title="市科技局提交"/>
+        <a-step title="财政主管处理"/>
+      </a-steps>
+    </a-card>
+    <BasicTable @register="projectLog"/>
+  </BasicModal>
 </template>
 
-<script lang="ts" name="projectLog-projectLog" setup>
-import {ref, reactive, computed, unref} from 'vue';
-import {BasicTable, useTable, TableAction} from '/@/components/Table';
-import {useModal} from '/@/components/Modal';
-import { useListPage } from '/@/hooks/system/useListPage'
-import ProjectLogModal from './components/ProjectLogModal.vue'
-import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
-import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import { useUserStore } from '/@/store/modules/user';
-const queryParam = reactive<any>({});
-const checkedKeys = ref<Array<string | number>>([]);
-const userStore = useUserStore();
-//注册model
-const [registerModal, {openModal}] = useModal();
-//注册table数据
-const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-  tableProps:{
-    title: '项目操作日志',
-    api: list,
-    columns,
-    canResize:false,
-    formConfig: {
-      //labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter:true,
-      showAdvancedButton:true,
-      fieldMapToNumber: [
-      ],
-      fieldMapToTime: [
-      ],
-    },
-    actionColumn: {
-      width: 120,
-      fixed:'right'
-    },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
-    },
-  },
-  exportConfig: {
-    name:"项目操作日志",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-})
+<script lang="ts">
+import {defineComponent,defineProps} from 'vue';
+import {useAttrs} from '/@/hooks/core/useAttrs';
+import {BasicModal, useModalInner} from '/@/components/Modal';
+import PageWrapper from "@/components/Page/src/PageWrapper.vue";
+import {BasicTable, useTable} from '/@/components/Table';
+import {columns} from "@/views/projectLog/ProjectLog.data";
+import {list} from "@/views/projectLog/ProjectLog.api";
+import {useRoute} from "vue-router";
+import {defHttp} from "@/utils/http/axios";
+const props = defineProps(['projectId'])
+const route = useRoute();
 
-const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+const list2 = () =>{
+   // console.log("projectId",props.projectId)
+  let params = {projectId:'1849284130146025473'}
+  return defHttp.get({url: '/projectLog/projectLog/list', params});
+}
 
-// 高级查询配置
-const superQueryConfig = reactive(superQuerySchema);
 
-/**
- * 高级查询事件
- */
-function handleSuperQuery(params) {
-  Object.keys(params).map((k) => {
-    queryParam[k] = params[k];
-  });
-  reload();
-}
-/**
- * 新增事件
- */
-function handleAdd() {
-  openModal(true, {
-    isUpdate: false,
-    showFooter: true,
-  });
-}
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: true,
-  });
-}
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: false,
-  });
-}
-/**
- * 删除事件
- */
-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),
-      auth: 'projectLog:project_log:edit'
-    }
-  ]
-}
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record){
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-        placement: 'topLeft',
-      },
-      auth: 'projectLog:project_log:delete'
-    }
-  ]
-}
+export default defineComponent({
+  name: 'ProjectLogModal',
+  inheritAttrs: false,
+  components: {BasicTable, PageWrapper, BasicModal},
+  setup() {
+    const attrs = useAttrs();
+    const [registerProjectLogModal, {closeModal}] = useModalInner();
 
+    const [projectLog] = useTable({
+      label: '项目日志',
+      columns: columns,
+      pagination: false,
+      // dataSource: null,
+      api: list2,
+      showIndexColumn: false,
+      scroll: {y: 300},
+    });
 
-</script>
+    function onOk() {
+      closeModal();
+    }
 
-<style lang="less" scoped>
-:deep(.ant-picker),:deep(.ant-input-number){
-  width: 100%;
-}
-</style>
+    return {attrs, registerProjectLogModal, projectLog, onOk};
+  },
+});
+</script>
diff --git a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue
index 71e5049..8782825 100644
--- a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue
+++ b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue
@@ -1,199 +1,221 @@
 <template>
   <div>
+    <a-card :current="null" title="流程进度" :bordered="false">
+      <a-steps size="small">
+        <a-step title="申请人提交"/>
+        <a-step title="申请单位提交"/>
+        <a-step title="科技主管提交"/>
+        <a-step title="市科技局提交"/>
+        <a-step title="财政主管处理"/>
+      </a-steps>
+    </a-card>
     <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-<!--      <template #tableTitle>
-          <a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" 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 v-auth="'projectLog:project_log:deleteBatch'">批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-        &lt;!&ndash; 高级查询 &ndash;&gt;
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-       &lt;!&ndash;操作栏&ndash;&gt;
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      &lt;!&ndash;字段回显插槽&ndash;&gt;
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <!--      <template #tableTitle>
+                <a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+                <a-button  type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                <j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" 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 v-auth="'projectLog:project_log:deleteBatch'">批量操作
+                      <Icon icon="mdi:chevron-down"></Icon>
+                    </a-button>
+              </a-dropdown>
+              &lt;!&ndash; 高级查询 &ndash;&gt;
+              <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+            </template>
+             &lt;!&ndash;操作栏&ndash;&gt;
+            <template #action="{ record }">
+              <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+            </template>
+            &lt;!&ndash;字段回显插槽&ndash;&gt;
+            <template v-slot:bodyCell="{ column, record, index, text }">
+            </template>-->
     </BasicTable>
     <!-- 表单区域 -->
     <ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal>
   </div>
+  <div class="button-container">
+    <a-button type="primary" @click="router.back()">返回</a-button>
+  </div>
 </template>
 
 <script lang="ts" name="projectLog-projectLog" setup>
-  import {ref, reactive, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import ProjectLogModal from './components/ProjectLogModal.vue'
-  import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import { useUserStore } from '/@/store/modules/user';
-  import {useRoute} from "vue-router";
-  import {defHttp} from "@/utils/http/axios";
-  const queryParam = reactive<any>({});
-  const checkedKeys = ref<Array<string | number>>([]);
-  const userStore = useUserStore();
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-
-  const route = useRoute();
-  const listByProjectId = () =>{
-    // console.log("projectId",props.projectId)
-    let params = {projectId: route.query.id}
-    return defHttp.get({url: '/projectLog/projectLog/list', params});
-  }
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '项目操作日志',
-           api: listByProjectId,
-           columns,
-           canResize:false,
-           formConfig: {
-              //labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-               fixed:'right'
-            },
-            beforeFetch: (params) => {
-              return Object.assign(params, queryParam);
-            },
+
+import {reactive, ref} from 'vue';
+import {BasicTable} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import ProjectLogModal from './components/ProjectLogModal.vue'
+import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
+import {batchDelete, deleteOne, getExportUrl, getImportUrl} from './ProjectLog.api';
+import {useUserStore} from '/@/store/modules/user';
+import {useRoute, useRouter} from "vue-router";
+import {defHttp} from "@/utils/http/axios";
+
+const queryParam = reactive<any>({});
+const checkedKeys = ref<Array<string | number>>([]);
+const userStore = useUserStore();
+const router = useRouter();
+//注册model
+const [registerModal, {openModal}] = useModal();
+
+const route = useRoute();
+const listByProjectId = () => {
+  let params = {projectId: route.query.id}
+  return defHttp.get({url: '/projectLog/projectLog/list', params});
+}
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '',
+    api: listByProjectId,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 120,
+      fixed: 'right'
+    },
+    beforeFetch: (params) => {
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "项目操作日志",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  reload();
+}
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+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),
+      auth: 'projectLog:project_log:edit'
+    }
+  ]
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
       },
-       exportConfig: {
-            name:"项目操作日志",
-            url: getExportUrl,
-            params: queryParam,
-          },
-          importConfig: {
-            url: getImportUrl,
-            success: handleSuccess
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
-
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    reload();
-  }
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  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),
-           auth: 'projectLog:project_log:edit'
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           },
-           auth: 'projectLog:project_log:delete'
-         }
-       ]
-   }
+      auth: 'projectLog:project_log:delete'
+    }
+  ]
+}
 
 
 </script>
 
 <style lang="less" scoped>
-  :deep(.ant-picker),:deep(.ant-input-number){
-    width: 100%;
-  }
+:deep(.ant-picker), :deep(.ant-input-number) {
+  width: 100%;
+}
+ .button-container {
+   text-align: center;
+ }
 </style>

From f926cad86abceac143887ab28724d9eefb974768 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Thu, 7 Nov 2024 09:31:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?mainOut.ts=20=E4=BF=AE=E6=94=B9=2011.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/router/helper/mainOut.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/router/helper/mainOut.ts b/jeecgboot-vue3/src/router/helper/mainOut.ts
index c4e8005..190f34b 100644
--- a/jeecgboot-vue3/src/router/helper/mainOut.ts
+++ b/jeecgboot-vue3/src/router/helper/mainOut.ts
@@ -67,7 +67,7 @@ export const mainOutRoutes: AppRouteModule[] = [
       {
         path: '/main-home/newsList',
         name: 'NewsList',
-        component: () => import('/@/views/demo/main-home/components/newsList/index.vue'),
+        component: () => import('/@/views/demo/main-home/components/NewsList/index.vue'),
         meta: {
           title: '新闻列表',
           ignoreAuth: true,
@@ -76,7 +76,7 @@ export const mainOutRoutes: AppRouteModule[] = [
       {
         path: '/main-home/newsInfo',
         name: 'NewsIndo',
-        component: () => import('/@/views/demo/main-home/components/newsInFo/index.vue'),
+        component: () => import('/@/views/demo/main-home/components/newsInfo/index.vue'),
         meta: {
           title: '新闻详情',
           ignoreAuth: true,