张丁 作业票延期修改、申请人id修改等

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

@@ -194,6 +194,8 @@ public class TJobticketController extends BaseController
             tJobticket.setUserMg(tInvoiceWorkcontent.getBookingworkticket().getUserMg());
             tJobticket.setUserUnit(tInvoiceWorkcontent.getBookingworkticket().getUserUnit());
             tJobticket.setZypzt("10");
+            tJobticket.setQfsj("8:30");
+            tJobticket.setKprq(tInvoiceWorkcontent.getBookingworkticket().getWorkStartTime());
             //先查询是否重复
             int same=  tJobticketService.selectTJobticketSameData(tJobticket);
             if(same>0){

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

@@ -126,6 +126,7 @@ public class TApproveReserveInvoiceController extends BaseController {
         String applyUser = "";
         for (String id : ids) {
             TInvoiceBookingworkticket invoice = workService.getById(id);
+            tApproveReserveInvoice.setUserId(invoice.getCreaterCode());
             applyUser = invoice.getCreaterCode().toString();
 //            invoice.setStatus(0L);
 //            workService.updateById(invoice);

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

@@ -450,125 +450,9 @@
         <el-form-item :label="$t('签发人')" prop="qfr">
           <el-input v-model="postponeform.qfr" :placeholder="$t('请输入') + $t('签发人')" />
         </el-form-item>
-        <el-form-item :label="$t('新票/续票')" prop="xpxp" v-if="isxp">
-          <el-select v-model="postponeform.xpxp" :placeholder="$t('请选择') + $t('新票/续票')">
-            <el-option
-              v-for="dict in xpxpOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item :label="$t('延期许可证号')" prop="yqxkzh">
           <el-input v-model="postponeform.yqxkzh" :placeholder="$t('请输入') + $t('延期许可证号')" />
         </el-form-item>
-        <el-form-item :label="$t('危害工作许可证号')" prop="whgzxkzh">
-          <el-input v-model="postponeform.whgzxkzh" :placeholder="$t('请输入') + $t('危害工作许可证号')" />
-        </el-form-item>
-        <el-form-item :label="$t('动火作业许可证号')" prop="dhzyxkzh">
-          <el-input v-model="postponeform.dhzyxkzh" :placeholder="$t('请输入') + $t('动火作业许可证号')" />
-        </el-form-item>
-        <el-form-item :label="$t('火票级别')" prop="hpjb">
-          <el-select v-model="postponeform.hpjb" :placeholder="$t('请选择') + $t('火票级别')">
-            <el-option
-              v-for="dict in hpjbOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('限制空间许可证号')" prop="xzkjxkzh">
-          <el-input v-model="postponeform.xzkjxkzh" :placeholder="$t('请输入') + $t('限制空间许可证号')" />
-        </el-form-item>
-        <el-form-item :label="$t('内容')" prop="content">
-          <el-input v-model="postponeform.content" :placeholder="$t('请输入') + $t('内容')" />
-        </el-form-item>
-        <el-form-item label="用户单位" prop="userUnit">
-          <el-select v-model="postponeform.userUnit" placeholder="请选择用户单位" @change="checkCategoryPromotionRenew(postponeform.userUnit)">
-             <el-option
-            v-for="dict in userUnitOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="parseInt(dict.dictValue)"
-             ></el-option>
-          </el-select>
-        </el-form-item>
-          <el-form-item label="用户主管" prop="userMg">
-          <el-select v-model="postponeform.userMg" placeholder="请先选择好用户单位" @change="pick()">
-             <el-option
-              v-for="dict in userMgOptions"
-            :key="dict.userId"
-            :label="dict.nickName"
-            :value="dict.userId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('施工单位')" prop="sgdw">
-          <el-select v-model="postponeform.sgdw" placeholder="请选择施工单位" @change="selectworkUnit(form.sgdw)">
-             <el-option
-            v-for="dict in sgdwOptions"
-            :key="dict.id"
-            :label="dict.label"
-            :value="dict.label"
-                 ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('联系人')" prop="lxr">
-          <el-input v-model="postponeform.lxr" :placeholder="$t('请输入') + $t('联系人')" />
-        </el-form-item>
-        <el-form-item :label="$t('联系电话')" prop="lxdh">
-          <el-input v-model="postponeform.lxdh" :placeholder="$t('请输入') + $t('联系电话')" />
-        </el-form-item>
-        <el-form-item :label="$t('销票时间')" prop="xpsj">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="postponeform.xpsj"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('销票时间')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('作业票状态')" prop="zypzt">
-          <el-select v-model="postponeform.zypzt" :placeholder="$t('请选择') + $t('作业票状态')">
-            <el-option
-              v-for="dict in zypztOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('检查/存档人')" prop="jccdr">
-          <el-input v-model="postponeform.jccdr" :placeholder="$t('请输入') + $t('检查/存档人')" />
-        </el-form-item>
-        <el-form-item :label="$t('未撤销项编号')" prop="wcxxbh">
-          <el-input v-model="postponeform.wcxxbh" :placeholder="$t('请输入') + $t('未撤销项编号')" />
-        </el-form-item>
-        <el-form-item :label="$t('未撤销状态')" prop="wcxzt">
-         <el-select v-model="postponeform.wcxzt" :placeholder="$t('请选择') + $t('未撤销状态')">
-            <el-option
-              v-for="dict in wcxztOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('撤销时间')" prop="cxsj">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="postponeform.cxsj"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('撤销时间')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('备注')" prop="remarks">
-          <el-input v-model="postponeform.remarks" :placeholder="$t('请输入') + $t('备注')" />
-        </el-form-item>
-          <el-form-item :label="$t('归属部门')" prop="deptId">
-              <treeselect v-model="postponeform.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-          </el-form-item>
       </el-form>
      <div slot="footer" class="dialog-footer">
               <el-button @click="guanlianVisible=false">取 消</el-button>
@@ -671,7 +555,6 @@ export default {
         qfbz: null,
         qfr: null,
         xpxp: null,
-        yqxkzh: null,
         whgzxkzh: null,
         dhzyxkzh: null,
         hpjb: null,
@@ -732,8 +615,8 @@ export default {
         deptId: [
           { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ],
-        yqzyxkzh: [
-          { required: true, message: this.$t('当前作业票已经延期五次，请重新生成新的续票'), trigger: "blur" }
+        yqxkzh: [
+          { required: true, message: this.$t('当前续票必填'), trigger: "blur" }
         ],
         xpxp: [
           { required: true, message: this.$t('手动新增只能为新票'), trigger: "blur" },
@@ -834,7 +717,7 @@ export default {
        const id = row.id || this.ids
        getJobticket(id).then(response => {
         this.postponeform = response.data;
-         this.checkCategoryPromotion(response.data.userUnit);
+       //  this.checkCategoryPromotion(response.data.userUnit);
       });
        this.postponeParams=row
     
@@ -845,11 +728,16 @@ export default {
    //保留新票的参数 用来修改新票
    const id =this.postponeParams.id
      const postponeNumber=this.postponeParams.postponeNumber+1;
-      const  yqxkzh=this.postponeParams.yqxkzh
+      const  yqxkzh=this.postponeform.yqxkzh
+
        //续票的参数
        this.postponeParams.id=null
-       this.postponeParams.yqxkzh=this.yqzyxkzh
+       this.postponeParams.yqxkzh=this.postponeform.yqxkzh
        this.postponeParams.xpxp="12"
+       this.postponeParams.kprq=this.postponeform.kprq
+       this.postponeParams.qfsj=this.postponeform.qfsj
+       this.postponeParams.qfbz=this.postponeform.qfbz
+       this.postponeParams.qfr=this.postponeform.qfr
        
        if(postponeNumber>15){
        return  this.msgError("当前作业票最多可以延期十五次，请重新开票");
@@ -864,13 +752,14 @@ export default {
           putData.id=id
           putData.postponeNumber=postponeNumber
           if(putData.postponeNumber==1){
-            putData.yqxkzh=this.yqzyxkzh.substring(0, this.yqzyxkzh.indexOf("-"));
+            putData.yqxkzh=yqxkzh.substring(0, yqxkzh.indexOf("-"));
+            updateJobticket(putData).then(response => {
+              
+            });
           }else{
             putData.yqxkzh=yqxkzh
           }
-               updateJobticket(putData).then(response => {
               
-            });
            addJobticket(this.postponeParams).then(response => {
               this.msgSuccess(this.$t('延期成功，请查看新的续票'));
               this.open = false;

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

@@ -666,10 +666,23 @@ export default {
     //作业票统计
     tickedStatis(){
         let putData=this.$refs.multipleTable.selection
-
-        batchAddJobticket(putData).then(response => {
+        let arr=[]
+        putData.forEach(item => {
+          if(item.whgzxkzh!=null||item.dhzyxkzh!=null 
+          ||item.xzkjxkzh!=null||item.gczyxkzh!=null
+          ||item.mbzyxkzh!=null){
+         arr.push(item)
+       }
+       
+       })
+       if(arr.length==0){
+        return this.msgError("你选择的数据都不是已经关联的完成的预约票，请重新选择！")
+       }else{
+          batchAddJobticket(arr).then(response => {
        this.msgSuccess(this.$t(response.msg));
       });
+       }
+      
     },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
         checkCategoryPromotion(oneId){