LY

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

@@ -32,7 +32,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * @date 2022-02-23
  */
 @RestController
-@RequestMapping("/ticket/permit")
+@RequestMapping("/ticket/firework")
 public class TFireWorkPermitController extends BaseController
 {
     @Autowired
@@ -44,7 +44,7 @@ public class TFireWorkPermitController extends BaseController
     @Autowired
     private TTicketIdController tTicketIdController;
     /**
-     * 查询【请填写功能名称】列表
+     * 查询【动火作业票】列表
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:list')")
     @GetMapping("/list")
@@ -56,10 +56,10 @@ public class TFireWorkPermitController extends BaseController
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出【动火作业票】列表
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【动火作业票】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TFireWorkPermit tFireWorkPermit)
     {
@@ -69,7 +69,7 @@ public class TFireWorkPermitController extends BaseController
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【动火作业票】详细信息
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:query')")
     @GetMapping(value = "/{hId}")
@@ -82,7 +82,7 @@ public class TFireWorkPermitController extends BaseController
      * 新增【请填写功能名称】
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "【动火作业票】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TFireWorkPermit tFireWorkPermit)
     {
@@ -104,7 +104,7 @@ public class TFireWorkPermitController extends BaseController
      * 修改【请填写功能名称】
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "【动火作业票】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TFireWorkPermit tFireWorkPermit)
     {
@@ -115,7 +115,7 @@ public class TFireWorkPermitController extends BaseController
      * 删除【请填写功能名称】
      */
     @PreAuthorize("@ss.hasPermi('ticket:permit:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "【动火作业票】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{hIds}")
     public AjaxResult remove(@PathVariable Long[] hIds)
     {

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

@@ -209,7 +209,7 @@ public class THazardWorkPermitController extends BaseController {
         permitRelation.setPermitType("H");
         permitRelation.setPermitStatus(1L);
         this.itPermitRelationService.add(permitRelation);
-        return AjaxResult.success(tHazardWorkPermit.getaId());
+        return AjaxResult.success(tHazardWorkPermit.getcHId());
     }
 
     /**

ui/src/api/invoicing/firework.js

@@ -1,53 +1,20 @@
 import request from '@/utils/request'
+import {praseStrEmpty} from "@/utils/ruoyi";
 
-// 查询【请填写功能名称】列表
-export function listPermit(query) {
-  return request({
-    url: '/ticket/permit/list',
-    method: 'get',
-    params: query
-  })
-}
 
-// 查询【请填写功能名称】详细
-export function getPermit(hId) {
+// 修改票据
+export function updateFireTicket(data) {
   return request({
-    url: '/ticket/permit/' + hId,
-    method: 'get'
-  })
-}
-
-// 新增【请填写功能名称】
-export function addPermit(data) {
-  return request({
-    url: '/ticket/permit',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改【请填写功能名称】
-export function updatePermit(data) {
-  return request({
-    url: '/ticket/permit',
+    url: '/ticket/firework',
     method: 'put',
     data: data
   })
 }
 
-// 删除【请填写功能名称】
-export function delPermit(hId) {
+// 票据信息
+export function getFireInfo(aId) {
   return request({
-    url: '/ticket/permit/' + hId,
-    method: 'delete'
+    url: '/ticket/firework/' + praseStrEmpty(aId),
+    method: 'get'
   })
 }
-
-// 导出【请填写功能名称】
-export function exportPermit(query) {
-  return request({
-    url: '/ticket/permit/export',
-    method: 'get',
-    params: query
-  })
-}

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

@@ -2730,13 +2730,13 @@ export default {
       updateTicket(this.form).then(response => {
         this.msgSuccess(this.$t('票据数据已更新'));
       });
-
     },
     //点击生成ID
     aIdClick() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.aId == null) {
+            this.dataSet();
             addTicket(this.form).then(response => {
               this.form.aId = response.data;
               this.msgSuccess(this.$t('生成ID成功'));
@@ -2753,14 +2753,15 @@ export default {
       if (this.form.aId == null) {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            this.dataSet();
               addTicket(this.form).then(response => {
                 this.form.aId = response.data;
                 addFireTicket(this.form).then(response => {
-                  this.form.aId = response.data;
+                  this.form.cHId = response.data
                   this.$nextTick(() => {
                     let routeData = this.$router.resolve({
                       path: "/firework",
-                      query:{aId: this.form.aId}
+                      query:{hId: this.form.cHId}
                     });
                     window.open(routeData.href, '_blank');
                   })