张丁 修改图片

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

@@ -533,7 +533,6 @@ public class TInvoiceBookingworkticketController extends BaseController
                 for (SysDictData p : book_risk_level) {
                     if (tInvoiceWorkcontent.getRiskLevel().toString().equals(p.getDictValue())) {
                         content.append(ticket.getWorkArea()+","+tInvoiceWorkcontent.getWorkDescription());//装置名称
-                        content.append("   风险提醒： "+p.getDictLabel());
                     }
                 }
             }
@@ -554,7 +553,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                 SysUser sysUser =sysUserService.selectUserById(ticket.getUserMg());
                 if(!params.containsKey("userMg")){
                     if(sysUser.getSignUrl()!=null){
-                        params.put("userMg", fileName(sysUser.getSignUrl()));
+                        params.put("userMg", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 if(!params.containsKey("userNumber")){
@@ -572,7 +571,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                 if (!params.containsKey("userName")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getUserId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("userName",fileName(sysUser.getSignUrl()));
+                        params.put("userName",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
             }
@@ -621,7 +620,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                 if (!params.containsKey("zzUser")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevSupId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zzUser", fileName(sysUser.getSignUrl()));
+                        params.put("zzUser",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 //装置批准人的电话
@@ -637,7 +636,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                 if (!params.containsKey("zjgcs")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevEngineerId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zjgcs",fileName(sysUser.getSignUrl()));
+                        params.put("zjgcs",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 //批准日期
@@ -652,7 +651,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                 if (!params.containsKey("zzjl")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getManagerconId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zzjl",fileName(sysUser.getSignUrl()));
+                        params.put("zzjl",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 if (!params.containsKey("DateTwo")) {

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.listener.invoiceApprove;
 
 import com.alibaba.fastjson.JSON;
 import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.data.Texts;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
@@ -179,7 +180,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 for (SysDictData p : book_risk_level) {
                     if (tInvoiceWorkcontent.getRiskLevel().toString().equals(p.getDictValue())) {
                         content.append(ticket.getWorkArea()+","+tInvoiceWorkcontent.getWorkDescription());//装置名称
-                        content.append("   风险提醒： "+p.getDictLabel());
+
                     }
                 }
             }
@@ -200,7 +201,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 SysUser sysUser =sysUserService.selectUserById(ticket.getUserMg());
                 if(!params.containsKey("userMg")){
                     if(sysUser.getSignUrl()!=null){
-                        params.put("userMg", fileName(sysUser.getSignUrl()));
+                        params.put("userMg", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 if(!params.containsKey("userNumber")){
@@ -218,7 +219,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 if (!params.containsKey("userName")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getUserId());
             if(sysUser.getSignUrl()!=null){
-                params.put("userName",fileName(sysUser.getSignUrl()));
+                params.put("userName",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
             }
                 }
             }
@@ -267,7 +268,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 if (!params.containsKey("zzUser")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevSupId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zzUser", fileName(sysUser.getSignUrl()));
+                        params.put("zzUser", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 //装置批准人的电话
@@ -283,7 +284,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 if (!params.containsKey("zjgcs")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevEngineerId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zjgcs",fileName(sysUser.getSignUrl()));
+                        params.put("zjgcs",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 //批准日期
@@ -298,7 +299,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                 if (!params.containsKey("zzjl")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getManagerconId());
                     if(sysUser.getSignUrl()!=null){
-                        params.put("zzjl",fileName(sysUser.getSignUrl()));
+                        params.put("zzjl",Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(100, 40).create());
                     }
                 }
                 if (!params.containsKey("DateTwo")) {
@@ -330,6 +331,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         if (!dir.exists()) {
             logger.info("目录不存在，创建文件夹{}!", fileDir);
             dir.mkdirs();
+        }else{
+
         }
         String filePath = fileDir +"/"+ fileName;
         logger.info("目录{}!", filePath);

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

@@ -1033,14 +1033,13 @@ export default {
       putData.reservationNumber=this.reservationNumber
        updateWorkcontent(putData).then(response => {
               console.log(response.data)
+                 this.$set(this.tableData, index, row);
           });
            assion(this.associationParams.bookingticketId).then(response => {
               console.log(response.data)
           });
          this.msgSuccess("请求成功");
         this.getList()
-
-       
        
       },
       /** 下载模板操作 */
@@ -1116,7 +1115,14 @@ export default {
             colspan: _col
           };
         }
-
+        if (columnIndex === 14) {
+          const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
 
       },
       //单元格整理
@@ -1159,7 +1165,6 @@ export default {
       else{
          const formatDate =new FormData();
       formatDate.append("filepath",row.bookingworkticket.filename)
-//       formatDate.append("filepath","/profile\\开票预约系统需求文档(4).pdf")
 
       //调用文件预览api
       let res= this.officeConvert.bookConvertCommon(formatDate)