修改委外主键id

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

@@ -69,10 +69,10 @@ public class CmcOutsourceController extends BaseController
     /**
      * 获取项目委外详细信息
      */
-    @GetMapping(value = "/{outsoureId}")
-    public AjaxResult getInfo(@PathVariable("outsoureId") String outsoureId)
+    @GetMapping(value = "/{outsourceId}")
+    public AjaxResult getInfo(@PathVariable("outsourceId") String outsourceId)
     {
-        return success(cmcOutsourceService.selectCmcOutsourceByOutsoureId(outsoureId));
+        return success(cmcOutsourceService.selectCmcOutsourceByOutsourceId(outsourceId));
     }
 
     /**
@@ -99,10 +99,10 @@ public class CmcOutsourceController extends BaseController
      * 删除项目委外
      */
     @Log(title = "项目委外", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{outsoureIds}")
-    public AjaxResult remove(@PathVariable String[] outsoureIds)
+	@DeleteMapping("/{outsourceIds}")
+    public AjaxResult remove(@PathVariable String[] outsourceIds)
     {
-        return toAjax(cmcOutsourceService.deleteCmcOutsourceByOutsoureIds(outsoureIds));
+        return toAjax(cmcOutsourceService.deleteCmcOutsourceByOutsourceIds(outsourceIds));
     }
 
     public void partnerIdToName(CmcOutsource cmcOutsource) {

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1637,7 +1637,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
         }
         if (flowTaskDto.getProcDefName().equals("项目委外")) {
-            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
+            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsourceId(formId);
             projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
             if (projectId == null)
                 flowTaskDto.setTitle(cmcOutsource.getApplyReason());

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

@@ -20,7 +20,7 @@ public class CmcOutsource extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 委外id */
-    private String outsoureId;
+    private String outsourceId;
 
     /** 项目id */
     @Excel(name = "项目id")
@@ -92,14 +92,14 @@ public class CmcOutsource extends BaseEntity
 
     private SysDept dept;
 
-    public void setOutsoureId(String outsoureId) 
+    public void setOutsourceId(String outsourceId) 
     {
-        this.outsoureId = outsoureId;
+        this.outsourceId = outsourceId;
     }
 
-    public String getOutsoureId() 
+    public String getOutsourceId() 
     {
-        return outsoureId;
+        return outsourceId;
     }
     public void setApplyReason(String applyReason) 
     {
@@ -273,7 +273,7 @@ public class CmcOutsource extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("outsoureId", getOutsoureId())
+            .append("outsourceId", getOutsourceId())
             .append("applyReason", getApplyReason())
             .append("projectId", getProjectId())
             .append("partnerId", getPartnerId())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcOutsourceMapper.java

@@ -14,10 +14,10 @@ public interface CmcOutsourceMapper
     /**
      * 查询项目委外
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 项目委外
      */
-    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId);
+    public CmcOutsource selectCmcOutsourceByOutsourceId(String outsourceId);
 
     /**
      * 查询项目委外列表
@@ -46,16 +46,16 @@ public interface CmcOutsourceMapper
     /**
      * 删除项目委外
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 结果
      */
-    public int deleteCmcOutsourceByOutsoureId(String outsoureId);
+    public int deleteCmcOutsourceByOutsourceId(String outsourceId);
 
     /**
      * 批量删除项目委外
      * 
-     * @param outsoureIds 需要删除的数据主键集合
+     * @param outsourceIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds);
+    public int deleteCmcOutsourceByOutsourceIds(String[] outsourceIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcOutsourceService.java

@@ -14,10 +14,10 @@ public interface ICmcOutsourceService
     /**
      * 查询项目委外
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 项目委外
      */
-    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId);
+    public CmcOutsource selectCmcOutsourceByOutsourceId(String outsourceId);
 
     /**
      * 查询项目委外列表
@@ -46,16 +46,16 @@ public interface ICmcOutsourceService
     /**
      * 批量删除项目委外
      * 
-     * @param outsoureIds 需要删除的项目委外主键集合
+     * @param outsourceIds 需要删除的项目委外主键集合
      * @return 结果
      */
-    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds);
+    public int deleteCmcOutsourceByOutsourceIds(String[] outsourceIds);
 
     /**
      * 删除项目委外信息
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 结果
      */
