xiaweibo 1 месяц назад
Родитель
Сommit
31777e842a

+ 7 - 7
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/employeeReportHiddenTroubleManagement.vue

@@ -17,7 +17,7 @@
                 <span>隐患问题:</span>
                 <el-input
                   v-model="tableQuery.queryParam.keyword"
-                  placeholder="请输入隐患问题、地点、姓名、工号或联系电话"
+                  placeholder="请输入隐患问题"
                   class="act-search-input"
                 />
               </div>
@@ -32,17 +32,17 @@
               </div>
               <div class="select-box--item">
                 <span>提交类型:</span>
-                <el-input
-                  v-model="tableQuery.queryParam.sourceTypeName"
-                  placeholder="请输入提交类型"
-                  class="act-search-input"
-                />
+                <el-select v-model="tableQuery.queryParam.sourceTypeName" placeholder="请选择提交类型" clearable>
+                  <el-option label="员工提交" value="员工提交" />
+                  <el-option label="供应商提交" value="供应商提交" />
+                  <el-option label="第三方提交" value="第三方提交" />
+                </el-select>
               </div>
             </section>
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
-              <el-button plain class="search-table-container--button" @click="handleDownload"> 导出 </el-button>
+              <el-button plain @click="handleDownload"> 导出 </el-button>
             </section>
           </div>
         </header>

+ 17 - 7
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue

@@ -19,10 +19,10 @@
           style="width: 450px"
         >
           <el-option
-            v-for="option in ruleFormConfig.find((c) => c.prop === 'typeId')?.selectOptions || []"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value"
+            v-for="option in hiddenRiskCategoriesList || []"
+            :key="option.id"
+            :label="option.categoryName"
+            :value="option.id"
           />
         </el-select>
       </el-form-item>
@@ -235,7 +235,7 @@
   <footer class="safety-platform-container__footer">
     <el-button @click="router.back()">返回</el-button>
     <template v-if="isReviewMode">
-      <el-button type="warning" @click="openReviewRejectDialog">审查不通过</el-button>
+      <el-button type="primary" @click="openReviewRejectDialog">审查不通过</el-button>
       <el-button type="primary" @click="handleReviewPass">审查通过</el-button>
     </template>
     <template v-else-if="!isViewMode">
@@ -376,14 +376,17 @@
   import type { DeptTree } from '@/types/dept/type';
   import { queryAvailableUserList } from '@/api/production-safety/responsibility-implementation';
   import PreviewOnline from '@/views/disaster/components/PreviewOnline.vue';
-import { ru } from 'element-plus/es/locale';
+  import { ru } from 'element-plus/es/locale';
+  import {
+    queryDangerTypePage
+  } from '@/api/production-safety';
 
   const router = useRouter();
   const route = useRoute();
   const searchDeptName = ref('');
   const operate = computed(() => (route.query.operate as string) || 'hidden-trouble-account-create');
   const currentId = computed(() => Number(route.query.id));
-
+  const hiddenRiskCategoriesList = ref();
   const isCreateMode = computed(() => operate.value === 'hidden-trouble-account-create');
   const isEditMode = computed(() => operate.value === 'hidden-trouble-account-edit');
   const isViewMode = computed(
@@ -868,6 +871,13 @@ const attachmentsFileList = ref([]) as any
   onMounted(async () => {
     cloneRuleFormData();
     await loadDeptAndUserOptions();
+    await queryDangerTypePage({
+      pageNumber: 1,
+      pageSize: 9999,
+      queryParam: {}
+    }).then(res => {
+      hiddenRiskCategoriesList.value = res?.records || [];
+    });
     if (isEditMode.value || isViewMode.value) {
       await getDetail();
       if (route.query.action === 'review' && isViewMode.value && canReview.value) {

+ 6 - 6
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/hiddenTroubleReviewManagement.vue

@@ -34,17 +34,17 @@
               </div>
               <div class="select-box--item">
                 <span>提交类型:</span>
-                <el-input
-                  v-model="tableQuery.queryParam.sourceTypeName"
-                  placeholder="请输入提交类型"
-                  class="act-search-input"
-                />
+                <el-select v-model="tableQuery.queryParam.sourceTypeName" placeholder="请选择提交类型" clearable>
+                  <el-option label="员工提交" value="员工提交" />
+                  <el-option label="供应商提交" value="供应商提交" />
+                  <el-option label="第三方提交" value="第三方提交" />
+                </el-select>
               </div>
             </section>
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
-              <el-button plain class="search-table-container--button" @click="handleDownload"> 导出 </el-button>
+              <el-button plain @click="handleDownload"> 导出 </el-button>
             </section>
           </div>
         </header>

+ 6 - 0
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/oneByOneManagement.vue

@@ -489,6 +489,12 @@
   async function handleIssueSubmit() {
     await issueFormRef.value?.validate?.().catch(() => {});
     if (!currentIssueRow.value) return;
+    const startDate = issueForm.value.planStartDate;
+    const endDate = issueForm.value.planEndDate;
+    if (startDate && endDate && endDate < startDate) {
+      ElMessage.warning('计划结束时间不能早于计划开始时间');
+      return;
+    }
     try {
       await issueDrawLessons({
         associationOtId: currentIssueRow.value.id,

+ 9 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/components/oneByOneManagementDeptDetail.vue

@@ -112,12 +112,13 @@
           <div class="row row--upload" v-if="!isViewMode">
             <div class="col col--full">
               <div class="label">选择附件:</div>
-              <div class="value value--attachment">
+              <div class="value">
                 <UploadFiles
+                  label="上传附件"
                   v-if="!isViewMode"
-                  label="选择附件"
                   :file-list="materialAttachmentList"
                   @uploadSuccess="handleMaterialUploadSuccess"
+                  class="custom-upload-files"
                 />
               </div>
             </div>
@@ -557,4 +558,10 @@
       }
     }
   }
+
+  .custom-upload-files :deep(.upload-button) {
+    height: 34.49px;
+    line-height: 34.49px;
+  }
+
 </style>