预约开票申请相关，装置程序清单修订日期判空

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -20,7 +20,6 @@ import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -49,7 +48,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     /**
      * 查询预约开票申请列表
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TApproveReserveInvoice tApproveReserveInvoice) {
         startPage();
@@ -70,7 +69,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     /**
      * 导出预约开票申请列表
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:export')")
+
     @Log(title = "预约开票申请", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TApproveReserveInvoice tApproveReserveInvoice) {
@@ -82,7 +81,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     /**
      * 获取预约开票申请详细信息
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TApproveReserveInvoice tApprove = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(id);
@@ -100,7 +99,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     /**
      * 新增预约开票申请
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:add')")
+
     @Log(title = "预约开票申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TApproveReserveInvoice tApproveReserveInvoice) {
@@ -165,7 +164,11 @@ public class TApproveReserveInvoiceController extends BaseController {
         ids = invoice.getInvoiceId().split(",");
         for (String id : ids) {
             TInvoiceBookingworkticket invoiceBook = workService.getById(id);
-            invoiceBook.setStatus(0L);
+            if (devTask.getCondition().equals("1")) {
+                invoiceBook.setStatus(2L);
+            } else if (devTask.getCondition().equals("0")) {
+                invoiceBook.setStatus(3L);
+            }
             workService.updateById(invoiceBook);
         }
         Map<String, Object> param = new HashMap<>();
@@ -177,13 +180,14 @@ public class TApproveReserveInvoiceController extends BaseController {
                 .claim(taskId, getUserId().toString());
         taskService.addComment(taskId, processInstancesId, devTask.getComment());
         taskService.complete(taskId, param);
+        tApproveReserveInvoiceService.updateTApproveReserveInvoice(invoice);
         return AjaxResult.success();
     }
 
     /**
      * 修改预约开票申请
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:edit')")
+
     @Log(title = "预约开票申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TApproveReserveInvoice tApproveReserveInvoice) {
@@ -193,7 +197,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     /**
      * 删除预约开票申请
      */
