考核流程更新

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -110,6 +110,7 @@ public class CmcAssessController extends BaseController
         formData.put("assessId", assessId);
         if (cmcAssess != null) {
             formData.put("assessTime", cmcAssess.getAssessTime());
+            formData.put("projectId", cmcAssess.getProjectId());
             if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
                 formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
                 formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());

oa-ui/src/views/flowable/form/cwTable.vue

@@ -107,7 +107,7 @@
           <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload01',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -117,7 +117,7 @@
           <el-radio-group v-model="tableForm.assessment01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'assessment01',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -211,7 +211,7 @@
           <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload02',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -221,7 +221,7 @@
           <el-radio-group v-model="tableForm.assessment02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'assessment02',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -274,7 +274,7 @@
           <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload03',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -284,7 +284,7 @@
           <el-radio-group v-model="tableForm.assessment03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'assessment03',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -367,7 +367,7 @@
           <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload04',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -377,7 +377,7 @@
           <el-radio-group v-model="tableForm.assessment04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'assessment04',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -468,7 +468,7 @@
           <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload05',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -478,7 +478,7 @@
           <el-radio-group v-model="tableForm.assessment05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'assessment05',isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -521,10 +521,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -532,15 +531,17 @@
 <script>
 import { XMContent } from '@/assets/datas/XMContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
