Browse Source

根据项目id查询项目进度

lamphua 1 year ago
parent
commit
5cfbe010a3

+ 7
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java View File

61
     /**
61
     /**
62
      * 获取cmc项目进度详细信息
62
      * 获取cmc项目进度详细信息
63
      */
63
      */
64
-    @GetMapping(value = "/{progressId}")
65
-    public AjaxResult getInfo(@PathVariable("progressId") String progressId)
64
+    @GetMapping(value = "/{projectId}")
65
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
66
     {
66
     {
67
-        return success(cmcProjectProgressService.selectCmcProjectProgressByProgressId(progressId));
67
+        return success(cmcProjectProgressService.selectCmcProjectProgressByProjectId(projectId));
68
     }
68
     }
69
 
69
 
70
     /**
70
     /**
74
     @PostMapping
74
     @PostMapping
75
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
75
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
76
     {
76
     {
77
-        cmcProjectProgress.setProgressId(new SnowFlake().generateId());
77
+        cmcProjectProgress.setProjectId(new SnowFlake().generateId());
78
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
78
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
79
     }
79
     }
80
 
80
 
92
      * 删除cmc项目进度
92
      * 删除cmc项目进度
93
      */
93
      */
94
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
94
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
95
-	@DeleteMapping("/{progressIds}")
96
-    public AjaxResult remove(@PathVariable String[] progressIds)
95
+	@DeleteMapping("/{projectIds}")
96
+    public AjaxResult remove(@PathVariable String[] projectIds)
97
     {
97
     {
98
-        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProgressIds(progressIds));
98
+        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProjectIds(projectIds));
99
     }
99
     }
100
 }
100
 }

+ 6
- 6
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectProgressMapper.java View File

14
     /**
14
     /**
15
      * 查询cmc项目进度
15
      * 查询cmc项目进度
16
      * 
16
      * 
17
-     * @param progressId cmc项目进度主键
17
+     * @param projectId cmc项目进度主键
18
      * @return cmc项目进度
18
      * @return cmc项目进度
19
      */
19
      */
20
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
20
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
21
 
21
 
22
     /**
22
     /**
23
      * 查询cmc项目进度列表
23
      * 查询cmc项目进度列表
46
     /**
46
     /**
47
      * 删除cmc项目进度
47
      * 删除cmc项目进度
48
      * 
48
      * 
49
-     * @param progressId cmc项目进度主键
49
+     * @param projectId cmc项目进度主键
50
      * @return 结果
50
      * @return 结果
51
      */
51
      */
52
-    public int deleteCmcProjectProgressByProgressId(String progressId);
52
+    public int deleteCmcProjectProgressByProjectId(String projectId);
53
 
53
 
54
     /**
54
     /**
55
      * 批量删除cmc项目进度
55
      * 批量删除cmc项目进度
56
      * 
56
      * 
57
-     * @param progressIds 需要删除的数据主键集合
57
+     * @param projectIds 需要删除的数据主键集合
58
      * @return 结果
58
      * @return 结果
59
      */
59
      */
60
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
60
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds);
61
 }
61
 }

+ 6
- 6
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectProgressService.java View File

14
     /**
14
     /**
15
      * 查询cmc项目进度
15
      * 查询cmc项目进度
16
      * 
16
      * 
17
-     * @param progressId cmc项目进度主键
17
+     * @param projectId cmc项目进度主键
18
      * @return cmc项目进度
18
      * @return cmc项目进度
19
      */
19
      */
20
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
20
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
21
 
21
 
22
     /**
22
     /**
23
      * 查询cmc项目进度列表
23
      * 查询cmc项目进度列表
46
     /**
46
     /**
47
      * 批量删除cmc项目进度
47
      * 批量删除cmc项目进度
48
      * 
48
      * 
49
-     * @param progressIds 需要删除的cmc项目进度主键集合
49
+     * @param projectIds 需要删除的cmc项目进度主键集合
50
      * @return 结果
50
      * @return 结果
51
      */
51
      */
52
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
52
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds);
53
 
53
 
54
     /**
54
     /**
55
      * 删除cmc项目进度信息
55
      * 删除cmc项目进度信息
56
      * 
56
      * 
57
-     * @param progressId cmc项目进度主键
57
+     * @param projectId cmc项目进度主键
58
      * @return 结果
58
      * @return 结果
59
      */
