From 678ad047199333f438e0b1c9a4e39609538ea745 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Sun, 10 Nov 2024 20:46:14 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2011?=
 =?UTF-8?q?.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectController.java | 20 +++++++++++--------
 .../service/impl/ProjectServiceImpl.java      |  2 +-
 .../ProjectAnnualBudgetController.java        |  6 +++---
 .../system/controller/SysUserController.java  |  1 +
 4 files changed, 17 insertions(+), 12 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 a68e2e6..d80deb5 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
@@ -124,7 +124,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
     /**
      * @description: 申报列表，不同角色可见数据
      * @param: [project, pageNo, pageSize, req]
-     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.project.entity.Project>>
+     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.demo.project.entity.Project>>
      * @author: z.h.c
      * @date: 24/11/7 14:56
      */
@@ -303,11 +303,10 @@ public class ProjectController extends JeecgController<Project, IProjectService>
             queryWrapper.in("project_status", 12);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 11,12);
+            queryWrapper.in("budget_status", 11, 12);
         }
 
 
-
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -357,7 +356,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
             queryWrapper.in("project_status", 13);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 12,13);
+            queryWrapper.in("budget_status", 12, 13);
         }
 
         IPage<Project> pageList = projectService.page(page, queryWrapper);
@@ -420,7 +419,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         project.setAnnualName(projectType.getAnnualName());
         project.setProjectTypeName(projectType.getTypeName());
-        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
         project.setDepartName(sysDepart.getDepartName());
         SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
         project.setProjectCharger(sysUser.getRealname());
@@ -434,7 +433,8 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         project.setAnnualName(projectType.getAnnualName());
         project.setProjectTypeName(projectType.getTypeName());
-        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+//        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
         project.setDepartName(sysDepart.getDepartName());
         SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
         project.setProjectCharger(sysUser.getRealname());
@@ -522,8 +522,12 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getDepid, project.getSysOrgCode()));
         DepartExtDto2 dto = new DepartExtDto2();
         BeanUtils.copyProperties(sysDepart, dto);
-        BeanUtils.copyProperties(departExt, dto);
-        BeanUtils.copyProperties(depadminlx, dto);
+        if (ObjectUtil.isNotEmpty(departExt)) {
+            BeanUtils.copyProperties(departExt, dto);
+        }
+        if (ObjectUtil.isNotEmpty(depadminlx)) {
+            BeanUtils.copyProperties(depadminlx, dto);
+        }
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         dto.setAnnualName(projectType.getAnnualName());
         List<DictModel> dictModels = sysBaseApi.queryDictItemsByCode("depart_type");
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
index a41dab5..153608c 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
@@ -106,7 +106,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         BeanUtils.copyProperties(dto, sysDepart);
         BeanUtils.copyProperties(dto, userExt);
         BeanUtils.copyProperties(dto, project);
-        project.setSysOrgCode(loginUser.getOrgId());
+        project.setSysOrgCode(loginUser.getOrgCode());
         this.updateById(project);
 
         userExt.setUserId(loginUser.getId());
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
index edfbd16..60fd44c 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
@@ -154,9 +154,9 @@ public class ProjectAnnualBudgetController extends JeecgController<ProjectAnnual
     @GetMapping(value = "/queryByProjectId/{projectId}")
     public Result<ProjectAnnualBudget> queryByProjectId(@PathVariable("projectId") String projectId) {
         ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId,projectId));
