Explorar o código

Merge branch 'feat/production-safety' of http://192.168.6.110/product-group-fe/sfy-safety-group/sfy-safety into feat/production-safety

sunqijun hai 2 meses
pai
achega
ac66cc00d0

+ 2 - 2
src/views/production-safety/risk-identification-and-control/hazard-approval-manage/audit.vue

@@ -41,7 +41,7 @@
         </el-form>
 
         <div>
-          <el-button type="primary" @click="$router.push({ name: 'hazardApprovalManageAdd' })">添加 </el-button>
+          <!-- <el-button type="primary" @click="$router.push({ name: 'hazardApprovalManageAdd' })">添加 </el-button> -->
           <el-button type="primary" @click="queryTableList">查询</el-button>
           <el-button @click="handleRestParams">重置</el-button>
         </div>
@@ -77,7 +77,7 @@
 
               <!-- <el-button type="primary" link @click="handleConfirmDeleteRow(scope)">删除</el-button> -->
 
-              <el-button type="primary" link @click="openApproveDialog(scope)">审核</el-button>
+              <el-button type="primary" link @click="openApproveDialog(scope)" v-if="scope.row.status === 2">审核</el-button>
               <!-- <el-button
                 type="primary"
                 link

+ 7 - 2
src/views/production-safety/risk-identification-and-control/hazard-approval-manage/list.vue

@@ -62,15 +62,18 @@
 
           <el-table-column fixed="right" min-width="240" label="操作">
             <template #default="scope">
+
               <el-button v-if="scope.row.status === 1" type="primary" link @click="handleSendApproval(scope)"
                 >提交</el-button
               >
               <el-button
                 type="primary"
                 link
+                v-if="scope.row.status === 1"
                 @click="$router.push({ name: 'hazardApprovalManageEdit', query: { id: scope.row.id } })"
                 >编辑</el-button
               >
+              
               <el-button
                 type="primary"
                 link
@@ -78,19 +81,21 @@
                 >查看</el-button
               >
 
-              <el-popconfirm title="确定要删除吗?" @confirm="handleConfirmDeleteRow(scope)">
+              <el-popconfirm title="确定要删除吗?" @confirm="handleConfirmDeleteRow(scope)" v-if="scope.row.status === 1">
                 <template #reference>
                   <el-button type="primary" link>删除</el-button>
                 </template>
               </el-popconfirm>
 
-              <el-button type="primary" link>审批</el-button>
+              <!-- <el-button type="primary" link>审批</el-button> -->
               <el-button
+                v-if="scope.row.status === 3"
                 type="primary"
                 link
                 @click="$router.push({ name: 'hazardApprovalManageMonitor', query: { id: scope.row.id } })"
                 >视频监控</el-button
               >
+              
             </template>
           </el-table-column>
         </el-table>