徐明浩

危害工作许可证开票
票据列表页面

master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -15,21 +15,20 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 【请填写功能名称】Controller
+ * 危害工作许可证Controller
  *
  * @author ruoyi
  * @date 2021-10-25
  */
 @RestController
-@RequestMapping("/his/permit")
+@RequestMapping("/ticket/hazardworks")
 public class THazardWorkPermitController extends BaseController {
     @Autowired
     private ITHazardWorkPermitService tHazardWorkPermitService;
 
     /**
-     * 查询【请填写功能名称】列表
+     * 查询危害工作许可证列表
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:list')")
     @GetMapping("/list")
     public TableDataInfo list(THazardWorkPermit tHazardWorkPermit) {
         startPage();
@@ -38,10 +37,9 @@ public class THazardWorkPermitController extends BaseController {
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出危害工作许可证列表
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "危害工作许可证", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(THazardWorkPermit tHazardWorkPermit) {
         List<THazardWorkPermit> list = tHazardWorkPermitService.selectTHazardWorkPermitList(tHazardWorkPermit);
@@ -50,39 +48,35 @@ public class THazardWorkPermitController extends BaseController {
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取危害工作许可证详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:query')")
     @GetMapping(value = "/{aId}")
     public AjaxResult getInfo(@PathVariable("aId") Long aId) {
         return AjaxResult.success(tHazardWorkPermitService.selectTHazardWorkPermitById(aId));
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增危害工作许可证
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "危害工作许可证", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody THazardWorkPermit tHazardWorkPermit) {
         return toAjax(tHazardWorkPermitService.insertTHazardWorkPermit(tHazardWorkPermit));
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改危害工作许可证
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "危害工作许可证", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody THazardWorkPermit tHazardWorkPermit) {
         return toAjax(tHazardWorkPermitService.updateTHazardWorkPermit(tHazardWorkPermit));
     }
 
     /**
-     * 删除【请填写功能名称】
+     * 删除危害工作许可证
      */
-    @PreAuthorize("@ss.hasPermi('his:permit:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "危害工作许可证", businessType = BusinessType.DELETE)
     @DeleteMapping("/{aIds}")
     public AjaxResult remove(@PathVariable Long[] aIds) {
         return toAjax(tHazardWorkPermitService.deleteTHazardWorkPermitByIds(aIds));

master/src/main/java/com/ruoyi/project/ticket/domain/THazardWorkPermit.java

@@ -70,7 +70,7 @@ public class THazardWorkPermit extends BaseEntity {
     /**
      * 用户（涉及外部承包商时）
      */
-    @Excel(name = "用户", readConverterExp = "涉=及外部承包商时")
+    @Excel(name = "用户", readConverterExp = "涉及外部承包商时")
     private String aContractorName;
     /**
      * 用户主管

ui/src/api/invoicing/hazardwork.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 新增用户
+export function addTicket(data) {
+  return request({
+    url: '/ticket/hazardworks',
+    method: 'post',
+    data: data
+  })
+}

ui/src/views/invoicing/advance/index.vue

@@ -1,5 +1,7 @@
 <template>
-<b>开发中</b>
+  <div style="width: 500px; height: 500px; text-align: center; padding-top: 200px">
+    <b style="font-size: xxx-large">页面开发中</b>
+  </div>
 </template>
 
 <script>

ui/src/views/invoicing/delaypermit/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <b>开发中</b>
+  <div style="width: 500px; height: 500px; text-align: center; padding-top: 200px">
+    <b style="font-size: xxx-large">页面开发中</b>
+  </div>
 </template>
 
 <script>

ui/src/views/invoicing/firework/index.vue

@@ -1871,17 +1871,17 @@ export default {
     },
     // 取消所有防护用品选中
     falseProtect() {
-      this.eIsSafeGoggles = null;
-      this.eIsFaceShield = null;
-      this.eIsProtectGloves = null;
+      this.eIsSafeGoggles = "0";
+      this.eIsFaceShield = "0";
+      this.eIsProtectGloves = "0";
       this.eProtectGlovesContent = null;
-      this.eIsRubberBoots = null;
-      this.eIsRubberApron = null;
-      this.eIsProtectSuit = null;
+      this.eIsRubberBoots = "0";
+      this.eIsRubberApron = "0";
+      this.eIsProtectSuit = "0";
       this.eProtectSuitContent = null;
-      this.eIsResProtect = null;
+      this.eIsResProtect = "0";
       this.eResProtectContent = null;
-      this.eIsFallArrest = null;
+      this.eIsFallArrest = "0";
       this.eFallArrestContent = null;
     },
     /* 为多选框进行动态选择*/

ui/src/views/invoicing/ticketList/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="ticketList" :height="clientHeight" border>
+      <el-table-column label="编号" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
+      <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
+      <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="续票状态" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="延期票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="危害工作许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火工作许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火作业等级" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="限制性空间进入许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="工作内容" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      ticketList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+      }
+    };
+  },
+  created() {
+  },
+  methods: {
+    getList(){
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>