59
      */
60
-    public int deleteCmcProjectProgressByProgressId(String progressId);
60
+    public int deleteCmcProjectProgressByProjectId(String projectId);
61
 }
61
 }

+ 9
- 9
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectProgressServiceImpl.java View File

22
     /**
22
     /**
23
      * 查询cmc项目进度
23
      * 查询cmc项目进度
24
      * 
24
      * 
25
-     * @param progressId cmc项目进度主键
25
+     * @param projectId cmc项目进度主键
26
      * @return cmc项目进度
26
      * @return cmc项目进度
27
      */
27
      */
28
     @Override
28
     @Override
29
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId)
29
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId)
30
     {
30
     {
31
-        return cmcProjectProgressMapper.selectCmcProjectProgressByProgressId(progressId);
31
+        return cmcProjectProgressMapper.selectCmcProjectProgressByProjectId(projectId);
32
     }
32
     }
33
 
33
 
34
     /**
34
     /**
70
     /**
70
     /**
71
      * 批量删除cmc项目进度
71
      * 批量删除cmc项目进度
72
      * 
72
      * 
73
-     * @param progressIds 需要删除的cmc项目进度主键
73
+     * @param projectIds 需要删除的cmc项目进度主键
74
      * @return 结果
74
      * @return 结果
75
      */
75
      */
76
     @Override
76
     @Override
77
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds)
77
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds)
78
     {
78
     {
79
-        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressIds(progressIds);
79
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProjectIds(projectIds);
80
     }
80
     }
81
 
81
 
82
     /**
82
     /**
83
      * 删除cmc项目进度信息
83
      * 删除cmc项目进度信息
84
      * 
84
      * 
85
-     * @param progressId cmc项目进度主键
85
+     * @param projectId cmc项目进度主键
86
      * @return 结果
86
      * @return 结果
87
      */
87
      */
88
     @Override
88
     @Override
89
-    public int deleteCmcProjectProgressByProgressId(String progressId)
89
+    public int deleteCmcProjectProgressByProjectId(String projectId)
90
     {
90
     {
91
-        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressId(progressId);
91
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProjectId(projectId);
92
     }
92
     }
93
 }
93
 }

+ 8
- 8
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectProgressMapper.xml View File

26
         </where>
26
         </where>
27
     </select>
27
     </select>
28
     
28
     
29
-    <select id="selectCmcProjectProgressByProgressId" parameterType="String" resultMap="CmcProjectProgressResult">
29
+    <select id="selectCmcProjectProgressByProjectId" parameterType="String" resultMap="CmcProjectProgressResult">
30
         <include refid="selectCmcProjectProgressVo"/>
30
         <include refid="selectCmcProjectProgressVo"/>
31
-        where progress_id = #{progressId}
31
+        where project_id = #{projectId}
32
     </select>
32
     </select>
33
         
33
         
34
     <insert id="insertCmcProjectProgress" parameterType="CmcProjectProgress">
34
     <insert id="insertCmcProjectProgress" parameterType="CmcProjectProgress">
60
         where progress_id = #{progressId}
60
         where progress_id = #{progressId}
61
     </update>
61
     </update>
62
 
62
 
63
-    <delete id="deleteCmcProjectProgressByProgressId" parameterType="String">
64
-        delete from cmc_project_progress where progress_id = #{progressId}
63
+    <delete id="deleteCmcProjectProgressByProjectId" parameterType="String">
64
+        delete from cmc_project_progress where project_id = #{projectId}
65
     </delete>
65
     </delete>
66
 
66
 
67
-    <delete id="deleteCmcProjectProgressByProgressIds" parameterType="String">
68
-        delete from cmc_project_progress where progress_id in 
69
-        <foreach item="progressId" collection="array" open="(" separator="," close=")">
70
-            #{progressId}
67
+    <delete id="deleteCmcProjectProgressByProjectIds" parameterType="String">
68
+        delete from cmc_project_progress where project_id in
69
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
70
+            #{projectId}
71
         </foreach>
71
         </foreach>
72
     </delete>
72
     </delete>
73
 </mapper>