-    },
     taskName: {
       type: String
+    },
+    taskForm: {
+      type: Object
     }
   },
   watch: {
@@ -550,6 +551,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -567,13 +569,26 @@ export default {
   mounted() {
     this.formatForm();
   },
-  methods: {
+  methods: {// 获取需要处理的表单表格信息
     initForm() {
-
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
     },
     formatForm() {
 
-      if (this.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -597,8 +612,48 @@ export default {
     },
     submit() {
       let flag = this.formValidate(this.tableForm)
-      if (flag)
-        this.$emit('submit', this.tableForm);
+      if (flag) {
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+      }
     },
     formValidate(form) {
       let flag = [];
@@ -614,13 +669,13 @@ export default {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-      }else{
+      } else {
         isF = true
       }
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -642,7 +697,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },    
   },
 }
 </script>
@@ -657,11 +712,13 @@ export default {
   background-color: #90d6f1;
   font-weight: bold;
 }
-.table-fillin{
+
+.table-fillin {
   background-color: #bfee93;
   font-weight: bold;
 }
-.table-fzr{
+
+.table-fzr {
   background-color: #eead93;
   font-weight: bold;
 }

oa-ui/src/views/flowable/form/jsTable.vue

@@ -123,7 +123,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -220,7 +221,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -300,7 +302,8 @@
         <td rowspan="13">
           <el-radio-group v-model="tableForm.skill03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -453,7 +456,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -542,7 +546,8 @@
         <td rowspan="3">
           <el-radio-group v-model="tableForm.skill05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -597,10 +602,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -608,13 +612,18 @@
 <script>
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
+    taskName: {
+      type: String
     },
+    taskForm: {
+      type: Object
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -623,6 +632,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -642,25 +652,38 @@ export default {
   },
   methods: {
     initForm() {
-
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
     },
     formatForm() {
-      if (this.tableForm.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工填报') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -669,8 +692,48 @@ export default {
     },
     submit() {
       let flag = this.formValidate(this.tableForm)
-      if (flag)
-        this.$emit('submit', this.tableForm);
+      if (flag) {
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+      }
     },
     formValidate(form) {
       let flag = [];
@@ -686,13 +749,13 @@ export default {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-      }else{
+      } else {
         isF = true
       }
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -714,7 +777,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },
   },
 }
 </script>
@@ -800,4 +863,5 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}</style>
+}
+</style>

oa-ui/src/views/flowable/form/jyTable.vue

@@ -305,10 +305,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -316,13 +315,18 @@
 <script>
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
+    taskName: {
+      type: String
     },
+    taskForm: {
+      type: Object
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -331,6 +335,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -350,25 +355,38 @@ export default {
   },
   methods: {
     initForm() {
-      console.log(this.tableForm);
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
     },
     formatForm() {
-      if (this.tableForm.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工填报') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -377,8 +395,48 @@ export default {
     },
     submit() {
       let flag = this.formValidate(this.tableForm)
-      if (flag)
-        this.$emit('submit', this.tableForm);
+      if (flag) {
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+      }
     },
     formValidate(form) {
       let flag = [];
@@ -394,13 +452,13 @@ export default {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-      }else{
+      } else {
         isF = true
       }
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -422,7 +480,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },
   },
 }
 </script>
@@ -509,4 +567,5 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}</style>
+}
+</style>

oa-ui/src/views/flowable/form/scTable.vue

@@ -150,7 +150,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -237,7 +238,8 @@
         <td rowspan="10">
           <el-radio-group v-model="tableForm.skill02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -361,7 +363,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -445,7 +448,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -518,7 +522,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -606,7 +611,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill06" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill06', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -694,7 +700,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill07" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill07', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -767,7 +774,8 @@
         <td rowspan="3">
           <el-radio-group v-model="tableForm.skill08" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill08', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill08', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -833,7 +841,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill09" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill09', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill09', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -922,7 +931,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill10" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill10', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill10', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1003,7 +1013,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill11" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill11', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill11', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1092,7 +1103,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill12" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill12', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill12', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1173,7 +1185,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill13" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill13', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill13', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1262,7 +1275,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill14" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill14', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill14', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1351,7 +1365,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill15" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill15', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill15', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1440,7 +1455,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill16" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill16', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill16', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1512,7 +1528,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill17" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill17', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'skill17', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1570,10 +1587,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -1583,14 +1599,19 @@ import { SCContent } from '@/assets/datas/SCContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { listProject } from '@/api/oa/project/project.js'
 import { getProject } from '@/api/oa/project/project'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
+    taskName: {
+      type: String
     },
+    taskForm: {
+      type: Object
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -1599,6 +1620,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -1619,6 +1641,20 @@ export default {
   },
   methods: {
     initForm() {
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
       listProject({ pageSize: 200 }).then(res => {
         this.projectList = res.rows;
       })
@@ -1642,22 +1678,22 @@ export default {
             this.form['role' + i] = this.tableForm['role' + i]
         }
       }
-      if (this.tableForm.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工填报') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -1694,10 +1730,57 @@ export default {
       if (flag) {
         this.assignmentToTableForm();
         this.initTableFormFromForm();
-        console.log(this.tableForm);
-        this.$emit('submit', this.tableForm);
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            console.log(this.tableForm);
+            getProject(this.tableForm.projectId).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '项目负责人审核') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
       }
-
     },
     formValidate(form) {
       let flag = [];
@@ -1718,7 +1801,7 @@ export default {
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -1740,7 +1823,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },
   },
 }
 </script>
@@ -1826,5 +1909,4 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}
-</style>
+}</style>

oa-ui/src/views/flowable/form/xmTable.vue

@@ -335,10 +335,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -346,13 +345,18 @@
 <script>
 import { XMContent } from '@/assets/datas/XMContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
+    taskName: {
+      type: String
     },
+    taskForm: {
+      type: Object
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -361,6 +365,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},      
       form: {},
       radio1: "",
       radio2: "",
@@ -380,25 +385,38 @@ export default {
   },
   methods: {
     initForm() {
-
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
     },
     formatForm() {
-      if (this.tableForm.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工填报') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -407,8 +425,48 @@ export default {
     },
     submit() {
       let flag = this.formValidate(this.tableForm)
-      if (flag)
-        this.$emit('submit', this.tableForm);
+      if (flag) {
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+      }
     },
     formValidate(form) {
       let flag = [];
@@ -430,7 +488,7 @@ export default {
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -452,7 +510,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },
   },
 }
 </script>
@@ -539,4 +597,5 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}</style>
+}
+</style>

oa-ui/src/views/flowable/form/zhTable.vue

@@ -101,12 +101,13 @@
 
         <td rowspan="9">
           <div>{{ tableForm.remark01 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="9">
           <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -215,12 +216,13 @@
         </td>
         <td rowspan="8">
           <div>{{ tableForm.remark02 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -317,12 +319,13 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark03 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -394,12 +397,13 @@
         </td>
         <td rowspan="7">
           <div>{{ tableForm.remark04 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -487,12 +491,13 @@
         </td>
         <td rowspan="10">
           <div>{{ tableForm.remark05 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
           <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -603,12 +608,13 @@
         </td>
         <td rowspan="7">
           <div>{{ tableForm.remark06 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark06"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.workload06" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload06', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -695,12 +701,13 @@
         </td>
         <td rowspan="2">
           <div>{{ tableForm.remark07 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark07"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark07" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="2">
           <el-radio-group v-model="tableForm.workload07" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload07', isStaff)">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -746,10 +753,9 @@
         </td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
-      <el-button type="primary" @click="submit">提交</el-button>
-      <el-button @click="$emit('close')">取消</el-button>
+    <el-row justify="center" type="flex" style="margin-top:20px;">
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -757,13 +763,22 @@
 <script>
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
-  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment','cmc_workload'],
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
     tableForm: {
       type: Object,
       required: true
     },
+    taskName: {
+      type: String
+    },
+    taskForm: {
+      type: Object
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -772,6 +787,7 @@ export default {
   },
   data() {
     return {
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -790,26 +806,39 @@ export default {
     this.formatForm();
   },
   methods: {
-    initForm() {
-
+initForm() {
+      getAssess(this.taskForm.formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+      })
     },
     formatForm() {
-      if (this.tableForm.taskName == '负责人审核') {
+      if (this.taskName == '项目负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工填报') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -818,8 +847,48 @@ export default {
     },
     submit() {
       let flag = this.formValidate(this.tableForm)
-      if (flag)
-        this.$emit('submit', this.tableForm);
+      if (flag) {
+        // this.$emit('submit', this.tableForm);
+        let formData = new FormData();
+        this.tableForm.formId = this.taskForm.formId;
+        let form = JSON.stringify(this.tableForm);
+        formData.append("form", form);
+        listAssess({ assessId: this.tableForm.formId }).then(result => {
+          let list = result;
+          if (list.total != 0) {
+            modifyAssess(formData);
+          } else {
+            submitAssess(formData);
+          }
+        })
+        const params = { taskId: this.taskForm.taskId }
+        getNextFlowNode(params).then(res => {
+          if (this.taskName == '员工填报') {
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data)
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '部门审核') {
+            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+              let userId = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            })
+          } else if (this.taskName == '分管审核') {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+      }
     },
     formValidate(form) {
       let flag = [];
@@ -835,13 +904,13 @@ export default {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-      }else{
+      } else {
         isF = true
       }
       return isF
     },
     cancelSelect(value, name, disabled) {
-      if(disabled){
+      if (disabled) {
         return
       }
       if (this.isStaff) {
@@ -863,7 +932,7 @@ export default {
             this.tableForm[name] = value
         }
       }
-    }
+    },
   },
 }
 </script>
@@ -878,11 +947,13 @@ export default {
   background-color: #90d6f1;
   font-weight: bold;
 }
-.table-fillin{
+
+.table-fillin {
   background-color: #bfee93;
   font-weight: bold;
 }
-.table-fzr{
+
+.table-fzr {
   background-color: #eead93;
   font-weight: bold;
 }
@@ -948,5 +1019,4 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}
-</style>
+}</style>

oa-ui/src/views/flowable/task/finished/detail/index.vue

@@ -15,12 +15,12 @@
           </el-col>
         </el-tab-pane> -->
         <el-tab-pane label="表单信息" name="1">
-          <sc-table :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
-          <jy-table :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
-          <js-table :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
-          <xm-table :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
-          <cw-table :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
-          <zh-table :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
+          <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
+          <jy-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
+          <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+          <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
+          <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
+          <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
           <el-col :span="16" :offset="4" v-else>
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="variablesData" />

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -10,18 +10,18 @@
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
-          <sc-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
-          <jy-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
-          <js-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
-          <xm-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
-          <cw-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
-          <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
-            v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
+          <sc-table :taskForm="taskForm" :taskName="taskName" v-if="taskForm.procDefName == '生产部门考核'"
+            @goBack="goBack"></sc-table>
+          <jy-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '经营发展部考核'"
+            @goBack="goBack"></jy-table>
+          <js-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '技术质量部考核'"
+            @goBack="goBack"></js-table>
+          <xm-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '项目管理部考核'"
+            @goBack="goBack"></xm-table>
+          <cw-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '财务部考核'"
+            @goBack="goBack"></cw-table>
+          <zh-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '综合事务部考核'"
+            @goBack="goBack"></zh-table>
           <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"
             @goBack="goBack"></car-form>
           <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批（工会）'"
@@ -38,11 +38,12 @@
             @goBack="goBack"></safe-form>
           <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
             @goBack="goBack"></technical-form>
-          <el-row type="flex" justify="center" v-show="isShowApprove()">
-            <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
-              @click="handleComplete">审核通过
-            </el-button>
-            <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
+          <el-row type="flex" justify="center">
+            <!-- <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
+              @click="handleComplete">审批
+            </el-button> -->
+            <el-button v-show="isShowApprove()" icon="el-icon-refresh-left" type="warning" size="mini"
+              @click="handleReturn">退回</el-button>
             <!-- <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button> -->
           </el-row>
         </el-tab-pane>
@@ -175,7 +176,6 @@ import {
 import flow from '@/views/flowable/task/todo/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listUser } from "@/api/system/user";
-import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
 import ScTable from "@/views/flowable/form/scTable.vue";
 import JyTable from "@/views/flowable/form/jyTable.vue";
 import ZhTable from "@/views/flowable/form/zhTable.vue";
@@ -276,8 +276,6 @@ export default {
       startUser: null, // 发起人信息,
       multiInstanceVars: '', // 会签节点
       formKeyExist: false, // 当前节点是否存在表单
-      // 表单信息
-      tableForm: {}
     };
   },
   created() {
@@ -295,7 +293,6 @@ export default {
       if (this.taskForm.taskId) {
         this.processVariables(this.taskForm.taskId)
         this.getFlowTaskForm(this.taskForm.taskId)
-        this.getAssessByAssessId(this.taskForm.formId)
       }
       this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
     }
@@ -386,38 +383,11 @@ export default {
         });
       }
     },
-    // 获取需要处理的表单表格信息
-    getAssessByAssessId(formId) {
-
-      getAssess(formId).then(res => {
-        let data = res.data;
-
-        for (let d in data) {
-          if (d.includes('role')) {
-            if (data[d] != "" && data[d] != undefined && data[d] != null)
-              data[d] = data[d].split(',')
-          }
-          if (d.includes('familiar')) {
-            if (data[d] != "" && data[d] != undefined && data[d] != null)
-              data[d] = parseInt(data[d])
-          }
-        }
-        this.tableForm = data;
-        this.tableForm.taskId = this.$route.query.taskId;
-        this.tableForm.taskName = this.$route.query.taskName;
-      })
-    },
     /** 加载审批任务弹框 */
     handleComplete() {
       // this.completeOpen = true;
       // this.completeTitle = "流程审批";
-      // this.submitForm(null);
-
-      let formData = new FormData();
-      this.tableForm.formId = this.tableForm.assessId;
-      let form = JSON.stringify(this.tableForm);
-      formData.append("form", form);
-      this.submitForm(formData, this.tableForm.assessId);
+      this.submitForm(null);
     },
     /** 用户审批任务 */
     taskComplete() {
@@ -526,20 +496,7 @@ export default {
       this.returnTaskList = [];
     },
     /** 申请流程表单数据提交 */
-    submitForm(formData, assessId) {
-      listAssess({ assessId }).then(result => {
-        let list = result;
-        if (list.total != 0) {
-          modifyAssess(formData).then(res => {
-          });
-        } else {
-          submitAssess(formData)
-        }
-      })
-
-      if (this.taskForm.variables === null) {
-        this.taskForm.variables = {};
-      }
+    submitForm(formData) {
       // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
       const params = { taskId: this.taskForm.taskId }
       getNextFlowNode(params).then(res => {
@@ -564,7 +521,7 @@ export default {
           }
         }
         this.completeOpen = true;
-        this.completeTitle = "选择下一节点审核人";
+        this.completeTitle = "流程审批";
       })
     },
     // 是否显示审批通过
@@ -608,4 +565,5 @@ export default {
 
 .my-label {
   background: #E1F3D8;
-}</style>
+}
+</style>