-    @PreAuthorize("@ss.hasPermi('invoice:invoice:remove')")
+
     @Log(title = "预约开票申请", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

master/src/main/resources/processes/reserveInvoice.bpmn

@@ -4,113 +4,181 @@
     <startEvent id="start" name="开始" activiti:initiator="${applyUserId}"></startEvent>
     <userTask id="yhzgtask" name="用户主管签字确认" activiti:assignee="#{yhzgusers}"></userTask>
     <userTask id="zzzgtask" name="装置主管签字确认" activiti:assignee="#{zzzgusers}"></userTask>
-    <sequenceFlow id="flow2" sourceRef="yhzgtask" targetRef="zzzgtask"></sequenceFlow>
+    <sequenceFlow id="flow2" name="通过" sourceRef="yhzgtask" targetRef="zzzgtask">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
     <userTask id="zzgcstask" name="装置工程师签字确认" activiti:assignee="#{zzgcsusers}"></userTask>
     <userTask id="zzjltask" name="装置经理签字确认" activiti:assignee="#{zzjlusers}"></userTask>
     <userTask id="confirmtask" name="各班班长、开票人员确认、整合信息关联至CTS系统" activiti:assignee="#{bzusers}"></userTask>
-    <sequenceFlow id="flow11" sourceRef="zzjltask" targetRef="confirmtask"></sequenceFlow>
+    <sequenceFlow id="flow11" name="通过" sourceRef="zzjltask" targetRef="confirmtask">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
     <endEvent id="end" name="结束"></endEvent>
-    <sequenceFlow id="flow12" sourceRef="confirmtask" targetRef="end"></sequenceFlow>
     <sequenceFlow id="flow13" sourceRef="start" targetRef="yhzgtask"></sequenceFlow>
     <exclusiveGateway id="istoday" name="作业开始时间是否为预约当天"></exclusiveGateway>
-    <sequenceFlow id="flow18" sourceRef="zzzgtask" targetRef="istoday"></sequenceFlow>
+    <sequenceFlow id="flow18" name="通过" sourceRef="zzzgtask" targetRef="istoday">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
     <sequenceFlow id="flow19" name="是" sourceRef="istoday" targetRef="zzgcstask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${message=='是'}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="isspecial" name="是否涉及特技动火、受限空间"></exclusiveGateway>
     <sequenceFlow id="flow20" name="否" sourceRef="istoday" targetRef="isspecial">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${message=='否'}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow21" name="否" sourceRef="isspecial" targetRef="confirmtask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${message=='否'}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow22" name="是" sourceRef="isspecial" targetRef="zzjltask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${message=='是'}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow23" name="通过" sourceRef="zzgcstask" targetRef="isspecial">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
+    <endEvent id="end1" name="结束"></endEvent>
+    <sequenceFlow id="flow24" name="不通过" sourceRef="yhzgtask" targetRef="end1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow25" name="不通过" sourceRef="zzzgtask" targetRef="end1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow26" name="不通过" sourceRef="zzgcstask" targetRef="end1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow27" name="不通过" sourceRef="zzjltask" targetRef="end1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow28" sourceRef="confirmtask" targetRef="end">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow23" sourceRef="zzgcstask" targetRef="isspecial"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_reserveInvoice">
     <bpmndi:BPMNPlane bpmnElement="reserveInvoice" id="BPMNPlane_reserveInvoice">
       <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
-        <omgdc:Bounds height="35.0" width="35.0" x="350.0" y="10.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="738.0" y="22.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="yhzgtask" id="BPMNShape_yhzgtask">
-        <omgdc:Bounds height="55.0" width="145.0" x="295.0" y="90.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="145.0" x="683.0" y="102.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzzgtask" id="BPMNShape_zzzgtask">
-        <omgdc:Bounds height="55.0" width="145.0" x="295.0" y="180.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="145.0" x="683.0" y="192.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzgcstask" id="BPMNShape_zzgcstask">
-        <omgdc:Bounds height="71.0" width="136.0" x="590.0" y="270.0"></omgdc:Bounds>
+        <omgdc:Bounds height="71.0" width="136.0" x="500.0" y="282.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzjltask" id="BPMNShape_zzjltask">
-        <omgdc:Bounds height="71.0" width="136.0" x="50.0" y="390.0"></omgdc:Bounds>
+        <omgdc:Bounds height="71.0" width="136.0" x="320.0" y="402.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="confirmtask" id="BPMNShape_confirmtask">
-        <omgdc:Bounds height="71.0" width="145.0" x="295.0" y="510.0"></omgdc:Bounds>
+        <omgdc:Bounds height="71.0" width="145.0" x="683.0" y="522.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
-        <omgdc:Bounds height="35.0" width="35.0" x="350.0" y="620.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="738.0" y="632.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="istoday" id="BPMNShape_istoday">
-        <omgdc:Bounds height="40.0" width="40.0" x="347.0" y="285.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="735.0" y="297.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="isspecial" id="BPMNShape_isspecial">
-        <omgdc:Bounds height="40.0" width="40.0" x="347.0" y="405.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="735.0" y="417.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="end1" id="BPMNShape_end1">
+        <omgdc:Bounds height="35.0" width="35.0" x="371.0" y="202.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
-        <omgdi:waypoint x="367.0" y="145.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="180.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="157.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="192.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="755.0" y="157.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
-        <omgdi:waypoint x="118.0" y="461.0"></omgdi:waypoint>
-        <omgdi:waypoint x="118.0" y="545.0"></omgdi:waypoint>
-        <omgdi:waypoint x="295.0" y="545.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12">
-        <omgdi:waypoint x="367.0" y="581.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="620.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="473.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="557.0"></omgdi:waypoint>
+        <omgdi:waypoint x="683.0" y="557.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="388.0" y="473.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13">
-        <omgdi:waypoint x="367.0" y="45.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="90.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="57.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="102.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="367.0" y="235.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="285.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="247.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="297.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="755.0" y="247.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow19" id="BPMNEdge_flow19">
-        <omgdi:waypoint x="387.0" y="305.0"></omgdi:waypoint>
-        <omgdi:waypoint x="590.0" y="305.0"></omgdi:waypoint>
+        <omgdi:waypoint x="735.0" y="317.0"></omgdi:waypoint>
+        <omgdi:waypoint x="636.0" y="317.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="387.0" y="305.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="12.0" x="711.0" y="317.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow20" id="BPMNEdge_flow20">
-        <omgdi:waypoint x="367.0" y="325.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="405.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="337.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="417.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="367.0" y="325.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="12.0" x="755.0" y="337.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21">
-        <omgdi:waypoint x="367.0" y="445.0"></omgdi:waypoint>
-        <omgdi:waypoint x="367.0" y="510.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="457.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="522.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="367.0" y="445.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="12.0" x="755.0" y="457.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
-        <omgdi:waypoint x="347.0" y="425.0"></omgdi:waypoint>
-        <omgdi:waypoint x="186.0" y="425.0"></omgdi:waypoint>
+        <omgdi:waypoint x="735.0" y="437.0"></omgdi:waypoint>
+        <omgdi:waypoint x="456.0" y="437.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="261.0" y="432.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="12.0" x="711.0" y="440.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23">
-        <omgdi:waypoint x="658.0" y="341.0"></omgdi:waypoint>
-        <omgdi:waypoint x="657.0" y="425.0"></omgdi:waypoint>
-        <omgdi:waypoint x="387.0" y="425.0"></omgdi:waypoint>
+        <omgdi:waypoint x="568.0" y="353.0"></omgdi:waypoint>
+        <omgdi:waypoint x="568.0" y="436.0"></omgdi:waypoint>
+        <omgdi:waypoint x="735.0" y="437.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="568.0" y="353.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24">
+        <omgdi:waypoint x="683.0" y="129.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="129.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="202.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="623.0" y="130.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25">
+        <omgdi:waypoint x="683.0" y="219.0"></omgdi:waypoint>
+        <omgdi:waypoint x="406.0" y="219.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="623.0" y="223.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26">
+        <omgdi:waypoint x="500.0" y="317.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="317.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="237.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="456.0" y="317.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow27" id="BPMNEdge_flow27">
+        <omgdi:waypoint x="388.0" y="402.0"></omgdi:waypoint>
+        <omgdi:waypoint x="388.0" y="237.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="388.0" y="381.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28">
+        <omgdi:waypoint x="755.0" y="593.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="632.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -36,7 +36,7 @@
     </form>
     <span slot="footer" class="dialog-footer">
       <el-button v-if="this.taskForm.taskId == ''" @click="visible = false">{{$t('message.return')}}</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''" type="primary" @click="dataFormSubmit(1)" :disabled="submitDisabled">{{$t('通过')}}</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''" type="primary" @click="dataFormSubmit(1)" >{{$t('通过')}}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="danger" @click="dataFormSubmit(0)" :disabled="submitDisabled">{{$t('拒绝')}}</el-button>
     </span>
     <div>
@@ -57,7 +57,7 @@
   import {getToken} from "@/utils/auth";
   import {getHistorylist} from "@/api/ehs/approvedanger";
   import record from "./spec-itemDetail";
-  import {getInvoice, listInvoice} from "@/api/invoice/invoice";
+  import {getInvoice, listInvoice,handleApprove} from "@/api/invoice/invoice";
 
 export default {
   name: "invoice-detail",

ui/src/views/approve/pending/index.vue

@@ -128,6 +128,7 @@
     <intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>
     <kekao-resolve v-if="kekaoResolveVisible" ref="kekaoResolveDeal" @refreshDataList="getList"></kekao-resolve>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
+    <invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>
   </div>
 </template>
 
@@ -145,6 +146,7 @@
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import SpecMaintenance from "@/views/approve/pending/specMaintenance-deal";
   import KekaoResolve from '../approveDetail/kekao-resolve';
+  import InvoiceDetail from "@/views/approve/approveDetail/invoice-detail";
 
   export default {
     name: "Pending",
@@ -157,7 +159,8 @@
       ProcessImg,
       IntactResolve,
       SpecMaintenance,
-      KekaoResolve
+      KekaoResolve,
+      InvoiceDetail
     },
     data() {
       return {
@@ -172,6 +175,7 @@
         intactResolveVisible:false,
         kekaoResolveVisible:false,
         specMaintenanceVisible: false,
+        invoiceDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -383,6 +387,13 @@
 
             this.$refs.kekaoResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
+        } else if (row.processName == "预约开票审批流程"){
+          this.invoiceDetailVisible = true
+          this.$nextTick(() => {
+            console.log(row)
+            console.log(row.approveObj)
+            this.$refs.invoiceDetail.init(row.approveObject.id, row.taskId, row.processId,row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

ui/src/views/components/PlantProgList/index.vue

@@ -178,7 +178,7 @@
           <el-input v-model="form.fileno" :placeholder="$t('请输入') + $t('文件编号')" />
         </el-form-item>
         <el-form-item :label="$t('文件名称')" prop="filename">
-          <el-input v-model="form.filename" :placeholder="$t('请输入') + $t('文件名称')" />
+          <el-input v-model="form.filename" :placeholder="$t('请输入') + $t('文件名称')" @change="changeRevisionDate"/>
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -736,7 +736,7 @@ export default {
     changeRevisionDate() {
       const filename = this.form.filename;
       var nexteditdate="";
-      if (filename.indexOf("应急响应")!=-1) {
+      if (filename&&filename.indexOf("应急响应")!==-1) {
         if(this.form.filedate.endsWith("02-29")){
           nexteditdate=dayjs(new Date(this.form.filedate)).add(1,'year').format("YYYY-MM-DD");
         }else{

ui/src/views/invoice/approveinvoice/index.vue

@@ -58,9 +58,9 @@
               <el-select v-model="form.userSupId" filterable :placeholder="$t('请选择') + $t('用户主管')">
                 <el-option
                   v-for="dict in managerOptions"
-                  :key="dict.staffId"
+                  :key="dict.userId"
                   :label="dict.nickName"
-                  :value="dict.staffId">
+                  :value="dict.userId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -72,9 +72,9 @@
               <el-select v-model="form.devSupId" filterable :placeholder="$t('请选择') + $t('装置主管')">
                 <el-option
                   v-for="dict in managerOptions"
-                  :key="dict.staffId"
+                  :key="dict.userId"
                   :label="dict.nickName"
-                  :value="dict.staffId">
+                  :value="dict.userId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -86,9 +86,9 @@
               <el-select v-model="form.devEngineerId" filterable :placeholder="$t('请选择') + $t('装置工程师')">
                 <el-option
                   v-for="dict in managerOptions"
-                  :key="dict.staffId"
+                  :key="dict.userId"
                   :label="dict.nickName"
-                  :value="dict.staffId">
+                  :value="dict.userId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -100,9 +100,9 @@
               <el-select v-model="form.managerconId" filterable :placeholder="$t('请选择') + $t('装置经理')">
                 <el-option
                   v-for="dict in managerOptions"
-                  :key="dict.staffId"
+                  :key="dict.userId"
                   :label="dict.nickName"
-                  :value="dict.staffId">
+                  :value="dict.userId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -114,9 +114,9 @@
               <el-select v-model="form.monitorId" filterable :placeholder="$t('请选择') + $t('班长')">
                 <el-option
                   v-for="dict in managerOptions"
-                  :key="dict.staffId"
+                  :key="dict.userId"
                   :label="dict.nickName"
-                  :value="dict.staffId">
+                  :value="dict.userId">
                 </el-option>
               </el-select>
             </el-form-item>