-    public int deleteCmcOutsourceByOutsoureId(String outsoureId);
+    public int deleteCmcOutsourceByOutsourceId(String outsourceId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcOutsourceServiceImpl.java

@@ -22,13 +22,13 @@ public class CmcOutsourceServiceImpl implements ICmcOutsourceService
     /**
      * 查询项目委外
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 项目委外
      */
     @Override
-    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId)
+    public CmcOutsource selectCmcOutsourceByOutsourceId(String outsourceId)
     {
-        return cmcOutsourceMapper.selectCmcOutsourceByOutsoureId(outsoureId);
+        return cmcOutsourceMapper.selectCmcOutsourceByOutsourceId(outsourceId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcOutsourceServiceImpl implements ICmcOutsourceService
     /**
      * 批量删除项目委外
      * 
-     * @param outsoureIds 需要删除的项目委外主键
+     * @param outsourceIds 需要删除的项目委外主键
      * @return 结果
      */
     @Override
-    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds)
+    public int deleteCmcOutsourceByOutsourceIds(String[] outsourceIds)
     {
-        return cmcOutsourceMapper.deleteCmcOutsourceByOutsoureIds(outsoureIds);
+        return cmcOutsourceMapper.deleteCmcOutsourceByOutsourceIds(outsourceIds);
     }
 
     /**
      * 删除项目委外信息
      * 
-     * @param outsoureId 项目委外主键
+     * @param outsourceId 项目委外主键
      * @return 结果
      */
     @Override
-    public int deleteCmcOutsourceByOutsoureId(String outsoureId)
+    public int deleteCmcOutsourceByOutsourceId(String outsourceId)
     {
-        return cmcOutsourceMapper.deleteCmcOutsourceByOutsoureId(outsoureId);
+        return cmcOutsourceMapper.deleteCmcOutsourceByOutsourceId(outsourceId);
     }
 }

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

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.oa.mapper.CmcOutsourceMapper">
     
     <resultMap type="CmcOutsource" id="CmcOutsourceResult">
-        <result property="outsoureId"    column="outsoure_id"    />
+        <result property="outsourceId"    column="outsource_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="projectId"    column="project_id"    />
         <result property="partnerId"    column="partner_id"    />
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcOutsourceVo">
-        select o.outsoure_id, o.apply_reason, o.project_id, p.project_number, p.project_name, o.partner_id, o.applier, u.nick_name as applier_nick_name,
+        select o.outsource_id, o.apply_reason, o.project_id, p.project_number, p.project_name, o.partner_id, o.applier, u.nick_name as applier_nick_name,
                o.apply_dept, d.dept_name, o.apply_time, o.manager_user_id, u1.nick_name as manager_nick_name, o.manager_comment, o.manager_time,
                o.zjl_user_id, u2.nick_name as zjl_nick_name, o.zjl_comment, o.zjl_time from cmc_outsource as o
         left join cmc_project as p on o.project_id = p.project_id
@@ -80,15 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcOutsourceByOutsoureId" parameterType="String" resultMap="CmcOutsourceResult">
+    <select id="selectCmcOutsourceByOutsourceId" parameterType="String" resultMap="CmcOutsourceResult">
         <include refid="selectCmcOutsourceVo"/>
-        where o.outsoure_id = #{outsoureId}
+        where o.outsource_id = #{outsourceId}
     </select>
         
     <insert id="insertCmcOutsource" parameterType="CmcOutsource">
         insert into cmc_outsource
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="outsoureId != null">outsoure_id,</if>
+            <if test="outsourceId != null">outsource_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="projectId != null">project_id,</if>
             <if test="partnerId != null">partner_id,</if>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlTime != null">zjl_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="outsoureId != null">#{outsoureId},</if>
+            <if test="outsourceId != null">#{outsourceId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="partnerId != null">#{partnerId},</if>
@@ -135,17 +135,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
             <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
         </trim>
-        where outsoure_id = #{outsoureId}
+        where outsource_id = #{outsourceId}
     </update>
 
-    <delete id="deleteCmcOutsourceByOutsoureId" parameterType="String">
-        delete from cmc_outsource where outsoure_id = #{outsoureId}
+    <delete id="deleteCmcOutsourceByOutsourceId" parameterType="String">
+        delete from cmc_outsource where outsource_id = #{outsourceId}
     </delete>
 
-    <delete id="deleteCmcOutsourceByOutsoureIds" parameterType="String">
-        delete from cmc_outsource where outsoure_id in 
-        <foreach item="outsoureId" collection="array" open="(" separator="," close=")">
-            #{outsoureId}
+    <delete id="deleteCmcOutsourceByOutsourceIds" parameterType="String">
+        delete from cmc_outsource where outsource_id in 
+        <foreach item="outsourceId" collection="array" open="(" separator="," close=")">
+            #{outsourceId}
         </foreach>
     </delete>
 </mapper>

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

@@ -49,10 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select p.performance_id, p.reporter, u.nick_name as report_nick_name, p.document, p.remark, p.report_time, p.report_dept, d.dept_name,
                p.manager_user_id, u1.nick_name as manager_nick_name,p.manager_comment, p.manager_time, p.zjl_user_id, u2.nick_name as zjl_nick_name,
                p.zjl_comment, p.zjl_time, p.zh_user_id, p.zh_time from cmc_performance as p
