LY 预约续票

master/src/main/java/com/ruoyi/project/ehs/controller/TEnvironapprovalController.java

@@ -288,7 +288,7 @@ public class TEnvironapprovalController extends BaseController
                 environapproval.setConExhaust(url);
             }
             tEnvironapprovalService.updateTEnvironapproval(environapproval);
-            return AjaxResult.success();
+            return AjaxResult.success(url);
         }
         return AjaxResult.error("上传失败，请联系管理员");
     }

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -196,6 +196,7 @@ public class TJobticketController extends BaseController {
             tJobticket.setLxr(tInvoiceWorkcontent.getBookingworkticket().getContact());
             tJobticket.setLxdh(tInvoiceWorkcontent.getBookingworkticket().getPhonenumber());
             //各项票号
+            tJobticket.setYqxkzh(tInvoiceWorkcontent.getYqxkzh());
             tJobticket.setXzkjxkzh(tInvoiceWorkcontent.getXzkjxkzh());
             tJobticket.setMbzyxkzh(tInvoiceWorkcontent.getMbzyxkzh());
             tJobticket.setWhgzxkzh(tInvoiceWorkcontent.getWhgzxkzh());
@@ -209,7 +210,7 @@ public class TJobticketController extends BaseController {
             tJobticket.setZypzt("10");
             tJobticket.setQfsj("8:30");
             tJobticket.setKprq(tInvoiceWorkcontent.getBookingworkticket().getWorkStartTime());
-            //tJobticket.set
+            tJobticket.setXpxp(tInvoiceWorkcontent.getXpxp());
             //先查询是否重复
             int same = tJobticketService.selectTJobticketSameData(tJobticket);
             if (same > 0) {

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

@@ -439,10 +439,8 @@ public class TInvoiceBookingworkticketController extends BaseController
        /*     wt.setReservationNumber("Steam Cracker"+tInvoiceBookingworkticket.getId().toString()+"-"+wt.getId().toString());
             tInvoiceBookingworkticketService.updateTInvoiceWorkcontent(wt);*/
         }
-
         return AjaxResult.success(didi);
     }
-
     /**
      * 修改预约作业票台账
      */

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceBookingworkticketVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.invoice.domain;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
@@ -24,6 +25,31 @@ public class TInvoiceBookingworkticketVo extends BaseEntity
     private String workPeopleNumber;
     private String estimateWorktime;
     private Long bookingticketId;
+    /** 危害工作许可证号 */
+    private String whgzxkzh;
+
+    /** 动火作业许可证号 */
+    private String dhzyxkzh;
+
+    /** 限制空间许可证号 */
+    private String xzkjxkzh;
+
+    /** 盲板作业许可证号 */
+    private String mbzyxkzh;
+
+    /** 高处作业许可证号 */
+    private String gczyxkzh;
+
+    /** 高处作业级别 */
+
+    private String gczyjb;
+
+    /** 新票/续票 */
+    private String xpxp;
+
+    /** 延期许可证号 */
+    private String yqxkzh;
+    private String status;
 
     public Long getBookingticketId() {
         return bookingticketId;
@@ -41,7 +67,7 @@ public class TInvoiceBookingworkticketVo extends BaseEntity
         this.status = status;
     }
 
-    private String status;
+
 
     public TInvoiceBookingworkticketVo(String workUnit, String workArea, String floorLocation, String workStartTime, String workEndTime, String contact, String phonenumber, String workType, String riskLevel, String workDescription, String workPeopleNumber, String estimateWorktime) {
         this.workUnit = workUnit;
@@ -58,6 +84,70 @@ public class TInvoiceBookingworkticketVo extends BaseEntity
         this.estimateWorktime = estimateWorktime;
     }
 
+    public String getWhgzxkzh() {
+        return whgzxkzh;
+    }
+
+    public void setWhgzxkzh(String whgzxkzh) {
+        this.whgzxkzh = whgzxkzh;
+    }
+
+    public String getDhzyxkzh() {
+        return dhzyxkzh;
+    }
+
+    public void setDhzyxkzh(String dhzyxkzh) {
+        this.dhzyxkzh = dhzyxkzh;
+    }
+
+    public String getXzkjxkzh() {
+        return xzkjxkzh;
+    }
+
+    public void setXzkjxkzh(String xzkjxkzh) {
+        this.xzkjxkzh = xzkjxkzh;
+    }
+
+    public String getMbzyxkzh() {
+        return mbzyxkzh;
+    }
+
+    public void setMbzyxkzh(String mbzyxkzh) {
+        this.mbzyxkzh = mbzyxkzh;
+    }
+
+    public String getGczyxkzh() {
+        return gczyxkzh;
+    }
+
+    public void setGczyxkzh(String gczyxkzh) {
+        this.gczyxkzh = gczyxkzh;
+    }
+
+    public String getGczyjb() {
+        return gczyjb;
+    }
+
+    public void setGczyjb(String gczyjb) {
+        this.gczyjb = gczyjb;
+    }
+
+    public String getXpxp() {
+        return xpxp;
+    }
+
+    public void setXpxp(String xpxp) {
+        this.xpxp = xpxp;
+    }
+
+    public String getYqxkzh() {
+        return yqxkzh;
+    }
+
+    public void setYqxkzh(String yqxkzh) {
+        this.yqxkzh = yqxkzh;
+    }
+
     public String getWorkUnit() {
         return workUnit;
     }

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceWorkcontent.java

@@ -101,6 +101,14 @@ public class TInvoiceWorkcontent extends BaseEntity
     @Excel(name = "高处作业级别")
     private String gczyjb;
 
+    /** 新票/续票 */
+    @Excel(name = "新票/续票", dictType = "XPXP")
+    private String xpxp;
+
+    /** 延期许可证号 */
+    @Excel(name = "延期许可证号")
+    private String yqxkzh;
+
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
@@ -256,6 +264,22 @@ public class TInvoiceWorkcontent extends BaseEntity
         this.tag = tag;
     }
 