73
 </mapper>

+ 31
- 14
oa-ui/src/views/flowable/form/cwTable.vue View File

39
             :disabled="!isDeptLeader">
39
             :disabled="!isDeptLeader">
40
           </el-input>
40
           </el-input>
41
           <el-row justify="center" type="flex">
41
           <el-row justify="center" type="flex">
42
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
43
-                :disabled="!isDeptLeader"></el-input> </el-col>
44
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
45
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
42
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
44
+            </el-col>
45
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
47
+            </el-col>
46
           </el-row>
48
           </el-row>
47
         </td>
49
         </td>
48
         <td colspan="3" rowspan="3">
50
         <td colspan="3" rowspan="3">
50
             :disabled="!isManager">
52
             :disabled="!isManager">
51
           </el-input>
53
           </el-input>
52
           <el-row justify="center">
54
           <el-row justify="center">
53
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
54
-                :disabled="!isManager"></el-input></el-col>
55
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
56
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
55
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
57
+            </el-col>
58
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
60
+            </el-col>
57
           </el-row>
61
           </el-row>
58
         </td>
62
         </td>
59
       </tr>
63
       </tr>
529
 </template>
533
 </template>
530
 
534
 
531
 <script>
535
 <script>
536
+import { parseTime } from "@/utils/ruoyi";
537
+import { mapGetters } from "vuex";
532
 import { XMContent } from '@/assets/datas/XMContent'
538
 import { XMContent } from '@/assets/datas/XMContent'
533
 import { getDicts as getDicts } from '@/api/system/dict/data'
539
 import { getDicts as getDicts } from '@/api/system/dict/data'
534
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
540
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
551
   },
557
   },
552
   data() {
558
   data() {
553
     return {
559
     return {
560
+      deptAssesser: '',
561
+      deptTime: undefined,
562
+      managerAssesser: '',
563
+      managerTime: undefined,
554
       tableForm: {},
564
       tableForm: {},
555
       form: {},
565
       form: {},
556
       radio1: "",
566
       radio1: "",
564
     }
574
     }
565
   },
575
   },
566
   created() {
576
   created() {
577
+    if (this.taskName == '部门审核') {
578
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
579
+      this.deptAssesser = this.name;
580
+    }
581
+    else if (this.taskName == '分管审核') {
582
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
583
+      this.managerAssesser = this.name;
584
+    }
567
     this.initForm();
585
     this.initForm();
568
   },
586
   },
569
   mounted() {
587
   mounted() {
588
     },
606
     },
589
     formatForm() {
607
     formatForm() {
590
 
608
 
591
-      if (this.taskName == '项目负责人审核') {
609
+      if (this.taskName == '部门审核') {
592
         this.isPiLeader = true;
610
         this.isPiLeader = true;
593
-        this.isDeptLeader = false;
594
-        this.isManager = false;
595
-        this.isStaff = false;
596
-      } else if (this.taskName == '部门审核') {
597
-        this.isPiLeader = false;
598
         this.isDeptLeader = true;
611
         this.isDeptLeader = true;
599
         this.isManager = false;
612
         this.isManager = false;
600
         this.isStaff = false;
613
         this.isStaff = false;
784
   border-radius: 0px;
797
   border-radius: 0px;
785
   background: none;
798
   background: none;
786
 }
799
 }
800
+.auditor {
801
+  font-family: '华文行楷';
802
+  font-size: 20px;
803
+}
787
 </style>
804
 </style>

+ 32
- 14
oa-ui/src/views/flowable/form/jsTable.vue View File

40
             :disabled="!isDeptLeader">
40
             :disabled="!isDeptLeader">
41
           </el-input>
41
           </el-input>
42
           <el-row justify="center" type="flex">
42
           <el-row justify="center" type="flex">
43
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
44
-                :disabled="!isDeptLeader"></el-input> </el-col>
45
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
46
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
43
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
44
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
45
+            </el-col>
46
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
47
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
48
+            </el-col>
47
           </el-row>
49
           </el-row>
48
         </td>
50
         </td>
49
         <td colspan="3" rowspan="4">
51
         <td colspan="3" rowspan="4">
51
             :disabled="!isManager">
53
             :disabled="!isManager">
52
           </el-input>
54
           </el-input>
53
           <el-row justify="center">
55
           <el-row justify="center">
54
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
55
-                :disabled="!isManager"></el-input></el-col>
56
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
57
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
56
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
57
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
58
+            </el-col>
59
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
60
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
61
+            </el-col>
58
           </el-row>
62
           </el-row>
59
         </td>
63
         </td>
60
       </tr>
64
       </tr>
610
 </template>
614
 </template>
611
 
615
 
612
 <script>
616
 <script>
617
+import { parseTime } from "@/utils/ruoyi";
618
+import { mapGetters } from "vuex";
613
 import { JYContent } from '@/assets/datas/JYContent'
619
 import { JYContent } from '@/assets/datas/JYContent'
614
 import { getDicts as getDicts } from '@/api/system/dict/data'
620
 import { getDicts as getDicts } from '@/api/system/dict/data'
615
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
621
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
632
   },
638
   },
633
   data() {
639
   data() {
634
     return {
640
     return {
641
+      deptAssesser: '',
642
+      deptTime: undefined,
643
+      managerAssesser: '',
644
+      managerTime: undefined,
635
       tableForm: {},
645
       tableForm: {},
636
       form: {},
646
       form: {},
637
       radio1: "",
647
       radio1: "",
645
     }
655
     }
646
   },
656
   },
647
   created() {
657
   created() {
658
+    if (this.taskName == '部门审核') {
659
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
660
+      this.deptAssesser = this.name;
661
+    }
662
+    else if (this.taskName == '分管审核') {
663
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
664
+      this.managerAssesser = this.name;
665
+    }
648
     this.initForm();
666
     this.initForm();
649
   },
667
   },
650
   mounted() {
668
   mounted() {
668
       })
686
       })
669
     },
687
     },
670
     formatForm() {
688
     formatForm() {
671
-      if (this.taskName == '项目负责人审核') {
689
+
690
+      if (this.taskName == '部门审核') {
672
         this.isPiLeader = true;
691
         this.isPiLeader = true;
673
-        this.isDeptLeader = false;
674
-        this.isManager = false;
675
-        this.isStaff = false;
676
-      } else if (this.taskName == '部门审核') {
677
-        this.isPiLeader = false;
678
         this.isDeptLeader = true;
692
         this.isDeptLeader = true;
679
         this.isManager = false;
693
         this.isManager = false;
680
         this.isStaff = false;
694
         this.isStaff = false;
864
   border-radius: 0px;
878
   border-radius: 0px;
865
   background: none;
879
   background: none;
866
 }
880
 }
881
+.auditor {
882
+  font-family: '华文行楷';
883
+  font-size: 20px;
884
+}
867
 </style>
885
 </style>

+ 32
- 13
oa-ui/src/views/flowable/form/jyTable.vue View File

39
             :disabled="!isDeptLeader">
39
             :disabled="!isDeptLeader">
40
           </el-input>
40
           </el-input>
41
           <el-row justify="center" type="flex">
41
           <el-row justify="center" type="flex">
42
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
43
-                :disabled="!isDeptLeader"></el-input> </el-col>
44
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
45
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
42
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
44
+            </el-col>
45
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
47
+            </el-col>
46
           </el-row>
48
           </el-row>
47
         </td>
49
         </td>
48
         <td colspan="3" rowspan="3">
50
         <td colspan="3" rowspan="3">
50
             :disabled="!isManager">
52
             :disabled="!isManager">
51
           </el-input>
53
           </el-input>
52
           <el-row justify="center">
54
           <el-row justify="center">
53
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
54
-                :disabled="!isManager"></el-input></el-col>
55
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
56
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
55
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
57
+            </el-col>
58
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
60
+            </el-col>
57
           </el-row>
61
           </el-row>
58
         </td>
62
         </td>
59
       </tr>
63
       </tr>
313
 </template>
317
 </template>
314
 
318
 
315
 <script>
319
 <script>
320
+import { parseTime } from "@/utils/ruoyi";
321
+import { mapGetters } from "vuex";
316
 import { JYContent } from '@/assets/datas/JYContent'
322
 import { JYContent } from '@/assets/datas/JYContent'
317
 import { getDicts as getDicts } from '@/api/system/dict/data'
323
 import { getDicts as getDicts } from '@/api/system/dict/data'
318
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
324
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
335
   },
341
   },
