commit

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/ExamConfigController.java

@@ -0,0 +1,60 @@
+package com.budwk.app.zhgh.dayofficework.ghkh.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.dayofficework.ghkh.model.ExamConfig;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * @ClassName ExamConfigController
+ * @Author JyuHsin
+ * @Date 2025/11/27 15:00
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "量化考核配置")
+@At("/platform/exam/config")
+public class ExamConfigController {
+
+	@Inject
+	private Dao dao;
+
+	@At("/")
+	@SaCheckPermission("exam.config")
+	@Ok("beetl:/platform/zhgh/dayofficework/ghkh/config/index.html")
+	public void index() {}
+
+	@At
+	@ApiOperation("查询配置")
+	@SaCheckLogin
+	public Result fetch() {
+		ExamConfig config = dao.fetch(ExamConfig.class, Cnd.NEW());
+		return Result.success(config);
+	}
+
+	@At
+	@ApiOperation("新增/修改配置")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission("exam.config")
+	@SLog(tag = "量化考核-考核配置", msg = "新增/修改配置")
+	public Object submit(ExamConfig config) {
+		dao.insertOrUpdate(config);
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhKhZpController.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.ghkh.controller;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.sys.models.Sys_user;
@@ -37,27 +38,23 @@ import java.util.concurrent.atomic.AtomicInteger;
 @IocBean
 public class GhKhZpController {
 
+	@Inject
+	private KhzpService khzpService;
+	@Inject
+	private BaseService baseService;
+	@Inject
+	private KhZbService khZbService;
 
     @At("")
     @Ok("beetl:/platform/zhgh/dayofficework/ghkh/zp.html")
     @SaCheckPermission("ghkh.zp")
-    public void index() {
-
-    }
-
-
-    @Inject
-    private KhzpService khzpService;
-    @Inject
-    private GhkhGhzbController ghkhGhzbController;
-
+    public void index() {}
 
     @At
     @SaCheckPermission("ghkh.zp")
     public Result pageData(@Param(value = "annual") String annual,
                            @Param(value = "assessment") String assessment, int pageNumber, int pageSize) {
 
-
         Sql sql = Sqls.create("SELECT * from kh_zb zb left join kh_record re on zb.id = re.zb_id and re.union_id = @unionid $condition").setParam("unionid", SecurityUtil.getUnionId());
         Cnd cnd = Cnd.NEW();
 //        if (ShiroUtil.hasRole("H04")) {
@@ -78,9 +75,6 @@ public class GhKhZpController {
         return Result.success(khzpService.listPage(pageNumber, pageSize, sql));
     }
 
-    @Inject
-    private BaseService baseService;
-
     @At
     @POST
     @SaCheckPermission("ghkh.zp")
@@ -89,10 +83,7 @@ public class GhKhZpController {
         if (zp.length == 0) {
             return null;
         }
-
         int score = 0;
-
-
         for (Kh_zp kh_zp : zp) {
             kh_zp.setFlatid(SecurityUtil.getUnionId());
             khzpService.dao().insertOrUpdate(kh_zp);
@@ -107,27 +98,22 @@ public class GhKhZpController {
             record.setUnion_id(SecurityUtil.getUnionId());
             record.setZp_score(score);
             record.setXgh_score(0);
-            record.setState(handletype.equals("submit") ? 2 : 1);
+            record.setState("submit".equals(handletype) ? 2 : 1);
+			record.setFillTime(DateUtil.now());
         } else {
             record.setZp_score(score);
-            if (handletype.equals("submit")) {
+            if ("submit".equals(handletype)) {
                 record.setState(2);
             }
         }
         baseService.dao().insertOrUpdate(record);
-
         return Result.success();
     }
 
-    @Inject
-    private KhZbService khZbService;
-
     @At
     public Result openView(String id) {
         Kh_zb khzb = khZbService.khzb(id);
-
         List<Kh_zp> list = khzpService.query(Cnd.where("zb_id", "=", id).and("flatid", "=", SecurityUtil.getUnionId()));
-
         khzb.getNrs().forEach(nr -> {
             nr.getBzs().forEach(bz -> {
                 Kh_zp zp = list.stream().filter(v -> v.getBz_id().equals(bz.getId())).findFirst().orElse(null);

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhGhzbController.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.ghkh.controller;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zb;
 import com.budwk.app.zhgh.dayofficework.ghkh.model.kh_nr;
@@ -36,110 +37,106 @@ import java.util.List;
 public class GhkhGhzbController {
 
 
-    @Inject
-    private KhZbService khZbService;
-    @Inject
-    private KhNrService khNrService;
-    @Inject
-    private KhBzService khBzService;
+	@Inject
+	private KhZbService khZbService;
+	@Inject
+	private KhNrService khNrService;
+	@Inject
+	private KhBzService khBzService;
 
-    @At("")
-    @Ok("beetl:/platform/zhgh/dayofficework/ghkh/khzb.html")
-    @SaCheckPermission("ghkh.khzb")
-    public void index() {
+	@At("")
+	@Ok("beetl:/platform/zhgh/dayofficework/ghkh/khzb.html")
+	@SaCheckPermission("ghkh.khzb")
+	public void index() {
+	}
 
-    }
+	@At
+	@SaCheckPermission("ghkh.khzb")
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "annual") String annual,
+						   @Param(value = "assessment") String assessment) {
+		Sql sql = Sqls.create("SELECT * FROM `kh_zb` $condition");
+		Cnd cnd = Cnd.NEW();
+		if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) {
+			cnd.and("annual", "=", annual);
+		}
+		if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) {
+			cnd.where().andLike("assessment", assessment);
+		}
+		cnd.desc("createTime");
+		sql.setCondition(cnd);
+		return Result.success(khZbService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
+	}
 
-    @At
-    @SaCheckPermission("ghkh.khzb")
-    public Result pageData(@Param(value = "annual") String annual,
-                           @Param(value = "assessment") String assessment,
-                           int pageNumber, int pageSize) {
-        Sql sql = Sqls.create("SELECT * FROM `kh_zb` $condition");
-        Cnd cnd = Cnd.NEW();
-        if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) {
-            cnd.and("annual", "=", annual);
-        }
-        if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) {
-            cnd.where().andLike("assessment", assessment);
-        } else {
-            cnd.desc("annual");
-        }
-        sql.setCondition(cnd);
-        return Result.success(khZbService.listPage(pageNumber, pageSize, sql));
-    }
+	@At
+	public Result getZb(String id) {
+		return Result.success(khZbService.khzb(id));
+	}
 
+	@At
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission("ghkh.khzb")
+	public Result delete(String id) {
 
-    @At
-    public Result getZb(String id) {
-        return Result.success(khZbService.khzb(id)) ;
-    }
+		khZbService.delete(id);
 
+		List<kh_nr> query = khNrService.query(Cnd.where("zb_id", "=", id));
 
-    @At
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("ghkh.khzb")
-    public Result delete(String id) {
+		for (kh_nr kh_nr : query) {
+			khBzService.clear(Cnd.where("nr_id", "=", kh_nr.getId()));
+		}
 
-        khZbService.delete(id);
+		khNrService.clear(Cnd.where("zb_id", "=", id));
 
-        List<kh_nr> query = khNrService.query(Cnd.where("zb_id", "=", id));
+		return Result.success();
+	}
 
-        for (kh_nr kh_nr : query) {
-            khBzService.clear(Cnd.where("nr_id", "=", kh_nr.getId()));
-        }
+	@At
+	public Result edit(String id) {
+		return getZb(id);
+	}
 
-        khNrService.clear(Cnd.where("zb_id", "=", id));
+	@At
+	@POST
+	@SaCheckPermission("ghkh.khzb")
+	@Aop(TransAop.READ_COMMITTED)
+	public Result doEdit(@Param(value = "kh_zb") Kh_zb kh_zb) {
+		khZbService.updateIgnoreNull(kh_zb);
 
-        return Result.success();
-    }
+		List<kh_nr> query = khNrService.query(Cnd.where("zb_id", "=", kh_zb.getId()));
 
-    @At
-    public Result edit(String id) {
-        return getZb(id);
-    }
+		for (kh_nr kh_nr : query) {
+			System.err.println(kh_nr.getZb_id());
+			khBzService.clear(Cnd.where("nr_id", "=", kh_nr.getId()));
+		}
 
-    @At
-    @POST
-    @SaCheckPermission("ghkh.khzb")
-    @Aop(TransAop.READ_COMMITTED)
-    public Result doEdit(@Param(value = "kh_zb") Kh_zb kh_zb) {
-        khZbService.updateIgnoreNull(kh_zb);
+		khNrService.clear(Cnd.where("zb_id", "=", kh_zb.getId()));
 
-        List<kh_nr> query = khNrService.query(Cnd.where("zb_id", "=", kh_zb.getId()));
+		for (kh_nr nr : kh_zb.getNrs()) {
+			nr.setZb_id(kh_zb.getId());
+			khNrService.insertWith(nr, "bzs");
+		}
+		return Result.success();
 
-        for (kh_nr kh_nr : query) {
-            System.err.println(kh_nr.getZb_id());
-            khBzService.clear(Cnd.where("nr_id", "=", kh_nr.getId()));
-        }
+	}
 
-        khNrService.clear(Cnd.where("zb_id", "=", kh_zb.getId()));
+	@At
+	@POST
+	@SaCheckPermission("ghkh.khzb")
+	public Result toggleEnable(@Param("id") String id, @Param("enable") boolean enable) {
+		if (Strings.isBlank(id)) {
+			return Result.error("参数错误");
+		}
 
-        for (kh_nr nr : kh_zb.getNrs()) {
-            nr.setZb_id(kh_zb.getId());
-            khNrService.insertWith(nr, "bzs");
-        }
-        return Result.success();
+		Kh_zb khZb = khZbService.fetch(id);
+		if (khZb == null) {
+			return Result.error("未找到对应的考核指标");
+		}
 
-    }
+		khZb.setDisabled(enable);
+		khZbService.updateIgnoreNull(khZb);
 
-    @At
-    @POST
-    @SaCheckPermission("ghkh.khzb")
-    public Result toggleEnable(@Param("id") String id, @Param("enable") boolean enable) {
-        if (Strings.isBlank(id)) {
-            return Result.error("参数错误");
-        }
-
-        Kh_zb khZb = khZbService.fetch(id);
-        if (khZb == null) {
-            return Result.error("未找到对应的考核指标");
-        }
-
-        khZb.setDisabled(enable);
-        khZbService.updateIgnoreNull(khZb);
-
-        return Result.success("操作成功");
-    }
+		return Result.success("操作成功");
+	}
 
 }

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java

@@ -1,11 +1,17 @@
 package com.budwk.app.zhgh.dayofficework.ghkh.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.dayofficework.ghkh.model.ExamConfig;
+import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_record;
+import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zb;
 import com.budwk.app.zhgh.dayofficework.ghkh.service.KhXghshService;
 import com.budwk.app.zhgh.dayofficework.ghkh.service.KhZbService;
+import io.swagger.models.auth.In;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -14,6 +20,8 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import java.util.List;
+
 /**
  * Created with IntelliJ IDEA.
  *
@@ -37,7 +45,6 @@ public class GhkhKhphController {
     @SaCheckPermission("ghkh.khph")
     public void index() {}
 
-
     @At
     @SaCheckPermission("ghkh.khph")
     public Result pageData(int pageNumber, int pageSize,
@@ -53,10 +60,10 @@ public class GhkhKhphController {
         cnd.and("re.zb_id ", "=", khid);
         cnd.and("re.state", "=", 3);
         cnd.andEX("zb.`annual`","=",annual);
-        cnd.desc("re.xgh_score");
+        cnd.desc("re.totalScore");
         cnd.groupBy("re.union_id");
         sql.setCondition(cnd);
-        return Result.success(khXghshService.listPage(pageNumber, pageSize, sql));
+        return Result.success(khXghshService.listPageMap(pageNumber, pageSize, sql));
     }
 
     @At
@@ -65,4 +72,25 @@ public class GhkhKhphController {
         return Result.success(khZbService.list(sql));
     }
 
+	@At
+	@SaCheckLogin
+	public Result doEditScore(String id, Integer score, String khId) {
+		Kh_record record = khZbService.dao().fetch(Kh_record.class, id);
+		ExamConfig config = khZbService.dao().fetch(ExamConfig.class, Cnd.NEW());
+		record.setOffLineScore(score);
+		if(config.getOffLine() != null) {
+			record.setOffLineFinalScore(score * config.getOffLine() * 0.01);
+		} else {
+			record.setOffLineFinalScore(Double.valueOf(score));
+		}
+		record.setTotalScore(record.getOnLineFinalScore() + record.getOffLineFinalScore());
+		khZbService.dao().update(record);
+
+		List<Kh_record> list = khZbService.dao().query(Kh_record.class, Cnd.where("zb_id", "=", khId).desc("totalScore"));
+		for (int i = 0; i < list.size(); i++) {
+			list.get(i).setSort(i + 1);
+		}
+		khZbService.dao().update(list);
+		return Result.success();
+	}
 }

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java

@@ -5,16 +5,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.sys.models.Sys_user;
-import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_record;
-import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_xghsh;
-import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zb;
-import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zp;
+import com.budwk.app.zhgh.dayofficework.ghkh.model.*;
 import com.budwk.app.zhgh.dayofficework.ghkh.service.KhXghshService;
 import com.budwk.app.zhgh.dayofficework.ghkh.service.KhZbService;
 import com.budwk.app.zhgh.dayofficework.ghkh.service.KhzpService;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.DaoUp;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;
@@ -112,7 +110,10 @@ public class GhkhXghshController {
                 if (zp != null) {
                     bz.setZp(zp);
                 }
-            });
+				Kh_xghsh xghsh = khZbService.dao().fetch(Kh_xghsh.class, Cnd.where("bz_id", "=", bz.getId()).and("flatid", "=", union_id));
+				bz.setSchools(xghsh.getSchools());
+				bz.setAddition(xghsh.getAddition());
+			});
         });
         return Result.success(khzb);
     }
@@ -129,7 +130,7 @@ public class GhkhXghshController {
     @At
     @POST
     @SaCheckPermission("ghkh.xghsh")
-    public Result marking(@Param(value = "pf") Kh_xghsh[] pf) {
+    public Result marking(@Param(value = "pf") Kh_xghsh[] pf, @Param(value = "type") String type) {
 
         if (pf.length == 0) {
             return null;
@@ -138,6 +139,7 @@ public class GhkhXghshController {
         int score = 0;
 
 //        Sys_user sys_user = (Sys_user) ShiroUtil.getPrincipal();
+		khXghshService.dao().clear(Kh_xghsh.class, Cnd.where("zb_id", "=", pf[0].getZb_id()).and("flatid", "=", pf[0].getFlatid()));
         for (Kh_xghsh p : pf) {
             khzpService.dao().insert(p);
             score += p.getSchools() != null ? p.getSchools() : 0;
@@ -147,7 +149,16 @@ public class GhkhXghshController {
 
         if (record != null) {
             record.setXgh_score(score);
-            record.setState(3);
+			ExamConfig config = baseService.dao().fetch(ExamConfig.class, Cnd.NEW());
+			if(config.getOnLine() != null) {
+				record.setOnLineFinalScore(score * config.getOnLine() * 0.01);
+			} else {
+				record.setOnLineFinalScore((double) score);
+			}
+			record.setTotalScore(record.getOnLineFinalScore());
+			if("submit".equals(type)) {
+				record.setState(3);
+			}
             baseService.dao().update(record);
         }
 

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/model/ExamConfig.java

@@ -0,0 +1,51 @@
+package com.budwk.app.zhgh.dayofficework.ghkh.model;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @ClassName ExamConfig
+ * @Author JyuHsin
+ * @Date 2025/11/27 14:57
+ * @Version 1.0
+ * @Description TODO
+ */
+@Data
+@Comment("考核配置")
+@Accessors(chain = true)
+@Table("exam_config")
+@EqualsAndHashCode(callSuper = true)
+public class ExamConfig extends BaseModel {
+
+	@Name
+	@Comment("ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@PrevInsert(uu32 = true)
+	private String id;
+
+	@Column
+	@Comment("线上成绩占比")
+	@ColDefine(type = ColType.INT)
+	private Integer onLine;
+
+	@Column
+	@Comment("线下成绩占比")
+	@ColDefine(type = ColType.INT)
+	private Integer offLine;
+
+	@Column
+	@Comment("是否需要分工会自评")
+	@ColDefine(type = ColType.BOOLEAN)
+	@Default("1")
+	private Boolean selfAssessment;
+
+	@Column
+	@Comment("是否显示单项分")
+	@ColDefine(type = ColType.BOOLEAN)
+	@Default("1")
+	private Boolean displaySingleItem;
+}

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/model/Kh_bz.java

@@ -96,4 +96,6 @@ public class Kh_bz extends BaseModel {
     private Kh_zp zp;
     private Kh_xghsh sh;
 
+	private Integer schools;
+	private String addition;
 }

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/model/Kh_record.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.dayofficework.ghkh.model;
 
+import lombok.Data;
 import org.nutz.dao.entity.annotation.*;
 
 /**
@@ -9,6 +10,7 @@ import org.nutz.dao.entity.annotation.*;
  * @Date: 2020/10/12/16:43
  * @Description: 考核记录
  */
+@Data
 @Table("Kh_record")
 public class Kh_record {
 
@@ -44,51 +46,37 @@ public class Kh_record {
     @ColDefine(type = ColType.INT, width = 4)
     private Integer xgh_score;
 
-    public String getRecord_id() {
-        return record_id;
-    }
+	@Column
+	@Comment("线上最终得分")
+	@ColDefine(type = ColType.INT, width = 4)
+	private Double onLineFinalScore;
 
-    public void setRecord_id(String record_id) {
-        this.record_id = record_id;
-    }
+	@Column
+	@Comment("创建时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String fillTime;
 
-    public String getZb_id() {
-        return zb_id;
-    }
+	@Column
+	@Comment("线下得分")
+	@ColDefine(type = ColType.INT, width = 4)
+	@Default(value = "0")
+	private Integer offLineScore;
 
-    public void setZb_id(String zb_id) {
-        this.zb_id = zb_id;
-    }
+	@Column
+	@Comment("线下最终得分")
+	@ColDefine(type = ColType.INT, width = 4)
+	@Default(value = "0")
+	private Double offLineFinalScore;
 
-    public String getUnion_id() {
-        return union_id;
-    }
+	@Column
+	@Comment("总分")
+	@ColDefine(type = ColType.INT, width = 4)
+	@Default(value = "0")
+	private Double totalScore;
 
-    public void setUnion_id(String union_id) {
-        this.union_id = union_id;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Integer getZp_score() {
-        return zp_score;
-    }
-
-    public void setZp_score(Integer zp_score) {
-        this.zp_score = zp_score;
-    }
-
-    public Integer getXgh_score() {
-        return xgh_score;
-    }
-
-    public void setXgh_score(Integer xgh_score) {
-        this.xgh_score = xgh_score;
-    }
+	@Column
+	@Comment("排名")
+	@ColDefine(type = ColType.INT, width = 4)
+	@Default(value = "1")
+	private Integer sort;
 }

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/model/Kh_xghsh.java

@@ -26,6 +26,7 @@ public class Kh_xghsh extends BaseModel {
     @Column
     @Comment("校工会评分")
     @ColDefine(type = ColType.INT, width = 4)
+	@Default("0")
     private Integer schools;
 
     @Column

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/model/Kh_zb.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.dayofficework.ghkh.model;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.nutz.dao.DB;
 import org.nutz.dao.entity.annotation.*;
 import com.budwk.app.base.model.BaseModel;
@@ -16,8 +17,9 @@ import java.util.List;
  * @Date: 2020/09/25/11:46
  * @Description:考核指标
  */
-@Table("Kh_zb")
 @Data
+@Table("Kh_zb")
+@EqualsAndHashCode(callSuper = true)
 public class Kh_zb extends BaseModel {
 
     @Column
@@ -87,7 +89,6 @@ public class Kh_zb extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String assessment;
 
-
     @Column
     @Comment("填报开始时间")
     @ColDefine(type = ColType.DATETIME)
@@ -125,8 +126,7 @@ public class Kh_zb extends BaseModel {
     @Column
     @Comment("添加时间")
     @ColDefine(type = ColType.VARCHAR, width = 32)
-    private String addtime;
-
+    private String addTime;
 
     @Many(field = "zb_id")
     private List<kh_nr> nrs;
@@ -137,53 +137,4 @@ public class Kh_zb extends BaseModel {
             @SQL(db= DB.MYSQL,value = "SELECT IFNULL(MAX(location),0)+1 FROM Kh_zb"),
     })
     private Integer location;
-
-    public Integer getLocation() {
-        return location;
-    }
-
-    public void setLocation(Integer location) {
-        this.location = location;
-    }
-
-    public List<kh_nr> getNrs() {
-        return nrs;
-    }
-
-    public void setNrs(List<kh_nr> nrs) {
-        this.nrs = nrs;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAnnual() {
-        return annual;
-    }
-
-    public void setAnnual(String annual) {
-        this.annual = annual;
-    }
-
-    public String getAssessment() {
-        return assessment;
-    }
-
-    public void setAssessment(String assessment) {
-        this.assessment = assessment;
-    }
-
-    public String getAddtime() {
-        return addtime;
-    }
-
-    public void setAddtime(String addtime) {
-        this.addtime = addtime;
-    }
-
 }

src/main/resources/static/components/module/kh/KhZb.vue

@@ -2,102 +2,82 @@
 
   <el-form class="el_form" :model="formData" ref="addForm" :rules="formRules" label-width="100px">
     <table-tool label="指标信息"></table-tool>
-    <el-row :gutter="20">
-      <el-col :span="6">
-        <el-form-item prop="annual" label="年&emsp;&emsp;度">
-          <el-date-picker
+    <template v-if="!is_view">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item prop="annual" label="年&emsp;&emsp;度">
+            <el-date-picker
               style="width: 100%"
-              v-if="!is_view"
               :picker-options="pickerOptions"
               v-model="formData.annual"
               type="year"
               value-format="yyyy"
-              placeholder="选择年度">
-          </el-date-picker>
-          <el-input v-else style="color: #F6F7FA;" disabled v-model="formData.annual"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item prop="assessment" label="考核名称">
-          <el-input maxlength="30" v-if="!is_view" v-model="formData.assessment" placeholder="请填写考核名称"
-                    type="text">
-          </el-input>
-          <el-input v-else style="color: #F6F7FA;" disabled v-model="formData.assessment"></el-input>
-
-        </el-form-item>
-
-      </el-col>
-      <el-col :span="6">
-        <el-form-item prop="assessment" label="">
-          <el-checkbox v-model="formData.isEvaluationIndex">是否采用往年考核指标</el-checkbox>
-        </el-form-item>
-
-      </el-col>
-
-
-      <el-col :span="6">
-
-        <el-form-item prop="zbId" label="" v-if="formData.isEvaluationIndex">
-          <el-select v-model="formData.zbId" placeholder="请选择指标" filterable clearable
-                     style="width: 100%" @change="getByZbData">
-            <el-option
+              placeholder="请选择年度">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item prop="assessment" label="考核名称">
+            <el-input maxlength="30" v-model="formData.assessment" placeholder="请输入考核名称" type="text"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item prop="assessment" label="">
+            <el-checkbox v-model="formData.isEvaluationIndex">是否采用往年考核指标</el-checkbox>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item prop="zbId" label="往年指标" v-if="formData.isEvaluationIndex">
+            <el-select v-model="formData.zbId" placeholder="请选择指标" filterable clearable
+                       style="width: 100%" @change="getByZbData">
+              <el-option
                 v-for="item in zbList"
                 :key="item.id"
                 :label="item.annual+item.assessment"
                 :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item prop="fillTime" label="考核时间">
-          <el-date-picker
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item prop="fillTime" label="填报时间">
+            <el-date-picker
               style="width: 100%"
-              v-if="!is_view"
               v-model="formData.fillTimeRange"
               type="datetimerange"
               value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间">
-          </el-date-picker>
-          <div v-else>
-            <div v-if="formData.startDateTime && formData.endDateTime">
-              {{ formData.startDateTime }} 至 {{ formData.endDateTime }}
-            </div>
-            <div v-else>未设置</div>
-          </div>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="appealTime" label="申诉时间">
-          <el-date-picker
+              start-placeholder="填报开始时间"
+              end-placeholder="填报结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item prop="appealTime" label="申诉时间">
+            <el-date-picker
               style="width: 100%"
-              v-if="!is_view"
               v-model="formData.appealTimeRange"
               type="datetimerange"
               value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间">
-          </el-date-picker>
-          <div v-else>
-            <div v-if="formData.startApplyTime && formData.appealEndTime">
-              {{ formData.startApplyTime }} 至 {{ formData.endApplyTime }}
-            </div>
-            <div v-else>未设置</div>
-          </div>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-      <table-tool label="考核内容"></table-tool>
+              start-placeholder="申诉开始时间"
+              end-placeholder="申诉结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </template>
 
+    <el-descriptions border class="descriptions-form" v-if="is_view" :column="2">
+      <el-descriptions-item label="年度">{{ formData.annual }}</el-descriptions-item>
+      <el-descriptions-item label="考核名称">{{ formData.assessment }}</el-descriptions-item>
+      <el-descriptions-item label="填报时间">{{ formData.startDateTime }} 至 {{ formData.endDateTime }}</el-descriptions-item>
+      <el-descriptions-item label="申诉时间">{{ formData.startApplyTime }} 至 {{ formData.endApplyTime }}</el-descriptions-item>
+    </el-descriptions>
 
+    <table-tool label="考核内容" class="mt10"></table-tool>
 
     <el-form-item label="" label-width="0" v-for="(nr,idx) in formData.nrs" :key="idx">
-
       <el-row type="flex" justify="space-between">
         <el-input v-model="nr.content" v-if="!is_view" maxlength="30" style="width: 50%" placeholder="请填写考核内容">
           <template slot="prepend"><span>{{ idx + 1 }}</span></template>
@@ -108,7 +88,7 @@
                      @click="formData.nrs.push({bzs:[{}]})">
             添加内容
           </el-button>
-          <el-button v-if="!is_view" size="medium" :disabled="formData.nrs.length<=1" type="danger"
+          <el-button v-if="!is_view" size="small" :disabled="formData.nrs.length<=1" type="danger"
                      @click="formData.nrs.splice(idx,1)" icon="el-icon-delete">
           </el-button>
         </div>
@@ -128,21 +108,21 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="单项分" prop="single_score"  width="100px">
+          <el-table-column label="单项分" prop="single_score"  width="200px">
             <template v-slot="{row}">
               <el-input v-if="!is_view" v-model="row.single_score" placeholder="请填写单项分"></el-input>
               <span v-else>{{ row.single_score }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column label="标准分" prop="score"  width="100px">
+          <el-table-column label="标准分" prop="score"  width="200px">
             <template v-slot="{row}">
               <el-input v-if="!is_view" v-model.number="row.score" maxlength="4" placeholder="请填写标准分"></el-input>
               <span v-else>{{ row.score }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column label="备注" prop="remark"  width="100px">
+          <el-table-column label="备注" prop="remark"  width="300px">
             <template v-slot="{row}">
               <el-input v-if="!is_view" v-model.number="row.remark" maxlength="4" placeholder="请填写备注"></el-input>
               <span v-else>{{ row.remark }}</span>
@@ -182,19 +162,19 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="关联模块" prop="associatedmodule"  width="200px">
-            <template v-slot="{row}">
-              <el-input v-if="!is_view" v-model="row.associatedmodule" maxlength="10" placeholder="请填写关联模块"></el-input>
-              <span v-else>{{ row.associatedmodule }}</span>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="关联模块" prop="associatedmodule"  width="200px">-->
+<!--            <template v-slot="{row}">-->
+<!--              <el-input v-if="!is_view" v-model="row.associatedmodule" maxlength="10" placeholder="请填写关联模块"></el-input>-->
+<!--              <span v-else>{{ row.associatedmodule }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
-          <el-table-column label="关联标识" prop="bz_relation_id"  width="100px">
-            <template v-slot="{row}">
-              <el-input v-if="!is_view" v-model="row.bz_relation_id" maxlength="20" placeholder="请填写关联标识,该标识唯一"></el-input>
-              <span v-else>{{ row.bz_relation_id }}</span>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="关联标识" prop="bz_relation_id"  width="100px">-->
+<!--            <template v-slot="{row}">-->
+<!--              <el-input v-if="!is_view" v-model="row.bz_relation_id" maxlength="20" placeholder="请填写关联标识,该标识唯一"></el-input>-->
+<!--              <span v-else>{{ row.bz_relation_id }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
 <!--          <el-table-column label="能否删除" prop="canDelete"  width="100px">-->
 <!--            <template v-slot="{row}">-->
@@ -391,4 +371,13 @@ module.exports = {
   color: white;
 }
 
+.el-descriptions-item__content {
+  width: 300px;
+  min-width: 300px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+  width: 100px;
+}
+
 </style>

src/main/resources/static/components/module/kh/UploadMaterials.vue

@@ -1,6 +1,5 @@
 <template>
-  <el-form :model="data" ref="form" :rules="formRules" label-width="100px">
-    <el-form-item label="&emsp;" label-width="110px" class="view-header"></el-form-item>
+  <el-form :model="data" ref="form" :rules="formRules" label-width="90px">
 
     <el-form-item prop="nr" label="考核内容">
       <el-input disabled v-model="data.nr" type="text"></el-input>
@@ -10,18 +9,20 @@
       <el-input disabled v-model="data.bz" type="text"></el-input>
     </el-form-item>
 
+    <el-form-item prop="remark" label="备注">
+      <el-input disabled v-model="data.remark" type="text"></el-input>
+    </el-form-item>
 
     <el-form-item prop="clnr" label="材料内容">
       <el-input v-model="data.clnr" type="textarea" :autosize="{ minRows: 2, maxRows: 10}"
                 placeholder="暂无" :disabled="is_view"></el-input>
     </el-form-item>
 
-    <el-form-item label="&emsp;" label-width="110px" class="view-header"></el-form-item>
-    <el-form-item label="佐证材料1">
-      <span v-if="is_view&&!data.files">暂无</span>
-<!--      <file-upload :files.sync="data.files" :view="is_view" card v-else></file-upload>-->
+    <el-form-item label="佐证材料">
+      <span v-if="is_view&&!data.files">暂无佐证材料</span>
       <file-upload
-          v-model="data.files"
+          v-else
+          :value.sync="data.files"
           :upload_number="5"
           upload_mode="drag"
           upload_result_category="array"
@@ -29,6 +30,9 @@
           :accept="'.pdf,.doc,.docx,.jpg,.png'"
       ></file-upload>
     </el-form-item>
+
+    <slot name="extra"></slot>
+
   </el-form>
 </template>
 

src/main/resources/static/components/plugins/Guava.vue

@@ -189,8 +189,8 @@ module.exports = {
 }
 
 .header-right button{
-  padding: 9px 15px;
-  font-size: 12px;
+  /*padding: 9px 15px;
+  font-size: 12px;*/
 }
 
 

src/main/resources/views/platform/zhgh/dayofficework/ghkh/config/index.html

@@ -0,0 +1,100 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .card-shadow {
+        border-radius: 20px;
+        width: 40%;
+        margin: 0 auto;
+        transform: translateY(130px);
+    }
+</style>
+
+<div id="app" v-cloak>
+    <el-card shadow="never" class="card-shadow">
+        <template #header>
+            <h3 style="color: var(--color-primary)">量化考核全局配置</h3>
+        </template>
+        <el-form :model="formData" :rules="formRules" label-width="200px" ref="formRef" label-position="top" size="small">
+            <el-form-item label="线上成绩占比" prop="onLine">
+                <el-input :min="0" :max="100" v-model="formData.onLine" type="number">
+                    <template slot="append">%</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="线下成绩占比" prop="offline">
+                <el-input :min="0" :max="100" v-model="formData.offline" type="number">
+                    <template slot="append">%</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="是否需要分工会自评" prop="selfAssessment">
+                <el-radio-group v-model="formData.selfAssessment">
+                    <el-radio-button :label="true">需要</el-radio-button>
+                    <el-radio-button :label="false">不需要</el-radio-button>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="是否显示单项分" prop="displaySingleItem">
+                <el-radio-group v-model="formData.displaySingleItem">
+                    <el-radio-button :label="true">显示</el-radio-button>
+                    <el-radio-button :label="false">不显示</el-radio-button>
+                </el-radio-group>
+            </el-form-item>
+        </el-form>
+        <el-row type="flex" justify="end">
+            <el-button type="primary" @click="submit">保存</el-button>
+        </el-row>
+    </el-card>
+</div>
+<script>
+    new Vue({
+        el: "#app",
+        data() {
+            return {
+                unitOptions: [],
+                formData: {
+                    onLine: 0,
+                    offline: 0,
+                    selfAssessment: true,
+                    displaySingleItem: true
+                },
+                formRules: {
+                    onLine: [{ required: true, message: "请输入线上成绩占比", trigger: ["blur"] }],
+                    offline: [{ required: true, message: "请输入线下成绩占比", trigger: ["blur"] }],
+                    selfAssessment: [{ required: true, message: "请选择是否需要分工会自评", trigger: ["blur"] }],
+                    displaySingleItem: [{ required: true, message: "请选择是否显示单项分", trigger: ["blur"] }]
+                }
+            }
+        },
+        methods: {
+            init() {
+                this.$axios.post(loc() + "/fetch").then((res) => {
+                    if (res.code === 0) {
+                        this.formData = res.data
+                    }
+                })
+            },
+            submit() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$axios
+                            .post(loc() + "/submit", this.formData)
+                            .then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.init()
+                                } else {
+                                    this.$message.error(res.msg)
+                                }
+                            })
+                    }
+                })
+            },
+        },
+        created() {
+            this.init()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html

@@ -26,36 +26,59 @@ layout("/layouts/platform.html"){
                 </search>
             </el-card>
             <el-card shadow="never" class="mt20">
-                <el-table :data="tableData" style="width: 100%" row-key="id"
+                <table-tool label="得分列表"></table-tool>
+                <el-table :data="tableData" style="width: 100%" row-key="record_id"
                           v-loading="tabLoading">
                     <el-table-column align="center" header-align="center" label="序号" width="100px">
                         <template scope="scope">
                             <span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
                         </template>
                     </el-table-column>
-
-                    <el-table-column label="年度" prop="annual" header-align="center" width="300px"
+                    <el-table-column label="年度" prop="annual" header-align="center"
                                      align="center">
                     </el-table-column>
-
                     <el-table-column label="分工会名称" prop="unionname" header-align="center"
                                      show-overflow-tooltip
                                      align="center" sortable></el-table-column>
-                    <el-table-column label="最终考核得分" prop="xgh_score" header-align="center"
+                    <el-table-column label="线上得分" prop="xgh_score" header-align="center"
+                                     show-overflow-tooltip
+                                     align="center" sortable></el-table-column>
+                    <el-table-column :label="'线上最终得分' + (examConfig.onLine ? '（' + examConfig.onLine + '%）' : '')" prop="onLineFinalScore" header-align="center"
+                                     show-overflow-tooltip
+                                     align="center" sortable></el-table-column>
+                    <el-table-column label="线下得分" prop="offLineScore" header-align="center"
+                                     show-overflow-tooltip
+                                     align="center" sortable>
+                        <template scope="scope">
+                            <div>
+                                <div v-if="rowDataEdit && rowDataIndex==scope.$index">
+                                    <el-input placeholder="请输入线下得分"
+                                              autofocus
+                                              size="mini"
+                                              :ref="'input'+scope.row.record_id"
+                                              v-model="scope.row.offLineScore" @blur="openEdit(scope.row)"></el-input>
+                                </div>
+                                <div v-else title="点击编辑" @click="doRowDataEditMobile(scope.row,scope.$index)">
+                                    {{scope.row.offLineScore}}
+                                    <i class="el-icon-edit" style="color: #0a84ff"></i>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="'线下最终得分' + (examConfig.offLine ? '（' + examConfig.offLine + '%）' : '')" prop="offLineFinalScore" header-align="center"
+                                     show-overflow-tooltip
+                                     align="center" sortable></el-table-column>
+                    <el-table-column label="最终考核得分" prop="totalScore" header-align="center"
+                                     show-overflow-tooltip
+                                     align="center" sortable></el-table-column>
+                    <el-table-column label="排名" prop="sort" header-align="center"
                                      show-overflow-tooltip
                                      align="center" sortable></el-table-column>
-                    <!--                        <el-table-column label="名次" prop="Ranking" header-align="center" show-overflow-tooltip-->
-                    <!--                                         align="center"></el-table-column>-->
                 </el-table>
-
                 <!--#include("/layouts/pagination.html"){}#-->
-
             </el-card>
-
-
         </template>
     </guava>
-
 </div>
 <script>
     const vue = new Vue({
@@ -80,19 +103,44 @@ layout("/layouts/platform.html"){
                         );
                     }
                 },
+                examConfig: {},
+                rowDataEdit: false,
+                rowDataIndex: null,
             }
         },
         methods: {
+            async openEdit(row) {
+                this.rowDataEdit = !this.rowDataEdit
+                const res = await $.post(loc() + "/doEditScore", {id: row.record_id, score: row.offLineScore, khId: this.pageForm.khid})
+                if(res.code === 0) {
+                    this.$message.success(res.msg)
+                } else {
+                    this.$message.error(res.msg)
+                }
+                this.doSearch()
+            },
             async getKh() {
-                this.$axios.post("/platform/ghkh/khph/getKh", {"annual": this.pageForm.annual}).then(res => {
-                    if (res.code === 0) {
-                        if (res.data.length != 0) {
-                            this.kh = res.data
-                            this.pageForm.khid = this.kh[0].id
-                        } else {
-                            this.kh = []
-                            this.pageForm.khid = ""
-                        }
+                const res = await this.$axios.post("/platform/ghkh/khph/getKh", {"annual": this.pageForm.annual})
+                if (res.code === 0) {
+                    if (res.data.length !== 0) {
+                        this.kh = res.data
+                        this.pageForm.khid = this.kh[0].id
+                    } else {
+                        this.kh = []
+                        this.pageForm.khid = ""
+                    }
+                }
+            },
+            doRowDataEditMobile(row, index) {
+                this.tableData.map(v => {
+                    if (row.record_id === v.record_id) {
+                        this.rowDataIndex = index
+                        this.rowDataEdit = !this.rowDataEdit;
+                        this.$nextTick(() => {
+                            const ref = 'input' + row.record_id
+                            console.log(this.$refs[ref])
+                            this.$refs[ref][0].focus();
+                        })
                     }
                 })
             },
@@ -103,7 +151,7 @@ layout("/layouts/platform.html"){
             pageData() {
                 this.$axios.post(base + "/platform/ghkh/khph/pageData", this.pageForm).then(res => {
                     this.tabLoading = false
-                    if (res.code == 0) {
+                    if (res.code === 0) {
                         this.tableData = res.data.list;
                         this.pageForm.totalCount = res.data.totalCount;
                     } else {
@@ -117,8 +165,16 @@ layout("/layouts/platform.html"){
                 });
                 this.tabLoading = true
             },
+            fetchConfig() {
+                this.$axios.post("/platform/exam/config/fetch").then((res) => {
+                    if (res.code === 0) {
+                        this.examConfig = res.data
+                    }
+                })
+            },
         },
         async created() {
+            this.fetchConfig()
             this.pageForm.annual = new Date().getFullYear() + ""
             await this.getKh()
             this.pageData();

src/main/resources/views/platform/zhgh/dayofficework/ghkh/khzb.html

@@ -9,7 +9,6 @@ layout("/layouts/platform.html"){
 </style>
 <div id="app" v-cloak>
     <guava ref="guava">
-
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
@@ -20,14 +19,14 @@ layout("/layouts/platform.html"){
                                 v-model="pageForm.annual"
                                 type="year"
                                 value-format="yyyy"
-                                placeholder="选择年度"
+                                placeholder="请选择年度"
                                 style="width: 100%">
                         </el-date-picker>
                     </search-item>
                     <search-item label="考核名称">
                         <el-input
                                 v-model="pageForm.assessment"
-                                placeholder="根据考核名称关键字查询"
+                                placeholder="请输入考核名称查询"
                                 clearable
                                 style="width: 100%">
                         </el-input>
@@ -37,92 +36,68 @@ layout("/layouts/platform.html"){
 
 
             <el-card shadow="never" class="mt20">
-                <el-table :data="tableData" style="width: 100%" row-key="id"
-                          v-loading="tabLoading">
-                    <el-table-column align="center" header-align="center" label="序号" width="100px">
-                        <template scope="scope">
-                            <span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
+                <table-tool label="考核指标"></table-tool>
+                <el-table :data="tableData" style="width: 100%" row-key="id" v-loading="tabLoading">
+                    <el-table-column :index="indexMethod" header-align="center" label="序号" type="index" width="80px"></el-table-column>
+                    <el-table-column v-for="column in tableColumns"
+                                     :key="column.prop"
+                                     :label="column.label"
+                                     :prop="column.prop"
+                                     :sortable="column.sortable"
+                                     :width="column.width"
+                                     header-align="center"
+                                     show-overflow-tooltip>
+                        <template scope="{row}" v-if="column.prop==='startTime'">
+                            <span>{{row.startDateTime}} - {{row.endDateTime}}</span>
                         </template>
-                    </el-table-column>
-
-                    <el-table-column label="年度" prop="annual" header-align="center" width="300px"
-                                     sortable
-                                     align="center">
-                        <template scope="scope">
-                            {{scope.row.annual}}
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="考核名称" prop="assessment" header-align="center"
-                                     show-overflow-tooltip
-                                     align="center"></el-table-column>
-
-                    <el-table-column label="填报时间" width="300px" header-align="center" show-overflow-tooltip align="center">
-                        <template scope="scope">
-                            <span>{{scope.row.startdatetime}} - {{scope.row.enddatetime}}</span>
-                        </template>
-                    </el-table-column>
-
-
-                    <el-table-column label="创建时间" prop="createtime" header-align="center"
-                                     show-overflow-tooltip
-                                     align="center"></el-table-column>
-
-                    <el-table-column label="创建人" prop="createusername" header-align="center"
-                                     show-overflow-tooltip
-                                     align="center"></el-table-column>
-
-                    <el-table-column label="是否开启" header-align="center" align="center">
-                        <template scope="scope">
+                        <template scope="{row}" v-else-if="column.prop==='disabled'">
                             <el-switch
-                                    v-model="scope.row.disabled"
+                                    v-model="row.disabled"
                                     active-color="#13ce66"
                                     inactive-color="#ff4949"
-                                    @change="(val) => toggleEnable(val, scope.row.id)">
+                                    @change="(val) => toggleEnable(val, row.id)">
                             </el-switch>
                         </template>
                     </el-table-column>
-
-
-                    <el-table-column align="center" header-align="center" label="操作" fixed="right"
-                                     width="250px">
+                    <el-table-column align="center" header-align="center" label="操作" fixed="right" width="250px">
                         <template scope="scope">
                             <el-button size="mini" type="primary" @click="openView(scope.row.id)">查看</el-button>
-                            <el-button size="mini" type="primary" @click="openEdit(scope.row.id)">
-                                编辑
-                            </el-button>
-                            <el-button size="mini" type="danger" @click="doDelete(scope.row.id)">
-                                删除
-                            </el-button>
+                            <el-button size="mini" type="primary" @click="openEdit(scope.row.id)">编辑</el-button>
+                            <el-button size="mini" type="danger" @click="doDelete(scope.row.id)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
-
+                <!--#include("/layouts/pagination.html"){}#-->
             </el-card>
         </template>
         <template #edit_func>
-            <el-button type="primary" style="float: right;margin-top: 5px"
-                       @click="doEdit()">提交
-            </el-button>
+            <el-button type="primary" @click="doEdit()">提交</el-button>
+        </template>
+        <template #edit_footer>
+            <el-button type="primary" @click="doEdit()">提交</el-button>
         </template>
         <template #edit>
             <kh-zb :form_data="formData" @change="v=>{this.formData=v}"></kh-zb>
         </template>
-
         <template #view>
-
             <kh-zb :form_data="viewData" :is_view="true"></kh-zb>
         </template>
     </guava>
 </div>
 <script>
-
     const vue = new Vue({
         el: '#app',
         mixins: [initTableMixins],
         data() {
-
             return {
+                tableColumns: [
+                    { prop: 'annual', label: '年度' },
+                    { prop: 'assessment', label: '考核名称' },
+                    { prop: 'startTime', label: '填报时间', width: 300 },
+                    { prop: 'createTime', label: '创建时间' },
+                    { prop: 'createUserName', label: '创建人' },
+                    { prop: 'disabled', label: '是否开启' },
+                ],
                 tabLoading: false,
                 loading: true,
                 activeName: '1',

src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html

@@ -71,7 +71,7 @@ layout("/layouts/platform.html"){
                                      align="center"></el-table-column>
 
                     <el-table-column label="自评得分" sortable prop="zp_score" header-align="center"
-                                     show-overflow-tooltip
+                                     show-overflow-tooltip v-if="examConfig.selfAssessment === true"
                                      align="center"></el-table-column>
 
                     <el-table-column label="校工会评分" sortable prop="xgh_score"
@@ -104,71 +104,40 @@ layout("/layouts/platform.html"){
         </template>
 
         <template #edit_func>
-            <el-button type="primary" style="float: right;margin-top: 5px"
-                       @click="doEdit()">提交
-            </el-button>
+            <el-button type="primary" @click="doEdit('save')">暂存</el-button>
+            <el-button type="primary" @click="doEdit('submit')">提交</el-button>
+        </template>
+
+        <template #edit_footer>
+            <el-button type="primary" @click="doEdit('save')">暂存</el-button>
+            <el-button type="primary" @click="doEdit('submit')">提交</el-button>
         </template>
 
         <template #edit>
-            <el-form :model="formData" ref="form" label-width="100px" :rules="formRules"
-                     style="height: calc(100vh - 50px);overflow-y: scroll;padding: 10px 15px">
-                <vi-title title="指标信息"></vi-title>
-                </el-form-item>
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item prop="annual" label="年&emsp;&emsp;度">
-                            <el-date-picker
-                                    :picker-options="pickerOptions"
-                                    v-model="formData.annual"
-                                    type="year"
-                                    value-format="yyyy"
-                                    placeholder="选择年度">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="flatname" label="分工会名称">
-                            <el-input maxlength="30" value="" readonly
-                                      v-model="formData.flatname"
-                                      placeholder="请填写分工会名称"
-                                      type="text"></el-input>
-
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item prop="assessment" label="考核名称">
-                            <el-input maxlength="30" readonly v-model="formData.assessment"
-                                      placeholder="请填写考核名称"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <vi-title title="考核内容"></vi-title>
-                </el-form-item>
-
+            <el-form :model="formData" ref="form" label-width="100px" :rules="formRules">
+                <table-tool label="指标信息"></table-tool>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="年度">{{ formData.annual }}</el-descriptions-item>
+                    <el-descriptions-item label="考核名称">{{ formData.assessment }}</el-descriptions-item>
+                    <el-descriptions-item label="分工会名称">{{ formData.flatname }}</el-descriptions-item>
+                </el-descriptions>
 
+                <table-tool label="考核内容" class="mt10"></table-tool>
                 <el-form-item label="" label-width="0" v-for="nr,idx in formData.nrs">
-
                     <el-row type="flex" align="middle" justify="space-between">
-                        <el-input v-model="nr.content" readonly maxlength="30"
-                                  style="width: 50%"
-                                  placeholder="请填写考核内容">
+                        <el-input v-model="nr.content" readonly maxlength="30" placeholder="请填写考核内容">
                             <template slot="prepend"><span>{{ idx + 1 }}</span></template>
                         </el-input>
                     </el-row>
-
-
                     <el-row style="margin-top: 20px">
                         <el-table :data="nr.bzs" style="width: 100%" border show-summary
-                                  :summary-method="getSummaries">
+                                  :summary-method="getSummaries" size="small">
                             <el-table-column align="center" header-align="center" label="序号"
-                                             type="index">
+                                             type="index" width="60">
                             </el-table-column>
 
                             <el-table-column label="考核标准" disabled prop="inspection"
-                                             header-align="center"
-                                             width="250px" align="center">
+                                             header-align="center" align="center">
                                 <template scope="{row}">
                                     <el-input v-model="row.inspection"
                                               readonly placeholder="请填写考核标准"></el-input>
@@ -176,8 +145,7 @@ layout("/layouts/platform.html"){
                             </el-table-column>
 
                             <el-table-column label="标准分" prop="score" header-align="center"
-                                             align="center"
-                                             width="250px">
+                                             align="center">
                                 <template scope="{row}">
                                     <el-input v-model.number="row.score" readonly maxlength="4"
                                               placeholder="请填写标准分"></el-input>
@@ -185,8 +153,7 @@ layout("/layouts/platform.html"){
                             </el-table-column>
 
                             <el-table-column label="自评得分" prop="zpf" header-align="center"
-                                             align="center"
-                                             width="250px">
+                                             align="center" v-if="examConfig.selfAssessment === true">
                                 <template scope="{row}">
                                     <el-input v-if="row.zpf" v-model.number="row.zpf"
                                               maxlength="4"
@@ -198,8 +165,7 @@ layout("/layouts/platform.html"){
                             </el-table-column>
 
                             <el-table-column label="校工会评分" prop="schools" header-align="center"
-                                             align="center"
-                                             width="250px">
+                                             align="center">
                                 <template scope="{row}">
                                     <el-input v-model.number="row.schools" maxlength="4"
                                               placeholder="请填写评分"></el-input>
@@ -207,19 +173,17 @@ layout("/layouts/platform.html"){
                             </el-table-column>
 
                             <el-table-column label="加、减原因" prop="addition" header-align="center"
-                                             align="center"
-                                             width="250px">
+                                             align="center">
                                 <template scope="{row}">
                                     <el-input v-model.number="row.addition" maxlength="50"
                                               placeholder="请填写加、减原因"></el-input>
                                 </template>
                             </el-table-column>
 
-                            <el-table-column label="有关佐证材料" header-align="center" align="center"
-                                             width="250px">
-                                <template scope="{row}">
-                                    <el-button type="primary" plain
-                                               @click="doView(nr.content,row.inspection,row)">
+                            <el-table-column label="佐证材料" header-align="center" align="center">
+                                <template scope="{row, $index}">
+                                    <el-button type="primary" plain size="small"
+                                               @click="doView(nr.content,row.inspection,row, $index, idx)">
                                         查看佐证材料
                                     </el-button>
                                 </template>
@@ -230,18 +194,42 @@ layout("/layouts/platform.html"){
                 </el-form-item>
             </el-form>
         </template>
-
-
     </guava>
 
-
     <el-drawer
+            title="佐证材料"
             :visible.sync="dialog"
             direction="rtl" size="40%"
             custom-class="demo-drawer"
             ref="drawer">
         <div class="demo-drawer__content" style="padding: 0 15px">
-            <upload-materials :data="data" :is_view="true"></upload-materials>
+            <upload-materials :data="data" :is_view="true">
+                <template #extra>
+                    <table-tool label="校工会评分"></table-tool>
+                    <el-form-item prop="score" label="评分标准">
+                        <el-input disabled v-model="viewRow.score" type="text"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="schools" label="校工会评分">
+                        <el-input v-model="viewRow.schools" type="text" placeholder="请输入校工会评分"
+                                  type="number"></el-input>
+                    </el-form-item>
+                </template>
+            </upload-materials>
+
+            <div class="demo-drawer__footer" style="float: right">
+                <el-popover
+                        placement="top"
+                        width="160"
+                        v-model="visible">
+                    <p>您确定要返回吗？返回将不能保存！</p>
+                    <div style="text-align: right; margin: 0">
+                        <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+                        <el-button type="primary" size="mini" @click="cancelForm">确定</el-button>
+                    </div>
+                    <el-button slot="reference">返 回</el-button>
+                </el-popover>
+                <el-button type="primary" @click="addForm">确 定</el-button>
+            </div>
         </div>
     </el-drawer>
 
@@ -253,7 +241,7 @@ layout("/layouts/platform.html"){
         mixins: [initTableMixins],
         data() {
             return {
-
+                visible: false,
                 unions: [],
                 unionOptions: [],
                 ghPageForm: {},
@@ -265,7 +253,7 @@ layout("/layouts/platform.html"){
                 dialog: false,
                 loading: false,
                 pageForm: {
-	                annual: moment().format('YYYY'),
+                    annual: moment().format('YYYY'),
                     isAudit: 3,
                     pageNumber: 1,
                     pageSize: 10,
@@ -285,13 +273,25 @@ layout("/layouts/platform.html"){
                         );
                     }
                 },
-
+                examConfig: {},
+                viewRow: {},
+                index: "",
+                idx: "",
             }
         },
         components: {
             'upload-materials': httpVueLoader('/components/module/kh/UploadMaterials.vue')
         },
         methods: {
+            addForm() {
+                this.formData.nrs[this.idx].bzs[this.index].zp = this.data
+                this.dialog = false
+            },
+            cancelForm() {
+                this.visible = false
+                this.loading = false;
+                this.dialog = false;
+            },
             async getKh() {
                 this.$axios.post("/platform/ghkh/khph/getKh", {"annual": this.pageForm.annual}).then(res => {
                     if (res.code === 0) {
@@ -308,27 +308,18 @@ layout("/layouts/platform.html"){
             async khSearch() {
                 await this.getKh()
             },
-            doEdit() {
+            doEdit(type) {
                 let arr = []
                 this.formData.nrs.forEach(n => {
                     let zp
                     n.bzs.forEach(b => {
-                        if (b.zp) {
-                            zp = {
-                                "zb_id": this.formData.id,
-                                "nr_id": n.id,
-                                "bz_id": b.id,
-                                "flatid": this.formData.union_id,
-                                "schools": b.schools,
-                                "addition": b.addition
-                            }
-                        } else {
-                            zp = {
-                                "zb_id": this.formData.id,
-                                "nr_id": n.id,
-                                "bz_id": b.id,
-                                "flatid": this.formData.union_id
-                            }
+                        zp = {
+                            "zb_id": this.formData.id,
+                            "nr_id": n.id,
+                            "bz_id": b.id,
+                            "flatid": this.formData.union_id,
+                            "schools": b.schools,
+                            "addition": b.addition
                         }
                         arr.push(zp)
                     })
@@ -339,7 +330,10 @@ layout("/layouts/platform.html"){
                     spinner: 'el-icon-loading',
                     background: 'rgba(0, 0, 0, 0.7)'
                 });
-                this.$axios.post(base + "/platform/ghkh/xghsh/marking", {pf: JSON.stringify(arr)}).then(res => {
+                this.$axios.post(base + "/platform/ghkh/xghsh/marking", {
+                    pf: JSON.stringify(arr),
+                    type: type
+                }).then(res => {
                     if (res.code == 0) {
                         this.$refs.guava.index()
                         this.pageData()
@@ -355,9 +349,12 @@ layout("/layouts/platform.html"){
                     loading.close()
                 })
             },
-            doView(nr, bz, row) {
+            doView(nr, bz, row, index, idx) {
                 this.dialog = true
-                this.data = {nr, bz, ...row.zp}
+                this.viewRow = row
+                this.data = {nr, bz, ...row.zp, remark: row.remark}
+                this.index = index
+                this.idx = idx
             },
             getSummaries(param) {
                 const {columns, data} = param;
@@ -424,14 +421,20 @@ layout("/layouts/platform.html"){
                     this.tabLoading = false
                 });
             },
+            fetchConfig() {
+                this.$axios.post("/platform/exam/config/fetch").then((res) => {
+                    if (res.code === 0) {
+                        this.examConfig = res.data
+                    }
+                })
+            },
         },
         async created() {
+            this.fetchConfig()
             this.pageData();
             //工会查询
             this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
         }
-
-
     })
 </script>
 <!--#

src/main/resources/views/platform/zhgh/dayofficework/ghkh/xjkhzb.html

@@ -19,13 +19,16 @@ layout("/layouts/platform.html"){
                     <h3 style="color: #1867b0">新建考核指标</h3>
                 </div>
                 <div>
-                    <el-button type="primary" @click="doAdd()">
-                        提交
-                    </el-button>
+                    <el-button type="primary" @click="doAdd()">暂存</el-button>
+                    <el-button type="primary" @click="doAdd()">提交</el-button>
                 </div>
             </template>
             <template>
                 <kh-zb :form_data="formData" @change="v=>{this.formData=v}"></kh-zb>
+                <el-row type="flex" justify="end">
+                    <el-button type="primary" @click="doAdd()">暂存</el-button>
+                    <el-button type="primary" @click="doAdd()">提交</el-button>
+                </el-row>
             </template>
         </el-card>
     </guava>

src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html

@@ -2,20 +2,10 @@
 layout("/layouts/platform.html"){
 #-->
 <style>
-/*    #app {
-        height: 100%;
-        overflow-y: unset !important;
-    }
 
-    .el-form {
-        height: calc(100vh - 100px) !important;
-    }*/
 </style>
 <div id="app" v-cloak>
-
     <guava ref="guava">
-
-
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
@@ -42,51 +32,37 @@ layout("/layouts/platform.html"){
             </el-card>
 
             <el-card shadow="never" class="mt20">
-                <el-table :data="tableData" style="width: 100%" row-key="id"
-                          v-loading="tabLoading">
+                <table-tool label="考核信息"></table-tool>
+                <el-table :data="tableData" style="width: 100%" row-key="id" v-loading="tabLoading">
                     <el-table-column align="center" header-align="center" label="序号" width="100px">
                         <template scope="scope">
                             <span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
                         </template>
                     </el-table-column>
-
-                    <el-table-column label="年度" prop="annual" header-align="center" width="300px" sortable
-                                     align="center">
-                        <template scope="scope">
-                            {{scope.row.annual}}
-                        </template>
+                    <el-table-column label="年度" prop="annual" header-align="center" width="300px" sortable align="center">
                     </el-table-column>
-
-                    <el-table-column label="考核名称" prop="assessment" header-align="center" show-overflow-tooltip
-                                     align="center"></el-table-column>
-
-
+                    <el-table-column label="考核名称" prop="assessment" header-align="center" show-overflow-tooltip align="center"></el-table-column>
                     <el-table-column label="填报时间" width="300px" header-align="center" show-overflow-tooltip align="center">
                         <template scope="scope">
                             <span>{{scope.row.startdatetime}} - {{scope.row.enddatetime}}</span>
                         </template>
                     </el-table-column>
-
-                    <el-table-column label="状态" prop="name" header-align="center"
-                                     align="center">
+                    <el-table-column label="状态" prop="name" header-align="center" align="center">
                         <template scope="scope">
-                            <span class="text-info" v-if="!scope.row.state">未自评</span>
-                            <span class="text-success" v-if="scope.row.state==1">自评中</span>
-                            <span class="text-warning" v-if="scope.row.state==2">待总部工会评分</span>
+                            <span class="text-info" v-if="!scope.row.state">未填报</span>
+                            <span class="text-success" v-if="scope.row.state==1">填报中</span>
+                            <span class="text-warning" v-if="scope.row.state==2">待校工会评分</span>
                             <span class="text-success" v-if="scope.row.state==3">考核成功</span>
                         </template>
                     </el-table-column>
-
                     <el-table-column align="center" header-align="center" label="操作" fixed="right" width="250px">
                         <template scope="scope">
                             <el-button size="mini" type="primary" v-if="scope.row.state" @click="openView(scope.row)">查看
                             </el-button>
-                            <el-button size="mini" type="primary" @click="openAdd(scope.row)"
-                                       v-if="!scope.row.state">
-                                自评
+                            <el-button size="mini" type="primary" @click="openAdd(scope.row)" v-if="!scope.row.state">
+                                填报
                             </el-button>
-                            <el-button size="mini" type="primary" @click="openEdit(scope.row)"
-                                       v-if="scope.row.state==1||scope.row.state==2">
+                            <el-button size="mini" type="primary" @click="openEdit(scope.row)" v-else>
                                 修改
                             </el-button>
                         </template>
@@ -98,94 +74,41 @@ layout("/layouts/platform.html"){
         </template>
 
         <template #edit_func>
-            <el-button type="primary"
-                       style="float: right;margin-top: 5px;margin-left: 10px;"
-                       @click="doSaveOrSubmit('submit')">提交
-            </el-button>
-            <el-button type="primary" plain style="float: right;margin-top: 5px"
-                       @click="doSaveOrSubmit('save')">
-                保存
-            </el-button>
+            <el-button type="primary" @click="doSaveOrSubmit('save')">暂存</el-button>
+            <el-button type="primary" @click="doSaveOrSubmit('submit')">提交</el-button>
+        </template>
+
+        <template #edit_footer>
+            <el-button type="primary" @click="doSaveOrSubmit('save')">暂存</el-button>
+            <el-button type="primary" @click="doSaveOrSubmit('submit')">提交</el-button>
         </template>
 
         <template #edit>
-
-            <el-form :model="formData" ref="form" label-width="100px"
-                     style="height: calc(100vh - 50px);overflow-y: scroll;padding: 10px 15px">
+            <el-form :model="formData" ref="form" label-width="100px">
                 <table-tool label="联系信息"></table-tool>
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item prop="userName" label="填报人">
-                            <el-input maxlength="30" readonly v-model="formData.userName" placeholder="填报人"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item prop="mobile" label="联系方式">
-                            <el-input maxlength="30" readonly v-model="formData.mobile" placeholder="联系方式"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item prop="fillTime" label="填报时间">
-                            <el-date-picker style="width: 100%"
-                                            v-model="formData.fillTime"
-                                            type="datetime"
-                                            value-format="yyyy-MM-dd HH:mm:ss"
-                                            placeholder="请选择填报时间">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <table-tool label="指标信息"></table-tool>
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item prop="annual" label="年&emsp;&emsp;度">
-                            <el-date-picker
-                                    style="width: 100%"
-                                    @change="khSearch"
-                                    :picker-options="pickerOptions"
-                                    v-model="formData.annual"
-                                    type="year"
-                                    value-format="yyyy"
-                                    placeholder="选择年度">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item prop="assessment" label="考核名称">
-                            <el-input maxlength="30" readonly v-model="formData.assessment" placeholder="请填写考核名称"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item prop="unionName" label="分工会名称">
-                            <el-input maxlength="30" readonly v-model="formData.unionName" placeholder="请填写分工会名称"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-
-                <table-tool label="考核内容"></table-tool>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="填报人">{{ $store.state.user.username }}</el-descriptions-item>
+                    <el-descriptions-item label="联系方式">{{ $store.state.user.mobile }}</el-descriptions-item>
+                    <el-descriptions-item label="填报时间">{{ formData.fillTime }}</el-descriptions-item>
+                </el-descriptions>
+                <table-tool label="指标信息" class="mt10"></table-tool>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="年度">{{ formData.annual }}</el-descriptions-item>
+                    <el-descriptions-item label="考核名称">{{ formData.assessment }}</el-descriptions-item>
+                    <el-descriptions-item label="分工会名称">{{ $store.state.user.union.name }}</el-descriptions-item>
+                </el-descriptions>
 
+                <table-tool label="考核内容" class="mt10"></table-tool>
                 <el-form-item label="" label-width="0" v-for="nr,idx in formData.nrs" :key="nr.id">
-
                     <el-row type="flex" align="middle" justify="space-between">
                         <el-input v-model="nr.content" readonly maxlength="30" style="width: 50%">
                             <template slot="prepend"><span>{{ idx + 1 }}</span></template>
                         </el-input>
                     </el-row>
 
-
                     <el-row style="margin-top: 20px">
                         <el-table :data="nr.bzs" style="width: 100%" border show-summary
-                                  :summary-method="getSummaries">
+                                  :summary-method="getSummaries" size="small">
                             <el-table-column align="center" header-align="center" label="序号" type="index"
                                              width="100px">
                             </el-table-column>
@@ -199,7 +122,7 @@ layout("/layouts/platform.html"){
                             </el-table-column>
 
                             <el-table-column label="单项分" prop="single_score" header-align="center" align="center"
-                                             width="250px">
+                                             v-if="examConfig.displaySingleItem === true" width="250px">
                                 <template scope="{row}">
                                     <el-input v-model.number="row.single_score" readonly maxlength="4"></el-input>
                                 </template>
@@ -212,7 +135,7 @@ layout("/layouts/platform.html"){
                                 </template>
                             </el-table-column>
                             <el-table-column label="自评得分" prop="zp.zpf" header-align="center" align="center"
-                                             width="250px">
+                                             v-if="examConfig.selfAssessment === true" width="250px">
                                 <template slot-scope="{row}">
                                     <el-input v-model.number="row.zp.zpf" maxlength="4"
                                               @input="(val)=>{onInputZpf(val,row)}"
@@ -224,19 +147,22 @@ layout("/layouts/platform.html"){
                                 </template>
                             </el-table-column>
 
-                            <!--                                <el-table-column label="能否超过标准分" prop="beyond_highestscore" header-align="center" align="center"-->
-                            <!--                                                 width="200px">-->
-                            <!--                                    <template scope="{row}">-->
-                            <!--                                       <span v-if="row.beyond_highestscore" class="text-primary">能</span>-->
-                            <!--                                       <span v-else class="text-danger">否</span>-->
-                            <!--                                    </template>-->
-                            <!--                                </el-table-column>-->
+                            <el-table-column label="佐证材料数量" header-align="center" align="center" width="100">
+                                <template scope="scope">
+                                    <span v-if="scope.row.zp?.files?.length > 0" class="text-primary" style="font-weight: bolder; font-size: 16px">
+                                        {{ scope.row.zp?.files?.length || 0 }}</span>
+                                    <span v-else>0</span>
+                                </template>
+                            </el-table-column>
 
-                            <el-table-column label="上传有关佐证材料" header-align="center" align="center"
-                                             width="250px">
+                            <el-table-column label="佐证材料" header-align="center" align="center" width="250px">
                                 <template scope="props">
-                                    <el-button type="primary" plain :disabled="!props.row.isEvidence"
-                                               @click="upload(nr.content,props.row.inspection,props.row,props.$index,idx)">
+                                    <el-button v-if="!props.row.isEvidence" plain size="small" type="info">此项无需佐证材料</el-button>
+                                    <el-button :type="props.row.zp?.files?.length > 0 ? 'success' : 'primary'"
+                                               plain
+                                               :disabled="!props.row.isEvidence" size="small"
+                                               v-else
+                                               @click="upload(nr.content, props.row.inspection, props.row, props.$index,idx)">
                                         上传佐证材料
                                     </el-button>
                                 </template>
@@ -248,44 +174,15 @@ layout("/layouts/platform.html"){
         </template>
 
         <template #view>
-            <el-form :model="formData" ref="form" label-width="100px"
-                     style="height: calc(100vh - 50px);overflow-y: scroll;padding: 10px 15px">
-                <vi-title title="指标信息"></vi-title>
-                </el-form-item>
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item prop="annual" label="年&emsp;&emsp;度">
-                            <el-date-picker
-                                    @change="khSearch"
-                                    :picker-options="pickerOptions"
-                                    v-model="formData.annual"
-                                    type="year"
-                                    value-format="yyyy"
-                                    placeholder="选择年度">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
-
-                    <el-col :span="8">
-                        <el-form-item prop="assessment" label="考核名称">
-                            <el-input maxlength="30" readonly v-model="formData.assessment" placeholder="请填写考核名称"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="unionId" label="分工会名称">
-                            <el-input maxlength="30" readonly v-model="formData.unionId" placeholder="请填写分工会名称"
-                                      type="text"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <vi-title title="考核内容"></vi-title>
-                </el-form-item>
-
-
+            <el-form :model="formData" ref="form" label-width="100px">
+                <table-tool label="指标信息"></table-tool>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="年度">{{ formData.annual }}</el-descriptions-item>
+                    <el-descriptions-item label="考核名称">{{ formData.assessment }}</el-descriptions-item>
+                    <el-descriptions-item label="分工会名称">{{ $store.state.user.union.name }}</el-descriptions-item>
+                </el-descriptions>
+                <table-tool label="考核内容" class="mt10"></table-tool>
                 <el-form-item label="" label-width="0" v-for="nr,idx in formData.nrs" :key="nr.id">
-
                     <el-row type="flex" align="middle" justify="space-between">
                         <el-input v-model="nr.content" readonly maxlength="30" style="width: 50%"
                                   placeholder="请填写考核内容">
@@ -293,11 +190,10 @@ layout("/layouts/platform.html"){
                         </el-input>
                     </el-row>
 
-
                     <el-row style="margin-top: 20px">
                         <el-table :data="nr.bzs" style="width: 100%" border show-summary
-                                  :summary-method="getSummaries">
-                            <el-table-column align="center" header-align="center" label="序号" type="index">
+                                  :summary-method="getSummaries" size="small">
+                            <el-table-column align="center" header-align="center" label="序号" type="index" width="80">
                             </el-table-column>
 
                             <el-table-column label="考核标准" disabled prop="inspection" header-align="center"
@@ -331,7 +227,7 @@ layout("/layouts/platform.html"){
                                              width="250px">
                                 <template scope="{row}">
                                     <el-button type="primary" :disabled="!row.zp||!row.zp.zpf||!row.isEvidence"
-                                               plain
+                                               plain size="small"
                                                @click="viewUpload(nr.content,row.inspection,row)">
                                         查看佐证材料
                                     </el-button>
@@ -342,12 +238,10 @@ layout("/layouts/platform.html"){
                 </el-form-item>
             </el-form>
         </template>
-
-
     </guava>
 
-
     <el-drawer
+            title="佐证材料"
             :visible.sync="dialog"
             :show-close="false"
             direction="rtl" size="40%"
@@ -368,13 +262,13 @@ layout("/layouts/platform.html"){
                     </div>
                     <el-button slot="reference">返 回</el-button>
                 </el-popover>
-                <!--                <el-button @click="cancelForm">取 消</el-button>-->
                 <el-button type="primary" @click="addForm">确 定</el-button>
             </div>
         </div>
     </el-drawer>
 
     <el-drawer
+            title="佐证材料"
             :visible.sync="dialog_view"
             direction="rtl" size="40%"
             custom-class="demo-drawer"
@@ -387,12 +281,13 @@ layout("/layouts/platform.html"){
     <calcscore-table :relation_year="relationYear"
                      :show_modal.sync="calcSoreTableModal"
                      @get_table_data="autoFillScore">
-
+    </calcscore-table>
 
 </div>
 <script>
     const vue = new Vue({
         el: '#app',
+        store,
         mixins: [initTableMixins],
         data() {
             return {
@@ -410,7 +305,7 @@ layout("/layouts/platform.html"){
                     pageSize: 10,
                     totalCount: 0,
                 },
-                data: {bz: '', clnrs: null, nr: ''},
+                data: {bz: '', clnrs: null, nr: '', remark: ''},
                 row: {},
                 index: "",
                 idx: "",
@@ -424,7 +319,8 @@ layout("/layouts/platform.html"){
                 },
                 relationYear: {},
                 calcSoreTableModal: false,
-                current_bz_id: ''
+                current_bz_id: '',
+                examConfig: {},
             }
         },
 
@@ -527,15 +423,43 @@ layout("/layouts/platform.html"){
             },
             async doSaveOrSubmit(v) {
                 const params = []
-                this.formData.nrs.forEach(n => {
-                    n.bzs.forEach(b => {
+                let valid = true
+                let msg = ''
+                outerLoop:
+                for (let i = 0; i < this.formData.nrs.length; i++) {
+                    const n = this.formData.nrs[i]
+                    for (let j = 0; j < n.bzs.length; j++) {
+                        const b = n.bzs[j]
                         params.push({
                             "zb_id": this.formData.id, "nr_id": n.id,
-                            "bz_id": b.id, "clnr": b.zp.clnr, "zpf": b.zp.zpf, "files": b.zp.files,
-                            "id": b.zp.id ? b.zp.id : null
+                            "bz_id": b.id, "clnr": b.zp?.clnr, "zpf": b.zp?.zpf, "files": b.zp?.files,
+                            "id": b.zp?.id ? b.zp?.id : null
                         })
-                    })
-                })
+                        if(!b.zp?.clnr) {
+                            msg = '考核内容第' + (i + 1) + '项，考核标准第' + (j + 1) + '项，材料内容为空，是否继续提交？'
+                            valid = false
+                            break outerLoop
+                        }
+                        if(b.isEvidence === true && !b.zp?.files) {
+                            msg = '考核内容第' + (i + 1) + '项，考核标准第' + (j + 1) + '项，佐证材料为空，是否继续提交？'
+                            valid = false
+                            break outerLoop
+                        }
+                    }
+                }
+                if (v === 'submit' && valid === false) {
+                    this.$confirm(msg, '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.submit(params, v)
+                    }).catch(() => {})
+                } else {
+                    this.submit(params, v)
+                }
+            },
+            submit(params, v) {
                 const loading = this.$loading({
                     lock: true,
                     text: '数据提交中...',
@@ -583,15 +507,15 @@ layout("/layouts/platform.html"){
                 await this.getKh()
             },
             viewUpload(nr, bz, row) {
-                this.data = {nr, bz, clnr: row.clnr, ...row.zp}
+                this.data = {nr, bz, clnr: row.clnr, ...row.zp, remark: row.remark}
                 this.dialog_view = true
             },
             upload(nr, bz, row, index, idx) {
                 this.dialog = true
                 if (row.zp) {
-                    this.data = {nr, bz, clnr: row.clnr, ...row.zp}
+                    this.data = {nr, bz, clnr: row.clnr, ...row.zp, remark: row.remark}
                 } else {
-                    this.data = {nr, bz, clnr: row.clnr, ...row.zp}
+                    this.data = {nr, bz, clnr: row.clnr, ...row.zp, remark: row.remark}
                 }
                 this.row = row
                 this.index = index
@@ -616,7 +540,7 @@ layout("/layouts/platform.html"){
                     } else if ([1, 2, 5].includes(index)) {
                         sums[index] = '';
                         return;
-                    } else if (index === 4) {
+                    } else if (index === 4 && this.examConfig.selfAssessment === true) {
                         const zpfs = data.map(v => v['zp']['zpf'])
                         sums[index] = zpfs.reduce((a, b) => {
                             return a + b;
@@ -658,6 +582,14 @@ layout("/layouts/platform.html"){
                 });
             },
             async openAdd(row) {
+                if(this.$moment().isBefore(this.$moment(row.startDateTime))) {
+                    this.$message.error("该考核未开始")
+                    return
+                }
+                if(this.$moment().isAfter(this.$moment(row.endDateTime))) {
+                    this.$message.error("该考核已结束")
+                    return
+                }
                 this.$axios.post(base + "/platform/ghkh/khzb/getZb", {id: row.id}).then(data => {
                     if (data.code === 0) {
                         data.data.nrs.forEach(v => {
@@ -669,13 +601,34 @@ layout("/layouts/platform.html"){
                         })
                         this.formData = data.data
                         this.formData.userName = this.$store.state.user.username
-                        this.formData.mobile = this.$store.user.mobile
+                        this.formData.mobile = this.$store.state.user.mobile
                         this.formData.unionName = this.$store.state.user.union.name
+                        this.formData.fillTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
                         this.$refs.guava.edit()
                     }
                 })
             },
             async openEdit(row) {
+                if(this.$moment().isBefore(this.$moment(row.startDateTime))) {
+                    this.$message.error("该考核未开始")
+                    return
+                }
+                if(this.$moment().isAfter(this.$moment(row.endDateTime))) {
+                    this.$message.error("该考核已结束")
+                    return
+                }
+                if(![1, 2].includes(row.state)) {
+                    this.$message.error("当前状态不能修改")
+                    return
+                }
+                if(this.$moment().isBefore(this.$moment(row.startApplyTime))) {
+                    this.$message.error("该考核申诉期未开始")
+                    return
+                }
+                if(this.$moment().isAfter(this.$moment(row.endApplyTime))) {
+                    this.$message.error("该考核申诉期已结束")
+                    return
+                }
                 this.$axios.post(base + '/platform/ghkh/zp/openView', {id: row.id}).then(resa => {
                     if (resa.code === 0) {
                         this.formData = resa.data
@@ -806,9 +759,16 @@ layout("/layouts/platform.html"){
                     this.$refs.guava.view()
                 })
             },
-
+            fetchConfig() {
+                this.$axios.post("/platform/exam/config/fetch").then((res) => {
+                    if (res.code === 0) {
+                        this.examConfig = res.data
+                    }
+                })
+            },
         },
         async created() {
+            this.fetchConfig()
             this.pageData();
         }