+    public String getXpxp() {
+        return xpxp;
+    }
+
+    public void setXpxp(String xpxp) {
+        this.xpxp = xpxp;
+    }
+
+    public String getYqxkzh() {
+        return yqxkzh;
+    }
+
+    public void setYqxkzh(String yqxkzh) {
+        this.yqxkzh = yqxkzh;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -103,8 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gczyxkzh != null  and gczyxkzh != ''"> and gczyxkzh = #{gczyxkzh}</if>
         <if test="whgzxkzh != null  and whgzxkzh != ''"> and whgzxkzh = #{whgzxkzh}</if>
         <if test="dhzyxkzh != null  and dhzyxkzh != ''"> and dhzyxkzh = #{dhzyxkzh}</if>
+        <if test="yqxkzh != null  and yqxkzh != ''"> and yqxkzh = #{yqxkzh}</if>
         and d.del_flag = 0
-        and  d.xpxp = '10'
+        and  d.xpxp = #{xpxp}
     </where>
     </select>
 

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

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTInvoiceWorkcontentVo">
         select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.hpjb, d.estimate_worktime, d.bookingticket_id, d.dept_id ,d.reservation_number,s.dept_name,
-            d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.tag from t_invoice_workcontent d
+            d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.tag,d.yqxkzh,d.xpxp from t_invoice_workcontent d
        left join sys_dept s on s.dept_id = d.dept_id  left join t_invoice_bookingworkticket b on d.bookingticket_id =b.id
     </sql>
 
@@ -153,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDetailById" parameterType="Long" resultMap="TInvoiceBookingworkticketResultVo">
         select a.work_unit,a.work_area,a.floor_location,a.work_start_time,a.work_end_time,a.status,b.work_type,b.risk_level,b.work_description,b.work_people_number,b.estimate_worktime,a.contact,a.phonenumber,a.id
+        ,b.whgzxkzh,b.dhzyxkzh,b.xzkjxkzh,b.mbzyxkzh,b.gczyxkzh,b.gczyjb,b.tag,b.yqxkzh,b.xpxp
         from  t_invoice_bookingworkticket a,t_invoice_workcontent b
         where a.id=b.bookingticket_id and  a.id=#{id} and a.del_flag = 0 and b.del_flag = 0
     </select>

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

@@ -28,11 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gczyxkzh"    column="gczyxkzh"    />
         <result property="gczyjb"    column="gczyjb"    />
         <result property="tag"    column="tag"    />
+        <result property="yqxkzh"    column="yqxkzh"    />
+        <result property="xpxp"    column="xpxp"    />
     </resultMap>
 
     <sql id="selectTInvoiceWorkcontentVo">
         select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.hpjb, d.estimate_worktime, d.bookingticket_id, d.dept_id ,
-               d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.reservation_number,d.tag,s.dept_name from t_invoice_workcontent d
+               d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.reservation_number,d.tag,d.yqxkzh,d.xpxp,s.dept_name from t_invoice_workcontent d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -103,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mbzyxkzh != null">mbzyxkzh,</if>
             <if test="gczyxkzh != null">gczyxkzh,</if>
             <if test="gczyjb != null">gczyjb,</if>
+            <if test="xpxp != null">xpxp,</if>
+            <if test="yqxkzh != null">yqxkzh,</if>
+            <if test="tag != null">tag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -126,6 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mbzyxkzh != null">#{mbzyxkzh},</if>
             <if test="gczyxkzh != null">#{gczyxkzh},</if>
             <if test="gczyjb != null">#{gczyjb},</if>
+            <if test="xpxp != null">#{xpxp},</if>
+            <if test="yqxkzh != null">#{yqxkzh},</if>
+            <if test="tag != null">#{tag},</if>
          </trim>
     </insert>
 
@@ -154,6 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gczyxkzh != null">gczyxkzh = #{gczyxkzh},</if>
             <if test="gczyjb != null">gczyjb = #{gczyjb},</if>
             <if test="tag != null">tag = #{tag},</if>
+            <if test="gczyjb != null">yqxkzh = #{yqxkzh},</if>
+            <if test="tag != null">xpxp = #{xpxp},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -6,21 +6,16 @@
       :visible.sync="visible"
       :append-to-body="true">
       <el-form :model="taskForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
-        <el-form-item :label="$t('申请开票')">
+        <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" :show-overflow-tooltip="true"/>
             <el-table-column label="作业区域单元" align="center" prop="workArea" :show-overflow-tooltip="true"/>
             <el-table-column label="楼层位置" align="center" prop="floorLocation" :formatter="floorLocationFormat"/>
-            <el-table-column label=" 作业开始时间" align="center" prop="workStartTime" width="100">
+            <el-table-column label=" 作业日期" align="center" prop="workStartTime" width="100">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.workStartTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="作业结束时间" align="center" prop="workEndTime" width="100">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.workEndTime, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
             <el-table-column label="作业类型" align="center" prop="workType" :formatter="workTypeFormat"
                              :show-overflow-tooltip="true"/>
             <el-table-column label="风险等级" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
@@ -30,6 +25,15 @@
             <el-table-column label="联系人" align="center" prop="contact" :show-overflow-tooltip="true"/>
             <el-table-column label="联系方式" align="center" prop="phonenumber" :show-overflow-tooltip="true"/>
             <el-table-column label="状态" align="center" prop="status" width="100" :formatter="statusFormat"/>
+            <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="火票级别" align="center" prop="hpjb" width="50" :formatter="hpjbFormat"/>
+            <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="高处作业级别" align="center" prop="gczyjb" :formatter="gczyjbFormat"/>
+            <el-table-column label="延期许可证号" align="center" prop="yqxkzh" :show-overflow-tooltip="true"/>
+            <el-table-column label="索引" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
           </el-table>
         </el-form-item>
         <el-form-item :label="$t('申请时间')" prop="creattime">
@@ -44,7 +48,7 @@
       <el-button v-if="this.taskForm.taskId == ''" @click="visible = false">{{ $t('message.return') }}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="primary"
                  @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''&&(this.isDevSup||this.isUserMag)" type="success"
+      <el-button v-if="!this.taskForm.taskId == ''&&(this.isDevSup||this.isUserMag) && this.xpxp!= 12" type="success"
                  @click="updateDetail">{{ $t('修改') }}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="danger" @click="dataFormSubmit(0)"
                  :disabled="submitDisabled">{{ $t('作废') }}</el-button>
@@ -290,6 +294,7 @@ export default {
       approveForm: {},
       isUserMag: false,
       isDevSup: false,
+      xpxp: null,
       loading: true,
       bookingworkticketVisible: false,
       // 总条数
@@ -315,6 +320,10 @@ export default {
       riskLevelOptions: [],
       // 监护人单位字典
       guardianUnitOptions: [],
+      // 火票级别字典
+      hpjbOptions: [],
+      // 高处作业级别字典
+      gczyjbOptions: [],
       recordVisible: false,
       // 遮罩层
       historyLoading: false,
@@ -427,6 +436,14 @@ export default {
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
     },
+    // 火票级别字典翻译
+    hpjbFormat(row, column) {
+      return this.selectDictLabel(this.hpjbOptions, row.hpjb);
+    },
+    // 高处作业级别字典翻译
+    gczyjbFormat(row, column) {
+      return this.selectDictLabel(this.gczyjbOptions, row.gczyjb);
+    },
     // 字典翻译
     workUnitFormat(row, column) {
       return this.selectDictLabel(this.workUnitOptions, row.workUnit);
@@ -498,6 +515,12 @@ export default {
       this.getDicts("book_guardian_unit").then(response => {
         this.guardianUnitOptions = response.data;
       });
+      this.getDicts("HPJB").then(response => {
+        this.hpjbOptions = response.data;
+      });
+      this.getDicts("GCZYJB").then(response => {
+        this.gczyjbOptions = response.data;
+      });
       this.dataForm.processId = processId
       this.taskName = taskName
       this.taskForm.taskId = taskId
@@ -528,6 +551,7 @@ export default {
         this.devList = response.data.devList
         this.isUserMag = this.devList[0].status == 0 ? true : false;
         this.isDevSup = this.devList[0].status == 2 ? true : false;
+        this.xpxp = this.devList[0].xpxp
         this.dataForm.delayDate = response.data.delayDate
         this.dataForm.delayReason = response.data.delayReason
         this.dataForm.delayMeasure = response.data.delayMeasure
@@ -550,8 +574,8 @@ export default {
       this.reset();
     },
 
-    getDeviceup(){
-      const queryForm= {
+    getDeviceup() {
+      const queryForm = {
         pageNum: 1,
         pageSize: 20,
         devName: null,
@@ -838,7 +862,7 @@ export default {
                 });
               } else {
                 getInvoice(this.taskForm.businessKey).then(response => {
-                  this.devList=response.data.devList;
+                  this.devList = response.data.devList;
                 });
                 this.open = false;
               }

ui/src/views/ehs/environapproval/index.vue

@@ -108,13 +108,13 @@
             废水
             <el-image
               style="width: 100px; height: 100px"
-              :src="scope.row.reqWater"
+              :src=getUrl(scope.row.reqWater)
               :preview-src-list="scope.row.srcWaterList">
             </el-image>
             废气
             <el-image
               style="width: 100px; height: 100px"
-              :src="scope.row.reqExhaust"
+              :src=getUrl(scope.row.reqExhaust)
               :preview-src-list="scope.row.srcExhaustList">
           </el-image>
           </span>
@@ -127,13 +127,13 @@
             废水
             <el-image
               style="width: 100px; height: 100px"
-              :src="scope.row.conWater"
+              :src= getUrl(scope.row.conWater)
               :preview-src-list="scope.row.conWaterList">
             </el-image>
             废气
             <el-image
               style="width: 100px; height: 100px"
-              :src="scope.row.conExhaust"
+              :src= getUrl(scope.row.conExhaust)
               :preview-src-list="scope.row.conExhaustList">
           </el-image>
           </span>
@@ -785,6 +785,9 @@ export default {
     });
   },
   methods: {
+    getUrl(value){
+      return value
+    },
     /** 查询环保批文清单列表 */
     getList() {
       this.loading = true;
@@ -804,6 +807,8 @@ export default {
               item.srcExhaustList = srcExhaustList;
               item.reqExhaust = process.env.VUE_APP_BASE_API + item.reqExhaust;
             }
+          }
+          if (item.conPic === 'true') {
             if (item.conWater) {
               var conWaterList = [];
               conWaterList.push(process.env.VUE_APP_BASE_API + item.conWater);
@@ -1140,19 +1145,24 @@ export default {
       },
     handleWaterAvatarSuccess (res, file, fileList) {
       this.picWaterUrl =  URL.createObjectURL(file.raw);
+      this.form.reqWater = res.msg
       this.$alert(res.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
     },
     handleExhaustAvatarSuccess (res, file, fileList) {
       this.picExhaustUrl =  URL.createObjectURL(file.raw);
+      this.form.reqExhaust = res.msg
       this.$alert(res.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
     },
     handleWaterConSuccess (res, file, fileList) {
       this.conWaterUrl =  URL.createObjectURL(file.raw);
+      this.form.conWater = res.msg
       this.$alert(res.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
     },
     handleExhaustConSuccess (res, file, fileList) {
       this.conExhaustUrl =  URL.createObjectURL(file.raw);
+      this.form.conExhaust = res.msg
       this.$alert(res.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+
     },
 
   }

ui/src/views/login.vue

@@ -158,8 +158,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/image/CPMS20210107.jpg");
-  //background-image: url("../assets/image/CPMS20211128.jpg");
+  //background-image: url("../assets/image/CPMS20210107.jpg");
+  background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
 .title {