创新券

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -244,8 +244,11 @@ public class SysDepartController {
 		//单位法人角色时，只查询自己部门
 		if ("faren_admin".equals(user.getRoleCode())) {
 			queryWrapper.eq("id", user.getOrgId());
-		} else { // 查询下级部门
+		} 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","");
 		}
 		return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray;
 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.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -194,19 +193,15 @@ public class SysUserController {
     public Result<IPage<SysUser>> getDeclarantList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        user.setUserType("shenbaoren");
         String roleCode = loginUser.getRoleCode();
-        List<String> userIds = new LinkedList<>();
+//        List<String> userIds = new LinkedList<>();
         //申报人是只查询自己
-        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
-            userIds.add(loginUser.getId());
-        } else if (StringUtils.equals(roleCode, "faren_admin")) {
-            List<SysUserDepart> departList = sysUserDepartService.list(new LambdaQueryWrapper<SysUserDepart>().eq(SysUserDepart::getDepId, loginUser.getOrgId()));
-            userIds = Optional.ofNullable(departList).orElse(new LinkedList<>()).stream().map(u -> u.getUserId()).collect(Collectors.toList());
-        }
-        user.setUserType("shenbaoren");
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-        if (ObjectUtil.isNotEmpty(userIds)) {
+        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
-            queryWrapper.in("id", userIds);
+            queryWrapper.eq("org_code", loginUser.getOrgCode());
+        } else {
+            queryWrapper.likeRight("org_code", loginUser.getOrgCode());
         }
         return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
     }

jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue

@@ -182,7 +182,7 @@
       // },
       {
         label: '驳回',
-        ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 1,
+        ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 1,
         popConfirm: {
           title: '确定驳回吗?',
           confirm: handleFrozen.bind(null, record, 0),
@@ -190,7 +190,7 @@
       },
       {
         label: '通过',
-        ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 0,
+        ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 0,
         popConfirm: {
           title: '确定通过吗?',
           confirm: handleFrozen.bind(null, record, 1),

jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts

@@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'departNameAbbr',
   },
-  {
+  /* {
      title: '编码',
      align:"center",
      dataIndex: 'orgCode'
-  },
+   },*/
   {
     title: '手机号',
     align:"center",

jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue

@@ -4,8 +4,8 @@
     <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" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
-<!--        <a-button type="primary" @click="go_xinjianshenbao" preIcon="ant-design:plus-outlined"> 新建审报书</a-button>-->
+        <!--        <a-button type="primary" @click="go_xinjianshenbao" 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" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown>
@@ -15,13 +15,16 @@
                 <Icon icon="ant-design:plus-outlined"></Icon>
                 科技攻关
               </a-menu-item>
+              <!--              <a-menu-item v-for="opt of RANGE_OPTIONS" :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>
           </template>
-          <a-button type="primary">新建审报
+          <a-button type="primary">新建申报
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -48,12 +51,22 @@ 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, batchDelete, getImportUrl,getExportUrl} from './Project.api';
+  import {
+    list,
+    deleteOne,
+    rollbackOne,
+    submitOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    getProjectTypeList
+  } from './Project.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";
   const go = useGo();
 
   const queryParam = reactive<any>({});
@@ -61,7 +74,6 @@ const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   //注册model
   const [registerModal, {openModal}] = useModal();
-//注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
     tableProps:{
       title: '项目表',
@@ -79,7 +91,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
         ],
       },
       actionColumn: {
-      width: 280,
+        width: 380,
         fixed:'right'
       },
       beforeFetch: (params) => {
@@ -97,6 +109,21 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
     },
   })
 
+  // 日期范围选项
+  // 日期范围选项
+  const RANGE_OPTIONS = [
+    {key: 'TODAY', label: '今天'},
+    {key: 'YESTERDAY', label: '昨天'},
+    {key: 'TOMORROW', label: '明天'},
+    {key: 'THIS_WEEK', label: '本周'},
+    {key: 'LAST_WEEK', label: '上周'},
+    {key: 'NEXT_WEEK', label: '下周'},
+    {key: 'LAST_7_DAYS', label: '过去七天'},
+    {key: 'THIS_MONTH', label: '本月'},
+    {key: 'LAST_MONTH', label: '上月'},
+    {key: 'NEXT_MONTH', label: '下月'},
+  ];
+
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
   // 高级查询配置
@@ -124,7 +151,7 @@ function handleAdd() {
   //跳转到新建申报页面
   function go_xinjianshenbao() {
     // go('/comp/jeecg/basic');
-  go('/projectApplication/index');
+    go('/projectApplication/index?projectTypeId='+'1846744340708184065');
   }
 
   //跳转到项目书页面
@@ -136,10 +163,16 @@ function go_xiangmushu(record) {
   //跳转到预算书页面
   function go_yusuanshu(record) {
     // go('/comp/jeecg/basic?id=' +'666');
-  go('/projectApplication/kejigongguan/xiangmushu?id='+record.id);
+    go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
+  }
+
+  function go_projectLog(record) {
+    // go('/comp/jeecg/basic?id=' +'666');
+    go('/projectLog/projectLogList?id='+record.id);
   }
 
 
+
   /**
    * 编辑事件
    */
@@ -166,6 +199,16 @@ function handleDetail(record: Recordable) {
   async function handleDelete(record) {
     await deleteOne({id: record.id}, handleSuccess);
   }
+
+  //取回项目
+  async function handleSubmitOne(record) {
+    await submitOne({id: record.id}, handleSuccess);
+  }
+
+  //取回项目
+  async function handleRollbackOne(record) {
+    await rollbackOne({id: record.id}, handleSuccess);
+  }
   /**
    * 批量删除事件
    */
@@ -198,19 +241,40 @@ function getTableAction(record){
         onClick: handleDetail.bind(null, record),
       },
       {
+        label: '日志查询',
+        onClick: go_projectLog.bind(null, record),
+      }
+    ];
+    //申请人待提交时可以删除(只有自己能删除)
+    if (record.projectStatus == 5) {
+      actions.unshift({
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-      // auth: 'projecttype:project_type:delete'
+      });
-    }];
+    }
-  //申请人待提交时，可以修改
     if (record.projectStatus == 5) {
       actions.unshift({
-         label: '编辑',
+        label: '提交项目',
-         onClick: handleEdit.bind(null, record),
+        onClick: handleSubmitOne.bind(null, record),
+      });
+    }
+    //projectStatus 项目书状态
+    //('科技主管部门待提交', '1');
+    //('科技主管部门已提交', '2');
+    //('不受理', '3');
+    //('已受理', '4');
+    //('申请人待提交', '5');
+    //('申请单位待提交', '6');
+    //('市科技局待提交', '7');
+    //('市科技局已提交', '8');
+    if (record.projectStatus ==6) {
+      actions.unshift({
+        label: '取回项目',
+        onClick: handleRollbackOne.bind(null, record),
       });
     }
     return actions;