From 7022f6970f0affd3e32749be9f582dbe7e08b252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sat, 9 Nov 2024 11:17:36 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert/controller/ExpertController.java   | 56 ++++++++++---------
 .../workbench/components/WorkbenchHeader.vue  |  4 +-
 .../src/views/dashboard/workbench/index.vue   |  2 +-
 .../src/views/expert/admin/Expert.api.ts      |  8 ++-
 .../src/views/expert/admin/Expert.data.ts     |  6 +-
 .../src/views/expert/admin/ExpertList.vue     |  8 +--
 .../expert/admin/components/ExpertForm.vue    | 19 ++++---
 .../src/views/expert/adminback/Expert.data.ts |  6 +-
 .../src/views/expert/adminback/ExpertList.vue |  6 +-
 .../adminback/components/ExpertForm.vue       |  5 +-
 .../src/views/expert/county/Expert.api.ts     |  8 ++-
 .../src/views/expert/county/Expert.data.ts    |  4 +-
 .../expert/county/components/ExpertForm.vue   |  8 +--
 .../src/views/expert/firm/Expert.api.ts       |  8 ++-
 .../src/views/expert/firm/Expert.data.ts      |  4 +-
 .../src/views/expert/firm/ExpertList.vue      | 12 ++--
 .../expert/firm/components/ExpertForm.vue     | 10 ++--
 .../src/views/expert/self/Expert.data.ts      |  4 +-
 .../src/views/expert/self/ExpertList.vue      |  4 +-
 .../expert/self/components/ExpertForm.vue     | 10 ++--
 .../src/views/expert/selfback/Expert.data.ts  | 11 +---
 .../src/views/expert/selfback/ExpertList.vue  |  4 +-
 .../expert/selfback/components/ExpertForm.vue | 10 ++--
 .../views/expproject/admin/Expproject.data.ts |  4 +-
 .../views/expproject/admin/ExpprojectList.vue | 10 ++++
 .../views/expproject/self/Expproject.data.ts  |  4 +-
 26 files changed, 131 insertions(+), 104 deletions(-)

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 3d6cf8d..b20de69 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
@@ -174,30 +174,34 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 //开始对比两个List获取相同部分，获取的交叉id就是需要的id
 		 List<String> commonElements = idlistss.stream().filter(userbyrole::contains).collect(Collectors.toList());
 		 //根据查询的userid去获取username
-		 List<SysUser> sysUserList = sysUserService.query().in("id",commonElements).list();
-		 //根据查询的结果获取username的list
-		 List<String> usernames = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
-		 //用于查看本公司下面的专家信息无论是否审核，无论哪个部门
-		 QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
-		 queryWrapper.eq("isdone","Y");
-		 queryWrapper.in("seusername",usernames);
-		 Page<Expert> page = new Page<Expert>(pageNo, pageSize);
-		 IPage<Expert> pageList = expertService.page(page, queryWrapper);
-		 pageList.getRecords().forEach(experttemp -> {
-			 //开始用于修改数据
-			 SysUser sysUser = sysUserService.query().eq("username",experttemp.getSeusername()).one();
-			 String depid = expertService.getdeps(sysUser.getId());
-			 SysDepart sysDepart = sysDepartService.getById(depid);
-			 experttemp.setRealname(sysUser.getRealname());
-			 experttemp.setWorkon(sysUser.getWorkNo());
-			 experttemp.setSex(sysUser.getSex());
-			 experttemp.setTopPic(sysUser.getAvatar());
-			 experttemp.setPhone(sysUser.getPhone());
-			 experttemp.setEmails(sysUser.getEmail());
-			 experttemp.setSsdep(sysDepart.getDepartName());
-			 experttemp.setPsd(sysUser.getPassword());
-		 });
-		 return Result.OK(pageList);
+		 if (commonElements.isEmpty()){
+			return Result.error("请添加专家");
+		 }else {
+			 List<SysUser> sysUserList = sysUserService.query().in("id", commonElements).list();
+			 //根据查询的结果获取username的list
+			 List<String> usernames = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
+			 //用于查看本公司下面的专家信息无论是否审核，无论哪个部门
+			 QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
+			 queryWrapper.eq("isdone", "Y");
+			 queryWrapper.in("seusername", usernames);
+			 Page<Expert> page = new Page<Expert>(pageNo, pageSize);
+			 IPage<Expert> pageList = expertService.page(page, queryWrapper);
+			 pageList.getRecords().forEach(experttemp -> {
+				 //开始用于修改数据
+				 SysUser sysUser = sysUserService.query().eq("username", experttemp.getSeusername()).one();
+				 String depid = expertService.getdeps(sysUser.getId());
+				 SysDepart sysDepart = sysDepartService.getById(depid);
+				 experttemp.setRealname(sysUser.getRealname());
+				 experttemp.setWorkon(sysUser.getWorkNo());
+				 experttemp.setSex(sysUser.getSex());
+				 experttemp.setTopPic(sysUser.getAvatar());
+				 experttemp.setPhone(sysUser.getPhone());
+				 experttemp.setEmails(sysUser.getEmail());
+				 experttemp.setSsdep(sysDepart.getDepartName());
+				 experttemp.setPsd(sysUser.getPassword());
+			 });
+			 return Result.OK(pageList);
+		 }
 	 }
 
 	 @ApiOperation(value="专家管理-分页列表查询/公司管理员角色", notes="专家管理-分页列表查询/公司管理员角色")
@@ -623,8 +627,8 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 	 @GetMapping(value = "handleadminback")
 	 public Result<String> handleadminback(@RequestParam(name="id",required=true) String id) {
 		 Expert expert =expertService.getById(id);
-		 expert.setAdminopen("1");
-		 expert.setCompopen("1");
+		 expert.setAdminopen("3");
+		 expert.setCompopen("3");
 		 expert.setIsdone("N");
 		 expertService.updateById(expert);
 		 return Result.OK("驳回成功！请到编辑页面确定问题数据并填写驳回原因");
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
index b0eb7cc..8db47e3 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="lg:flex">
-    <Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" />
+<!--    <Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" />-->
     <div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2">
-      <h1 class="md:text-lg text-md">早安, {{ userinfo.realname }}, 开始您一天的工作吧！</h1>
+<!--      <h1 class="md:text-lg text-md">早安, {{ userinfo.realname }}, 开始您一天的工作吧！</h1>-->
     </div>
     <div class="flex flex-1 justify-end md:mt-0 mt-4">
     </div>
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/index.vue b/jeecgboot-vue3/src/views/dashboard/workbench/index.vue
index cc17cae..3084f25 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/index.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/index.vue
@@ -10,7 +10,7 @@
         <QuickNav :loading="loading" class="enter-y" />
 
         <Card class="!my-4 enter-y" :loading="loading">
-          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
+<!--          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />-->
         </Card>
 
         <SaleRadar :loading="loading" class="enter-y" />
diff --git a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts
index 0fca733..354bae9 100644
--- a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts
+++ b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts
@@ -30,13 +30,17 @@ export const getImportUrl = Api.importExcel;
  * 列表接口
  * @param params
  */
-export const handleadminup = (params) => defHttp.get({ url: Api.handleadminup, params });
+export const handleadminup = (params,handleSuccess) => defHttp.get({ url: Api.handleadminup, params }).then(() => {
+  handleSuccess();
+})
 
 /**
  * 管理员驳回
  * @param params
  */
-export const handleadminback = (params) => defHttp.get({ url: Api.handleadminback, params });
+export const handleadminback = (params,handleSuccess) => defHttp.get({ url: Api.handleadminback, params }).then(() => {
+  handleSuccess();
+})
 
 
 /**
diff --git a/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts b/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts
index 9ecca63..f1cf9e6 100644
--- a/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'expsture',
     customRender:({text}) => {
-      return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
+      return  render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
     },
   },
 ];
@@ -84,7 +84,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
index 07e619a..8975cb8 100644
--- a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
@@ -27,8 +27,8 @@
           <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>
+                <template #label><span title="细分方向">细分方向</span></template>
+                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -240,7 +240,7 @@
       }, {
         label: '驳回审核',
         popConfirm: {
-          title: '是否v',
+          title: '是否驳回',
           confirm: handlebackadmin.bind(null, record),
           placement: 'topLeft',
         },
@@ -273,7 +273,7 @@
       }, {
         label: '驳回审核',
         popConfirm: {
-          title: '是否v',
+          title: '是否驳回',
           confirm: handlebackadmin.bind(null, record),
           placement: 'topLeft',
         },
diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
index 0d6eb62..b867049 100644
--- a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
@@ -75,8 +75,8 @@
               </a-form-item>
             </a-col>
 						<a-col :span="24">
-							<a-form-item label="研究类型" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
-								<a-input v-model:value="formData.research" placeholder="请输入研究类型"  allow-clear ></a-input>
+							<a-form-item label="细分方向" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
+								<a-input v-model:value="formData.research" placeholder="请输入细分方向"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -94,26 +94,26 @@
                 <a-textarea v-model:value="formData.expinfo" :rows="4" placeholder="请输入专家简介" />
               </a-form-item>
 						</a-col>
-            <a-col :span="24">
-              <a-form-item label="专家状态" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
+<!--            <a-col :span="24">
+              <a-form-item label="专家状态异常标记" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
-            </a-col>
+            </a-col>-->
 <!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <a-input v-model:value="formData.errinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>-->
 
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+<!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
               </a-form-item>
-            </a-col>
+            </a-col>-->
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
+              <a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
+                <a-input v-model:value="formData.backinfo" placeholder="请输入驳回原因"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
 
@@ -168,6 +168,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     backinfo: '',
     zc: '',
     expsture: '',
+    errinfo: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
index 9ecca63..f1cf9e6 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'expsture',
     customRender:({text}) => {
-      return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
+      return  render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
     },
   },
 ];
@@ -84,7 +84,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
index f4fae3d..0a9d6c0 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
@@ -27,8 +27,8 @@
           <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>
+                <template #label><span title="细分方向">细分方向</span></template>
+                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -248,7 +248,7 @@
       }, {
         label: '驳回审核',
         popConfirm: {
-          title: '是否v',
+          title: '是否驳回',
           confirm: handlebackadmin.bind(null, record),
           placement: 'topLeft',
         },
diff --git a/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
index b21ed9a..2df3438 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
@@ -7,7 +7,7 @@
 
 
             <a-col :span="24">
-              <a-form-item label="专家状态" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
+              <a-form-item label="专家状态异常标记" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
             </a-col>
@@ -23,11 +23,13 @@
               </a-form-item>
             </a-col>
 
+<!--
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
                 <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
+-->
 
 
           </a-row>
@@ -80,6 +82,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     backinfo: '',
     zc: '',
     expsture: '',
+    errinfo: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts
index ea49a8f..7222793 100644
--- a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts
+++ b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts
@@ -36,13 +36,17 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
  * 通过审核接口
  * @param params
  */
-export const handleupcount = (params) => defHttp.get({ url: Api.handleupcount, params });
+export const handleupcount = (params,handleSuccess) => defHttp.get({ url: Api.handleupcount, params }).then(() => {
+  handleSuccess();
+})
 
 /**
  * 通过审核驳回
  * @param params
  */
-export const handlebackco = (params) => defHttp.get({ url: Api.handlebackcoount, params });
+export const handlebackco = (params,handleSuccess) => defHttp.get({ url: Api.handlebackcoount, params }).then(() => {
+  handleSuccess();
+})
 
 /**
  * 删除单个
diff --git a/jeecgboot-vue3/src/views/expert/county/Expert.data.ts b/jeecgboot-vue3/src/views/expert/county/Expert.data.ts
index 9f8d1cd..721475f 100644
--- a/jeecgboot-vue3/src/views/expert/county/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/county/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -67,7 +67,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
index 453776c..a350c3b 100644
--- a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
@@ -75,8 +75,8 @@
               </a-form-item>
             </a-col>
 						<a-col :span="24">
-							<a-form-item label="研究类型" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
-								<a-input v-model:value="formData.research" placeholder="请输入研究类型"  allow-clear ></a-input>
+							<a-form-item label="细分方向" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
+								<a-input v-model:value="formData.research" placeholder="请输入细分方向"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -112,8 +112,8 @@
             </a-col>
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
+              <a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
+                <a-input v-model:value="formData.backinfo" placeholder="请输入驳回原因"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
 
diff --git a/jeecgboot-vue3/src/views/expert/firm/Expert.api.ts b/jeecgboot-vue3/src/views/expert/firm/Expert.api.ts
index 5679ce1..f1d7420 100644
--- a/jeecgboot-vue3/src/views/expert/firm/Expert.api.ts
+++ b/jeecgboot-vue3/src/views/expert/firm/Expert.api.ts
@@ -36,13 +36,17 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
  * 通过审核
  * @param params
  */
-export const handleupup = (params) => defHttp.get({ url: Api.handleupup, params });
+export const handleupup = (params,handleSuccess) => defHttp.get({ url: Api.handleupup, params }).then(() => {
+  handleSuccess();
+})
 
 /**
  * 驳回审核
  * @param params
  */
-export const handlebackback = (params) => defHttp.get({ url: Api.handlebackback, params });
+export const handlebackback = (params,handleSuccess) => defHttp.get({ url: Api.handlebackback, params }).then(() => {
+  handleSuccess();
+})
 
 /**
  * 删除单个
diff --git a/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts b/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts
index 28c0130..34c044e 100644
--- a/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -68,7 +68,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
index 09334d4..5738052 100644
--- a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
@@ -11,22 +11,22 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="directioncal">
+<!--            <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 :lg="6">
+            </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>
+
           </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>
+                <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">
diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
index cb20ef8..5912aa0 100644
--- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
@@ -75,8 +75,8 @@
               </a-form-item>
             </a-col>
 						<a-col :span="24">
-							<a-form-item label="研究类型" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
-								<a-input v-model:value="formData.research" placeholder="请输入研究类型"  allow-clear ></a-input>
+							<a-form-item label="细分方向" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
+								<a-input v-model:value="formData.research" placeholder="请输入细分方向"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -96,9 +96,9 @@
 						</a-col>
 
 
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
-                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
+            <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
+                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
 
diff --git a/jeecgboot-vue3/src/views/expert/self/Expert.data.ts b/jeecgboot-vue3/src/views/expert/self/Expert.data.ts
index f4352a5..49db831 100644
--- a/jeecgboot-vue3/src/views/expert/self/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/self/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -65,7 +65,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
index 1c83d29..f0b2624 100644
--- a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue
@@ -19,8 +19,8 @@
           <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>
+                <template #label><span title="细分方向">细分方向</span></template>
+                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
               </a-form-item>
             </a-col>
           </template>
diff --git a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
index 30f10f5..a9e378d 100644
--- a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
@@ -73,8 +73,8 @@
               </a-form-item>
             </a-col>
 						<a-col :span="24">
-							<a-form-item label="研究类型" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
-								<a-input v-model:value="formData.research" placeholder="请输入研究类型"  allow-clear ></a-input>
+							<a-form-item label="细分方向" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
+								<a-input v-model:value="formData.research" placeholder="请输入细分方向"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -93,9 +93,9 @@
               </a-form-item>
 						</a-col>
 
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
-                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
+            <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
+                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
 
diff --git a/jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts b/jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts
index 2606f25..1578cc9 100644
--- a/jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directioncal_dictText'
   },
   {
-    title: '研究类型',
+    title: '细分方向',
     align: "center",
     dataIndex: 'research'
   },
@@ -58,17 +58,12 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'adminopen_dictText',
   },
-  {
-    title: '管理员审核',
-    align: "center",
-    dataIndex: 'adminopen_dictText',
-  },
   {
     title: '专家状态',
     align: "center",
     dataIndex: 'expsture',
     customRender:({text}) => {
-      return  render.renderSwitch(text, [{text:'正常',value:'Y'},{text:'异常',value:'N'}]);
+      return  render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
     },
   },
 ];
@@ -79,7 +74,7 @@ export const superQuerySchema = {
   colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
   major: {title: '专业',order: 2,view: 'text', type: 'string',},
   directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',},
-  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  research: {title: '细分方向',order: 4,view: 'text', type: 'string',},
   educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
   compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
   adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
diff --git a/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue b/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
index f7e2421..1d0fe29 100644
--- a/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
+++ b/jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
@@ -19,8 +19,8 @@
           <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>
+                <template #label><span title="细分方向">细分方向</span></template>
+                <a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input>
               </a-form-item>
             </a-col>
           </template>
diff --git a/jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue
index 0cddbaa..8edbfac 100644
--- a/jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue
@@ -4,9 +4,9 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
           <a-row>
-            <a-col :span="24" >
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear  disabled="true"></a-input>
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear disabled="true" />
               </a-form-item>
             </a-col>
 
@@ -58,7 +58,9 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     expinfo: '',
     compopen: '',
     adminopen: '',
-      backinfo: '',
+    backinfo: '',
+    errinfo: '',
+    expsture: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts b/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
index de9474c..67ecf8a 100644
--- a/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
+++ b/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
@@ -21,11 +21,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'needexp'
    },
-   {
+/*   {
     title: '简介',
     align:"center",
     dataIndex: 'proinfo'
-   },
+   },*/
    {
     title: '附件',
     align:"center",
diff --git a/jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue b/jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue
index a86e7f6..7189d1d 100644
--- a/jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue
+++ b/jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue
@@ -292,4 +292,14 @@
       width: 100%;
     }
   }
+
+
+  :deep(.ant-table-wrapper .ant-table-tbody >tr >td){
+    height: 140px;
+  }
+  :deep(.jeecg-basic-table-action){
+    height: 140px;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
 </style>
diff --git a/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts b/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
index be35f06..8458b27 100644
--- a/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
+++ b/jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
@@ -21,11 +21,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'needexp'
    },
-   {
+/*   {
     title: '简介',
     align:"center",
     dataIndex: 'proinfo'
-   },
+   },*/
    {
     title: '附件',
     align:"center",