-        left join sys_user as u on u.user_id = o.reporter
-        left join sys_user as u1 on u1.user_id = o.manager_user_id
-        left join sys_user as u2 on u2.user_id = o.zjl_user_id
-        left join sys_dept as d on d.dept_id = o.apply_dept
+        left join sys_user as u on u.user_id = p.reporter
+        left join sys_user as u1 on u1.user_id = p.manager_user_id
+        left join sys_user as u2 on u2.user_id = p.zjl_user_id
+        left join sys_dept as d on d.dept_id = p.report_dept
     </sql>
 
     <select id="selectCmcPerformanceList" parameterType="CmcPerformance" resultMap="CmcPerformanceResult">

oa-ui/src/api/oa/outsource/outsource.js

@@ -10,9 +10,9 @@ export function listOutsource(query) {
 }
 
 // 查询项目委外详细
-export function getOutsource(outsoureId) {
+export function getOutsource(outsourceId) {
   return request({
-    url: '/oa/outsource/' + outsoureId,
+    url: '/oa/outsource/' + outsourceId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateOutsource(data) {
 }
 
 // 删除项目委外
-export function delOutsource(outsoureId) {
+export function delOutsource(outsourceId) {
   return request({
-    url: '/oa/outsource/' + outsoureId,
+    url: '/oa/outsource/' + outsourceId,
     method: 'delete'
   })
 }

oa-ui/src/views/flowable/form/outsource/outsourceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-20 16:09:07
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-24 10:38:33
+ * @LastEditTime: 2024-09-24 14:56:45
 -->
 <template>
   <div class="app-container">
@@ -61,7 +61,7 @@
           </el-form-item>
           <el-form-item label="委外工作计划：">
             <outsource-plan ref="planRef" :taskForm="taskForm" :taskName="taskName"
-              :outsoureId="outsoureId"></outsource-plan>
+              :outsourceId="outsourceId"></outsource-plan>
           </el-form-item>
           <el-form-item label="分管审核意见：" prop="managerComment" label-width="130px">
             <el-input type="textarea" v-model="form.managerComment" :autosize="{ minRows: 4 }"
@@ -153,7 +153,7 @@ export default {
       prOpen: false,
       partOpen: false,
       formTotal: 0,
-      outsoureId: ''
+      outsourceId: ''
     }
   },
   created() {
@@ -170,7 +170,7 @@ export default {
     },
     initForm() {
       const formId = this.taskForm.formId;
-      this.outsoureId = formId;
+      this.outsourceId = formId;
       getOutsource(formId).then(res => {
         if (res.data) {
           this.formTotal = 1
@@ -212,7 +212,7 @@ export default {
         }
         await updateOutsource(this.form)
       } else {
-        this.form.outsoureId = this.taskForm.formId;
+        this.form.outsourceId = this.taskForm.formId;
         await addOutsource(this.form)
       }
       this.savePlan()
@@ -222,7 +222,7 @@ export default {
       const planList = this.$refs.planRef.workList;
       const isAdd = this.$refs.planRef.formTotal;
       const outsourceId = this.taskForm.formId;
-      if (isAdd)
+      if (isAdd != 0)
         await delOutsourceWork(outsourceId)
       for (let plan of planList) {
         plan.outsourceId = outsourceId

oa-ui/src/views/flowable/form/outsource/outsourcePlan.vue

@@ -109,7 +109,7 @@ export default {
       type: String,
       required: true
     },
-    outsoureId: {
+    outsourceId: {
       type: String,
       default: ''
     }
@@ -134,8 +134,8 @@ export default {
   },
   methods: {
     initTable() {
-      if (!this.outsoureId) return
-      listOutsourceWork({ pageNum: 1, pageSize: 100, outsourceId: this.outsoureId }).then(res => {
+      if (!this.outsourceId) return
+      listOutsourceWork({ pageNum: 1, pageSize: 100, outsourceId: this.outsourceId }).then(res => {
         if (res.rows.length > 0) {
           this.formTotal = 1;
           this.workList = res.rows;

oa-ui/src/views/flowable/form/procure/procureForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-19 13:45:43
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-24 11:44:34
+ * @LastEditTime: 2024-09-24 15:16:51
 -->
 <template>
   <div class="app-container">
@@ -178,6 +178,7 @@ export default {
     },
     // 保存表单
     async saves() {
+      console.log(this.formTotal);
       if (this.formTotal != 0) {
         if (this.taskName == '编制计划') {
           this.form.planUserId = this.$refs.zhRef.localSignatureUserId;

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

@@ -45,7 +45,7 @@
 
     <el-table v-loading="loading" :data="outsourceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="委外id" align="center" prop="outsoureId" /> -->
+      <!-- <el-table-column label="委外id" align="center" prop="outsourceId" /> -->
       <el-table-column label="委外说明" align="center" prop="applyReason" />      
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" width="200px" />
@@ -182,7 +182,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        outsoureId: null,
+        outsourceId: null,
         applyReason: null,
         projectId: null,
         partnerId: null,
@@ -210,7 +210,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.outsoureId)
+      this.ids = selection.map(item => item.outsourceId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -223,8 +223,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const outsoureId = row.outsoureId || this.ids
-      getOutsource(outsoureId).then(response => {
+      const outsourceId = row.outsourceId || this.ids
+      getOutsource(outsourceId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改项目委外";
@@ -232,13 +232,13 @@ export default {
     },
     handleView(row) {
       this.open = true;
-      this.taskForm.formId = row.outsoureId;
+      this.taskForm.formId = row.outsourceId;
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.outsoureId != null) {
+          if (this.form.outsourceId != null) {
             updateOutsource(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -256,9 +256,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const outsoureIds = row.outsoureId || this.ids;
-      this.$modal.confirm('是否确认删除项目委外编号为"' + outsoureIds + '"的数据项？').then(function() {
-        return delOutsource(outsoureIds);
+      const outsourceIds = row.outsourceId || this.ids;
+      this.$modal.confirm('是否确认删除项目委外编号为"' + outsourceIds + '"的数据项？').then(function() {
+        return delOutsource(outsourceIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -2,85 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上报人" prop="reporter">
-        <el-input
-          v-model="queryParams.reporter"
-          placeholder="请输入上报人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="附件" prop="document">
-        <el-input
-          v-model="queryParams.document"
-          placeholder="请输入附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上报日期" prop="reportTime">
-        <el-date-picker clearable
-          v-model="queryParams.reportTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择上报日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审核人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          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="zjlUserId">
-        <el-input
-          v-model="queryParams.zjlUserId"
-          placeholder="请输入总经理审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="人事管理员" prop="zhUserId">
-        <el-input
-          v-model="queryParams.zhUserId"
-          placeholder="请输入人事管理员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-select v-model="queryParams.reporter" 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="上报部门" prop="reportDept">
+        <el-select v-model="queryParams.reportDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>  
       <el-form-item label="制单日期" prop="zhTime">
         <el-date-picker clearable
           v-model="queryParams.zhTime"
@@ -96,38 +30,6 @@
     </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:performance: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:performance: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:performance:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -143,29 +45,33 @@
 
     <el-table v-loading="loading" :data="performanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="绩效审批id" align="center" prop="performanceId" />
-      <el-table-column label="上报人" align="center" prop="reporter" />
-      <el-table-column label="附件" align="center" prop="document" />
+      <!-- <el-table-column label="绩效审批id" align="center" prop="performanceId" /> -->
+      <el-table-column label="上报人" align="center" prop="reporter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.reporter) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="附件" align="center" prop="document" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
+      <!-- <el-table-column label="分管审核人" align="center" prop="managerUserId" /> -->
       <el-table-column label="分管审核意见" align="center" prop="managerComment" />
-      <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
+      <!-- <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
+      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" /> -->
       <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
-      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+      <!-- <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="人事管理员" align="center" prop="zhUserId" />
       <el-table-column label="制单日期" align="center" prop="zhTime" width="180">
         <template slot-scope="scope">
@@ -177,17 +83,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:performance:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:performance:remove']"
-          >删除</el-button>
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['oa:performance:query']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -199,79 +98,18 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改绩效审批对话框 -->
-    <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="上报人" prop="reporter">
-          <el-input v-model="form.reporter" placeholder="请输入上报人" />
-        </el-form-item>
-        <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="上报日期" prop="reportTime">
-          <el-date-picker clearable
-            v-model="form.reportTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择上报日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审核人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
-        </el-form-item>
-        <el-form-item label="分管审核意见" prop="managerComment">
-          <el-input v-model="form.managerComment" 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="zjlUserId">
-          <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="人事管理员" prop="zhUserId">
-          <el-input v-model="form.zhUserId" placeholder="请输入人事管理员" />
-        </el-form-item>
-        <el-form-item label="制单日期" prop="zhTime">
-          <el-date-picker clearable
-            v-model="form.zhTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择制单日期">
-          </el-date-picker>
-        </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 :title="title" :visible.sync="open" width="65%" append-to-body>
+      <performance-form :taskForm="taskForm" :taskName="''" :isFlow="false"></performance-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listPerformance, getPerformance, delPerformance, addPerformance, updatePerformance } from "@/api/oa/performance/performance";
+import performanceForm from '../../flowable/form/performance/performanceForm.vue';
 
-export default {
+export default {  
+  components: { performanceForm },
   name: "Performance",
   data() {
     return {
@@ -313,7 +151,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {
+        formId: ''
+      },
     };
   },
   created() {
@@ -385,6 +226,10 @@ export default {
         this.title = "修改绩效审批";
       });
     },
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.performanceId;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {