commit

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

@@ -1,7 +1,9 @@
 package com.budwk.app.zhgh.dayofficework.ghkh.model;
 
+import lombok.Data;
 import org.nutz.dao.DB;
 import org.nutz.dao.entity.annotation.*;
+import org.nutz.lang.util.NutMap;
 
 import java.util.List;
 import java.util.Map;
@@ -13,10 +15,10 @@ import java.util.Map;
  * @Date: 2020/09/27/20:13
  * @Description:
  */
+@Data
 @Table("Kh_zp")
 public class Kh_zp {
 
-
     @Column
     @Name
     @Comment("id")
@@ -28,10 +30,12 @@ public class Kh_zp {
     @Comment("标准id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String bz_id;
+
     @Column
     @Comment("指标id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String zb_id;
+
     @Column
     @Comment("内容id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
@@ -52,92 +56,21 @@ public class Kh_zp {
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String flatid;
 
-
-
     @Column
     @Comment("文件")
     @ColDefine(type = ColType.MYSQL_JSON)
-    private List<Map> files;
+    private List<NutMap> files;
-
 
     @Column
     @Comment("排序字段")
     @Prev({
             @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM Kh_zp"),
     })
-
     private Integer location;
 
-    public String getId() {
+	@Column
-        return id;
+	@Comment("是否修改，默认为false")
-    }
+	@ColDefine(type = ColType.BOOLEAN)
-
+	@Default("0")
-    public void setId(String id) {
+	private Boolean updateStatus;
-        this.id = id;
-    }
-
-    public String getBz_id() {
-        return bz_id;
-    }
-
-    public void setBz_id(String bz_id) {
-        this.bz_id = bz_id;
-    }
-
-    public String getZb_id() {
-        return zb_id;
-    }
-
-    public void setZb_id(String zb_id) {
-        this.zb_id = zb_id;
-    }
-
-    public String getNr_id() {
-        return nr_id;
-    }
-
-    public void setNr_id(String nr_id) {
-        this.nr_id = nr_id;
-    }
-
-    public String getClnr() {
-        return clnr;
-    }
-
-    public void setClnr(String clnr) {
-        this.clnr = clnr;
-    }
-
-    public Integer getZpf() {
-        return zpf;
-    }
-
-    public void setZpf(Integer zpf) {
-        this.zpf = zpf;
-    }
-
-    public String getFlatid() {
-        return flatid;
-    }
-
-    public void setFlatid(String flatid) {
-        this.flatid = flatid;
-    }
-
-
-    public List<Map> getFiles() {
-        return files;
-    }
-
-    public void setFiles(List<Map> files) {
-        this.files = files;
-    }
-
-    public Integer getLocation() {
-        return location;
-    }
-
-    public void setLocation(Integer location) {
-        this.location = location;
-    }
 }

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

@@ -2,6 +2,11 @@
 layout("/layouts/platform.html"){
 #-->
 
+<style>
+    .el-table .warning-row {
+        background: oldlace;
+    }
+</style>
 
 <div id="app" v-cloak>
 
@@ -130,15 +135,16 @@ layout("/layouts/platform.html"){
                 </el-descriptions>
 
                 <table-tool label="考核内容" class="mt10"></table-tool>
-                <el-form-item label="" label-width="0" v-for="nr,idx in formData.nrs">
+                <el-form-item label="" label-width="0" v-for="nr,idx in formData.nrs" v-if="nr?.auditUser === $store.state.user.loginname">
-                    <template v-if="nr?.auditUser === $store.state.user.loginname">
+                    <template>
                         <el-row type="flex" align="middle" justify="space-between">
                             <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 size="small" :summary-method="getSummaries">
+                            <el-table :data="nr.bzs" style="width: 100%" border show-summary size="small" :summary-method="getSummaries"
+                                      :row-class-name="tableRowClassName">
                                 <el-table-column align="center" header-align="center" label="序号"
                                                  type="index" width="60">
                                 </el-table-column>
@@ -299,6 +305,12 @@ layout("/layouts/platform.html"){
             'upload-materials': httpVueLoader('/components/module/kh/UploadMaterials.vue')
         },
         methods: {
+            tableRowClassName({row, rowIndex}) {
+                if(row.zp?.updateStatus === true) {
+                    return 'warning-row';
+                }
+                return '';
+            },
             addForm() {
                 this.formData.nrs[this.idx].bzs[this.index].zp = this.data
                 this.dialog = false