Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/views/train/assessment/participants.vue

@@ -54,7 +54,7 @@
             label: '班组',
             width: '300'
           },
-        
+
           {
             prop: 'userName',
             label: '人员姓名',
@@ -66,7 +66,7 @@
             width: '300'
           },
           {label: "是否合格", prop: "hgbz",formatter(a,b,c){
-            let hgbz= {'Y':'合格','N':'不合格'}
+            let hgbz= {'Y':'合格','N':'不合格','F':'未交卷','I':'未参考'}
             return hgbz[c]
           },width:200},
         ]

src/views/train/ksjl/ksjldet.vue

@@ -51,7 +51,7 @@
          {label: "公司", prop: "gsName", fieldType: "ftString",width:200},
           {label: "班组", prop: "bmName", fieldType: "ftString",width:200},
            {label: "是否合格", prop: "hgbz",formatter(a,b,c){
-             let hgbz= {'Y':'合格','N':'不合格'}
+             let hgbz= {'Y':'合格','N':'不合格','F':'未交卷','I':'未参考'}
              return hgbz[c]
            },width:200},
 				{label: "开始时间", prop: "kskssj", fieldType: "ftDateTime",width:200},