预约开票申请相关

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

@@ -164,15 +164,16 @@ public class TApproveReserveInvoiceController extends BaseController {
         ids = invoice.getInvoiceId().split(",");
         for (String id : ids) {
             TInvoiceBookingworkticket invoiceBook = workService.getById(id);
-            if (devTask.getCondition().equals("1")) {
-                invoiceBook.setStatus(2L);
-            } else if (devTask.getCondition().equals("0")) {
+            if (devTask.getCondition().equals("1")&&task.getName().equals("各班班长、开票人员确认、整合信息关联至CTS系统")) {
                 invoiceBook.setStatus(3L);
+            } else if (devTask.getCondition().equals("0")) {
+                invoiceBook.setStatus(5L);
             }
             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/mybatis/invoice/TApproveReserveInvoiceMapper.xml

@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTApproveReserveInvoiceById" parameterType="Long" resultMap="TApproveReserveInvoiceResult">
         <include refid="selectTApproveReserveInvoiceVo"/>
+        left join t_invoice_bookingworkticket s1 on d.invoice_id=s1.id
         where id = #{id}
     </select>
 

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

@@ -334,6 +334,7 @@ export default {
         deptId: null
       };
       this.resetForm("form");
+      this.historyList=[];
     },
 
     /** 提交按钮 */

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

@@ -57,6 +57,7 @@
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
     <intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>
     <kekao-detail v-if="kekaoDetailVisible" ref="kekaoDetail" @refreshDataList="getList"></kekao-detail>
+    <invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>
   </div>
 </template>
 
@@ -73,10 +74,11 @@
   import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
   import IntactDetail from "@/views/approve/approveDetail/intact-detail";
   import KekaoDetail from "@/views/approve/approveDetail/kekao-detail";
+  import InvoiceDetail from "@/views/approve/approveDetail/invoice-detail";
   export default {
     name: "Taskdone",
     components: {
-      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail
+      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail,InvoiceDetail
     },
     data() {
       return {
@@ -89,6 +91,7 @@
         specMaintenanceVisible: false,
         intactDetailVisible:false,
         kekaoDetailVisible:false,
+        invoiceDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -218,6 +221,13 @@
             console.log(row.taskName)
             this.$refs.kekaoDetail.init(row.approveObject.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/invoice/bookingworkticket/index.vue

@@ -566,8 +566,13 @@ export default {
         return item
       })
       for (let i = 0; i < rows.length; i++) {
-        if (rows[i].status != 0) {
-          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+        if(rows[i].status != 0){
+          this.$alert(this.$t('预约已确认，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        } else if (rows[i].status != 0&&rows[i].status != 5) {
+          this.$alert(this.$t('预约正在申请中，无法重复申请'), this.$t('提示'), {
             type: 'warning'
           })
           return