张丁 关联票号和票据内容修改

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

@@ -178,8 +178,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             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());
+                        content.append(ticket.getWorkArea()+","+tInvoiceWorkcontent.getWorkDescription());//装置名称
+                        content.append("   风险提醒： "+p.getDictLabel());
                     }
                 }
             }
@@ -222,10 +222,10 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             }
                 }
             }
-            //联系单位
+            //联系电话
             if(tApproveReserveInvoice.getUserId()!=null) {
                 SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getUserId());
-                String dName= sysUser.getDept().getDeptName();
+                String dName= sysUser.getPhonenumber();
                    //如果没有添加过  找到用户所属的部门添加进去
                 if (!params.containsKey("conUnit")) {
                     params.put("conUnit",Texts.of(dName).fontSize(10).bold().create());
@@ -264,12 +264,18 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             }
             //装置批准人
             if(tApproveReserveInvoice.getDevSupId()!=null) {
-                if (!params.containsKey("zzUser")&&!params.containsKey("zjNumber")) {
+                if (!params.containsKey("zzUser")) {
                     SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevSupId());
                     if(sysUser.getSignUrl()!=null){
                         params.put("zzUser", fileName(sysUser.getSignUrl()));
                     }
-                    params.put("zjNumber", Texts.of(sysUser.getPhonenumber()).fontSize(10).bold().create());
+                }
+                //装置批准人的电话
+                if (!params.containsKey("zjNumber")) {
+                    SysUser sysUser = sysUserService.selectUserById(tApproveReserveInvoice.getDevSupId());
+                    if(sysUser.getPhonenumber()!=null){
+                        params.put("zjNumber", Texts.of(sysUser.getPhonenumber()).fontSize(10).bold().create());
+                    }
                 }
             }
             //装置工程师  如果涉及
@@ -280,6 +286,12 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                         params.put("zjgcs",fileName(sysUser.getSignUrl()));
                     }
                 }
+                //批准日期
+                if (!params.containsKey("DateOne")) {
+                    if(tApproveReserveInvoice.getEnddate()!=null) {
+                        params.put("DateOne", Texts.of(DateUtils.dateTime(tApproveReserveInvoice.getEnddate())).fontSize(10).bold().create());
+                    }
+                }
             }
             //装置经理(副)  如果涉及
             if(tApproveReserveInvoice.getManagerconId()!=null) {
@@ -289,6 +301,12 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                         params.put("zzjl",fileName(sysUser.getSignUrl()));
                     }
                 }
+                if (!params.containsKey("DateTwo")) {
+                    if(tApproveReserveInvoice.getEnddate()!=null) {
+                        params.put("DateTwo", Texts.of(DateUtils.dateTime(tApproveReserveInvoice.getEnddate())).fontSize(10).bold().create());
+                    }
+                }
+
             }
             content.delete(0, content.length());
             contentUserWorkType.delete(0, contentUserWorkType.length());

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

@@ -116,9 +116,10 @@
       <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" :show-overflow-tooltip="true"/>
       <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" :show-overflow-tooltip="true"/>
       <el-table-column label="状态" align="center" prop="bookingworkticket.status" width="100" :formatter="statusFormat" />
-      <el-table-column label="操作" align="center" fixed="right" width="200" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+          v-if="scope.row.status== 0"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -132,6 +133,13 @@
             icon="el-icon-edit"
             @click="handleDelete(scope.row)"
           >删除</el-button>
+           <el-button
+            v-if="scope.row.status== 3"
+            size="mini"
+            type="text"
+            icon="el-icon-s-promotion"
+            @click="association(scope.row)"
+          >关联票号</el-button>
           <el-button
              v-if="scope.row.status== 3"
               size="mini"
@@ -358,6 +366,19 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
+      <el-dialog
+  title="关联票号"
+  :visible.sync="guanlianVisible"
+  width="30%"
+  center>
+  <div class="demo-input-size">
+    <el-input   size="medium" prefix-icon="el-icon-edit" placeholder="请输入票号" v-model="reservationNumber"></el-input>
+    </div>
+     <div slot="footer" class="dialog-footer">
+              <el-button @click="guanlianVisible=false">取 消</el-button>
+    <el-button type="primary" @click="submitassociation()">确 定</el-button>
+          </div>
+</el-dialog>
     <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
   </div>
 </template>
@@ -380,16 +401,16 @@ export default {
   components: { Treeselect,AddApprove},
   data() {
     return {
+      //关联票号
+      associationParams:{},
+      reservationNumber:"",
+      guanlianVisible:false,
       //禁用
       edit:true,
       ppt:false,
       pptView:false,
       imgs:[],
       tInvoiceWorkcontentList:[],
-        //作业内容表头
-      tabletou:['作业类型','风险等级','作业内容描述','作业人员数','作业预计时间','监护人单位'],
-      //用户名和承包商名
-      username:"",
       addAprroveVisible: false,
       hisAprroveVisible: false,
       // 遮罩层
@@ -623,7 +644,7 @@ export default {
               this.approveForm.isToday = 1;
         }
          //判断是否涉及 动火 和当日
-          if (row.workType===1||row.workType===15){
+          if (row.workType===1||row.workType===2||row.workType===3||row.workType===15){
             this.approveForm.isSpecial = 1
           }
         this.approveForm.userSupId=row.bookingworkticket.userMg;
@@ -859,13 +880,11 @@ export default {
       const id = row.bookingticketId || this.ids
       getBookingworkticket(id).then(response => {
         this.form = response.data;
-           //  回显用户主管
-           this.checkCategoryPromotion( response.data.userUnit);
         this.open = true;
         this.title = "修改预约作业票台账";
         this.ruleForm=response.data.tInvoiceWorkcontentList
-        
-     
+           //  回显用户主管
+        this.checkCategoryPromotion(this.form.userUnit);
     //  console.log(row.floorLocation)  将后台的字符串数组重新转换为el-select要的数组格式
        let arr=row.floorLocation.split(",")
        let st=[]
@@ -938,9 +957,9 @@ export default {
                    this.approveForm.isToday = 0;
             }
             for(let i=0;i<this.ruleForm.length;i++){
-               if( this.ruleForm[i].workType===1||this.ruleForm[i].workType===15){
+               if( this.ruleForm[i].workType===1||this.ruleForm[i].workType===2||
+               this.ruleForm[i].workType===3||this.ruleForm[i].workType===15){
               this.approveForm.isSpecial = 1
-                 break;
             }else{
                 this.approveForm.isSpecial = 0
             }
@@ -993,10 +1012,22 @@ export default {
           this.download(response.msg);
         })
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
+       //关联票号
+      association(row){
+       this.guanlianVisible=true
+       this.associationParams=row
+      },
+      //提交票号
+       submitassociation(){
+       this.guanlianVisible=false
+      const putData={}
+      putData.id=this.associationParams.id
+      putData.reservationNumber=this.reservationNumber
+       updateWorkcontent(putData).then(response => {
+              console.log(response.data)
+          });
+         this.msgSuccess("票号已关联");
+        this.getList()
       },
       /** 下载模板操作 */
       importTemplate() {
@@ -1063,7 +1094,7 @@ export default {
             colspan: _col
           };
         }
-        if (columnIndex === 13) {
+        if (columnIndex === 14) {
           const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
           const _col = _row > 0 ? 1 : 0;
           return {