ソースを参照

fix: 修改参数问题

xiaweibo 1 ヶ月 前
コミット
01e1953803

+ 3 - 4
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/notice-view.vue

@@ -31,13 +31,12 @@
               <el-option :value="6" label="已作废" />
             </el-select>
           </el-form-item> -->
-          <el-form-item label="区域类型">
-            <el-select v-model="queryParams.queryParam.type" clearable placeholder="选择区域类型" style="width: 170px">
+          <el-form-item label="通知区域">
+            <el-select v-model="queryParams.queryParam.type" clearable placeholder="选择通知区域" style="width: 170px">
               <el-option :value="1" label="公共区域" />
               <el-option :value="2" label="非公共区域" />
             </el-select>
           </el-form-item>
-
           <el-form-item label="分组名称">
             <el-select v-model="queryParams.queryParam.userGroupId" placeholder="分组名称" style="width: 170px">
               <el-option v-for="group in groupList" :key="group.id" :label="group.name" :value="group.id" />
@@ -66,7 +65,7 @@
         <el-table :data="tableData.data">
           <el-table-column label="责任通知名称" prop="responsibilityName" width="180" />
           <el-table-column label="状态" prop="statusName" width="100" />
-          <el-table-column label="类别名称" prop="safetyAreaTypeName" />
+          <el-table-column label="类" prop="safetyAreaTypeName" />
 
           <el-table-column label="通知区域" prop="safetyAreaName" />
           <el-table-column label="安全责任人" prop="responsiblePersonName" />

+ 14 - 0
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/review.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="safety-platform-container">
     <header class="safety-platform-container__header">
+      <div class="back"><BreadcrumbBack /> 安全责任通知管理审核 </div>
       <div class="detail-content">
         <span>类型:{{ formData?.departmentName }} </span>
         <span>创建人:{{ formData?.createdByName }} </span>
@@ -67,6 +68,18 @@
               </div>
             </div>
           </div>
+          <div class="row">
+            <div class="col">
+              <div class="label">责任通知内容:</div>
+              <div class="value value-s1">
+                <div class="file-list">
+                  <div class="file-item">
+                    <div v-html="formData.content"></div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
 
         <h4>材料上传</h4>
@@ -206,6 +219,7 @@
             attachment: unformatAttachment(res.attachment),
             signsUpload: unformatAttachment(res.signsUpload),
             feedback: unformatAttachment(res.feedback),
+            content: res.content,
           });
         }
       });

+ 1 - 0
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-dept/feedback.vue

@@ -280,6 +280,7 @@
             attachment: unformatAttachment(res.attachment),
             signsUpload: unformatAttachment(res.signsUpload),
             feedback: unformatAttachment(res.feedback),
+            content: res.content,
           });
         }
       });

+ 2 - 2
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-dept/list.vue

@@ -23,7 +23,7 @@
           </el-form-item>
           <el-form-item label="状态">
             <el-select v-model="queryParams.queryParam.status" clearable placeholder="状态" style="width: 170px">
-              <el-option :value="1" label="未下发" />
+              <!-- <el-option :value="1" label="未下发" /> -->
               <el-option :value="2" label="待反馈" />
               <el-option :value="3" label="待审核" />
               <el-option :value="4" label="已完成" />
@@ -66,7 +66,7 @@
         <el-table :data="tableData.data">
           <el-table-column label="责任通知名称" prop="responsibilityName" />
           <el-table-column label="状态" prop="statusName" width="100" />
-          <!-- <el-table-column label="类型" prop="safetyAreaName" width="130" /> -->
+          <el-table-column label="类型" prop="safetyAreaName" width="130" />
           <!-- <el-table-column label="下发数" prop="issuedQuantity" width="120" />
           <el-table-column label="反馈人数" prop="signedQuantity" width="120" />
           <el-table-column label="反馈比例" prop="signedRatio" width="120" /> -->

+ 1 - 1
src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagement/configs/tables.ts

@@ -101,7 +101,7 @@ export const WORK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '计划完成时间',
-    prop: 'plannedComplateTime',
+    prop: 'plannedEndTime',
     align: 'left',
     minWidth: '160px',
   },