综合事务部考核修改

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

@@ -10,6 +10,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oa.domain.CmcAssessContent;
 import com.ruoyi.oa.domain.CmcAssessContentWork;
 import com.ruoyi.oa.service.ICmcAssessContentService;
@@ -190,17 +191,15 @@ public class CmcAssessController extends BaseController
                 if (key.equals("selfAssess"))
                     cmcAssess.setSelfAssess(formDataJson.getString(key));
                 if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
-                    StringBuilder roles = new StringBuilder();
-                    for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
-                        String rolei = "";
-                        if (i == formDataJson.getJSONArray(key).size() - 1)
-                            rolei = formDataJson.getJSONArray(key).getString(i);
-                        else
-                            rolei = formDataJson.getJSONArray(key).getString(i) + ",";
-                        roles.append(rolei);
+                    JSONArray roleArray = new JSONArray();
+                    if (!formDataJson.getString(key).equals("") && !formDataJson.getString(key).contains(",")) {
+                        roleArray.add(formDataJson.getString(key));
                     }
+                    else
+                        roleArray = formDataJson.getJSONArray(key);
+                    String roles = StringUtils.join(roleArray, ",");
                     CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
-                    cmcAssessContent.setRole(roles.toString());
+                    cmcAssessContent.setRole(roles);
                     cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
                 }
                 if (key.startsWith("familiar")) {
@@ -273,16 +272,14 @@ public class CmcAssessController extends BaseController
             if (formDataJson.get(key) != null) {
                 if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
                     CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(4)).get(0);
-                    StringBuilder roles = new StringBuilder();
-                    for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
-                        String rolei = "";
-                        if (i == formDataJson.getJSONArray(key).size() - 1)
-                            rolei = formDataJson.getJSONArray(key).getString(i);
-                        else
-                            rolei = formDataJson.getJSONArray(key).getString(i) + ",";
-                        roles.append(rolei);
+                    JSONArray roleArray = new JSONArray();
+                    if (!formDataJson.getString(key).equals("") && !formDataJson.getString(key).contains(",")) {
+                        roleArray.add(formDataJson.getString(key));
                     }
-                    cmcAssessContent.setRole(roles.toString());
+                    else
+                        roleArray = formDataJson.getJSONArray(key);
+                    String roles = StringUtils.join(roleArray, ",");
+                    cmcAssessContent.setRole(roles);
                     cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
                 }
                 if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {

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

@@ -92,7 +92,7 @@ public class CmcContractController extends BaseController
         if (cmcContract.getManagerComment() != null && cmcContract.getGmComment() == null) {
             cmcContract.setManagerUserId(getLoginUser().getUserId());
         }
-        if (cmcContract.getGmComment() != null && cmcContract.getSignDate() == null) {
+        if (cmcContract.getGmComment() != null && cmcContract.getSignDate() == null && getLoginUser().getUserId() != 22) {
             cmcContract.setGmUserId(getLoginUser().getUserId());
         }
         return toAjax(cmcContractService.updateCmcContract(cmcContract));

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

@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oa.domain.CmcManageDept;
+import com.ruoyi.oa.service.ICmcManageDeptService;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -51,6 +53,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ICmcManageDeptService cmcManageDeptService;
+
     /**
      * 查询cmc项目列表
      */
@@ -140,7 +145,7 @@ public class CmcProjectController extends BaseController
 //                List<String> managerList = new ArrayList<>();
 //                String[] deptId = deptString.split(",");
 //                for (String dept : deptId) {
-//                        List<SysUser> manageList = SysPostController.getManageId(dept, null);
+//                        List<SysUser> manageList = getManageId(dept, "");
 //                        for (SysUser manager : manageList) {
 //                            managerList.add(manager.getPinyin());
 //
@@ -183,4 +188,15 @@ public class CmcProjectController extends BaseController
         }
         return cmcProject.getUndertakingDeptName();
     }
+
+    public  List<SysUser> getManageId(String deptId, String partyAId) {
+        List<SysUser> userList = new ArrayList<>();
+        CmcManageDept cmcManageDept = new CmcManageDept();
+        cmcManageDept.setDeptId(deptId);
+        cmcManageDept.setPartyAId(partyAId);
+        for (CmcManageDept manageDept : cmcManageDeptService.selectCmcManageDeptList(cmcManageDept)) {
+            userList.add(userService.selectUserById(manageDept.getUserId()));
+        }
+        return userList;
+    }
 }

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

@@ -1,9 +1,6 @@
 package com.ruoyi.web.controller.qyweixin;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.oa.domain.CmcProject;
