Jelajahi Sumber

fix:课程内容增加ppt格式附件上传,员工培训信息部分字段非必填,物品领取记录增加状态枚举

sunqijun 2 minggu lalu
induk
melakukan
9a70911f60

+ 3 - 1
src/views/production-safety/safetyAssessment/receiptRecord/configs/status.ts

@@ -1,6 +1,7 @@
 // 物品领取记录状态配置
-// 0 待审核, 1 审核通过, -1 审核不通过, 2 已领取
+// 0 待审核, 1 审核通过, -1 审核不通过, 2 已领取, 3 待提交
 export const RECEIPT_RECORD_STATUS_OPTIONS = [
+  { label: '待提交', value: 3 },
   { label: '待审核', value: 0 },
   { label: '审核通过', value: 1 },
   { label: '审核不通过', value: -1 },
@@ -12,6 +13,7 @@ export const RECEIPT_RECORD_STATUS_LABEL: Record<string, string> = {
   '1': '审核通过',
   '-1': '审核不通过',
   '2': '已领取',
+  '3': '待提交',
 };
 
 // 管理员审核页状态选项(含已领取)

+ 4 - 3
src/views/production-safety/safetyAssessment/receiptRecord/receiptRecord.vue

@@ -13,9 +13,7 @@
             <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
-            <el-button plain class="search-table-container--button" @click="handleDownload">
-              导出
-            </el-button>
+            
           </div>
 
           <div class="act-search">
@@ -51,6 +49,9 @@
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
+              <el-button plain @click="handleDownload">
+              导出
+            </el-button>
             </section>
           </div>
         </header>

+ 7 - 6
src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/components/addTrainingInformation.vue

@@ -228,6 +228,7 @@ const openState = ref(false)
       'application/zip',
       'application/msword',
       'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      'application/vnd.openxmlformats-officedocument.presentationml.presentation',
       'application/pdf',
       'video/mp4',
     ];
@@ -260,12 +261,12 @@ const openState = ref(false)
 
   // 课程内容文件上传
   const handleFileChange = async (file, fileLists) => {
-    
+    // console.log(file, fileLists, '文件列表')
 
-    if (!allowedTypes.includes(file.raw.type)) {
-      ElMessage.error('不支持的文件格式');
-      return;
-    }
+    // if (!allowedTypes.includes(file.raw.type)) {
+    //   ElMessage.error('不支持的文件格式');
+    //   return;
+    // }
 
     if (file.raw.size > 20 * 1024 * 1024) {
       ElMessage.error('文件大小不能超过20MB');
@@ -451,7 +452,7 @@ const openState = ref(false)
             v-if="!isViewMode"
             :on-change="handleFileChange"
             :on-remove="handleFileRemove"
-            accept=".rar, .zip, .doc, .docx, .pdf, .mp4"
+            accept=".rar, .zip, .doc, .docx, .pdf, .mp4, .ppt, .pptx"
             :file-list="fileList"
           >
             <el-button type="default" :disabled="isViewMode">

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

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-26 13:57:24
  * @LastEditors: liuJie
- * @LastEditTime: 2026-02-26 17:22:35
+ * @LastEditTime: 2026-04-16 13:33:17
  * @Describe: file describe
  */
 import { FormConfig } from '@/types/basic-form';
@@ -61,7 +61,7 @@ export const TRAINING_FORM_RULES = {
   courseType: [{ required: true, message: '请选择课程所属类别', trigger: 'blur' }],
   courseName: [{ required: true, message: '请输入培训课程名称', trigger: 'blur' }],
   trainingMethod: [{ required: true, message: '请输入培训方式', trigger: 'blur' }],
-  trainingTeacher: [{ required: true, message: '请输入培训课程讲师', trigger: 'blur' }],
+//   trainingTeacher: [{ required: true, message: '请输入培训课程讲师', trigger: 'blur' }],
   planNumOfParticipants: [
     { required: true, message: '请输入计划参与人数', trigger: 'blur' },
     { type: 'number', message: '人数必须为数字值', trigger: 'blur' },

+ 14 - 14
src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/configs/form.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-03 17:55:50
  * @LastEditors: liuJie
- * @LastEditTime: 2026-02-25 13:28:34
+ * @LastEditTime: 2026-04-16 13:41:45
  * @Describe: file describe
  */
 import { FormConfig } from '@/types/basic-form';
@@ -69,19 +69,19 @@ export const FORM_CARD_RULES = {
       trigger: 'blur',
     },
   ],
-  staffIdCard: [
-    { required: true, message: '请输入身份证号', trigger: 'blur' },
-    {
-      validator: (_rule: any, value: any, callback: any) => {
-        const v = String(value ?? '').trim();
-        if (!v) return callback();
-        if (!isValidChinaIdCard(v)) return callback(new Error('身份证号格式不正确'));
-        return callback();
-      },
-      trigger: 'blur',
-    },
-  ],
-  staffAddress: [{ required: true, message: '请输入家庭住址', trigger: 'blur' }],
+//   staffIdCard: [
+//     { required: true, message: '请输入身份证号', trigger: 'blur' },
+//     {
+//       validator: (_rule: any, value: any, callback: any) => {
+//         const v = String(value ?? '').trim();
+//         if (!v) return callback();
+//         if (!isValidChinaIdCard(v)) return callback(new Error('身份证号格式不正确'));
+//         return callback();
+//       },
+//       trigger: 'blur',
+//     },
+//   ],
+//   staffAddress: [{ required: true, message: '请输入家庭住址', trigger: 'blur' }],
   dateOfJoining: [
     { required: true, message: '请输入入职日期', trigger: 'blur' },
     {

+ 3 - 2
utils/devProxy/staff/proxy.ts

@@ -3,13 +3,14 @@ import path from 'path';
 
 // staff环境
 const proxyStaff: PROXY_TYPE = {
-  serverHost: 'http://192.168.6.42:8802/',
+//   serverHost: 'http://192.168.6.42:8802/',
+  serverHost: 'http://14.103.151.10:8005/',
   skyeyeLoginHost: 'http://192.168.6.42:7000/skyeye-login/#/',
   skyeyePlatformHost: 'http://192.168.6.42:7000/skyeye-pc/#/',
   skyeyeAdminHost: 'http://192.168.6.42:7000/skyeye-admin/#/',
   skyeyeH5Host: 'http://192.168.6.42:7000/skyeye-h5/#/',
   tiansuoHost: 'http://192.168.6.33:91/',
-  fileUploadHost: 'http://192.168.13.102:9000/',
+  fileUploadHost: 'http://14.103.151.10:9000/',
   violation_src: 'http://192.168.13.102:62/violation_src',
   push_stream_host: 'http://192.168.6.42:7000/skyeye-admin/push_stream_host/',
 };