张丁 预约作业票修改模板

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

@@ -473,8 +473,8 @@ public class TInvoiceBookingworkticketController extends BaseController
                 }
             }
         }
-        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String fileName = contentUserWorkUnit.toString()+invoiceBookingworkticket.getContact() +time+".docx";
+        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"));
+        String fileName = invoiceBookingworkticket.getWorkUnit()+invoiceBookingworkticket.getContact() +time+".docx";
         String wordPath = this.createWord(templatePath, fileDir, fileName, params);
 
         return wordPath;
@@ -489,35 +489,27 @@ public class TInvoiceBookingworkticketController extends BaseController
         List<TInvoiceWorkcontent> tInvoiceWorkcontentList= tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(ticket.getId());
         //字典查询
         List<SysDictData> book_work_type = iSysDictTypeService.selectDictDataByType("book_work_type");
-        List<SysDictData> book_work_unit = iSysDictTypeService.selectDictDataByType("book_work_unit");
         List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         List<SysDictData> book_risk_level = iSysDictTypeService.selectDictDataByType("book_risk_level");
-        List<SysDictData> book_work_area = iSysDictTypeService.selectDictDataByType("book_work_area");
         List<SysDictData> book_user_mg = iSysDictTypeService.selectDictDataByType("book_user_mg");
         //构造模板的value
         StringBuilder content=new StringBuilder();
         StringBuilder contentUserUnit=new StringBuilder();
         StringBuilder contentUserMg=new StringBuilder();
-        StringBuilder contentUserWorkUnit=new StringBuilder();
         StringBuilder contentUserWorkType=new StringBuilder();
        for(int i =0;i<tInvoiceWorkcontentList.size();i++){
            TInvoiceWorkcontent tInvoiceWorkcontent=tInvoiceWorkcontentList.get(i);
            //不为空的字段进行拼接
-          if(ticket.getWorkArea()!=null){
-              for (SysDictData p : book_work_area) {
-                  if (ticket.getWorkArea().toString().equals(p.getDictValue())) {
-                      content.append("具体工作内容："+tInvoiceWorkcontent.getWorkDescription()+"区域:"+p.getDictLabel());//装置名称
-                  }
-              }
-          }
            if(tInvoiceWorkcontent.getRiskLevel()!=null){
                for (SysDictData p : book_risk_level) {
                    if (tInvoiceWorkcontent.getRiskLevel().toString().equals(p.getDictValue())) {
+                       content.append("具体工作内容："+tInvoiceWorkcontent.getWorkDescription()+"区域:"+ticket.getWorkArea());//装置名称
                        content.append("风险提醒："+p.getDictLabel());
                    }
                }
            }
            params.put("content"+i, Texts.of(content.toString()).fontSize(10).bold().create());
+           //用户主管
            if(ticket.getUserUnit()!=null){
                for (SysDictData p : book_user_unit) {
                    if (ticket.getUserUnit().toString().equals(p.getDictValue())) {
@@ -538,15 +530,13 @@ public class TInvoiceBookingworkticketController extends BaseController
                    params.put("userMg", Texts.of(contentUserMg.toString()).fontSize(10).bold().create());
                }
            }
-           if(ticket.getWorkUnit()!=null){
-               for (SysDictData p : book_work_unit) {
-                   if (ticket.getWorkUnit().toString().equals(p.getDictValue())) {
-                       contentUserWorkUnit.append(p.getDictLabel());//施工单位承包商
-                   }
-               }
-               if(!params.containsKey("workUnit")){
-               params.put("workUnit", Texts.of(contentUserWorkUnit.toString()).fontSize(10).bold().create());
-               }
+           //承包商
+           if(ticket.getWorkUnit()!=null) {
+               params.put("workUnit", Texts.of(ticket.getWorkUnit()).fontSize(10).bold().create());
+           }
+           //申请人
+           if(ticket.getContact()!=null) {
+               params.put("userName", Texts.of(ticket.getContact()).fontSize(10).bold().create());
            }
            if(tInvoiceWorkcontent.getWorkType()!=null){
                for (SysDictData p : book_work_type) {
@@ -562,6 +552,9 @@ public class TInvoiceBookingworkticketController extends BaseController
            if(ticket.getWorkEndTime()!=null){
                params.put("workEndTime",Texts.of(DateUtils.dateTime(ticket.getWorkEndTime())).fontSize(10).bold().create());
            }
+           //关联票号
+           params.put("associated"+i, Texts.of( "Steam Cracker"+ticket.getId()+"-"+tInvoiceWorkcontent.getId().toString()).fontSize(10).bold().create());
+
            params.put("urlImg", "C:\\Users\\shi'sen'yuan\\Downloads\\SamplePNGImage_3mbmb.png");
            content.delete(0, content.length());
            contentUserWorkType.delete(0, contentUserWorkType.length());

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

@@ -243,7 +243,7 @@
         <el-row>
         <el-col :span="12">
   <el-form-item label="用户单位" prop="userUnit">
-          <el-select v-model="form.userUnit" placeholder="请选择用户单位">
+          <el-select v-model="form.userUnit" placeholder="请选择用户单位" @change="checkCategoryPromotion(form.userUnit)">
              <el-option
             v-for="dict in userUnitOptions"
             :key="dict.dictValue"
@@ -255,7 +255,7 @@
           </el-col>
         <el-col :span="12">
         <el-form-item label="用户主管" prop="userMg">
-          <el-select v-model="form.userMg" placeholder="请选择用户单位">
+          <el-select v-model="form.userMg" placeholder="请先选择好用户单位">
              <el-option
               v-for="dict in userMgOptions"
             :key="dict.dictValue"
@@ -516,8 +516,9 @@ export default {
       })
            this.getList();
         this.getTreeselect();
-        //初始化作业区域
+        //初始化作业区域、 初始化用户单位下拉框
         this.getDeviceup();
+     //   this.getOneCategorys();
       this.getDicts("booking_work_status").then(response => {
       this.statusOptions = response.data;
     });
@@ -549,7 +550,22 @@ export default {
 
   },
   methods: {
-    //得到区域
+    //查询用户单位下拉框
+     getOneCategorys() {
+      getOneCategorys().then(response => {
+        this.userUnitOptions = response.data;
+      });
+    },
+    //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
+        checkCategoryPromotion(oneId){
+      getTwoCategorys(oneId).then(response => {
+        this.form.userMg=null;
+        this.userMgOptions = response.data;
+        //   let arr=  response.data.userIds.split(',');
+      });
+        },
+
+    //得到区域下拉框
     getDeviceup(){
       const queryForm= {
         pageNum: 1,
@@ -645,6 +661,7 @@ export default {
     /** 查询预约作业票台账列表 */
     getList() {
         this.loading = true;
+        //得到用户名-承包商名称
        listBookingworkticket(this.queryParams).then(response => {
          this.bookingworkticketList=response.rows;
           for(let i = 0; i <  this.bookingworkticketList.length; i++) {
@@ -781,7 +798,6 @@ export default {
       	for (var arrInt in arr) {
 			st.push(parseInt(arr[arrInt]))
 		}
-
        this.form.floorLocation=st
 
         this.ruleForm.length=response.data.tInvoiceWorkcontentList.length