LY 专项培训

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiCc.java

@@ -209,6 +209,10 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    private  String perTestConclusion;
+
+
+
     public String getUnit() {
         return unit;
     }
@@ -230,6 +234,14 @@ public class TSpechiCc extends BaseEntity
         this.id = id;
     }
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public Long getId()
     {
         return id;

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiDt.java

@@ -178,6 +178,16 @@ public class TSpechiDt extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    private String perTestConclusion;
+
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiGl.java

@@ -202,6 +202,8 @@ public class TSpechiGl extends BaseEntity
     @Excel(name = "状态")
     private Long hiType;
 
+    private String perTestConclusion;
+
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
@@ -214,6 +216,14 @@ public class TSpechiGl extends BaseEntity
         this.deptName = deptName;
     }
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlgd.java

@@ -247,7 +247,7 @@ public class TSpechiYlgd extends BaseEntity
     @Excel(name = "状态")
     private Long hiType;
 
-
+    private String perTestConclusion;
 
     /** 部门名称 */
     @Excel(name = "部门名称")
@@ -257,6 +257,14 @@ public class TSpechiYlgd extends BaseEntity
         return deptName;
     }
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlrq.java

@@ -218,7 +218,7 @@ public class TSpechiYlrq extends BaseEntity
     @Excel(name = "状态")
     private Long hiType;
 
-
+    private String perTestConclusion;
 
     /** 部门名称 */
     @Excel(name = "部门名称")
@@ -228,6 +228,14 @@ public class TSpechiYlrq extends BaseEntity
         return deptName;
     }
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }

ui/src/views/approve/pending/specTrainingPlan-deal.vue

@@ -33,7 +33,7 @@
               <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="学时"  align="center" prop="classHour" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="学时"  align="center" prop="classHour" :show-overflow-tooltip="true"/>-->
           <el-table-column label="具体内容"  align="center" prop="classContent" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('申请状态')" align="center"  prop="approveStatus" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -167,9 +167,9 @@
                           placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="学时" prop="classHour">
-          <el-input v-model="form.classHour" placeholder="请输入学时" />
-        </el-form-item>
+<!--        <el-form-item label="学时" prop="classHour">-->
+<!--          <el-input v-model="form.classHour" placeholder="请输入学时" />-->
+<!--        </el-form-item>-->
         <el-form-item label="具体内容">
           <el-input
             type="textarea"

ui/src/views/training/spec/plan/plan-approve.vue

@@ -30,7 +30,6 @@
               <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>
           <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
         </el-table>
       </el-form-item>

ui/src/views/training/spec/successor/index.vue

@@ -184,6 +184,7 @@
               :key="dict.dictValue"
               :label="dict.dictLabel"
               :value="dict.dictValue"
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -404,6 +405,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.state = '0'
       this.open = true;
       this.title = "添加继任者清单";
     },

ui/src/views/training/spec/successor/staffResume.vue

@@ -70,7 +70,7 @@
             <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>
+<!--        <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>-->
         <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
         <el-table-column label="评分" align="center" prop="classContent" :show-overflow-tooltip="true"/>
       </el-table>

ui/src/views/training/spec/successor/successorPlan.vue

@@ -15,7 +15,7 @@
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="学时" align="center" prop="classHour" :show-overflow-tooltip="true"/>-->
       <el-table-column label="具体内容" align="center" prop="classContent" :show-overflow-tooltip="true"/>
       <el-table-column label="学习状态" align="center" prop="studyState" :formatter="studyStateFormat" />
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
@@ -67,9 +67,9 @@
                           placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="学时" prop="classHour">
-          <el-input v-model="form.classHour" placeholder="请输入学时" />
-        </el-form-item>
+<!--        <el-form-item label="学时" prop="classHour">-->
+<!--          <el-input v-model="form.classHour" placeholder="请输入学时" />-->
+<!--        </el-form-item>-->
         <el-form-item label="具体内容">
           <!-- <editor v-model="form.classContent" :min-height="192"/> -->
           <el-input

ui/src/views/training/spec/yearplan/index.vue

@@ -130,6 +130,7 @@
             type="text"
             icon="el-icon-edit"
             @click="addApprove(scope.row)"
+            v-if="scope.row.approveStatus != 1"
             v-hasPermi="['spec:plan:list']"
           >提交申请</el-button>
           <el-button