336
   data() {
342
   data() {
337
     return {
343
     return {
344
+      deptAssesser: '',
345
+      deptTime: undefined,
346
+      managerAssesser: '',
347
+      managerTime: undefined,
338
       tableForm: {},
348
       tableForm: {},
339
       form: {},
349
       form: {},
340
       radio1: "",
350
       radio1: "",
348
     }
358
     }
349
   },
359
   },
350
   created() {
360
   created() {
361
+    if (this.taskName == '部门审核') {
362
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
363
+      this.deptAssesser = this.name;
364
+    }
365
+    else if (this.taskName == '分管审核') {
366
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
367
+      this.managerAssesser = this.name;
368
+    }
351
     this.initForm();
369
     this.initForm();
352
   },
370
   },
353
   mounted() {
371
   mounted() {
371
       })
389
       })
372
     },
390
     },
373
     formatForm() {
391
     formatForm() {
374
-      if (this.taskName == '项目负责人审核') {
392
+
393
+      if (this.taskName == '部门审核') {
375
         this.isPiLeader = true;
394
         this.isPiLeader = true;
376
-        this.isDeptLeader = false;
377
-        this.isManager = false;
378
-        this.isStaff = false;
379
-      } else if (this.taskName == '部门审核') {
380
         this.isPiLeader = false;
395
         this.isPiLeader = false;
381
         this.isDeptLeader = true;
396
         this.isDeptLeader = true;
382
         this.isManager = false;
397
         this.isManager = false;
568
   border-radius: 0px;
583
   border-radius: 0px;
569
   background: none;
584
   background: none;
570
 }
585
 }
586
+.auditor {
587
+  font-family: '华文行楷';
588
+  font-size: 20px;
589
+}
571
 </style>
590
 </style>

+ 32
- 9
oa-ui/src/views/flowable/form/scTable.vue View File

57
             :disabled="!isDeptLeader">
57
             :disabled="!isDeptLeader">
58
           </el-input>
58
           </el-input>
59
           <el-row justify="center" type="flex">
59
           <el-row justify="center" type="flex">
60
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
61
-                :disabled="!isDeptLeader"></el-input> </el-col>
62
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
63
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
60
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
61
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
62
+            </el-col>
63
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
64
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
65
+            </el-col>
64
           </el-row>
66
           </el-row>
65
         </td>
67
         </td>
66
         <td colspan="3" rowspan="5">
68
         <td colspan="3" rowspan="5">
68
             :disabled="!isManager">
70
             :disabled="!isManager">
69
           </el-input>
71
           </el-input>
70
           <el-row justify="center">
72
           <el-row justify="center">
71
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
72
-                :disabled="!isManager"></el-input></el-col>
73
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
74
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
73
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
74
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
75
+            </el-col>
76
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
77
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
78
+            </el-col>
75
           </el-row>
79
           </el-row>
76
         </td>
80
         </td>
77
       </tr>
81
       </tr>
1595
 </template>
1599
 </template>
1596
 
1600
 
1597
 <script>
1601
 <script>
1602
+import { parseTime } from "@/utils/ruoyi";
1603
+import { mapGetters } from "vuex";
1598
 import { SCContent } from '@/assets/datas/SCContent'
1604
 import { SCContent } from '@/assets/datas/SCContent'
1599
 import { getDicts as getDicts } from '@/api/system/dict/data'
1605
 import { getDicts as getDicts } from '@/api/system/dict/data'
1600
 import { listProject } from '@/api/oa/project/project.js'
1606
 import { listProject } from '@/api/oa/project/project.js'
1620
   },
1626
   },
1621
   data() {
1627
   data() {
1622
     return {
1628
     return {
1629
+      deptAssesser: '',
1630
+      deptTime: undefined,
1631
+      managerAssesser: '',
1632
+      managerTime: undefined,
1623
       tableForm: {},
1633
       tableForm: {},
1624
       form: {},
1634
       form: {},
1625
       radio1: "",
1635
       radio1: "",
1634
     }
1644
     }
1635
   },
1645
   },
