Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,8 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
+import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
+import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
 import org.activiti.engine.ProcessEngine;
@@ -44,6 +46,9 @@ public class TApproveReserveInvoiceController extends BaseController {
     @Autowired
     private RuntimeService runtimeService;
 
+    @Autowired
+    private TInvoiceWorkcontentMapper invoiceWorkcontentMapper;
+
 
     /**
      * 查询预约开票申请列表
@@ -160,20 +165,30 @@ public class TApproveReserveInvoiceController extends BaseController {
             invoice.setStatus(3L);
             invoice.setEnddate(new Date());
         }
-        String[] ids;
-        ids = invoice.getInvoiceId().split(",");
-        for (String id : ids) {
-            TInvoiceBookingworkticket invoiceBook = workService.getById(id);
-            if (devTask.getCondition().equals("1")&&task.getName().equals("各班班长、开票人员确认、整合信息关联至CTS系统")) {
-                invoiceBook.setStatus(3L);
-            } else if (devTask.getCondition().equals("0")) {
-                invoiceBook.setStatus(5L);
+        Map<String, Object> param = new HashMap<>();
+
+        TInvoiceBookingworkticket invoiceBook = workService.getById(invoice.getInvoiceId());
+        if (devTask.getCondition().equals("1") && task.getName().equals("装置经理签字确认")) {
+            invoiceBook.setStatus(3L);
+        } else if (devTask.getCondition().equals("0")) {
+            invoiceBook.setStatus(5L);
+        }
+        workService.updateById(invoiceBook);
+        if (DateUtils.dateTime(invoiceBook.getCreatedate()).equals(DateUtils.dateTime(invoiceBook.getWorkStartTime()))) {
+            param.put("istoday", "1");
+        } else {
+            param.put("istoday", "0");
+        }
+        List<TInvoiceWorkcontent> workcontents = invoiceWorkcontentMapper.selectTInvoiceWorkcontentBybookingticketId(Long.valueOf(invoice.getInvoiceId()));
+        for (TInvoiceWorkcontent workcontent : workcontents) {
+            if (workcontent.getWorkType()==1||workcontent.getWorkType()==2||workcontent.getWorkType()==3||workcontent.getWorkType()==15) {
+                param.put("isspecial", "1");
+                break;
+            } else {
+                param.put("isspecial", "0");
             }
-            workService.updateById(invoiceBook);
         }
-        Map<String, Object> param = new HashMap<>();
         param.put("condition", devTask.getCondition());
-        param.put("message", "否");
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         TaskService taskService = processEngine.getTaskService();
         //认领任务

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

@@ -9,8 +9,7 @@
     </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" name="通过" sourceRef="zzjltask" targetRef="confirmtask">
+    <sequenceFlow id="flow11" name="通过" sourceRef="zzjltask" targetRef="end">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
     <endEvent id="end" name="结束"></endEvent>
@@ -20,17 +19,17 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow19" name="是" sourceRef="istoday" targetRef="zzgcstask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${istoday == 1}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="isspecial" name="是否涉及特技动火、受限空间"></exclusiveGateway>
     <sequenceFlow id="flow20" name="否" sourceRef="istoday" targetRef="isspecial">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${istoday == 0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow21" name="否" sourceRef="isspecial" targetRef="confirmtask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    <sequenceFlow id="flow21" name="否" sourceRef="isspecial" targetRef="end">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${isspecial == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow22" name="是" sourceRef="isspecial" targetRef="zzjltask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${isspecial == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow23" name="通过" sourceRef="zzgcstask" targetRef="isspecial">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
@@ -48,138 +47,128 @@
     <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>
   </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="738.0" y="22.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="520.0" y="41.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="yhzgtask" id="BPMNShape_yhzgtask">
-        <omgdc:Bounds height="55.0" width="145.0" x="683.0" y="102.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="145.0" x="465.0" y="121.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzzgtask" id="BPMNShape_zzzgtask">
-        <omgdc:Bounds height="55.0" width="145.0" x="683.0" y="192.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="145.0" x="465.0" y="211.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzgcstask" id="BPMNShape_zzgcstask">
-        <omgdc:Bounds height="71.0" width="136.0" x="500.0" y="282.0"></omgdc:Bounds>
+        <omgdc:Bounds height="71.0" width="136.0" x="282.0" y="301.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzjltask" id="BPMNShape_zzjltask">
-        <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="683.0" y="522.0"></omgdc:Bounds>
+        <omgdc:Bounds height="71.0" width="136.0" x="102.0" y="421.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
-        <omgdc:Bounds height="35.0" width="35.0" x="738.0" y="632.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="520.0" y="559.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="istoday" id="BPMNShape_istoday">
-        <omgdc:Bounds height="40.0" width="40.0" x="735.0" y="297.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="517.0" y="316.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="isspecial" id="BPMNShape_isspecial">
-        <omgdc:Bounds height="40.0" width="40.0" x="735.0" y="417.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="517.0" y="436.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>
+        <omgdc:Bounds height="35.0" width="35.0" x="153.0" y="221.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
-        <omgdi:waypoint x="755.0" y="157.0"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="192.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="176.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="211.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="755.0" y="157.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="537.0" y="176.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
-        <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>
+        <omgdi:waypoint x="170.0" y="492.0"></omgdi:waypoint>
+        <omgdi:waypoint x="169.0" y="576.0"></omgdi:waypoint>
+        <omgdi:waypoint x="520.0" y="576.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="388.0" y="473.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="170.0" y="492.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13">
-        <omgdi:waypoint x="755.0" y="57.0"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="102.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="76.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="121.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="755.0" y="247.0"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="297.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="266.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="316.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="755.0" y="247.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="537.0" y="266.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow19" id="BPMNEdge_flow19">
-        <omgdi:waypoint x="735.0" y="317.0"></omgdi:waypoint>
-        <omgdi:waypoint x="636.0" y="317.0"></omgdi:waypoint>
+        <omgdi:waypoint x="517.0" y="336.0"></omgdi:waypoint>
+        <omgdi:waypoint x="418.0" y="336.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="12.0" x="711.0" y="317.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="100.0" x="493.0" y="336.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow20" id="BPMNEdge_flow20">
-        <omgdi:waypoint x="755.0" y="337.0"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="417.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="356.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="436.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="12.0" x="755.0" y="337.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="100.0" x="537.0" y="356.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21">
-        <omgdi:waypoint x="755.0" y="457.0"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="522.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="476.0"></omgdi:waypoint>
+        <omgdi:waypoint x="537.0" y="559.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="12.0" x="755.0" y="457.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="100.0" x="537.0" y="476.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
-        <omgdi:waypoint x="735.0" y="437.0"></omgdi:waypoint>
-        <omgdi:waypoint x="456.0" y="437.0"></omgdi:waypoint>
+        <omgdi:waypoint x="517.0" y="456.0"></omgdi:waypoint>
+        <omgdi:waypoint x="238.0" y="456.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="12.0" x="711.0" y="440.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="100.0" x="493.0" y="459.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23">
-        <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>
+        <omgdi:waypoint x="350.0" y="372.0"></omgdi:waypoint>
+        <omgdi:waypoint x="349.0" y="456.0"></omgdi:waypoint>
+        <omgdi:waypoint x="517.0" y="456.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="568.0" y="353.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="350.0" y="372.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>
+        <omgdi:waypoint x="465.0" y="148.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="148.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="221.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="623.0" y="130.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="405.0" y="149.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>
+        <omgdi:waypoint x="465.0" y="238.0"></omgdi:waypoint>
+        <omgdi:waypoint x="188.0" y="238.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="623.0" y="223.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="405.0" y="242.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>
+        <omgdi:waypoint x="350.0" y="301.0"></omgdi:waypoint>
+        <omgdi:waypoint x="350.0" y="238.0"></omgdi:waypoint>
+        <omgdi:waypoint x="188.0" y="238.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="456.0" y="317.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="314.0" y="268.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>
+        <omgdi:waypoint x="170.0" y="421.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="256.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="388.0" y="381.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="170.0" y="400.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>
 </definitions>

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

@@ -296,7 +296,7 @@ export default {
       if (rows[0].workStartTime === rows[0].createdate)
         this.isToday = true;
       if (rows[0].workType === 1 || rows[0].workType === 2 || rows[0].workType === 14) {
-        this.form.isSpecial = 1;
+        this.isSpecial = true;
       }
       this.form.invoiceId=rows[0].id;
       listPostUser({
@@ -319,7 +319,7 @@ export default {
               this.form.files.push(obj)
             }
           }
-          if (this.form.workStartTime != null && this.form.workStartTime != undefined && this.form.workStartTime != "" && this.form.workStartTime === this.form.createdate)
+          if (this.form.workStartTime && this.form.workStartTime === this.form.createdate)
             this.form.isToday = 1;
           if (this.form.workType === 1 || this.form.workType === 2 || this.form.workType === 14) {
             this.form.isSpecial = 1;

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

@@ -387,6 +387,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import AddApprove from "../approveinvoice/index"
+import {addInvoice} from "@/api/invoice/invoice";
 
 export default {
   name: "Bookingworkticket",
@@ -492,6 +493,7 @@ export default {
         userMg: null,
          userUnit: null
       },
+      approveForm:{},
       // 表单参数
       form: {  },
        ruleForm: [{} ],
@@ -554,16 +556,21 @@ export default {
   },
   methods: {
     addAprrove(row) {
+      this.reset();
+      const id = row.bookingticketId || this.ids
+      getBookingworkticket(id).then(response => {
+        this.ruleForm=response.data.tInvoiceWorkcontentList
+      });
       var rows = row ? [row] : this.bookingworkticketList.map(item => {
         return item
       })
       for (let i = 0; i < rows.length; i++) {
-        if(rows[i].status != 0){
+        if(rows[i].status ===3){
           this.$alert(this.$t('预约已确认，无法重复申请'), this.$t('提示'), {
             type: 'warning'
           })
           return
-        } else if (rows[i].status != 0&&rows[i].status != 5) {
+        }else if (rows[i].status != 0&&rows[i].status != 5) {
           this.$alert(this.$t('预约正在申请中，无法重复申请'), this.$t('提示'), {
             type: 'warning'
           })
@@ -571,7 +578,26 @@ export default {
         }
       }
       this.$nextTick(() => {
-        this.$refs.addApprove.init(rows)
+
+        this.approveForm.invoiceId=row.bookingticketId;
+        if (row.bookingworkticket.workStartTime && row.bookingworkticket.workStartTime === row.createdate)
+          this.approveForm.isToday = 1;
+        this.ruleForm.forEach(item=>{
+          if (item.workType===1||item.workType===2||item.workType===3||item.workType===15){
+            this.approveForm.isSpecial = 1;
+          }
+        })
+
+        this.approveForm.userSupId=10000;
+        this.approveForm.devSupId=10081;
+        this.approveForm.devEngineerId=10082;
+        this.approveForm.managerconId=10084;
+        // this.$refs.addApprove.init(rows)
+        addInvoice(this.approveForm).then(response => {
+          this.msgSuccess(this.$t('预约成功'));
+          // this.visible = false;
+          // this.getList();
+        })
       })
       this.addAprroveVisible = true
     },
@@ -904,7 +930,7 @@ export default {
          const formatDate =new FormData();
       formatDate.append("filepath",row.bookingworkticket.filename)
 //       formatDate.append("filepath","/profile\\开票预约系统需求文档(4).pdf")
-     
+
       //调用文件预览api
       let res= this.officeConvert.bookConvertCommon(formatDate)