-import liquibase.pro.packaged.S;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -41,10 +41,10 @@ public class SysPostController extends BaseController
     private ISysPostService postService;
 
     @Autowired
-    private static ISysUserService userService;
+    private  ISysUserService userService;
 
     @Autowired
-    private static ICmcManageDeptService cmcManageDeptService;
+    private  ICmcManageDeptService cmcManageDeptService;
 
     /**
      * 获取岗位列表
@@ -165,7 +165,7 @@ public class SysPostController extends BaseController
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId().toString(), null));
+        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId().toString(), ""));
     }
 
     /**
@@ -267,7 +267,7 @@ public class SysPostController extends BaseController
         return success(posts);
     }
 
-    public static List<SysUser> getManageId(String deptId, String partyAId) {
+    public  List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
         CmcManageDept cmcManageDept = new CmcManageDept();
         cmcManageDept.setDeptId(deptId);

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java

@@ -22,19 +22,24 @@ public class CmcAssess extends BaseEntity
     private String assessId;
 
     /** 用户id */
-    @Excel(name = "用户id")
+    @Excel(name = "被考核人")
+    private String userName;
     private Long userId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
 
     /** 考核时间（月份） */
-    @Excel(name = "考核时间", readConverterExp = "月份")
+    @JsonFormat(pattern = "yyyy-MM")
+    @Excel(name = "考核时间", dateFormat = "yyyy-MM")
     private Date assessTime;
 
     /** 部门考核等级（不合格、合格、良好、优秀） */
-    @Excel(name = "部门考核等级", readConverterExp = "不合格、合格、良好、优秀")
+    @Excel(name = "部门考核等级", readConverterExp = "0=不合格,1=合格,2=良好,3=优秀")
     private String deptAssessment;
 
     /** 部门考核意见 */
@@ -48,12 +53,11 @@ public class CmcAssess extends BaseEntity
 
     /** 部门考核负责人 */
     @Excel(name = "部门考核负责人")
+    private String deptUserName;
     private Long deptAssesser;
 
-    private SysUser deptUser;
-
     /** 分管考核等级（不合格、合格、良好、优秀） */
-    @Excel(name = "分管考核等级", readConverterExp = "不合格、合格、良好、优秀")
+    @Excel(name = "分管考核等级", readConverterExp = "0=不合格,1=合格,2=良好,3=优秀")
     private String managerAssessment;
 
     /** 分管考核意见 */
@@ -67,10 +71,9 @@ public class CmcAssess extends BaseEntity
 
     /** 分管考核负责人 */
     @Excel(name = "分管考核负责人")
+    private String managerUserName;
     private Long managerAssesser;
 
-    private SysUser managerUser;
-
     /** 自述 */
     @Excel(name = "自述")
     private String selfAssess;
@@ -84,6 +87,14 @@ public class CmcAssess extends BaseEntity
     @Excel(name = "其他工作")
     private String otherWork;
 
