修改已办任务中的流转记录表单信息

修改用户头像
修改首页显示信息

oa-ui/src/store/modules/user.js

       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/user.png") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

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

       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title" style="width:300px;">分管领导考核意见</td>
       </tr>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title" style="width:300px;">项目负责人考核</td>
+        <td colspan="5" class="table-fillin">被考核人填写</td>
+        <td colspan="3" class="table-fzr" style="width:300px;">负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">工作内容</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">熟练程度</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">岗位综合表现</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">工作内容</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin" style="width:50px;">工作量</td>
+        <td class="table-fillin">熟练程度</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">工作量</td>
+        <td class="table-fzr">岗位综合表现</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="8">账务处理</td>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
 
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload01',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload02',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload03',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.familiar04" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="8">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload04',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload05',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05',isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.taskName == '分管领导审核') {
+      } else if (this.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
       }
     },
     submit() {
-      this.formValidate(this.tableForm)
-      this.$emit('submit', this.tableForm);
+      let flag = this.formValidate(this.tableForm)
+      if (flag)
+        this.$emit('submit', this.tableForm);
     },
     formValidate(form) {
       let flag = [];
       for (let f in form) {
-        
+
         if (f.startsWith('familiar') && form[f] != null) {
           flag.push(f.slice(-2));
         } else if (f.length == 5 && f.startsWith('f')) {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-        return
+      }else{
+        isF = true
       }
+      return isF
     },
     cancelSelect(value, name, disabled) {
-      
+      if(disabled){
+        return
+      }
       if (this.isStaff) {
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         }
       }
       if (this.isPiLeader) {
-        if (disabled) {
-          return
-        }
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         } else {
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
+}
+.table-fillin{
+  background-color: #bfee93;
+  font-weight: bold;
+}
+.table-fzr{
+  background-color: #eead93;
+  font-weight: bold;
 }
 
 .table,
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {

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

       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title">分管领导考核意见</td>
       </tr>
         <td class="table-title">部门职务</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
         <td colspan="3" rowspan="4">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice"
+            :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.deptTime" style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isDeptLeader"></el-input> </el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
+                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="4">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice"
+            :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.managerTime" style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isManager"></el-input></el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
+                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
           </el-row>
         </td>
       </tr>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="4" class="table-title" style="width:300px;">项目负责人考核</td>
+        <td colspan="5" class="table-fillin">被考核人填写</td>
+        <td colspan="4" class="table-fzr" style="width:300px;">负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">工作内容</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">熟练程度</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">技能掌握</td>
-        <td class="table-title">岗位综合表现</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">工作内容</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin">工作量</td>
+        <td class="table-fillin">熟练程度</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">工作量</td>
+        <td class="table-fzr">技能掌握</td>
+        <td class="table-fzr">岗位综合表现</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="6">参与生产</td>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
-        
+
         <td rowspan="6">
           <div v-if="!isStaff">{{ 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="6">
           <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, 'workload05')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="6" >
+        <td rowspan="6">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isPiLeader">
           </el-input>
         </td>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="4">
           <div v-if="!isStaff">{{ 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="4">
           <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, 'workload05')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-input v-if="isStaff" v-model="tableForm.f0204"></el-input>
         </td>
       </tr>
-<!--  -->
+      <!--  -->
 
       <tr>
         <td rowspan="13">质量检查</td>
         </td>
         <td rowspan="13">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="13">
           <div v-if="!isStaff">{{ 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="13">
           <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, 'workload05')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.familiar04" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="5">
           <div v-if="!isStaff">{{ 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="5">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <div v-if="!isStaff">{{ 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="3">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 export default {
-  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment','cmc_workload'],
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
     tableForm: {
       type: Object,
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管领导审核') {
+      } else if (this.tableForm.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
       }
     },
     submit() {
-      this.formValidate(this.tableForm)
-      this.$emit('submit', this.tableForm);
+      let flag = this.formValidate(this.tableForm)
+      if (flag)
+        this.$emit('submit', this.tableForm);
     },
     formValidate(form) {
       let flag = [];
       for (let f in form) {
-        
+
         if (f.startsWith('familiar') && form[f] != null) {
           flag.push(f.slice(-2));
         } else if (f.length == 5 && f.startsWith('f')) {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-        return
+      }else{
+        isF = true
       }
+      return isF
     },
     cancelSelect(value, name, disabled) {
-      
+      if(disabled){
+        return
+      }
       if (this.isStaff) {
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         }
       }
       if (this.isPiLeader) {
-        if (disabled) {
-          return
-        }
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         } else {
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
+}
+
+.table-fillin {
+  background-color: #bfee93;
+  font-weight: bold;
+}
+
+.table-fzr {
+  background-color: #eead93;
   font-weight: bold;
 }
 
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}
-</style>
+}</style>

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

   <div style="padding:10px">
     <h2 style="text-align: center;">经营发展部考核表</h2>
     <table class="table" ref="tableDatas">
-      <tr>
-        <td class="table-title">项目编号</td>
-        <td colspan="1" style="text-align:left;padding-left:10px;">
-          {{ tableForm.projectNumber }}
-        </td>
-        <td class="table-title">项目名称</td>
-        <td colspan="9" style="text-align:left;padding-left:10px;">
-          {{ tableForm.projectName }}
-        </td>
-      </tr>
       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title" style="width:300px;">分管领导考核意见</td>
       </tr>
         <td class="table-title">部门职务</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
         <td colspan="3" rowspan="3">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice"
+            :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.deptTime" style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isDeptLeader"></el-input> </el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
+                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice"
+            :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.managerTime" style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isManager"></el-input></el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
+                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
           </el-row>
         </td>
       </tr>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title">项目负责人考核</td>
+        <td colspan="5" class="table-fillin">被考核人填写</td>
+        <td colspan="3" class="table-fzr">负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">等级、比例尺等</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">熟练程度</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">岗位综合表现</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">等级、比例尺等</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin">工作量</td>
+        <td class="table-fillin">熟练程度</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">工作量</td>
+        <td class="table-fzr">岗位综合表现</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="6">参与生产</td>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
-        
+
         <td rowspan="6">
           <div v-if="!isStaff">{{ 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="6">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-radio-group v-model="tableForm.accessment01" :disabled="!isPiLeader">
+          <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, 'accessment01')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="6" >
+        <td rowspan="6">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isPiLeader">
           </el-input>
         </td>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <div v-if="!isStaff">{{ 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="3">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.accessment02" :disabled="!isPiLeader">
+          <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, 'accessment02')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
-            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <div v-if="!isStaff">{{ 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="3">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.accessment03" :disabled="!isPiLeader">
+          <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, 'accessment03')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 export default {
-  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment','cmc_workload'],
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
     tableForm: {
       type: Object,
   },
   methods: {
     initForm() {
-
+      console.log(this.tableForm);
     },
     formatForm() {
       if (this.tableForm.taskName == '负责人审核') {
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管领导审核') {
+      } else if (this.tableForm.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
       }
     },
     submit() {
-      this.formValidate(this.tableForm)
-      this.$emit('submit', this.tableForm);
+      let flag = this.formValidate(this.tableForm)
+      if (flag)
+        this.$emit('submit', this.tableForm);
     },
     formValidate(form) {
       let flag = [];
       for (let f in form) {
-        
+
         if (f.startsWith('familiar') && form[f] != null) {
           flag.push(f.slice(-2));
         } else if (f.length == 5 && f.startsWith('f')) {
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-        return
+      }else{
+        isF = true
       }
+      return isF
     },
     cancelSelect(value, name, disabled) {
-      
+      if(disabled){
+        return
+      }
       if (this.isStaff) {
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         }
       }
       if (this.isPiLeader) {
-        if (disabled) {
-          return
-        }
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         } else {
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
 }
 
+.table-fillin {
+  background-color: #bfee93;
+  font-weight: bold;
+}
+
+.table-fzr {
+  background-color: #eead93;
+  font-weight: bold;
+}
+
+
 .table,
 th,
 td {
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}
-</style>
+}</style>

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

       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title">分管领导考核意见</td>
       </tr>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>
       <tr>
-        <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="6" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title">项目负责人考核</td>
+        <td rowspan="2" class="table-title" style="width:100px">考核内容</td>
+        <td colspan="6" class="table-fillin">被考核人填写</td>
+        <td colspan="3" class="table-fzr">项目负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">等级、比例尺等</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">熟练程度</td>
-        <td class="table-title">承担角色</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">产品质量</td>
-        <td class="table-title">技能掌握</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">等级、比例尺等</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin">工作量</td>
+        <td class="table-fillin">熟练程度</td>
+        <td class="table-fillin">承担角色</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">产品质量</td>
+        <td class="table-fzr">技能掌握</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="5">项目负责</td>
           <el-radio-group v-model="tableForm.quality01" :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, 'quality01')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality02" :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, 'quality02')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality03" :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, 'quality03')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality04" :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, 'quality04')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality05" :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, 'quality05')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality06" :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, 'quality06')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality07" :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, 'quality07')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality08" :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, 'quality08')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality08', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill08', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality09" :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, 'quality09')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality09', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill09', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality10" :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, 'quality10')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality10', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill10', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality11" :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, 'quality11')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality11', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill11', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality12" :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, 'quality12')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality12', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill12', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality13" :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, 'quality13')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality13', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill13', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality14" :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, 'quality14')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality14', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill14', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality15" :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, 'quality15')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality15', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill15', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality16" :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, 'quality16')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality16', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill16', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.quality17" :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, 'quality17')">
+                @click.native.prevent="cancelSelect(dict.value, 'quality17', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill17', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
       }
     },
     // 初始化tableForm，得到承担角色的值
-    initTableFormFromForm(){
-      for(let f in this.form){
-        if(this.form[f] != "" && this.form[f] != undefined && this.form[f] != null){
-          this.tableForm[f]  = this.form[f];
+    initTableFormFromForm() {
+      for (let f in this.form) {
+        if (this.form[f] != "" && this.form[f] != undefined && this.form[f] != null) {
+          this.tableForm[f] = this.form[f];
         }
       }
     },
       })
     },
     submit() {
-        this.formValidate(this.tableForm)
+      let flag = this.formValidate(this.tableForm)
+      if (flag) {
         this.assignmentToTableForm();
         this.initTableFormFromForm();
         console.log(this.tableForm);
         this.$emit('submit', this.tableForm);
+      }
+
     },
     formValidate(form) {
       let flag = [];
       let isF = false;
       if (flag.length == 0) {
         this.$modal.msgError("表格未填写，请填写表格");
-        return
+      } else {
+        isF = true
       }
+      return isF
     },
     cancelSelect(value, name, disabled) {
-      
+      if(disabled){
+        return
+      }
       if (this.isStaff) {
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         }
       }
       if (this.isPiLeader) {
-        if (disabled) {
-          return
-        }
         if (this.tableForm[name] == value) {
           this.tableForm[name] = null
         } else {
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
+}
+
+.table-fillin {
+  background-color: #bfee93;
+  font-weight: bold;
+}
+
+.table-fzr {
+  background-color: #eead93;
+  font-weight: bold;
 }
 
 .table,
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {

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

       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title" style="width:300px;">分管领导考核意见</td>
       </tr>
         <td class="table-title">部门职务</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
         <td colspan="3" rowspan="3">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice"
+            :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.deptTime" style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isDeptLeader"></el-input> </el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
+                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice"
+            :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.managerTime" style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isManager"></el-input></el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
+                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
           </el-row>
         </td>
       </tr>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title" style="width:300px;">项目负责人考核</td>
+        <td colspan="5" class="table-fillin">被考核人填写</td>
+        <td colspan="3" class="table-fzr" style="width:300px;">负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">工作内容</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">熟练程度</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">岗位综合表现</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">工作内容</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin">工作量</td>
+        <td class="table-fillin">熟练程度</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">工作量</td>
+        <td class="table-fzr">岗位综合表现</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="6">参与生产</td>
             <div><el-radio :label="3">精通</el-radio></div>
           </el-radio-group>
         </td>
-        
+
         <td rowspan="6">
           <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="6">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <td rowspan="6">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="6" >
+        <td rowspan="6">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isPiLeader">
           </el-input>
         </td>
         </td>
         <td rowspan="6">
           <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="6">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <td rowspan="6">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         </td>
         <td rowspan="3">
           <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="3">
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <td rowspan="3">
           <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')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-input v-if="isStaff" v-model="tableForm.f0303"></el-input>
         </td>
       </tr>
-<!--  -->
+      <!--  -->
       <tr style="height:90px;">
         <td>其他工作</td>
         <td colspan="9">
 import { XMContent } from '@/assets/datas/XMContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 export default {
-  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment','cmc_workload'],
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
     tableForm: {
       type: Object,
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管领导审核') {
+      } else if (this.tableForm.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
       }
     },
     submit() {
-      if(!this.isStaff){
-        this.$emit('submit', this.tableForm);
-      }else{
+      let flag = this.formValidate(this.tableForm)
+      if (flag)
         this.$emit('submit', this.tableForm);
+    },
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
+
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
       }
-      
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
+      } else {
+        isF = true
+      }
+      return isF
     },
-    cancelSelect(value, name) {
-      
-      if (!this.isPiLeader) {
+    cancelSelect(value, name, disabled) {
+      if(disabled){
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
 }
 
+.table-fillin {
+  background-color: #bfee93;
+  font-weight: bold;
+}
+
+.table-fzr {
+  background-color: #eead93;
+  font-weight: bold;
+}
+
+
 .table,
 th,
 td {
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}
-</style>
+}</style>

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

       <tr>
         <td class="table-title">姓名</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
-        <td class="table-title">考核年度</td>
-        <td> {{ tableForm.assessTime }}</td>
+        <td class="table-title" style="width:50px">考核时间</td>
+        <td>
+          <el-date-picker v-model="tableForm.assessTime" type="month" placeholder="选择日期">
+          </el-date-picker>
+        </td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title" style="width:300px">分管领导考核意见</td>
       </tr>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
-        <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title" style="width:300px;">项目负责人考核</td>
+        <td colspan="5" class="table-fillin">被考核人填写</td>
+        <td colspan="3" class="table-fzr" style="width:300px;">负责人考核</td>
       </tr>
       <tr>
-        <td class="table-title">工作内容</td>
-        <td class="table-title">单位</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">参与情况</td>
-        <td class="table-title">备注</td>
-        <td class="table-title">工作量</td>
-        <td class="table-title">岗位综合表现</td>
-        <td class="table-title">考核建议</td>
+        <td class="table-fillin">工作内容</td>
+        <td class="table-fillin">单位</td>
+        <td class="table-fillin">工作量</td>
+        <td class="table-fillin">参与情况</td>
+        <td class="table-fillin">备注</td>
+        <td class="table-fzr">工作量</td>
+        <td class="table-fzr">岗位综合表现</td>
+        <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
         <td rowspan="9">劳动组织</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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <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')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.assessment06" :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, 'assessment06')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment06', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         <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')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           <el-radio-group v-model="tableForm.assessment07" :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, 'assessment07')">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment07', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管领导审核') {
+      } else if (this.tableForm.taskName == '分管审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
       }
     },
     submit() {
-      if (!this.isStaff) {
-        this.$emit('submit', this.tableForm);
-      } else {
+      let flag = this.formValidate(this.tableForm)
+      if (flag)
         this.$emit('submit', this.tableForm);
-      }
+    },
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
 
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
+      }
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
+      }else{
+        isF = true
+      }
+      return isF
     },
