-修改邮件格式

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

@@ -238,11 +238,6 @@ public class TApproveReserveInvoiceController extends BaseController {
             devTask.setComment("通过" + symbol + devTask.getComment());
             invoice.setStatus(2L);
             invoice.setEnddate(new Date());
-        } else if (devTask.getCondition().equals("0")) {
-            devTask.setComment("未通过" + symbol + devTask.getComment());
-            invoice.setStatus(3L);
-            invoice.setEnddate(new Date());
-            invoiceBook.setStatus(7L);
         }
         Map<String, Object> param = new HashMap<>();
         List<TInvoiceWorkcontent> workcontents = invoiceWorkcontentMapper.selectTInvoiceWorkcontentBybookingticketId(Long.valueOf(invoice.getInvoiceId()));

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndFailListener.java

@@ -38,8 +38,11 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
 
         // 修改申请状态
         TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
+        approveEntity.setStatus(3L);
+        approveEntity.setEnddate(new Date());
         invoiceBook.setStatus(7L);
         tInvoiceBookingworkticketService.updateById(invoiceBook);
+        tApproveReserveInvoiceService.updateTApproveReserveInvoice(approveEntity);
         //发送邮件
         try {
             String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
@@ -63,8 +66,8 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
                     "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
                     "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
                     "Dear usernameEN(loginName)</font></font></h2>" +
-                    "<p><b>您的申请已作废</b><br>" +
-                    "Your application has been voided:<br>" +
+                    "<p><font style=\"line-height: 22px; \" size=\"5\"><b>您的申请已作废<br>" +
+                    "Your application has been voided</b></font><br>"+
                     "任务名：<b>预约开票审批流程</b><br>" +
                     "Task Name: <b>Approval process of booking invoicing</b><br>" +
                     "任务编号：<b>apNo</b><br>" +

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -79,8 +79,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                     "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
                     "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
                     "Dear usernameEN(loginName)</font></font></h2>" +
-                    "<p><b>您的审批已完成</b><br>" +
-                    "You have a new to-do task:<br>" +
+                    "<p><font style=\"line-height: 22px; \" size=\"5\"><b>您的审批已完成<br>" +
+                    "Your approval has been completed</b></font><br>" +
                     "任务名：<b>预约开票审批流程</b><br>" +
                     "Task Name: <b>Approval process of booking invoicing</b><br>" +
                     "任务编号：<b>apNo</b><br>" +

master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -166,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join t_approve_reserve_invoice r on r.invoice_id = d.id
          left join sys_user su on r.user_sup_id = su.user_id
         where d.id = #{id}
+        and r.status!=3
         and d.del_flag = 0
     </select>
 

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

@@ -8,8 +8,8 @@
       <el-form :model="taskForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
         <el-form-item :label=" xpxp == 12 ? '预约续票' : '预约新票' ">
           <el-table :data="devList" :span-method="mergeMethod" border style="width: 100%;">
-            <el-table-column label="作业单位" align="center" prop="workUnit" />
-            <el-table-column label="作业区域单元" align="center" prop="workArea" />
+            <el-table-column label="作业单位" align="center" prop="workUnit"/>
+            <el-table-column label="作业区域单元" align="center" prop="workArea"/>
             <el-table-column label="楼层位置" align="center" prop="floorLocation" :formatter="floorLocationFormat"/>
             <el-table-column label=" 作业日期" align="center" prop="workStartTime" width="100">
               <template slot-scope="scope">
@@ -18,21 +18,21 @@
             </el-table-column>
             <el-table-column label="作业类型" align="center" prop="workType" :formatter="workTypeFormat"/>
             <el-table-column label="风险等级" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
-            <el-table-column label="作业内容描述" align="center" prop="workDescription" />
-            <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" />
-            <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" />
-            <el-table-column label="联系人" align="center" prop="contact" />
-            <el-table-column label="联系方式" align="center" prop="phonenumber" />
+            <el-table-column label="作业内容描述" align="center" prop="workDescription"/>
+            <el-table-column label="作业人员数" align="center" prop="workPeopleNumber"/>
+            <el-table-column label="预计作业时间" align="center" prop="estimateWorktime"/>
+            <el-table-column label="联系人" align="center" prop="contact"/>
+            <el-table-column label="联系方式" align="center" prop="phonenumber"/>
             <el-table-column label="状态" align="center" prop="status" width="100" :formatter="statusFormat"/>
-            <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" />
-            <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" />
+            <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh"/>
+            <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh"/>
             <el-table-column label="火票级别" align="center" prop="hpjb" width="50" :formatter="hpjbFormat"/>
-            <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" />
-            <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" />
-            <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" />
+            <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh"/>
+            <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh"/>
+            <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh"/>
             <el-table-column label="高处作业级别" align="center" prop="gczyjb" :formatter="gczyjbFormat"/>
-            <el-table-column label="延期许可证号" align="center" prop="yqxkzh" />
-            <el-table-column label="索引" align="center" prop="tag" width="60" />
+            <el-table-column label="延期许可证号" align="center" prop="yqxkzh"/>
+            <el-table-column label="索引" align="center" prop="tag" width="60"/>
           </el-table>
         </el-form-item>
         <el-form-item :label="$t('申请时间')" prop="creattime">
@@ -90,7 +90,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" :disabled="isDevSup"/>
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"
+                          :disabled="isDevSup"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -112,7 +113,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="作业时间" prop="workStartTime" >
+            <el-form-item label="作业时间" prop="workStartTime">
               <el-date-picker clearable size="small" style="width: 190px"
                               v-model="form.workStartTime"
                               type="date"
@@ -122,16 +123,16 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">
-            <el-form-item label="作业结束" prop="workEndTime">
-              <el-date-picker clearable size="small" style="width: 190px"
-                              v-model="form.workEndTime"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择作业结束时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>-->
+          <!--          <el-col :span="12">
+                      <el-form-item label="作业结束" prop="workEndTime">
+                        <el-date-picker clearable size="small" style="width: 190px"
+                                        v-model="form.workEndTime"
+                                        type="date"
+                                        value-format="yyyy-MM-dd"
+                                        placeholder="选择作业结束时间">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -222,8 +223,9 @@
       <el-button @click="reduce" :disabled="flag">移除一条</el-button>
 
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="this.isUserMag" type="primary" @click="confirmDetail(1)">保存并重新申请</el-button>
-        <el-button v-else type="primary" @click="confirmDetail">保存</el-button>
+        <el-button v-if="this.isUserMag" type="primary" @click="confirmDetail(1)" :disabled="save">保存并重新申请
+        </el-button>
+        <el-button v-else type="primary" @click="confirmDetail" :disabled="save">保存</el-button>
         <el-button @click="detailCancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -250,6 +252,7 @@ export default {
     return {// 表单校验
       ruleForm: [{}],
       //禁用
+      save: false,
       edit: true,
       flag: true,
       rules: {
@@ -619,9 +622,9 @@ export default {
     reset() {
       this.historyList = [];
       this.devList = [];
-      this.isUserMag=false;
-      this.isDevSup=false;
-      this.userUnitOptions=[];
+      this.isUserMag = false;
+      this.isDevSup = false;
+      this.userUnitOptions = [];
     },
     detailReset() {
       this.form = {
@@ -774,6 +777,7 @@ export default {
       };
     },
     updateDetail() {
+      this.save=false
       this.detailReset();
       const id = this.devList[0].bookingticketId
       getBookingworkticket(id).then(response => {
@@ -813,7 +817,7 @@ export default {
       });
     },
     confirmDetail(val) {
-
+      this.save = true
       let arr = []
       const basicForm = this.$refs.form;
       arr.push(basicForm)
@@ -835,7 +839,7 @@ export default {
         const genForm4 = this.$refs.ruleForm[4];
         arr.push(genForm4)
       }
-      this.submitDisabled = true
+
       this.taskForm.condition = 0
       this.taskForm.govFiles = this.dataForm.files
 
@@ -855,7 +859,6 @@ export default {
               this.approveForm.userSupId = this.form.userMg
               if (val === 1) {
                 handleApprove(this.taskForm).then(response => {
-                  this.submitDisabled = false
                   this.msgSuccess(this.$t('处理成功'));
                   addInvoice(this.approveForm).then(response => {
                     // this.msgSuccess(this.$t('预约成功'));