+    private SysUser user;
+
+    private SysUser deptUser;
+
+    private SysUser managerUser;
+
+    private CmcProject project;
+
     public void setAssessId(String assessId)
     {
         this.assessId = assessId;
@@ -111,6 +122,17 @@ public class CmcAssess extends BaseEntity
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setAssessTime(Date assessTime)
     {
         this.assessTime = assessTime;
@@ -222,6 +244,7 @@ public class CmcAssess extends BaseEntity
     public void setDeptUser(SysUser deptUser)
     {
         this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
     }
 
     public SysUser getDeptUser()
@@ -231,12 +254,23 @@ public class CmcAssess extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
     {
         return managerUser;
     }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.userName = user == null ? "" : user.getNickName();
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessMapper.xml

@@ -20,8 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="selfAssess"    column="self_assess"    />
         <result property="fillTime"    column="fill_time"    />
         <result property="otherWork"    column="other_work"    />
+        <association property="user"    javaType="SysUser"         resultMap="UserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="UserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <resultMap type="SysUser" id="DeptUserResult">
@@ -34,11 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
     <sql id="selectCmcAssessVo">
-        select a.assess_id, a.user_id, a.project_id, a.assess_time, a.dept_assessment, a.dept_advice, a.dept_time, a.dept_assesser, u1.nick_name as dept_nick_name, a.manager_assessment,
+        select a.assess_id, a.user_id, u.nick_name as nick_name, a.project_id, p.project_number, p.project_name, a.assess_time, a.dept_assessment, a.dept_advice, a.dept_time, a.dept_assesser, u1.nick_name as dept_nick_name, a.manager_assessment,
                a.manager_advice, a.manager_time, a.manager_assesser, u2.nick_name as manager_nick_name, a.self_assess, a.fill_time, a.other_work from cmc_assess as a
+        left join sys_user as u on u.user_id = a.user_id
         left join sys_user as u1 on u1.user_id = a.dept_assesser
         left join sys_user as u2 on u2.user_id = a.manager_assesser
+        left join cmc_project as p on p.project_id = a.project_id
     </sql>
 
     <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -119,6 +119,7 @@
             <if test="applier != null "> and ca.applier = #{applier}</if>
             <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
             <if test="cars != null  and cars != ''"> and find_in_set(#{cars}, ca.cars)</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="drivers != null  and drivers != ''"> and find_in_set(#{drivers}, ca.drivers)</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>

oa-ui/src/views/flowable/form/access/zhForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-20 16:21:05
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-27 12:36:42
 -->
 <template>
   <div>
@@ -156,7 +156,7 @@ export default {
       for (let btn of this.checkedBtn) {
         let ids = this.changeLabelToValue(btn);
         if (this.form['role' + ids] == undefined) {
-          this.$message.error('熟练程度为必填项，请完善！');
+          this.$message.error('参与情况为必填项，请完善！');
           flag = 0
           break
         } else {

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

@@ -89,14 +89,14 @@
         <td class="table-fzr">考核建议</td>
       </tr>
       <tr>
-        <td rowspan="9">劳动组织</td>
+        <td rowspan="8">劳动组织</td>
         <td>组织会议</td>
         <td>次</td>
         <td class="personInput">
           <span v-if="!isStaff">{{ tableForm.f0101 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0101"></el-input>
         </td>
-        <td rowspan="9">
+        <td rowspan="8">
           <el-radio-group v-model="tableForm.role01" :disabled="!isStaff">
             <div><el-radio label="00">主办</el-radio></div>
             <div><el-radio label="01">参与</el-radio></div>
@@ -104,11 +104,11 @@
           </el-radio-group>
         </td>
 
-        <td rowspan="9">
+        <td rowspan="8">
           <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
-        <td rowspan="9">
+        <td rowspan="8">
           <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"
@@ -118,7 +118,7 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="9">
+        <td rowspan="8">
           <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"
@@ -128,7 +128,7 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="9">
+        <td rowspan="8">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isPiLeader">
           </el-input>
         </td>
@@ -174,15 +174,6 @@
           </el-input>
         </td>
       </tr>
-      <tr>
-        <td>公司发文管理</td>
-        <td>次</td>
-        <td class="personInput">
-          <span v-if="!isStaff">{{ tableForm.f0106 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0106">
-          </el-input>
-        </td>
-      </tr>
       <tr>
         <td>企业微信、公司官方群、公司网站维护</td>
         <td>次</td>
@@ -828,10 +819,10 @@ export default {
       getAssess(this.taskForm.formId).then(res => {
         let data = res.data;
         for (let d in data) {
-          if (d.includes('role')) {
-            if (data[d] != "" && data[d] != undefined && data[d] != null)
-              data[d] = data[d].split(',')
-          }
+          // if (d.includes('role')) {
+          //   if (data[d] != "" && data[d] != undefined && data[d] != null)
+          //     data[d] = data[d].split(',')
+          // }
           if (d.includes('familiar')) {
             if (data[d] != "" && data[d] != undefined && data[d] != null)
               data[d] = parseInt(data[d])

oa-ui/src/views/oa/assess/index.vue

@@ -1,157 +1,35 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="被考核人" prop="userId">
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="考核时间" prop="assessTime">
         <el-date-picker clearable
           v-model="queryParams.assessTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+          type="month"
           placeholder="请选择考核时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门考核等级" prop="deptAssessment">
-        <el-input
-          v-model="queryParams.deptAssessment"
-          placeholder="请输入部门考核等级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门考核意见" prop="deptAdvice">
-        <el-input
-          v-model="queryParams.deptAdvice"
-          placeholder="请输入部门考核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门考核时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门考核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门考核负责人" prop="deptAssesser">
-        <el-input
-          v-model="queryParams.deptAssesser"
-          placeholder="请输入部门考核负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管考核等级" prop="managerAssessment">
-        <el-input
-          v-model="queryParams.managerAssessment"
-          placeholder="请输入分管考核等级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管考核意见" prop="managerAdvice">
-        <el-input
-          v-model="queryParams.managerAdvice"
-          placeholder="请输入分管考核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管考核时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管考核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管考核负责人" prop="managerAssesser">
-        <el-input
-          v-model="queryParams.managerAssesser"
-          placeholder="请输入分管考核负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="自述" prop="selfAssess">
-        <el-input
-          v-model="queryParams.selfAssess"
-          placeholder="请输入自述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="考核填报时间" prop="fillTime">
-        <el-date-picker clearable
-          v-model="queryParams.fillTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择考核填报时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="其他工作" prop="otherWork">
-        <el-input
-          v-model="queryParams.otherWork"
-          placeholder="请输入其他工作"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      </el-form-item>      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <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="['oa:assess:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:assess:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:assess:remove']"
-        >删除</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">      
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -166,10 +44,24 @@
     </el-row>
 
     <el-table v-loading="loading" :data="assessList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="总考核表id" align="center" prop="assessId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="序号" align="center" type="index" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <el-table-column label="总考核表id" align="center" prop="assessId" /> -->
+      <el-table-column label="被考核人" align="center" prop="userId">
+        <template slot-scope="scope">
+          <span>{{ getUserName(scope.row.userId) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目编号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.project ? scope.row.project.projectNumber : "" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.project ? scope.row.project.projectName : "" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="考核时间" align="center" prop="assessTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.assessTime, '{y}-{m}-{d}') }}</span>
@@ -182,7 +74,11 @@
           <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="部门考核负责人" align="center" prop="deptAssesser" />
+      <el-table-column label="部门考核负责人" align="center" prop="deptAssesser">
+        <template slot-scope="scope">
+          <span>{{ getUserName(scope.row.deptAssesser) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="分管考核等级" align="center" prop="managerAssessment" />
       <el-table-column label="分管考核意见" align="center" prop="managerAdvice" />
       <el-table-column label="分管考核时间" align="center" prop="managerTime" width="180">
@@ -190,7 +86,11 @@
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分管考核负责人" align="center" prop="managerAssesser" />
+      <el-table-column label="分管考核负责人" align="center" prop="managerAssesser">
+        <template slot-scope="scope">
+          <span>{{ getUserName(scope.row.managerAssesser) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="自述" align="center" prop="selfAssess" />
       <el-table-column label="考核填报时间" align="center" prop="fillTime" width="180">
         <template slot-scope="scope">
@@ -198,7 +98,7 @@
         </template>
       </el-table-column>
       <el-table-column label="其他工作" align="center" prop="otherWork" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -215,7 +115,7 @@
             v-hasPermi="['oa:assess:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination
@@ -226,82 +126,12 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改cmc考核对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="考核时间" prop="assessTime">
-          <el-date-picker clearable
-            v-model="form.assessTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择考核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门考核等级" prop="deptAssessment">
-          <el-input v-model="form.deptAssessment" placeholder="请输入部门考核等级" />
-        </el-form-item>
-        <el-form-item label="部门考核意见" prop="deptAdvice">
-          <el-input v-model="form.deptAdvice" placeholder="请输入部门考核意见" />
-        </el-form-item>
-        <el-form-item label="部门考核时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择部门考核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门考核负责人" prop="deptAssesser">
-          <el-input v-model="form.deptAssesser" placeholder="请输入部门考核负责人" />
-        </el-form-item>
-        <el-form-item label="分管考核等级" prop="managerAssessment">
-          <el-input v-model="form.managerAssessment" placeholder="请输入分管考核等级" />
-        </el-form-item>
-        <el-form-item label="分管考核意见" prop="managerAdvice">
-          <el-input v-model="form.managerAdvice" placeholder="请输入分管考核意见" />
-        </el-form-item>
-        <el-form-item label="分管考核时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择分管考核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管考核负责人" prop="managerAssesser">
-          <el-input v-model="form.managerAssesser" placeholder="请输入分管考核负责人" />
-        </el-form-item>
-        <el-form-item label="自述" prop="selfAssess">
-          <el-input v-model="form.selfAssess" placeholder="请输入自述" />
-        </el-form-item>
-        <el-form-item label="考核填报时间" prop="fillTime">
-          <el-date-picker clearable
-            v-model="form.fillTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择考核填报时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="其他工作" prop="otherWork">
-          <el-input v-model="form.otherWork" placeholder="请输入其他工作" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listAssess, getAssess, delAssess, addAssess, updateAssess } from "@/api/oa/assess/assess";
+import { listProject } from '@/api/oa/project/project';
 
 export default {
   name: "Assess",
@@ -321,6 +151,7 @@ export default {
       total: 0,
       // cmc考核表格数据
       assessList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -369,6 +200,15 @@ export default {
       this.open = false;
       this.reset();
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 表单重置
     reset() {
       this.form = {