From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 05 三月 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/coalMine/cViolationRegistration/components/violationDialog.vue |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/views/coalMine/cViolationRegistration/components/violationDialog.vue b/src/views/coalMine/cViolationRegistration/components/violationDialog.vue
index 803c02e..006072d 100644
--- a/src/views/coalMine/cViolationRegistration/components/violationDialog.vue
+++ b/src/views/coalMine/cViolationRegistration/components/violationDialog.vue
@@ -13,6 +13,14 @@
       <el-form-item label="身份证号:" prop="idCard">
         <el-input v-model.trim="form.idCard" :readonly="disable"/>
       </el-form-item>
+      <el-form-item label="处罚人员类别:">
+        <el-radio-group v-model="radio">
+          <el-radio :label="1">学员</el-radio>
+          <el-radio :label="2">培训机构</el-radio>
+          <el-radio :label="3">考点</el-radio>
+          <el-radio :label="4">监考老师</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="IC卡编号:" prop="icNum">
         <el-input v-model.trim="form.icNum" :readonly="disable"/>
       </el-form-item>
@@ -58,7 +66,10 @@
           <i class="el-icon-plus"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="违章描述:" prop="remark">
+      <el-form-item label="违章描述与处罚情况:" prop="remark">
+        <el-input type="textarea" v-model.trim="form.remark" :readonly="disable"/>
+      </el-form-item>
+      <el-form-item label="核准建议:" prop="remark">
         <el-input type="textarea" v-model.trim="form.remark" :readonly="disable"/>
       </el-form-item>
     </el-form>
@@ -103,6 +114,7 @@
     }
     return {
       disable: false,
+      radio: 1,
       title: '新增填报',
       open: false,
       form:{

--
Gitblit v1.9.2