Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java

@@ -156,11 +156,12 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap(), customeRuleMap);
         Page<Project> page = new Page<Project>(pageNo, pageSize);
 
-        //('科技主管部门待提交', '1');
         //('不受理', '3');
         //('已受理', '4');
         //('申请人待提交', '5');
         //('申请单位待提交', '6');
+        //('科技主管部门待提交（区/县管理员）', '1');
+
         //('市科技局待提交', '7');
         //('市科技局已提交', '8');
         //('财政主管理部门待审核', '9');
@@ -169,18 +170,19 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //申请单位数据
         if ("faren_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
-            queryWrapper.eq("project_status", 6);
+            queryWrapper.in("project_status", 6,1,7,8,9,10);
+
         }
         // 区/县管理员数据
         if ("quxian_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
-            queryWrapper.eq("project_status", 1);
+            queryWrapper.in("project_status", 1,7,8,9,10);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("project_status", 7, 8);
+            queryWrapper.in("project_status", 7,8,9,10);
         }
         if ("caizheng_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 9, 10);
+            queryWrapper.in("budget_status", 8,9,10);
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -420,6 +422,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
 //            project.setProjectStatus("10");
             project.setBudgetStatus("10");
 
+            project.setProjectStatus(project1.getProjectStatus());
             log.setBudgetStatus("10");
             log.setOperationMark("财政主管部门审核通过");
         }

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

@@ -42,10 +42,22 @@
     <!-- 表单区域 -->
     <ProjectModal @register="registerModal" @success="handleSuccess"></ProjectModal>
   </div>
+  <div>
+    <ProjectLogModal
+      @register="registerModal"
+      v-model:value="editCronValue"
+      :exeStartTime="exeStartTime"
+      :hideYear="hideYear"
+      :remote="remote"
+      :hideSecond="hideSecond"
+    />
+  </div>
 </template>
 
 <script lang="ts" name="project-project" setup>
-  import {ref, reactive, computed, unref, onMounted} from 'vue';
+// import EasyCronModal from '/@/components/Form/src/jeecg/components/JEasyCron/EasyCronModal.vue';
+import ProjectLogModal from '/@/views/projectLog/ProjectLogBasicModal.vue'
+import {ref, reactive, computed, unref, onMounted} from 'vue';
 import {BasicTable, useTable, TableAction} from '/@/components/Table';
 import {useModal} from '/@/components/Modal';
 import { useListPage } from '/@/hooks/system/useListPage'
@@ -167,6 +179,11 @@ function go_yusuanshu(record) {
   go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
 }
 
+function projectLog(record) {
+  // go('/comp/jeecg/basic?id=' +'666');
+  go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
+}
+
 
 /**
  * 编辑事件
@@ -234,7 +251,12 @@ function getTableAction(record){
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
-    }];
+    },
+    {
+      label: '日志查询',
+      onClick: handleDetail.bind(null, record),
+    }
+    ];
   //申请人待提交时可以删除(只有自己能删除)
   if (record.projectStatus == 5) {
        actions.unshift({
@@ -262,7 +284,6 @@ function getTableAction(record){
   //('市科技局待提交', '7');
   //('市科技局已提交', '8');
   if (record.projectStatus ==6) {
-    // console.log("jjjjjjjjj",JSON.stringify(userStore.getUserInfo.roles))
        actions.unshift({
          label: '取回项目',
          onClick: handleRollbackOne.bind(null, record),

jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue

@@ -0,0 +1,44 @@
+<template>
+  <BasicModal @register="registerModal" title="日志" width="1024px" @ok="onOk">
+    <PageWrapper>
+      <a-card title="流程进度" :bordered="true">
+        <a-steps :current="1" progress-dot size="small">
+          <a-step title="申请人提交">
+            <template #description> <div>Jeecg</div> <p>2016-12-12 12:32</p> </template>
+          </a-step>
+          <a-step title="申请单位提交">
+            <template #description>
+              <p>Chad</p>
+            </template>
+          </a-step>
+          <a-step title="科技主管提交" />
+          <a-step title="市科技局提交" />
+          <a-step title="财政主管处理" />
+        </a-steps>
+      </a-card>
+    </PageWrapper>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useAttrs } from '/@/hooks/core/useAttrs';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import PageWrapper from "@/components/Page/src/PageWrapper.vue";
+
+export default defineComponent({
+  name: 'ProjectLogModal',
+  inheritAttrs: false,
+  components: {PageWrapper, BasicModal},
+  setup() {
+    const attrs = useAttrs();
+    const [registerModal, { closeModal }] = useModalInner();
+
+    function onOk() {
+      closeModal();
+    }
+
+    return { attrs, registerModal, onOk };
+  },
+});
+</script>