-    cancelSelect(value, name) {
-      
-      if (!this.isPiLeader) {
+    cancelSelect(value, name, disabled) {
+      if(disabled){
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },
 }
 
 .table-title {
-  background-color: #dad4d4;
+  background-color: #90d6f1;
+  font-weight: bold;
 }
+.table-fillin{
+  background-color: #bfee93;
+  font-weight: bold;
+}
+.table-fzr{
+  background-color: #eead93;
+  font-weight: bold;
+}
+
 
 .table,
 th,
 }
 
 td {
-  height: 24px;
-  width: 100px;
+  height: 50px;
+  // width: 100px;
 }
 
 .head {

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

 <template>
   <div class="app-container">
-    <el-card class="box-card" >
+    <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span class="el-icon-document">已办任务</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <!-- <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4" v-if="variableOpen">
           </el-col>
         </el-tab-pane> -->
         <el-tab-pane label="表单信息" name="1">
-          <ScTable :tableForm="tableForm"></ScTable>
+          <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>
+          <el-col :span="16" :offset="4" v-else>
+            <div class="test-form">
+              <parser :key="new Date().getTime()" :form-conf="variablesData" />
+            </div>
+          </el-col>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
-          <el-col :span="16" :offset="4" >
+          <el-col :span="16" :offset="4">
             <div class="block">
               <el-timeline>
-                <el-timeline-item
-                  v-for="(item,index ) in flowRecordList"
-                  :key="index"
-                  :icon="setIcon(item.finishTime)"
-                  :color="setColor(item.finishTime)"
-                >
-                  <p style="font-weight: 700">{{item.taskName}}</p>
+                <el-timeline-item v-for="(item, index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+                  :color="setColor(item.finishTime)">
+                  <p style="font-weight: 700">{{ item.taskName }}</p>
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-user"></i>办理人</template>
-                        {{item.assigneeName}}
-                        <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
+                        {{ item.assigneeName }}
+                        <el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-user"></i>候选办理</template>
-                        {{item.candidate}}
+                        {{ item.candidate }}
                       </el-descriptions-item>
                       <el-descriptions-item label-class-name="my-label">
                         <template slot="label"><i class="el-icon-date"></i>接收时间</template>
-                        {{item.createTime}}
+                        {{ item.createTime }}
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
-                        {{item.finishTime}}
+                        {{ item.finishTime }}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">
+                      <el-descriptions-item v-if="item.duration" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
-                        {{item.duration}}
+                        {{ item.duration }}
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.comment" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
-                        {{item.comment.comment}}
+                        {{ item.comment.comment }}
                       </el-descriptions-item>
                     </el-descriptions>
                   </el-card>
           </el-col>
         </el-tab-pane>
         <el-tab-pane label="流程图" name="3">
-          <flow :flowData="flowData"/>
+          <flow :flowData="flowData" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
 </template>
 
 <script>
-import {flowRecord} from "@/api/flowable/finished";
+import { flowRecord } from "@/api/flowable/finished";
 import Parser from '@/components/parser/Parser'
-import {getProcessVariables, flowXmlAndNode} from "@/api/flowable/definition";
+import { getProcessVariables, flowXmlAndNode } from "@/api/flowable/definition";
 import flow from '@/views/flowable/task/finished/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import ScTable from "../../../form/scTable.vue";
 import { getAssess, modifyAssess } from '@/api/oa/assess/assess'
+import JyTable from "@/views/flowable/form/jyTable.vue";
+import ZhTable from "@/views/flowable/form/zhTable.vue";
+import JsTable from "@/views/flowable/form/jsTable.vue";
+import XmTable from "@/views/flowable/form/xmTable.vue";
+import CwTable from "@/views/flowable/form/cwTable.vue";
 
 export default {
   name: "Record",
   components: {
     Parser,
     flow,
-    ScTable
-},
+    ScTable,
+    ZhTable,
+    JsTable,
+    XmTable,
+    CwTable,
+    JyTable
+  },
   props: {},
   data() {
     return {
       flowRecordList: [], // 流程流转数据
       formConfCopy: {},
       src: null,
-      taskForm:{
+      taskForm: {
         multiple: false,
-        comment:"", // 意见内容
+        comment: "", // 意见内容
         procInsId: "", // 流程实例编号
         instanceId: "", // 流程实例编号
         deployId: "",  // 流程定义编号
-        taskId: "" ,// 流程任务编号
+        taskId: "",// 流程任务编号
         procDefId: "",  // 流程编号
         vars: "",
-        targetKey:""
+        targetKey: ""
       },
       variables: [], // 流程变量数据
       variablesData: {}, // 流程变量数据
   },
   created() {
     this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
-    this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
+    this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
     this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
     this.taskForm.formId = this.$route.query.formId;
+    this.taskForm.procDefName = this.$route.query.procDefName;
     // 回显流程记录
     // 流程任务重获取变量表单
-    if (this.taskForm.taskId){
-      this.processVariables( this.taskForm.taskId)
+    if (this.taskForm.taskId) {
+      this.processVariables(this.taskForm.taskId)
       this.getAssessByAssessId(this.taskForm.formId)
     }
-    this.getFlowRecordList( this.taskForm.procInsId, this.taskForm.deployId);
-    
+    this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+
   },
   methods: {
     handleClick(tab, event) {
       if (tab.name === '3') {
-        flowXmlAndNode({procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId}).then(res => {
+        flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
           this.flowData = res.data;
         })
       }
     /** 流程流转记录 */
     getFlowRecordList(procInsId, deployId) {
       const that = this
-      const params = {procInsId: procInsId, deployId: deployId}
+      const params = { procInsId: procInsId, deployId: deployId }
       flowRecord(params).then(res => {
         that.flowRecordList = res.data.flowList;
       }).catch(res => {
     /** 返回页面 */
     goBack() {
       // 关闭当前标签页并返回上个页面
-      const obj = { path: "/task/finished", query: { t: Date.now()} };
+      const obj = { path: "/task/finished", query: { t: Date.now() } };
       this.$tab.closeOpenPage(obj);
     },
     // 获取需要处理的表单表格信息
         let data = res.data;
         for (let d in data) {
           if (d.includes('role')) {
-            data[d] = data[d].split(',')
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
           }
           if (d.includes('familiar')) {
-            data[d] = parseInt(data[d])
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
           }
         }
         this.tableForm = data;
   display: table;
   content: "";
 }
+
 .clearfix:after {
   clear: both
 }
   margin-bottom: 20px;
 }
 
-.el-tag + .el-tag {
+.el-tag+.el-tag {
   margin-left: 10px;
 }
 

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

     },
     /** 流程流转记录 */
     handleFlowRecord(row) {
+      console.log(row);
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
           path: '/flowable/task/finished/detail/index',
             procInsId: row.procInsId,
             deployId: row.deployId,
             taskId: row.taskId,
-            formId: res.data.formId
+            formId: res.data.formId,
+            procDefName:row.procDefName
           }
         })
       })

oa-ui/src/views/flowable/task/myProcess/index.vue

     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:deployment:add']">新增流程</el-button>
+          v-hasPermi="['system:deployment:add']">发起申请</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
       </el-table-column>
       <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">详情</el-button>
+          <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">进度</el-button>
           <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button>
           <el-button @click="handleDelete(scope.row)" type="text" size="small"
             v-hasPermi="['system:deployment:remove']">删除</el-button>
       </el-form>
       <el-table v-loading="processLoading" fit :data="definitionList" border>
         <el-table-column label="流程名称" align="center" prop="name" />
-        <el-table-column label="流程版本" align="center">
+        <!-- <el-table-column label="流程版本" align="center">
           <template slot-scope="scope">
             <el-tag size="medium">v{{ scope.row.version }}</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="流程分类" align="center" prop="category" />
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit-outline"
-              @click="handleStartProcess(scope.row)">发起流程</el-button>
+              @click="handleStartProcess(scope.row)">发起申请</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="processTotal > 0" :total="processTotal" :page.sync="queryProcessParams.pageNum"
         :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" />
     </el-dialog>
-    <el-dialog title="流程详情" :visible.sync="detailsOpen" append-to-body width="600px">
+    <el-dialog title="流程进度" :visible.sync="detailsOpen" append-to-body width="600px">
       <el-scrollbar style="height: 600px;">
         <RowDetail :rows="clickRow"></RowDetail>
       </el-scrollbar>
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
-      this.title = "发起流程";
+      this.title = "发起申请";
       this.listDefinition();
     },
     listDefinition() {

oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue

  * @Author: ysh
  * @Date: 2024-01-30 09:56:12
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-01 16:33:48
+ * @LastEditTime: 2024-02-26 16:13:14
 -->
 <template>
   <div>

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

     },
     /** 返回页面 */
     goBack() {
+      console.log(this.tableForm);
       // 关闭当前标签页并返回上个页面
       const obj = { path: "/task/todo", query: { t: Date.now() } };
       this.$tab.closeOpenPage(obj);

oa-ui/src/views/index.vue

  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-05 14:56:35
+ * @LastEditTime: 2024-02-26 17:01:28
 -->
 <template>
   <div class="app-container home">
                   入职时间
                 </el-row>
                 <el-row class="userinfo-data">
-                  2010
+                  {{ user.entryDate }}
                 </el-row>
               </el-col>
               <el-col :span="4">
                   工龄
                 </el-row>
                 <el-row class="userinfo-data">
-                  10年
+                  {{ getObtainSeniority(user.entryDate) }}
                 </el-row>
               </el-col>
               <el-col :span="4">
                   所在部门
                 </el-row>
                 <el-row class="userinfo-data">
-                  地理信息中心
+                  {{ }}
                 </el-row>
               </el-col>
               <el-col :span="4">
                 <el-row class="userinfo-item">
-                  部门职务
+                  岗级
                 </el-row>
                 <el-row class="userinfo-data">
-                  正职
+                  {{ engineerLevel }}
                 </el-row>
               </el-col>
               <el-col :span="4">
                   技术职称
                 </el-row>
                 <el-row class="userinfo-data">
-                  注册测绘师
+                  {{ titles }}
                 </el-row>
               </el-col>
             </el-row>
             </el-col>
             <!-- <el-col :span="4" class="item" style="background-color: #40A9FF;padding:3px">
               <el-row class="item-icon"><i class="el-icon-s-order"></i></el-row>
-              <el-row>新建项目</el-row>
+              <el-row>已办任务</el-row>
             </el-col> -->
           </el-row>
         </el-col>
           <el-row>
             <el-col :span="6" class="db-item">
               <el-row class="db-text">考核待审</el-row>
-              <el-row class="db-number">10</el-row>
+              <el-row class="db-number">{{ detail }}</el-row>
             </el-col>
           </el-row>
         </el-col>
             </el-table-column>
           </el-table>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-calendar v-model="times">
           </el-calendar>
         </el-col>
 <script>
 import { mapGetters } from "vuex";
 import { getUserProfile } from "@/api/system/user";
+import { todoList } from "@/api/flowable/todo";
+import { getDicts as getDicts, getData } from '@/api/system/dict/data'
 export default {
   name: "index",
   computed: {
     ...mapGetters(["avatar"]),
   },
+  dicts: ['sys_user_engineerlevel', 'sys_user_titles'],
   data() {
     return {
       user: {},
       weather: {},
       noticeData: [],
       projectData: [],
-      times: new Date()
+      times: new Date(),
+      detail: 0,
+      engineerLevel: '',
+      titles: ''
     };
   },
   created() {
     this.getUser();
+    this.getDetail();
   },
   methods: {
     goTarget(href) {
     getUser() {
       getUserProfile().then(response => {
         this.user = response.data;
-        console.log(this.user);
+        for (let d of this.dict.type.sys_user_engineerlevel) {
+          if (d.value == response.data.engineerLevel) {
+            console.log(d);
+            this.engineerLevel = d.label
+          }
+        }
+        for (let t of this.dict.type.sys_user_titles) {
+          if (t.value == response.data.titles) {
+            console.log(t);
+            this.titles = t.label
+          }
+        }
+      });
+    },
+    gotoTask() {
+      this.$router.push({ path: "/task/process" });
+    },
+    // 获取考核待办
+    getDetail() {
+      todoList({
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        category: 'assess'
+      }).then(response => {
+        this.detail = response.data.total;
       });
     },
-    gotoTask(){
-      this.$router.push({ path: "/task/process"});
+    // 获取工龄
+    getObtainSeniority(entryDate) {
+      if (entryDate != "" && entryDate != undefined && entryDate != null) {
+        let curYear = new Date();
+        let e = entryDate.substring(0, 5);
+        return curYear - parseInt(e)
+      }
+
+
     }
   },
 };
   .meau {
     height: 150px;
     margin-bottom: 20px;
+
     .meau-left {
       background-color: #fff;
       padding: 0px 20px 10px;
       background-color: #fff;
       padding: 0px 20px 10px;
       margin-left: 20px;
-      .db-item{
+
+      .db-item {
         text-align: center;
         background-color: #F5F5F5;
         padding: 10px 20px;
         cursor: pointer;
-        .db-text{
-        }
-        .db-number{
+
+        .db-text {}
+
+        .db-number {
           font-weight: bold;
           color: #e67153;
           line-height: 30px;
         }
       }
     }
-    .item{
+
+    .item {
       color: #fff;
       margin: 0 10px;
       cursor: pointer;
     }
-    .item-icon{
+
+    .item-icon {
       width: 100%;
       height: 100%;
       text-align: center;
-      i{
+
+      i {
         display: inline-block;
         font-size: 40px;
         color: #fff;
       }
     }
   }
-  .notice{
+
+  .notice {
     padding: 0px 20px 10px;
     background-color: #fff;
   }