预算书-财政拨款、年度预算表 功能添加 10.31

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depfile/controller/DepfileController.java

@@ -13,6 +13,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -28,6 +29,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -61,6 +64,9 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 	 @Autowired
 	 private IDepadminlxService depadminlxService;
 
+	 @Autowired
+	 private ISysDepartService iSysDepartService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -85,6 +91,27 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * @description: 申报书-单位管理员上传附件查询
+	 * @param: [depfile, pageNo, pageSize, req]
+	 * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.depfile.entity.Depfile>>
+	 * @author: z.h.c
+	 * @date: 24/11/1 16:38
+	 */
+	@ApiOperation(value="申报书-单位管理员上传附件查询", notes="申报书-单位管理员上传附件查询")
+	@GetMapping(value = "/getDepFileList")
+	public Result<IPage<Depfile>> getDepFileList(Depfile depfile,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode, depfile.getDepid()));
+		depfile.setDepid(sysDepart.getId());
+        QueryWrapper<Depfile> queryWrapper = QueryGenerator.initQueryWrapper(depfile, req.getParameterMap());
+		Page<Depfile> page = new Page<Depfile>(pageNo, pageSize);
+		IPage<Depfile> pageList = depfileService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
 	/**
 	 *   添加
 	 *

jeecgboot-vue3/src/views/depfile/Depfile.api.ts

@@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/depfile/depfile/list',
+  getDepFileList = '/depfile/depfile/getDepFileList',
   save='/depfile/depfile/add',
   edit='/depfile/depfile/edit',
   deleteOne = '/depfile/depfile/delete',
@@ -30,6 +31,8 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+export const listDepFile = (params) => defHttp.get({ url: Api.getDepFileList, params });
+
 /**
  * 删除单个
  * @param params

jeecgboot-vue3/src/views/depfile/Depfile.data.ts

@@ -42,6 +42,44 @@ export const columns: BasicColumn[] = [
   },
 ];
 
+export const columns2: BasicColumn[] = [
+  /*{
+    title: '部门名称',
+    align: "center",
+    dataIndex: 'depid_dictText'
+  },*/
+  {
+    title: '附件名称',
+    align: "center",
+    dataIndex: 'filename'
+  },
+  /*{
+    title: '认定部门及批号',
+    align: "center",
+    dataIndex: 'depnumber'
+  },
+  {
+    title: '认定时间',
+    align: "center",
+    dataIndex: 'rdtime'
+  },*/
+  {
+    title: '附件',
+    align: "center",
+    dataIndex: 'upfile',
+  },
+  {
+    title: '类型',
+    align: "center",
+    dataIndex: 'filehz'
+  },
+ /* {
+    title: '文件类型',
+    align: "center",
+    dataIndex: 'filelx_dictText'
+  },*/
+];
+
 // 高级查询数据
 export const superQuerySchema = {
   depid: {title: '部门名称',order: 0,view: 'sel_search', type: 'string',dictTable: "sys_depart", dictCode: 'id', dictText: 'depart_name',},

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/FuJianDemo.vue

@@ -22,6 +22,9 @@
     <!-- 表单区域 -->
     <ProjectFileModal @register="registerModal" @success="handleSuccess"></ProjectFileModal>
   </div>
+  <div>
+    <BasicTable title="单位管理员上传附件" @register="depfileTable" />
+  </div>
   <div class="button-container">
     <a-button type="primary" @click="goBack">返回</a-button>
   </div>
@@ -38,6 +41,8 @@ import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from '/@/views/
 import { downloadFile } from '/@/utils/common/renderUtils';
 import { useUserStore } from '/@/store/modules/user';
 import {useRoute, useRouter} from "vue-router";
+import {listDepFile} from "@/views/depfile/Depfile.api";
+import {columns2} from "@/views/depfile/Depfile.data";
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
 const userStore = useUserStore();
@@ -100,6 +105,27 @@ function goBack() {
   back();
 };
 
+
+const [depfileTable] = useTable({
+  label: '单位管理员上传附件',
+  columns: columns2,
+  pagination: false,
+  // dataSource: null,
+  api: listdepfileByDepId,
+  showIndexColumn: false,
+  scroll: {y: 300},
+});
+
+async function listdepfileByDepId() {
+  let params = {
+    depid: userStore.getUserInfo.orgCode,
+    filelx: '1',
+  };
+  console.log(JSON.stringify(params));
+  return await listDepFile(params);
+};
+
+
 /**
  * 高级查询事件
  */

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue

@@ -11,7 +11,7 @@
 <!--        <a-tab-pane key="JeecgPdfView" tab="PDF预览"></a-tab-pane>-->
         <a-tab-pane key="XiangMuJiXiaoMuBiaoDemo" tab="项目绩效目标"></a-tab-pane>
         <a-tab-pane key="YiJianDemo" tab="意见"></a-tab-pane>
-        <a-tab-pane key="FuJianDemo" tab="文件上传"></a-tab-pane>
+        <a-tab-pane key="FuJianDemo" tab="附件"></a-tab-pane>
       </a-tabs>
       <component :is="currentComponent"></component>
     </a-card>