-        if (projectAnnualBudget == null) {
-            return Result.error("未找到对应数据");
-        }
+        /*if (projectAnnualBudget == null) {
+            return Result.error("暂无数据");
+        }*/
         return Result.OK(projectAnnualBudget);
     }
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 1c2c097..83a7360 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -2024,6 +2024,7 @@ public class SysUserController {
             user.setSalt(salt);
             user.setUsername(username);
             user.setWorkNo(workon);
+            user.setOrgCode(depart.getOrgCode());
             user.setRealname(realname);
             user.setPassword(passwordEncode);
             //user.setEmail(email);

From 1d615430e0a28e3bef913277c9f7d5b1f8de1262 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Sun, 10 Nov 2024 20:46:51 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue   | 4 ++--
 .../src/views/system/usersetting/BaseSetting.vue          | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
index b29caed..81d1537 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
@@ -212,8 +212,8 @@
   //账号登录表单字段
   const formData = reactive<any>({
     inputCode: '',
-    username: 'admin',
-    password: '123456',
+    username: '',
+    password: '',
   });
   //手机登录表单字段
   const phoneFormData = reactive<any>({
diff --git a/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue b/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
index 619a538..39f9e05 100644
--- a/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
+++ b/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
@@ -39,10 +39,10 @@
           <span class="gray-75 item-label">性别</span>
           <span class="gray-3">{{ userInfo.sexText }}</span>
         </div>
-        <div class="margin-bottom-10 nowarp font-size-13">
-          <span class="gray-75 item-label">职位</span>
-          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
-        </div>
+<!--        <div class="margin-bottom-10 nowarp font-size-13">-->
+<!--          <span class="gray-75 item-label">职位</span>-->
+<!--          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>-->
+<!--        </div>-->
         <div class="font-size-13">
           <span class="item-label"></span>
           <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>

From 8334f69584a690fd9fa639d3a0329cece60fde07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 21:44:51 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java
index 9416b57..61be0f0 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java
@@ -60,5 +60,5 @@ public interface ExpertMapper extends BaseMapper<Expert> {
     void handlebackcount(String id);
 
     @Update("UPDATE sys_user SET sex = #{sex} , avatar = #{topPic}    WHERE username = #{seusername}")
-    void updateuser(String topPic, Integer sex, String seusername);
+    void updateuser(@Param("topPic") String topPic, @Param("sex") Integer sex,@Param("seusername")  String seusername);
 }

From 31409fdfb7b56f2feb1a6e45e31371669c72b723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 11 Nov 2024 09:02:54 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DepsbnczController.java        | 31 +++++++++++-----
 .../expert/controller/ExpertController.java   |  7 +++-
 .../src/views/depsbncz/DepsbnczList.vue       | 18 ++++++++++
 .../depsbncz/components/DepsbnczForm.vue      |  7 ++++
 .../src/views/expert/admin/ExpertList.vue     | 23 +++++-------
 .../src/views/expert/adminback/ExpertList.vue | 23 +++++-------
 .../src/views/expert/county/ExpertList.vue    | 23 ++++++------
 .../src/views/expert/firm/ExpertList.vue      | 29 +++++----------
 .../src/views/expert/self/ExpertList.vue      | 35 +------------------
 .../src/views/expert/selfback/ExpertList.vue  | 35 +------------------
 10 files changed, 94 insertions(+), 137 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java
index 942098d..e741d62 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java
@@ -120,16 +120,19 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		depsbncz.setUserid(user.getId());
 		String depiid = depadminlxService.getdepid(user.getId());
-		// 获取当前日期
-		LocalDate currentDate = LocalDate.now();
-		// 获取当前年份并直接转换为字符串
-		String currentYearString = String.valueOf(currentDate.getYear());
-		Annual annual = annualService.query().eq("annual_name",currentYearString).one();
-		List<Depsbncz> depsbnczs=depsbnczService.query().eq("annualid",annual.getId()).eq("depid",depiid).list();
-		if (depsbnczs.size()>0){
+		if (depiid == null || depiid.isEmpty()){
+			return Result.error("请确定自己的单位信息是否完整");
+		}
+		List<Depsbncz> depsbnczList =depsbnczService.query().eq("annualid",depsbncz.getAnnualid()).eq("depid",depiid).list();
+		int a=0;
+		if (depsbnczList == null || depsbnczList.isEmpty()) {
+
+		} else {
+			a=depsbnczList.size();
+		}
+		if (a>0){
 			return Result.error("本年度已经添加过了");
 		}else {
-			depsbncz.setAnnualid(annual.getId());
 			depsbncz.setDepid(depiid);
 			depsbnczService.save(depsbncz);
 			return Result.OK("添加成功！");
@@ -146,6 +149,18 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 	@ApiOperation(value="上年度(末)主要财务数据-编辑", notes="上年度(末)主要财务数据-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Depsbncz depsbncz) {
+
+		List<Depsbncz> depsbnczList =depsbnczService.query().eq("annualid",depsbncz.getAnnualid()).eq("depid",depsbncz.getDepid()).list();
+		int a=0;
+		if (depsbnczList == null || depsbnczList.isEmpty()) {
+
+		} else {
+			a=depsbnczList.size();
+		}
+		if (a>0){
+			return Result.error("每年度仅可添加一次");
+		}
+
 		depsbnczService.updateById(depsbncz);
 		return Result.OK("编辑成功!");
 	}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
index 86d98f5..b26cfda 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
@@ -173,7 +173,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 //开始对比两个List获取相同部分，获取的交叉id就是需要的id
 		 List<String> commonElements = userdepids.stream().filter(userbyrole::contains).collect(Collectors.toList());
 		 //根据查询的userid去获取username
-		 List<SysUser> sysUserList = sysUserService.query().in("id",commonElements).list();
+		 List<SysUser> sysUserList =new ArrayList<>();
+		 if(commonElements!=null && !commonElements.isEmpty()) {
+			 sysUserList = sysUserService.query().in("id", commonElements).list();
+		 } else{
+			 return Result.error("目前没有专家注册。");
+		 }
 		 //根据查询的结果获取username的list
 		 List<String> usernames = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
 
diff --git a/jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue b/jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue
index a9aa5ee..3407a05 100644
--- a/jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue
+++ b/jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue
@@ -4,6 +4,24 @@
     <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="annualid">
+              <template #label><span title="年度">年度</span></template>
+              <j-search-select placeholder="请选择年度" v-model:value="queryParam.annualid" dict="annual,annual_name,id" allow-clear />
+            </a-form-item>
+          </a-col>
+          <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>
diff --git a/jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue b/jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue
index b600b31..a275b60 100644
--- a/jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue
+++ b/jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue
@@ -4,6 +4,11 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DepsbnczForm">
           <a-row>
+            <a-col :span="24">
+              <a-form-item label="年度" v-bind="validateInfos.annualid" id="DepsbnczForm-annualid" name="annualid">
+                <j-search-select v-model:value="formData.annualid" dict="annual,annual_name,id"  allow-clear />
+              </a-form-item>
+            </a-col>
 <!--						<a-col :span="24">
 							<a-form-item label="部门" v-bind="validateInfos.depid" id="DepsbnczForm-depid" name="depid">
 								<j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id"  allow-clear />
@@ -96,6 +101,8 @@
     jyzc: '',
     jyjy: '',
     nsze: '',
+    annualid: '',
+
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
index 72d4814..341b264 100644
--- a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
@@ -7,28 +7,20 @@
           <a-col :lg="6">
             <a-form-item name="seusername">
               <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
+              <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+            <a-form-item name="compopen">
+              <template #label><span title="部门审核">部门审核</span></template>
+              <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
-            <a-form-item name="adminopen">
-              <template #label><span title="管理员审核">管理员审</span></template>
-              <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
-            </a-form-item>
-          </a-col>
-
-
           <template v-if="toggleSearchStatus">
             <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="细分方向">细分方向</span></template>
-                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
+              <a-form-item name="adminopen">
+                <template #label><span title="管理员审核">管理员审</span></template>
+                <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
               </a-form-item>
             </a-col>
           </template>
@@ -96,6 +88,7 @@
   import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
   import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
diff --git a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
index 0a9d6c0..ce2125d 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
@@ -7,28 +7,20 @@
           <a-col :lg="6">
             <a-form-item name="seusername">
               <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
+              <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+            <a-form-item name="compopen">
+              <template #label><span title="部门审核">部门审核</span></template>
+              <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
-            <a-form-item name="adminopen">
-              <template #label><span title="管理员审核">管理员审</span></template>
-              <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
-            </a-form-item>
-          </a-col>
-
-
           <template v-if="toggleSearchStatus">
             <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="细分方向">细分方向</span></template>
-                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
+              <a-form-item name="adminopen">
+                <template #label><span title="管理员审核">管理员审</span></template>
+                <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
               </a-form-item>
             </a-col>
           </template>
@@ -94,6 +86,7 @@
   import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
   import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
diff --git a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue
index 5de33c8..55e1dfd 100644
--- a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue
@@ -7,21 +7,23 @@
           <a-col :lg="6">
             <a-form-item name="seusername">
               <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
+              <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="adminopen">
-              <template #label><span title="管理员审核">管理员审</span></template>
-              <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
+            <a-form-item name="compopen">
+              <template #label><span title="部门审核">部门审核</span></template>
+              <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="adminopen">
+                <template #label><span title="管理员审核">管理员审</span></template>
+                <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" 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">
@@ -87,6 +89,7 @@
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
   import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
   import {handlebackback} from "@/views/expert/firm/Expert.api";
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
diff --git a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
index 5738052..2a2468b 100644
--- a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
@@ -7,32 +7,20 @@
           <a-col :lg="6">
             <a-form-item name="seusername">
               <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
+              <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-<!--            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
-            </a-form-item>-->
-
-              <a-form-item name="compopen">
-                <template #label><span title="部门审核">部门审核</span></template>
-                <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
-              </a-form-item>
-
+            <a-form-item name="compopen">
+              <template #label><span title="部门审核">部门审核</span></template>
+              <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
+            </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="细分方向">细分方向</span></template>
-                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="compopen">
-                <template #label><span title="部门审核">部门审核</span></template>
-                <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
+              <a-form-item name="adminopen">
+                <template #label><span title="管理员审核">管理员审</span></template>
+                <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
               </a-form-item>
             </a-col>
           </template>
@@ -98,6 +86,7 @@
   import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
   import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
diff --git a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
index f0b2624..66e5618 100644
--- a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
@@ -3,40 +3,7 @@
     <!--查询区域-->
     <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="seusername">
-              <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="细分方向">细分方向</span></template>
-                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></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>
     <!--引用表格-->
diff --git a/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue b/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
index 1d0fe29..5fd2f11 100644
--- a/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
@@ -3,40 +3,7 @@
     <!--查询区域-->
     <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="seusername">
-              <template #label><span title="用户名">用户名</span></template>
-              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="directioncal">
-              <template #label><span title="研究领域">研究领域</span></template>
-              <a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="6">
-              <a-form-item name="research">
-                <template #label><span title="细分方向">细分方向</span></template>
-                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></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>
     <!--引用表格-->

From 7a89eb6d8dc5f8f81d6375bffdc9fc52551aa93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 11 Nov 2024 09:22:22 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/CmsArticleController.java  |  50 ++++
 .../cms/admin/articelJSJL/CmsArticle.api.ts   |  77 ++++++
 .../cms/admin/articelJSJL/CmsArticle.data.ts  | 173 ++++++++++++
 .../cms/admin/articelJSJL/CmsArticleList.vue  | 249 ++++++++++++++++++
 .../admin/articelJSJL/CmsArticleListzwh.vue   | 249 ++++++++++++++++++
 .../articelJSJL/CmsArticle_menu_insert.sql    |  26 ++
 .../articelJSJL/components/CmsArticleForm.vue |  70 +++++
 .../components/CmsArticleModal.vue            |  66 +++++
 8 files changed, 960 insertions(+)
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue
 create mode 100644 jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
index 4636ece..794504c 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
@@ -73,6 +73,19 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
         return Result.OK(pageList);
     }
 
+    @ApiOperation(value = "文章-分页列表查询", notes = "文章-分页列表查询")
+    @GetMapping(value = "/listJSJLNEW")
+    public Result<IPage<CmsArticle>> queryPlistJSJLNEWageList(CmsArticle cmsArticle,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest req) {
+        QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
+        queryWrapper.eq("column_id","1855427069138923522");
+        Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
+        IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
 
 
     /**
@@ -134,6 +147,43 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
         return Result.OK("添加成功！");
     }
 
+
+    /**
+     * 添加
+     *
+     * @param cmsArticle
+     * @return
+     */
+    @AutoLog(value = "文章-添加")
+    @ApiOperation(value = "文章-添加", notes = "文章-添加")
+//    @RequiresPermissions("cms:cms_article:add")
+    @PostMapping(value = "/addJSJLNEW")
+    public Result<String> addJSJLNEW(@RequestBody CmsArticle cmsArticle) {
+        LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmsArticle.setCreateBy(principal.getUsername());
+        CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());
+        cmsArticle.setColumnName(cmsColumn.getName());
+//        if (StringUtils.equals("1", cmsArticle.getStatus())) {
+        cmsArticle.setPublishTime(new Date());
+        cmsArticle.setStatus("1");
+        cmsArticle.setColumnId("1855427069138923522");
+        cmsArticle.setColumnName("技术交流");
+//        }
+        /*QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>();
+        subwesideQueryWrapper.in("compadminid", principal.getId());
+        List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper);
+        if (!subwesideList.isEmpty()) {
+            List<String> subnames = subwesideList.stream()
+                    .map(Subweside::getSubname) // 将每个Subweside对象映射到其subname字段
+                    .collect(Collectors.toList()); // 收集结果到List<String>
+            String joinedString = String.join(", ", subnames);
+            cmsArticle.setSource("来自子站："+joinedString);
+        }else {
+            cmsArticle.setSource("");
+        }*/
+        cmsArticleService.save(cmsArticle);
+        return Result.OK("添加成功！");
+    }
     @ApiOperation(value = "文章管理-发布/取消发布", notes = "文章管理-发布/取消发布")
     @PostMapping(value = "/operationStatus")
     public Result<?> operationStatus(@RequestBody CmsArticle cmsArticle) {
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts
new file mode 100644
index 0000000..79a45c2
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts
@@ -0,0 +1,77 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  listzwh = '/cms/cmsArticle/listzwh',
+  list = '/cms/cmsArticle/listJSJLNEW',
+  save='/cms/cmsArticle/addJSJLNEW',
+  edit='/cms/cmsArticle/edit',
+  deleteOne = '/cms/cmsArticle/delete',
+  deleteBatch = '/cms/cmsArticle/deleteBatch',
+  importExcel = '/cms/cmsArticle/importExcel',
+  exportXls = '/cms/cmsArticle/exportXls',
+  operationStatus = '/cms/cmsArticle/operationStatus',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+export const updateStatus = (params) => defHttp.post({url: Api.operationStatus, params});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const listzwh = (params) =>
+  defHttp.get({url: Api.listzwh, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+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
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts
new file mode 100644
index 0000000..905fb6b
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts
@@ -0,0 +1,173 @@
+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: 'columnName'
+  },
+  {
+    title: '文章标题',
+    align: "center",
+    dataIndex: 'title',
+    // slots: {customRender: 'htmlSlot'},
+  },
+  {
+    title: '作者',
+    align: "center",
+    dataIndex: 'createBy_dictText'
+  },
+  {
+    title: '来源',
+    align: "center",
+    dataIndex: 'source'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText'
+  },
+  {
+    title: '发布时间',
+    align: "center",
+    dataIndex: 'publishTime'
+  },
+  // {
+  //   title: '源url',
+  //   align: "center",
+  //   dataIndex: 'originUrl'
+  // },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "所属栏目",
+    field: 'columnId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "cms_column,name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "文章标题",
+    field: 'title',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "是否发布",
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "captain_code"
+    },
+    colProps: {span: 3},
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '文章标题',
+    field: 'title',
+    component: 'Input',
+    dynamicRules: ({model, schema}) => {
+      return [
+        {required: true, message: '请输入文章标题!'},
+      ];
+    },
+  },
+/*  {
+    label: '所属栏目',
+    field: 'columnId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "cms_column,name,id"
+
+    },
+    dynamicRules: ({model, schema}) => {
+      return [
+        {required: true, message: '请输入所属栏目!'},
+      ];
+    },
+  },*/
+  {
+    label: '文章内容',
+    field: 'content',
+    component: 'JEditor',
+  },
+  // {
+  //   label: '所属栏目名称',
+  //   field: 'columnName',
+  //   component: 'Input',
+  // },
+  {
+    label: '发布时间',
+    field: 'publishTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '来源',
+    field: 'source',
+    component: 'Input',
+  },
+  {
+    label: '源url',
+    field: 'originUrl',
+    component: 'Input',
+  },
+
+  {
+    label: '文章图片',
+    field: 'comimg',
+    component: 'JImageUpload',
+    componentProps:{
+    },
+  },
+  {
+    label: '文章文件',
+    field: 'comfile',
+    component: 'JUpload',
+    componentProps:{
+    },
+  },
+
+  {
+    label: '简介',
+    field: 'info',
+    component: 'InputTextArea',
+  },
+/*  {
+    label: '文章来源',
+    field: 'artfrom',
+    component: 'JSearchSelect',
+    componentProps:{
+      dict: "subweside,subname,id"
+    },
+  },*/
+
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue
new file mode 100644
index 0000000..986a66a
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue
@@ -0,0 +1,249 @@
+<template>
+  <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)"/>-->
+        <TableAction :actions="getTableAction(record)"/>
+        <!--<TableAction
+          :stopButtonPropagation="true"
+          :actions="[
+                {
+                  label: '1',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'ant-design:plus-circle-outlined',
+                  onClick: add.bind(null, record),
+                },
+                {
+                  label: '2',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'fa6-regular:pen-to-square',
+                  onClick: editor.bind(null, record),
+                },
+                {
+                  label: '3',
+                  // color: 'error',
+                  icon: 'ic:outline-delete-outline',
+                  popConfirm: {
+                    title: '确定删除该数据吗？',
+                    confirm: del.bind(null, 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>
+    <!-- 表单区域 -->
+    <CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
+  </div>
+</template>
+
+<script lang="ts" name="cms-cmsArticle" setup>
+import {ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import CmsArticleModal from './components/CmsArticleModal.vue'
+import {columns, searchFormSchema} from './CmsArticle.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  list,
+  updateStatus
+} from './CmsArticle.api';
+// import {updateStatus} from './CmsArticle.api';
+import {Update} from "/@/views/topic/Topic.api";
+import {defHttp} from "/@/utils/http/axios";
+// import { downloadFile } from '/@/utils/common/renderUtils';
+const checkedKeys = ref<Array<string | number>>([]);
+//注册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: 180,
+      fixed: 'right'
+    },
+  },
+  exportConfig: {
+    name: "文章",
+    url: getExportUrl,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+function update2(record: Recordable, val) {
+  record.status = val;
+  updateStatus(record)
+  //第2种方法
+  // defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
+  reload()
+}
+
+/**
+ * 详情
+ */
+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) {
+  const actions = [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
+    {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ];
+  if (record.status == "1") {
+      actions.unshift({
+      label: '取消发布',
+      onClick: update2.bind(null,record, "0"),
+    });
+  }
+  if (record.status == "0") {
+      actions.unshift({
+      label: '发布',
+      onClick: update2.bind(null,record, "1"),
+    });
+  }
+  return actions;
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue
new file mode 100644
index 0000000..f3df9c8
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue
@@ -0,0 +1,249 @@
+<template>
+  <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)"/>-->
+        <TableAction :actions="getTableAction(record)"/>
+        <!--<TableAction
+          :stopButtonPropagation="true"
+          :actions="[
+                {
+                  label: '1',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'ant-design:plus-circle-outlined',
+                  onClick: add.bind(null, record),
+                },
+                {
+                  label: '2',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'fa6-regular:pen-to-square',
+                  onClick: editor.bind(null, record),
+                },
+                {
+                  label: '3',
+                  // color: 'error',
+                  icon: 'ic:outline-delete-outline',
+                  popConfirm: {
+                    title: '确定删除该数据吗？',
+                    confirm: del.bind(null, 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>
+    <!-- 表单区域 -->
+    <CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
+  </div>
+</template>
+
+<script lang="ts" name="cms-cmsArticle" setup>
+import {ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import CmsArticleModal from './components/CmsArticleModal.vue'
+import {columns, searchFormSchema} from './CmsArticle.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  listzwh,
+  updateStatus
+} from './CmsArticle.api';
+// import {updateStatus} from './CmsArticle.api';
+import {Update} from "/@/views/topic/Topic.api";
+import {defHttp} from "/@/utils/http/axios";
+// import { downloadFile } from '/@/utils/common/renderUtils';
+const checkedKeys = ref<Array<string | number>>([]);
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '文章',
+    api: listzwh,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 180,
+      fixed: 'right'
+    },
+  },
+  exportConfig: {
+    name: "文章",
+    url: getExportUrl,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+function update2(record: Recordable, val) {
+  record.status = val;
+  updateStatus(record)
+  //第2种方法
+  // defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
+  reload()
+}
+
+/**
+ * 详情
+ */
+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) {
+  const actions = [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
+    {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ];
+  if (record.status == "1") {
+      actions.unshift({
+      label: '取消发布',
+      onClick: update2.bind(null,record, "0"),
+    });
+  }
+  if (record.status == "0") {
+      actions.unshift({
+      label: '发布',
+      onClick: update2.bind(null,record, "1"),
+    });
+  }
+  return actions;
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql
new file mode 100644
index 0000000..0e34975
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql
@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/cms文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023101212013790550', NULL, '文章', '/cms/cmsArticleList', 'cms/CmsArticleList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790551', '2023101212013790550', '添加文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790552', '2023101212013790550', '编辑文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790553', '2023101212013790550', '删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790554', '2023101212013790550', '批量删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790555', '2023101212013790550', '导出excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790556', '2023101212013790550', '导入excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue
new file mode 100644
index 0000000..aeab99d
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue
@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../CmsArticle.data';
+    import {saveOrUpdate} from '../CmsArticle.api';
+    
+    export default defineComponent({
+        name: "CmsArticleForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/cms/cmsArticle/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
diff --git a/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue
new file mode 100644
index 0000000..d338f6e
--- /dev/null
+++ b/jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../CmsArticle.data';
+    import {saveOrUpdate} from '../CmsArticle.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>

From 401c11a55b396666712f6eee95b16a1b29860d7a Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 11 Nov 2024 09:23:09 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppointmentRecordController.java          |  28 ++
 .../AppointmentRecord.api.ts                  |   3 +
 .../AppointmentRecordList2.vue                | 302 ++++++++++++++++++
 3 files changed, 333 insertions(+)
 create mode 100644 jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java
index d7da315..8f60bbb 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java
@@ -116,6 +116,34 @@ public class AppointmentRecordController extends JeecgController<AppointmentReco
 		 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);
+	 }
+
 	/**
 	 *   添加
 	 *
diff --git a/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts b/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts
index 2efa0db..5ed5693 100644
--- a/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts
+++ b/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts
@@ -6,6 +6,7 @@ const { createConfirm } = useMessage();
 enum Api {
   list = '/appointmentrecord/appointmentRecord/list',
   list1 = '/appointmentrecord/appointmentRecord/list1',
+  list2 = '/appointmentrecord/appointmentRecord/list2',
   save='/appointmentrecord/appointmentRecord/add',
   edit='/appointmentrecord/appointmentRecord/edit',
   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 list2 = (params) => defHttp.get({ url: Api.list2, params });
+
 /**
  * 删除单个
  * @param params
diff --git a/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue b/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue
new file mode 100644
index 0000000..a1f800b
--- /dev/null
+++ b/jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue
@@ -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>

From 6900717cf4858d662ba4264e2f30c6c163340a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 11 Nov 2024 09:27:16 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/demo/cms/controller/CmsArticleController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
index 794504c..efb2ace 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
@@ -162,7 +162,7 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
         LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         cmsArticle.setCreateBy(principal.getUsername());
         CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());
-        cmsArticle.setColumnName(cmsColumn.getName());
+        /*cmsArticle.setColumnName(cmsColumn.getName());*/
 //        if (StringUtils.equals("1", cmsArticle.getStatus())) {
         cmsArticle.setPublishTime(new Date());
         cmsArticle.setStatus("1");

From b55040c4f9a8b48155a646f057c2337ea14020c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 11 Nov 2024 10:03:40 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/demo/cms/controller/CmsArticleController.java | 2 +-
 .../demo/expproject/controller/ExpprojectController.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
index efb2ace..3d7e852 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
@@ -161,7 +161,7 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
     public Result<String> addJSJLNEW(@RequestBody CmsArticle cmsArticle) {
         LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         cmsArticle.setCreateBy(principal.getUsername());
-        CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());
+        /*CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());*/
         /*cmsArticle.setColumnName(cmsColumn.getName());*/
 //        if (StringUtils.equals("1", cmsArticle.getStatus())) {
         cmsArticle.setPublishTime(new Date());
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
index 043981c..62f3811 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
@@ -126,7 +126,7 @@ public class ExpprojectController {
 			 IPage<Expproject> pageList = expprojectService.page(page, queryWrapper);
 			 return Result.OK(pageList);
 		 } else {
-			 return Result.error("未发现数据");
+			 return Result.error("您还没参加项目。");
 		 }
 
 	 }

From 41e29e26f061ea8942457e86319d200059a8b54e Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 11 Nov 2024 11:15:13 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/instrument/controller/InstrumentController.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
index 142518f..d495f3e 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
@@ -228,8 +228,12 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Instrument instrument) {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SysDepart sysDepart = sysDepartService.getById(loginUser.getOrgId());
+		if(sysDepart.getStatus().equals("0")){
+			return Result.error("该用户单位冻结,无法申请");
+		}
 		instrument.setDeclarationUnit(loginUser.getOrgId());
-		if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){
+		if(sysDepart.getOrgCategory().equals("3")){
 			instrument.setFlag("1");
 		}else{
 			instrument.setFlag("0");

From a4c6eceeb7c2f2743f12806bf839fa3bbc9fb862 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Mon, 11 Nov 2024 14:20:25 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2011?=
 =?UTF-8?q?.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/demo/project/controller/ProjectController.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d80deb5..c117481 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
@@ -519,7 +519,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
                 .eq(DepartExt::getDepartId, sysDepart.getId())
                 .eq(DepartExt::getProjectId, para.getId())
         );
-        Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getDepid, project.getSysOrgCode()));
+        Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getSysOrgCode, project.getSysOrgCode()));
         DepartExtDto2 dto = new DepartExtDto2();
         BeanUtils.copyProperties(sysDepart, dto);
         if (ObjectUtil.isNotEmpty(departExt)) {

From 7bdf838230e569f184f8f8365f4508582882a21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 11 Nov 2024 14:33:13 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E8=AF=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts b/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
index 8458b27..56f7431 100644
--- a/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
+++ b/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
@@ -53,7 +53,7 @@ export const expandproColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',
     },
-    {
+/*    {
       title: '所属领域',
       key: 'exptype',
       type: JVxeTypes.input,
@@ -61,7 +61,7 @@ export const expandproColumns: JVxeColumn[] = [
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
-    },
+    },*/
 /*    {
       title: '所属单位',
       key: 'ssdep',

From 0b41b3bbf516e7ede7d87fea272c2800e273bc95 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Tue, 12 Nov 2024 11:53:24 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=2011.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/config/shiro/ShiroConfig.java   |  2 ++
 .../controller/SysDepartController.java       | 21 +++++++++++++--
 .../modules/system/vo/QuXianDepartVo.java     | 16 +++++++++++
 jeecgboot-vue3/src/api/sys/user.ts            |  5 ++++
 .../system/loginmini/MiniRegister4faren.vue   | 27 ++++++++++++++++---
 5 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java

diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 9d7ec6c..37da5a6 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -191,6 +191,8 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时，选择部门列表
 
+        filterChainDefinitionMap.put("/sys/sysDepart/getDepartList4Quxian", "anon");//法人注册时，获取区县级别部门列表
+
 
 
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 94d75ba..e97c8a3 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -25,6 +26,7 @@ import org.jeecg.modules.system.model.SysDepartTreeModel;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.QuXianDepartVo;
 import org.jeecg.modules.system.vo.SysDepartExportVo;
 import org.jeecg.modules.system.vo.lowapp.ExportDepartVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -198,6 +200,21 @@ public class SysDepartController {
         return result;
     }
 
+    @ApiOperation(value = "法人注册时，获取区县级别部门", notes = "法人注册时，获取区县级别部门")
+    @GetMapping(value = "/getDepartList4Quxian")
+    public Result<List<QuXianDepartVo>> getDepartList4Quxian() {
+        SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, ""));
+        List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()));
+        List<QuXianDepartVo> quXianDepartVos = new ArrayList<>();
+        Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> {
+            QuXianDepartVo vo = new QuXianDepartVo();
+            vo.setDepName(depart.getDepartName());
+            vo.setDepId(depart.getId());
+            quXianDepartVos.add(vo);
+        });
+        return Result.OK(quXianDepartVos);
+    }
+
     /**
      * 获取某个部门的所有父级部门的ID
      *
@@ -247,8 +264,8 @@ public class SysDepartController {
         } else if ("quxian_admin".equals(user.getRoleCode())) {
             queryWrapper.eq("parent_id", user.getOrgId());
         } else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门
-            queryWrapper.ne("depart_name_abbr","null");
-            queryWrapper.ne("depart_name_abbr","");
+            queryWrapper.ne("depart_name_abbr", "null");
+            queryWrapper.ne("depart_name_abbr", "");
         }
         return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java
new file mode 100644
index 0000000..aca01e3
--- /dev/null
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+
+/**
+ * @Description: TODO
+ * @Author: Z.H.C
+ * @CreateTime: 2024-11-12 11:20
+ * @Version: 1.0
+ */
+
+@Data
+public class QuXianDepartVo {
+    private String depId;
+    private String depName;
+}
diff --git a/jeecgboot-vue3/src/api/sys/user.ts b/jeecgboot-vue3/src/api/sys/user.ts
index 1e64eec..76c4e1e 100644
--- a/jeecgboot-vue3/src/api/sys/user.ts
+++ b/jeecgboot-vue3/src/api/sys/user.ts
@@ -50,6 +50,7 @@ enum Api {
   //监控二维码扫描状态
   getQrcodeToken = '/sys/getQrcodeToken',
   getdepdataapi= '/expert/expert/getdepdata',
+  getDepartList4Quxian = '/sys/sysDepart/getDepartList4Quxian',
 }
 
 /**
@@ -244,4 +245,8 @@ export async function validateCasLogin(params) {
 export async function getdepdata(params) {
   let url = Api.getdepdataapi;
   return defHttp.get({ url: url, params });
+
+
+}export async function departList4Quxian(params) {
+  return defHttp.get({ url: Api.getDepartList4Quxian, params });
 }
diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
index 33ce11c..5e25518 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
@@ -39,10 +39,16 @@
                         <a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" />
                       </div>
                   </a-form-item>
-                  <a-form-item>
+<!--                  <a-form-item>
                     <div class="aui-input-line">
                       <JSelectDept4FaRen :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
                     </div>
+                  </a-form-item>-->
+                  <a-form-item>
+                    <div class="aui-input-line">
+                      <j-search-select :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :dictOptions="dictOptions" />
+                      {{ selectValue }}
+                    </div>
                   </a-form-item>
                   <a-form-item>
                     <div class="aui-input-line">
@@ -118,7 +124,7 @@
 <script lang="ts" setup name="mini-register">
 
   import { ref, reactive, unref, toRaw,onMounted } from 'vue';
-  import { getCaptcha, registerFaren, getCodeInfo } from '/@/api/sys/user';
+  import {getCaptcha, registerFaren, getCodeInfo, departList4Quxian} from '/@/api/sys/user';
   import { SmsEnum } from '/@/views/sys/login/useLogin';
   import { useMessage } from '/@/hooks/web/useMessage';
   import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
@@ -129,7 +135,7 @@
   import JSelectDept4FaRen from '/@/components/Form/src/jeecg/components/JSelectDept4FaRen.vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import codeImg from '/@/assets/images/checkcode.png';
-
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
   const { t } = useI18n();
   const { notification, createErrorModal, createMessage } = useMessage();
   const emit = defineEmits(['go-back', 'success', 'register']);
@@ -157,6 +163,21 @@
   const pwdIndex = ref<string>('close');
   //确认密码眼睛打开关闭
   const confirmPwdIndex = ref<string>('close');
+  const selectValue=ref('');
+  const dictOptions=ref([]);
+
+  // 获取区县级别部门列表
+  function getDepartList4Quxian(){
+    departList4Quxian().then(res => {
+      console.log(res,"res")
+      dictOptions.value = res.map(item => {
+        return {text:item.depName,value:item.depId}
+      })
+      console.log(dictOptions.value,"dictOptions")
+
+    })}
+
+  getDepartList4Quxian();
 
   /**
    * 返回

From 384da30d5bc198f84caf510e207cb6a1f5ac7cee Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Tue, 12 Nov 2024 17:59:25 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=2011.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/declarant/declarantList.vue     | 37 ++++++++++---------
 .../views/declarantUnit/declarantUnitList.vue |  5 +++
 .../views/declarantUnit/depart.user.data.ts   |  2 +
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/jeecgboot-vue3/src/views/declarant/declarantList.vue b/jeecgboot-vue3/src/views/declarant/declarantList.vue
index a8a724d..6e23854 100644
--- a/jeecgboot-vue3/src/views/declarant/declarantList.vue
+++ b/jeecgboot-vue3/src/views/declarant/declarantList.vue
@@ -33,7 +33,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
     <!--用户抽屉-->
@@ -69,7 +69,9 @@
   import { columns, searchFormSchema } from './user.data';
   import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch} from './user.api';
   import {usePermission} from "/@/hooks/web/usePermission";
-
+  import {useUserStore} from "@/store/modules/user";
+  const userStore = useUserStore();
+  console.log("the current user role:",userStore.getUserInfo.roleCode);
   const { createMessage, createConfirm } = useMessage();
   const { isDisabledAuth } = usePermission();
   //注册drawer
@@ -84,7 +86,6 @@
   const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal();
   //离职用户列表model
   const [registerQuitModal, { openModal: openQuitModal }] = useModal();
-
   // 列表页面公共参数、方法
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     designScope: 'user-list',
@@ -233,7 +234,7 @@
   /**
    * 操作栏
    */
-  function getTableAction(record): ActionItem[] {
+  /*function getTableAction(record): ActionItem[] {
     return [
       {
         label: '编辑',
@@ -241,31 +242,25 @@
         // ifShow: () => hasPermission('system:user:edit'),
       },
     ];
-  }
+  }*/
   /**
    * 下拉操作栏
    */
-  function getDropDownAction(record): ActionItem[] {
+  // function getDropDownAction(record): ActionItem[] {
+  function getTableAction(record): ActionItem[] {
     return [
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
       },
-      {
+      /*{
         label: '密码',
         //auth: 'user:changepwd',
         onClick: handleChangePassword.bind(null, record.username),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
+      },*/
       {
         label: '驳回',
-        ifShow: record.status == 1,
+        ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 1,
         popConfirm: {
           title: '确定驳回吗?',
           confirm: handleFrozen.bind(null, record, 2),
@@ -273,12 +268,20 @@
       },
       {
         label: '通过',
-        ifShow: record.status == 2,
+        ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 2,
         popConfirm: {
           title: '确定通过吗?',
           confirm: handleFrozen.bind(null, record, 1),
         },
       },
+      {
+        label: '删除',
+        ifShow: userStore.getUserInfo.roleCode != 'shenbaoren_role',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
       // {
       //   label: '代理人',
       //   onClick: handleAgentSettings.bind(null, record.username),
diff --git a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
index 15a5a14..5e389c6 100644
--- a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
+++ b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
@@ -196,6 +196,11 @@ function getTableAction(record) {
         confirm: handleFrozen.bind(null, record, 1),
       },
     },
+    {
+      ifShow: userStore.getUserInfo.roleCode =='faren_admin',
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
     {
       label: '删除',
       ifShow: userStore.getUserInfo.roleCode !='faren_admin',
diff --git a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
index 843810a..d724b4c 100644
--- a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
+++ b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
@@ -92,6 +92,7 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       dictCode:"depart_status"
     },
+    dynamicDisabled: true,
   },
   {
     label: '名称',
@@ -107,6 +108,7 @@ export const formSchema: FormSchema[] = [
     label: '编码',
     field: 'orgCode',
     component: 'Input',
+    dynamicDisabled: true,
   },
   {
     label: '手机号',

From 5f8b822b8f4d0555778e8b819b2b28faa7b5f195 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 13 Nov 2024 14:56:21 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E5=8A=9F=E6=80=81=E7=A7=91=E6=8A=80?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=2011.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectApplication/kejigongguan/data.ts   |  2 +-
 .../kejigongguan/projectApplicationList.vue   | 19 ++++--
 .../project/ProjectList.vue                   | 66 +++++++++++--------
 .../src/views/projectType/ProjectType.api.ts  |  3 +
 4 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index 2604c23..7e8325b 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -14,7 +14,7 @@ export const projectBaseInfoSchemas: FormSchema[] = [
     },
     dynamicDisabled: true,
     // defaultValue: '科技攻关',
-    defaultValue: '1846744340708184065',
+    // defaultValue: '1846744340708184065',
   },
   {
     field: 'annualId',
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index 5234854..4cda7e7 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -18,20 +18,21 @@
 </template>
 <script lang="ts">
   import { BasicForm, useForm } from '@/components/Form';
-  import {defineComponent, ref} from 'vue';
+  import {defineComponent, ref,nextTick,onMounted} from 'vue';
   import { PageWrapper } from '@/components/Page';
   import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data';
   import { Card } from 'ant-design-vue';
   import {defHttp} from "@/utils/http/axios";
   import {save4shenbao} from './data.api';
-  import { useRouter } from 'vue-router';
+  import { useRouter, useRoute } from 'vue-router';
 
   export default defineComponent({
     name: 'FormHightPage',
     components: { BasicForm, PageWrapper, [Card.name]: Card },
     setup() {
+      const route = useRoute();
       const { currentRoute, back } = useRouter();
-      const [registerProjectInfo, { validate: validateProjectInfoForm }] = useForm({
+      const [registerProjectInfo, { validate: validateProjectInfoForm, setFieldsValue }] = useForm({
         baseColProps: {
           span: 6,
         },
@@ -40,7 +41,13 @@
         schemas: projectBaseInfoSchemas,
         showActionButtonGroup: false,
       });
-
+      const setformValue1 = async () => {
+        // console.log(route,'route')
+        await setFieldsValue({projectTypeid: route.query.projectTypeId})
+      };
+      nextTick(() => {
+        setformValue1();
+      });
       const [registerUser, { validate: validateUserForm }] = useForm({
         baseColProps: {
           span: 6,
@@ -77,11 +84,9 @@
         back();
       };
 
-      function getUserDepart(){
-        projectBaseInfoSchemas.se
-      }
       return { registerProjectInfo, registerUser, registerDepart, submitAll, goBack };
     },
+
   });
 </script>
 <style lang="less" scoped>
diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
index 675a4f3..7a7af65 100644
--- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
@@ -10,26 +10,16 @@
 <!--        <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown>
           <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="go_xinjianshenbao">
-                <Icon icon="ant-design:plus-outlined"></Icon>
-                科技攻关
-              </a-menu-item>
-<!--              <a-menu-item v-for="opt of RANGE_OPTIONS" :key="opt.key">
+            <a-menu @click="go_xinjianshenbao">
+            <a-menu-item v-for="opt of projectTypeList" :key="opt.key">
                 {{ opt.label }}
-              </a-menu-item>-->
-              <!--<a-menu-item key="1" @click="go_xinjianshenbao">
-                <Icon icon="ant-design:plus-outlined"></Icon>
-                xxx
-              </a-menu-item>-->
+              </a-menu-item>
             </a-menu>
           </template>
           <a-button type="primary">新建申报
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
-        <!-- 高级查询
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -51,22 +41,24 @@ import {useModal} from '/@/components/Modal';
 import { useListPage } from '/@/hooks/system/useListPage'
 import ProjectModal from './components/ProjectModal.vue'
 import {columns, searchFormSchema, superQuerySchema} from './Project.data';
-  import {
-    list,
-    deleteOne,
-    rollbackOne,
-    submitOne,
-    batchDelete,
-    getImportUrl,
-    getExportUrl,
-    getProjectTypeList
-  } from './Project.api';
+import {
+  list,
+  deleteOne,
+  rollbackOne,
+  submitOne,
+  batchDelete,
+  getImportUrl,
+  getExportUrl,
+} from './Project.api';
+
+import {getProjectTypeList} from '../../projectType/ProjectType.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
 import { useGo } from '/@/hooks/web/usePage';
 
 import { useUserStore } from '/@/store/modules/user';
 import {getUserData} from "@/views/system/usersetting/UserSetting.api";
   import {useTimeoutFn} from "@/hooks/core/useTimeout";
+import {departList4Quxian} from "@/api/sys/user";
 const go = useGo();
 
 const queryParam = reactive<any>({});
@@ -110,8 +102,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
 })
 
   // 日期范围选项
-  // 日期范围选项
-  const RANGE_OPTIONS = [
+  /*const projectTypeList = [
     {key: 'TODAY', label: '今天'},
     {key: 'YESTERDAY', label: '昨天'},
     {key: 'TOMORROW', label: '明天'},
@@ -122,13 +113,16 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
     {key: 'THIS_MONTH', label: '本月'},
     {key: 'LAST_MONTH', label: '上月'},
     {key: 'NEXT_MONTH', label: '下月'},
-  ];
+  ];*/
+
+const projectTypeList =ref([]);
 
 const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+getProjectType();
 /**
  * 高级查询事件
  */
@@ -149,9 +143,10 @@ function handleAdd() {
 }
 
 //跳转到新建申报页面
-function go_xinjianshenbao() {
-  // go('/comp/jeecg/basic');
-  go('/projectApplication/index?projectTypeId='+'1846744340708184065');
+function go_xinjianshenbao(event: Recordable) {
+  // alert("选择的荐类型id: "+event.key)
+  // 根据不的项目类型跳到不同的页面
+  go('/projectApplication/index?projectTypeId='+event.key);
 }
 
 //跳转到项目书页面
@@ -171,7 +166,20 @@ function go_projectLog(record) {
   go('/projectLog/projectLogList?id='+record.id);
 }
 
+async function getProjectType(){
+
+  let params = {
+    status: '1',
+  };
 
+  await getProjectTypeList(params).then(res=>{
+  console.log("getProjectType is invoke-----------",JSON.stringify(res.records))
+    projectTypeList.value = res.records.map(item => {
+      return {label:item.typeName,key:item.id}
+    })
+    console.log(JSON.stringify(projectTypeList));
+  })
+}
 
 /**
  * 编辑事件
diff --git a/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
index ed5fa89..c925929 100644
--- a/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
+++ b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
@@ -31,6 +31,9 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+// export const getProjectTypeList = (params) => defHttp.get({ url: Api.getProjectTypeList, params });
+export const getProjectTypeList = (params) => defHttp.get({ url: Api.list, params });
+
 /**
  * 删除单个
  * @param params