1636
   created() {
1646
   created() {
1647
+    if (this.taskName == '部门审核') {
1648
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
1649
+      this.deptAssesser = this.name;
1650
+    }
1651
+    else if (this.taskName == '分管审核') {
1652
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
1653
+      this.managerAssesser = this.name;
1654
+    }
1637
     this.initForm();
1655
     this.initForm();
1638
   },
1656
   },
1639
   mounted() {
1657
   mounted() {
1909
   transform: rotate(-45deg);
1927
   transform: rotate(-45deg);
1910
   border-radius: 0px;
1928
   border-radius: 0px;
1911
   background: none;
1929
   background: none;
1912
-}</style>
1930
+}
1931
+.auditor {
1932
+  font-family: '华文行楷';
1933
+  font-size: 20px;
1934
+}
1935
+</style>

+ 38
- 16
oa-ui/src/views/flowable/form/xmTable.vue View File

39
             :disabled="!isDeptLeader">
39
             :disabled="!isDeptLeader">
40
           </el-input>
40
           </el-input>
41
           <el-row justify="center" type="flex">
41
           <el-row justify="center" type="flex">
42
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
43
-                :disabled="!isDeptLeader"></el-input> </el-col>
44
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
45
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
42
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
44
+            </el-col>
45
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
47
+            </el-col>
46
           </el-row>
48
           </el-row>
47
         </td>
49
         </td>
48
         <td colspan="3" rowspan="3">
50
         <td colspan="3" rowspan="3">
50
             :disabled="!isManager">
52
             :disabled="!isManager">
51
           </el-input>
53
           </el-input>
52
           <el-row justify="center">
54
           <el-row justify="center">
53
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
54
-                :disabled="!isManager"></el-input></el-col>
55
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
56
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
55
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
57
+            </el-col>
58
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
60
+            </el-col>
57
           </el-row>
61
           </el-row>
58
         </td>
62
         </td>
59
       </tr>
63
       </tr>
336
       </tr>
340
       </tr>
337
     </table>
341
     </table>
338
     <el-row justify="center" type="flex" style="margin-top:20px;">
342
     <el-row justify="center" type="flex" style="margin-top:20px;">
339
-      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
343
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过' }}</el-button>
340
       <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
344
       <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
341
     </el-row>
345
     </el-row>
342
   </div>
346
   </div>
343
 </template>
347
 </template>
344
 
348
 
345
 <script>
349
 <script>
350
+import { parseTime } from "@/utils/ruoyi";
351
+import { mapGetters } from "vuex";
346
 import { XMContent } from '@/assets/datas/XMContent'
352
 import { XMContent } from '@/assets/datas/XMContent'
347
 import { getDicts as getDicts } from '@/api/system/dict/data'
353
 import { getDicts as getDicts } from '@/api/system/dict/data'
348
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
354
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
365
   },
371
   },
366
   data() {
372
   data() {
367
     return {
373
     return {
368
-      tableForm: {},      
374
+      deptAssesser: '',
375
+      deptTime: undefined,
376
+      managerAssesser: '',
377
+      managerTime: undefined,
378
+      tableForm: {},
369
       form: {},
379
       form: {},
370
       radio1: "",
380
       radio1: "",
371
       radio2: "",
381
       radio2: "",
377
       isStaff: false,
387
       isStaff: false,
378
     }
388
     }
379
   },
389
   },
390
+  computed: {
391
+    ...mapGetters(["userId", "name"]),
392
+  },
380
   created() {
393
   created() {
394
+    if (this.taskName == '部门审核') {
395
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
396
+      this.deptAssesser = this.name;
397
+    }
398
+    else if (this.taskName == '分管审核') {
399
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
400
+      this.managerAssesser = this.name;
401
+    }
381
     this.initForm();
402
     this.initForm();
382
   },
403
   },
383
   mounted() {
404
   mounted() {
401
       })
422
       })
402
     },
423
     },
