Explorar el Código

feat: 更新安全责任人管理,添加员工和常驻供应商选项,优化图片上传处理

sunqijun hace 2 meses
padre
commit
03eb1fabd4

+ 1 - 1
src/views/production-safety/implement-safety-duty/components/IssueSafetyResponsibility.vue

@@ -261,7 +261,7 @@
       //   const id = departmentOptions.find((d) => d.deptName === '院领导')?.id;
       //   formData.deptId = [id];
       // }
-      console.log('departmentOptions:', departmentOptions);
+    //   console.log('departmentOptions:', departmentOptions);
       formData.leader1 = null;
       formData.leader2 = null;
       formData.signPerson = [];

+ 8 - 0
src/views/production-safety/implement-safety-duty/responsibility-agree-manage.vue

@@ -240,6 +240,10 @@
         return 'C';
       case '科室':
         return 'D';
+      case '员工':
+        return 'E';
+      case '常驻供应商':
+        return 'F';
       default:
         return 'default';
     }
@@ -253,6 +257,10 @@
         return filterDeptsByLevel(deptsOptions.value, 2);
       case 'D': // 科室
         return filterDeptsByLevel(deptsOptions.value, 3);
+      case 'E': // 员工
+        return filterDeptsByLevel(deptsOptions.value, 4);
+      case 'F': // 常驻供应商
+        return filterDeptsByLevel(deptsOptions.value, 5);
       default:
         return deptsOptions.value;
     }

+ 4 - 2
src/views/production-safety/implement-safety-duty/sign-agree-dept.vue

@@ -196,7 +196,7 @@
   <PreviewOnline ref="previewOnlineRef" />
   <el-dialog v-model="dialogVisible" title="下一节点签署人" width="500">
     <el-form-item :label="currentLabel">
-      <el-select v-model="signerId" placeholder="请选择" size="large" style="width: 100%" filterable>
+      <el-select v-model="signerId" placeholder="请选择" size="large"  style="width: 100%" filterable remote :remote-method="remoteMethod">
         <el-option v-for="item in userOptions" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
     </el-form-item>
@@ -435,7 +435,9 @@
       });
     });
   };
-
+  const remoteMethod = async (value) => {
+    await getUserData(value);
+  };
   const getUserData = (realname = '') => {
     queryAvailableUserList({
       pageNumber: 1,

+ 12 - 3
src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/components/addTrainingInformation.vue

@@ -136,7 +136,14 @@
   const handleEditorChange = () => {
     // 编辑器内容变化时的处理
   };
-  const handleImageUploadSuccess = (response: any, file: any, fileList: any[]) => {};
+  const handleImageUploadSuccess = (response: any, file: any, fileList: any[]) => {
+    console.log('图片上传成功:', response, file, fileList);
+    form.courseImg = fileList;
+  };
+const handleImageRemove = (file: any, fileList: any[]) => {
+    console.log('图片被移除:', file, fileList);
+    form.courseImg = fileList;
+}
 
 const handleFileChange = (file, fileList) => {
     // 1. 验证文件类型和大小
@@ -172,7 +179,7 @@ const handleFileChange = (file, fileList) => {
     };
 }
 
-  const handleUploadSignsUploadSuccess = async (item, fileList) => {
+  const handleUploadSignsUploadSuccess = async (item:any, fileList) => {
     // const attachment = await formatAttachmentList(fileList);
     // item.attachment = attachment;
 
@@ -319,7 +326,7 @@ const handleFileChange = (file, fileList) => {
             />
           <!-- <el-upload
             class="image-uploader"
-            action="safety_api/api/admin/minio/uploadFile"
+            action="#"
             :file-list="form.courseContent"
             :disabled="isViewMode"
             :limit="1"
@@ -336,6 +343,8 @@ const handleFileChange = (file, fileList) => {
               <div class="el-upload__tip"> 支持格式:.jpg .png .jpeg,单个文件不能超过300k,设置一个默认图片。 </div>
             </template>
           </el-upload> -->
+
+
         </el-form-item>
       </el-form>
 

+ 1 - 1
src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/components/educationTrainingPlanManagementDeptDetail.vue

@@ -46,7 +46,7 @@
             {{ details.deptName }}
           </el-descriptions-item>
 
-          <el-descriptions-item label="学时"> {{ details.studyHours }}时 </el-descriptions-item>
+          <el-descriptions-item label="学时"> {{ details.studyHours }}时 </el-descriptions-item>
           <el-descriptions-item label="培训分组">
             {{ details.groupName }}
           </el-descriptions-item>