Просмотр исходного кода

fix:修改学时输入类型,以及展示时单位问题

sunqijun недель назад: 2
Родитель
Сommit
5e11338bc0

+ 1 - 1
src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagement/components/educationTrainingPlanManagementDetail.vue

@@ -72,7 +72,7 @@
 
 
       <!-- 学时 -->
       <!-- 学时 -->
       <el-form-item label="学时:" prop="studyHours">
       <el-form-item label="学时:" prop="studyHours">
-        <el-input v-model.number="form.studyHours" placeholder="输入学时,如6、2、8等,单位时" :disabled="isViewMode" />
+        <el-input v-model="form.studyHours" placeholder="输入学时,如6、2、8等,单位时" :disabled="isViewMode" />
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 

+ 2 - 2
src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagement/configs/form.ts

@@ -1,3 +1,4 @@
+
 export const FORM_RULES = {
 export const FORM_RULES = {
   trainingPlanName: [{ required: true, message: '教育培训计划名称', trigger: 'blur' }],
   trainingPlanName: [{ required: true, message: '教育培训计划名称', trigger: 'blur' }],
   categoryName: [{ required: true, message: '请输入分类名称', trigger: 'change' }],
   categoryName: [{ required: true, message: '请输入分类名称', trigger: 'change' }],
@@ -9,8 +10,7 @@ export const FORM_RULES = {
   assessmentMethod: [{ required: true, message: '请输入考核方式', trigger: 'blur' }],
   assessmentMethod: [{ required: true, message: '请输入考核方式', trigger: 'blur' }],
   responsibleDeptIds: [{ required: true, type: 'array', message: '请选择培训责任部门', trigger: 'change' }],
   responsibleDeptIds: [{ required: true, type: 'array', message: '请选择培训责任部门', trigger: 'change' }],
   studyHours: [
   studyHours: [
-    { required: true, message: '请输入学时', trigger: 'blur' },
-    { type: 'number', message: '学时必须为数字', trigger: 'blur' },
+    { required: true, message: '请输入学时', trigger: 'blur' }
   ],
   ],
 };
 };
 
 

+ 4 - 4
src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/components/commonTable.vue

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Author: liuJie
  * @Date: 2026-02-13 16:04:29
  * @Date: 2026-02-13 16:04:29
  * @LastEditors: liuJie
  * @LastEditors: liuJie
- * @LastEditTime: 2026-04-17 17:39:36
+ * @LastEditTime: 2026-04-21 14:13:31
  * @Describe: file describe
  * @Describe: file describe
 -->
 -->
 <script setup lang="ts">
 <script setup lang="ts">
@@ -142,7 +142,7 @@
     tableQuery.pageNumber = 1;
     tableQuery.pageNumber = 1;
     handleSearch();
     handleSearch();
   };
   };
-  const getNumber = (value, unit)=>{
+  const getNumber = (value, unit='')=>{
     if(value===0){
     if(value===0){
         return value + unit;
         return value + unit;
     }else if(value === null || value === undefined || value === ''){
     }else if(value === null || value === undefined || value === ''){
@@ -183,7 +183,7 @@
       <el-table-column label="教育内容" prop="educationContent" width="280" />
       <el-table-column label="教育内容" prop="educationContent" width="280" />
       <el-table-column label="学时" prop="creditHour">
       <el-table-column label="学时" prop="creditHour">
         <template #default="scope">
         <template #default="scope">
-          <span>{{  getNumber(scope.row.creditHour, '时') }}</span>
+          <span>{{  getNumber(scope.row.creditHour) }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="成绩" prop="scoreMust">
       <el-table-column label="成绩" prop="scoreMust">
@@ -201,7 +201,7 @@
           <el-button link type="primary" @click="editHandle(scope.row)">编辑</el-button>
           <el-button link type="primary" @click="editHandle(scope.row)">编辑</el-button>
           <el-popconfirm title="确定要删除该条记录吗?" placement="top" @confirm="deleteHandle(scope.row.id)">
           <el-popconfirm title="确定要删除该条记录吗?" placement="top" @confirm="deleteHandle(scope.row.id)">
             <template #reference>
             <template #reference>
-              <el-button link type="danger">删除</el-button>
+              <el-button link type="primary">删除</el-button>
             </template>
             </template>
           </el-popconfirm>
           </el-popconfirm>
         </template>
         </template>

+ 4 - 4
src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/components/commonTable2.vue

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Author: liuJie
  * @Date: 2026-02-13 16:04:29
  * @Date: 2026-02-13 16:04:29
  * @LastEditors: liuJie
  * @LastEditors: liuJie
- * @LastEditTime: 2026-04-17 17:31:01
+ * @LastEditTime: 2026-04-21 14:14:11
  * @Describe: file describe
  * @Describe: file describe
 -->
 -->
 <script setup lang="ts">
 <script setup lang="ts">
@@ -145,7 +145,7 @@
     tableQuery.pageNumber = 1;
     tableQuery.pageNumber = 1;
     handleSearch();
     handleSearch();
   };
   };
-  const getNumber = (value, unit)=>{
+  const getNumber = (value, unit='')=>{
     if(value===0){
     if(value===0){
         return value + unit;
         return value + unit;
     }else if(value === null || value === undefined || value === ''){
     }else if(value === null || value === undefined || value === ''){
@@ -192,7 +192,7 @@
       <el-table-column label="培训单位" prop="trainingCompany" width="220" />
       <el-table-column label="培训单位" prop="trainingCompany" width="220" />
       <el-table-column label="学时" prop="creditHour" width="120">
       <el-table-column label="学时" prop="creditHour" width="120">
         <template #default="scope">
         <template #default="scope">
-          <span>{{  getNumber(scope.row.creditHour, '时') }}</span>
+          <span>{{  getNumber(scope.row.creditHour) }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" width="220" fixed="right">
       <el-table-column label="操作" width="220" fixed="right">
@@ -200,7 +200,7 @@
           <el-button link type="primary" @click="editHandle(scope.row)">编辑</el-button>
           <el-button link type="primary" @click="editHandle(scope.row)">编辑</el-button>
           <el-popconfirm title="确定要删除该条记录吗?" placement="top" @confirm="deleteHandle(scope.row.id)">
           <el-popconfirm title="确定要删除该条记录吗?" placement="top" @confirm="deleteHandle(scope.row.id)">
             <template #reference>
             <template #reference>
-              <el-button link type="danger">删除</el-button>
+              <el-button link type="primary">删除</el-button>
             </template>
             </template>
           </el-popconfirm>
           </el-popconfirm>
         </template>
         </template>