403
     formatForm() {
424
     formatForm() {
404
-      if (this.taskName == '项目负责人审核') {
425
+
426
+      if (this.taskName == '部门审核') {
405
         this.isPiLeader = true;
427
         this.isPiLeader = true;
406
-        this.isDeptLeader = false;
407
-        this.isManager = false;
408
-        this.isStaff = false;
409
-      } else if (this.taskName == '部门审核') {
410
-        this.isPiLeader = false;
411
         this.isDeptLeader = true;
428
         this.isDeptLeader = true;
412
         this.isManager = false;
429
         this.isManager = false;
413
         this.isStaff = false;
430
         this.isStaff = false;
598
   border-radius: 0px;
615
   border-radius: 0px;
599
   background: none;
616
   background: none;
600
 }
617
 }
618
+
619
+.auditor {
620
+  font-family: '华文行楷';
621
+  font-size: 20px;
622
+}
601
 </style>
623
 </style>

+ 34
- 15
oa-ui/src/views/flowable/form/zhTable.vue View File

39
             :disabled="!isDeptLeader">
39
             :disabled="!isDeptLeader">
40
           </el-input>
40
           </el-input>
41
           <el-row justify="center" type="flex">
41
           <el-row justify="center" type="flex">
42
-            <el-col :span="12">考核人:<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
43
-                :disabled="!isDeptLeader"></el-input> </el-col>
44
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
45
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
42
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
44
+            </el-col>
45
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
47
+            </el-col>
46
           </el-row>
48
           </el-row>
47
         </td>
49
         </td>
48
         <td colspan="3" rowspan="3">
50
         <td colspan="3" rowspan="3">
50
             :disabled="!isManager">
52
             :disabled="!isManager">
51
           </el-input>
53
           </el-input>
52
           <el-row justify="center">
54
           <el-row justify="center">
53
-            <el-col :span="12">考核人:<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
54
-                :disabled="!isManager"></el-input></el-col>
55
-            <el-col :span="12">日期:<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
56
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
55
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
57
+            </el-col>
58
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
60
+            </el-col>
57
           </el-row>
61
           </el-row>
58
         </td>
62
         </td>
59
       </tr>
63
       </tr>
761
 </template>
765
 </template>
762
 
766
 
763
 <script>
767
 <script>
768
+import { parseTime } from "@/utils/ruoyi";
769
+import { mapGetters } from "vuex";
764
 import { JYContent } from '@/assets/datas/JYContent'
770
 import { JYContent } from '@/assets/datas/JYContent'
765
 import { getDicts as getDicts } from '@/api/system/dict/data'
771
 import { getDicts as getDicts } from '@/api/system/dict/data'
766
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
772
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
787
   },
793
   },
788
   data() {
794
   data() {
789
     return {
795
     return {
796
+      deptAssesser: '',
797
+      deptTime: undefined,
798
+      managerAssesser: '',
799
+      managerTime: undefined,
790
       tableForm: {},
800
       tableForm: {},
791
       form: {},
801
       form: {},
792
       radio1: "",
802
       radio1: "",
800
     }
810
     }
801
   },
811
   },
802
   created() {
812
   created() {
813
+    if (this.taskName == '部门审核') {
814
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
815
+      this.deptAssesser = this.name;
816
+    }
817
+    else if (this.taskName == '分管审核') {
818
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
819
+      this.managerAssesser = this.name;
820
+    }
803
     this.initForm();
821
     this.initForm();
804
   },
822
   },
805
   mounted() {
823
   mounted() {
823
       })
841
       })
824
     },
842
     },
825
     formatForm() {
843
     formatForm() {
826
-      if (this.taskName == '项目负责人审核') {
844
+
845
+      if (this.taskName == '部门审核') {
827
         this.isPiLeader = true;
846
         this.isPiLeader = true;
828
-        this.isDeptLeader = false;
829
-        this.isManager = false;
830
-        this.isStaff = false;
831
-      } else if (this.taskName == '部门审核') {
832
-        this.isPiLeader = false;
833
         this.isDeptLeader = true;
847
         this.isDeptLeader = true;
834
         this.isManager = false;
848
         this.isManager = false;
835
         this.isStaff = false;
849
         this.isStaff = false;
1019
   transform: rotate(-45deg);
1033
   transform: rotate(-45deg);
1020
   border-radius: 0px;
1034
   border-radius: 0px;
1021
   background: none;
1035
   background: none;
1022
-}</style>
1036
+}
1037
+.auditor {
1038
+  font-family: '华文行楷';
1039
+  font-size: 20px;
1040
+}
1041
+</style>

Loading…
Cancel
Save