Procházet zdrojové kódy

fix: 修改接口请求,按钮新增判断,修改参数信息

xiaweibo před 1 měsícem
rodič
revize
7e7998ea77

+ 1 - 1
src/api/production-safety-system/index.ts

@@ -1240,7 +1240,7 @@ export function sandAreaCheckRecordToProductionHiddenDanger(data: SandAreaCheckR
 export function cancelAreaCheckPlanManage(id: number) {
 export function cancelAreaCheckPlanManage(id: number) {
   return http.request({
   return http.request({
     url: `${ADMIN_BASE}/updateStatusAreaCheckPlanManage?id=${id}`,
     url: `${ADMIN_BASE}/updateStatusAreaCheckPlanManage?id=${id}`,
-    method: 'post',
+    method: 'delete',
   });
   });
 }
 }
 
 

+ 1 - 0
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/areaCheckPlanManagement.vue

@@ -19,6 +19,7 @@
                   v-model="tableQuery.queryParam.keyword"
                   v-model="tableQuery.queryParam.keyword"
                   placeholder="搜索检查场所或计划名称"
                   placeholder="搜索检查场所或计划名称"
                   class="act-search-input"
                   class="act-search-input"
+                  style="min-width: 200px;"
                   clearable
                   clearable
                 />
                 />
               </div>
               </div>

+ 8 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanManagementDetail.vue

@@ -152,9 +152,9 @@
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
           value-format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          style="margin-right: 12px"
+          style="margin-right: 12px;max-width: 280px;"
         />
         />
-        <el-button type="primary" @click="onRecordSearch">查询</el-button>
+        <el-button type="primary" class="view-record-toolbar-btn" @click="onRecordSearch">查询</el-button>
         <el-button @click="onRecordExport">导出</el-button>
         <el-button @click="onRecordExport">导出</el-button>
       </div>
       </div>
       <BasicTable
       <BasicTable
@@ -1172,7 +1172,7 @@ import { id } from 'element-plus/es/locale';
           align-items: center;
           align-items: center;
           justify-content: flex-end;
           justify-content: flex-end;
           flex-shrink: 0;
           flex-shrink: 0;
-          width: 200px;
+          width: 260px;
           padding: 0 12px;
           padding: 0 12px;
           background-color: #f5f5f5;
           background-color: #f5f5f5;
           border-right: 1px solid #dcdfe6;
           border-right: 1px solid #dcdfe6;
@@ -1222,4 +1222,9 @@ import { id } from 'element-plus/es/locale';
   .view-record-table {
   .view-record-table {
     margin-bottom: 16px;
     margin-bottom: 16px;
   }
   }
+
+  .view-record-toolbar-btn{
+    margin-left: auto;
+  }
+
 </style>
 </style>

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -952,7 +952,7 @@
             align-items: center;
             align-items: center;
             justify-content: flex-end;
             justify-content: flex-end;
             flex-shrink: 0;
             flex-shrink: 0;
-            width: 200px;
+            width: 260px;
             padding: 0 12px;
             padding: 0 12px;
             background-color: #f5f5f5;
             background-color: #f5f5f5;
             border-right: 1px solid #dcdfe6;
             border-right: 1px solid #dcdfe6;

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

@@ -64,7 +64,7 @@
               <div class="action-container--div" style="justify-content: left">
               <div class="action-container--div" style="justify-content: left">
                 <!-- 待审核:显示审核和查看 -->
                 <!-- 待审核:显示审核和查看 -->
                 <template v-if="scope.row.status === 1">
                 <template v-if="scope.row.status === 1">
-                  <ActionButton text="审核" @click="handleApprove(scope.row.id)" />
+                  <ActionButton text="审核" @click="handleApprove(scope.row.id)" v-if="scope.row.canApprove"/>
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                 </template>
                 </template>
                 <!-- 审核通过(需求部门通过或安全部门通过):显示查看和入账 -->
                 <!-- 审核通过(需求部门通过或安全部门通过):显示查看和入账 -->

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

@@ -66,7 +66,7 @@
               <div class="action-container--div" style="justify-content: left">
               <div class="action-container--div" style="justify-content: left">
                 <!-- 待审核:显示审核和查看 -->
                 <!-- 待审核:显示审核和查看 -->
                 <template v-if="scope.row.status === 1">
                 <template v-if="scope.row.status === 1">
-                  <ActionButton text="审核" @click="handleApprove(scope.row.id)" />
+                  <ActionButton text="审核" @click="handleApprove(scope.row.id)" v-if="scope.row.canApprove"/>
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                 </template>
                 </template>
                 <!-- 审核通过(需求部门通过或安全部门通过):显示查看和入账 -->
                 <!-- 审核通过(需求部门通过或安全部门通过):显示查看和入账 -->