高空动土作业证添加 gengdidi

danger-manage-web/src/components/NewSaftyWork/BlindPlate.vue

 <template>
   <div>
-    <table>
+    <table id="blindPlatePrint">
       <tr>
         <td colspan="2">申请单位</td>
         <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="blindPlate.applyUnit" class="editInput"/></td>
@@ -253,7 +253,7 @@
           <div style="font-size: 18px;margin-top: 5px">作业负责人：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId)">
+          <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId,1)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -266,7 +266,7 @@
         <el-col :span="12">
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in leaderUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -281,7 +281,7 @@
           <div style="font-size: 18px;margin-top: 5px">作业单位：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="workDeptId" filterable placeholder="请选择作业单位" @change="switchDept(workDeptId)">
+          <el-select v-model="workDeptId" filterable placeholder="请选择作业单位" @change="switchDept(workDeptId,2)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -294,7 +294,7 @@
         <el-col :span="12">
           <el-select v-model="workAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in workUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -309,7 +309,7 @@
           <div style="font-size: 18px;margin-top: 5px">审核部门意见：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId)">
+          <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId,3)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -322,7 +322,7 @@
         <el-col :span="12">
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in auditUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -337,7 +337,7 @@
           <div style="font-size: 18px;margin-top: 5px">审批部门：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="approvalDeptId" filterable placeholder="请选择审批部门" @change="switchDept(approvalDeptId)">
+          <el-select v-model="approvalDeptId" filterable placeholder="请选择审批部门" @change="switchDept(approvalDeptId,4)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -350,7 +350,7 @@
         <el-col :span="12">
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in approvalUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -365,7 +365,7 @@
           <div style="font-size: 18px;margin-top: 5px">完工验收 ：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId)">
+          <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId,5)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -378,7 +378,7 @@
         <el-col :span="12">
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in completeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -395,7 +395,7 @@
       <el-button @click="cancelApproval">取消</el-button>
     </div>
 
-    <div style="margin-top:10px;float: right" v-if="(applyStatus-0) > '1'"><el-button type="primary" v-print="'#flareUpPrint'">打印</el-button></div>
+    <div style="margin-top:10px;float: right" v-if="(applyStatus-0) > '1'"><el-button type="primary" v-print="'#blindPlatePrint'">打印</el-button></div>
 
   </div>
 
@@ -495,7 +495,11 @@
             recipient: "",//接收人
           },
           deptList:[],
-          userList:[],
+          leaderUserList:[],
+          workUserList:[],
+          auditUserList:[],
+          approvalUserList:[],
+          completeUserList:[],
           leaderDeptId:"",
           workDeptId:"",
           auditDeptDeptId:"",
@@ -524,9 +528,23 @@
         });
         },
         //部门切换
-        switchDept(deptId){
+        switchDept(deptId,type){
           listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
-            this.userList = response.rows;
+            if(type == 1){
+              this.leaderUserList = response.rows;
+            }
+            if(type == 2){
+              this.workUserList = response.rows;
+            }
+            if(type == 3){
+              this.auditUserList = response.rows;
+            }
+            if(type == 4){
+              this.approvalUserList = response.rows;
+            }
+            if(type == 5){
+              this.completeUserList = response.rows;
+            }
         });
         },
         //新增特殊作业单
@@ -644,7 +662,6 @@
         signName(imageSrc){
           this.sign = imageSrc;
           this.signOpen = true;
-
         },
       }
     }

danger-manage-web/src/components/NewSaftyWork/FlareUp.vue

@@ -181,7 +181,7 @@
       </tr>
       <tr>
         <td colspan="4">动火作业实施时间</td>
-        <td colspan="16" v-if="(applyStatus-0) ==1">
+        <td colspan="16" v-if="(applyStatus-0) == 0">
         <el-row>
           <el-col :span="11">
             <el-date-picker clearable size="small"
@@ -206,8 +206,8 @@
           </el-col>
         </el-row>
       </td>
-        <td colspan="16" v-if="(applyStatus-0) !=1">
-          自{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}年{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分至{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}年{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分
+        <td colspan="16" v-if="(applyStatus-0) > 0">
+          自{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[0]}}年{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分至{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[0]}}年{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分
         </td>
       </tr>
       <tr>
@@ -359,7 +359,7 @@
           <div style="font-size: 18px;margin-top: 5px">作业负责人：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId)">
+          <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId,1)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -372,7 +372,7 @@
         <el-col :span="12">
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in leaderUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -387,7 +387,7 @@
           <div style="font-size: 18px;margin-top: 5px">所在单位：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="beyondUnitDeptId" filterable placeholder="请选择所在单位" @change="switchDept(beyondUnitDeptId)">
+          <el-select v-model="beyondUnitDeptId" filterable placeholder="请选择所在单位" @change="switchDept(beyondUnitDeptId,2)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -400,7 +400,7 @@
         <el-col :span="12">
           <el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in beyondUnitUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -415,7 +415,7 @@
           <div style="font-size: 18px;margin-top: 5px">审核部门：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId)">
+          <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId,3)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -428,7 +428,7 @@
         <el-col :span="12">
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in auditDeptUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -443,7 +443,7 @@
           <div style="font-size: 18px;margin-top: 5px">动火审部门：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="approvalDeptId" filterable placeholder="请选择动火审批人" @change="switchDept(approvalDeptId)">
+          <el-select v-model="approvalDeptId" filterable placeholder="请选择动火审批人" @change="switchDept(approvalDeptId,4)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -456,7 +456,7 @@
         <el-col :span="12">
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in approvalUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -471,7 +471,7 @@
           <div style="font-size: 18px;margin-top: 5px">动火前，岗位当班班长验票情况：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="fireBeforeDeptId" filterable placeholder="请选择岗位当班班长部门" @change="switchDept(fireBeforeDeptId)">
+          <el-select v-model="fireBeforeDeptId" filterable placeholder="请选择岗位当班班长部门" @change="switchDept(fireBeforeDeptId,5)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -484,7 +484,7 @@
         <el-col :span="12">
           <el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in fireBeforeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -499,7 +499,7 @@
           <div style="font-size: 18px;margin-top: 5px">完工验收 ：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId)">
+          <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId,6)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -512,7 +512,7 @@
         <el-col :span="12">
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in completeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -694,7 +694,12 @@
           guardian:""
         },
         deptList:[],
-        userList:[],
+        leaderUserList:[],
+        beyondUnitUserList:[],
+        auditDeptUserList:[],
+        approvalUserList:[],
+        fireBeforeUserList:[],
+        completeUserList:[],
         leaderDeptId:"",
         beyondUnitDeptId:"",
         auditDeptDeptId:"",
@@ -725,9 +730,26 @@
         });
       },
       //部门切换
-      switchDept(deptId){
+      switchDept(deptId,type){
         listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
-          this.userList = response.rows;
+          if(type == 1){
+            this.leaderUserList = response.rows;
+          }
+          if(type == 2){
+            this.beyondUnitUserList = response.rows;
+          }
+          if(type == 3){
+            this.auditDeptUserList = response.rows;
+          }
+          if(type == 4){
+            this.approvalUserList = response.rows;
+          }
+          if(type == 5){
+            this.fireBeforeUserList = response.rows;
+          }
+          if(type == 6){
+            this.completeUserList = response.rows;
+          }
         });
       },
       //新增特殊作业单

danger-manage-web/src/views/newWorkPermit/index.vue

@@ -302,6 +302,16 @@
                    :workPermitId = "item.workPermitId"
                    :licenceNum = "item.licenceNum"
                    applyStatus = "0"/>
+          <HeightWork v-if="item.mark == 'heightWork'"
+                   :ref="item.mark"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus = "0"/>
+          <BreakGround v-if="item.mark == 'breakGround'"
+                   :ref="item.mark"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus = "0"/>
 
         </div>
       </div>
@@ -330,6 +340,17 @@
                       :workPermitId = "item.workPermitId"
                       :licenceNum = "item.licenceNum"
                       applyStatus="1"/>
+
+          <HeightWork v-if="item.specialWorkType == 'heightWork'"
+                   :ref="item.specialWorkType"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus="1"/>
+          <BreakGround v-if="item.specialWorkType == 'breakGround'"
+                      :ref="item.specialWorkType"
+                      :workPermitId = "item.workPermitId"
+                      :licenceNum = "item.licenceNum"
+                      applyStatus="1"/>
         </div>
       </div>
     </el-dialog>
@@ -459,6 +480,8 @@
   import { listAll } from "@/api/contractor/contractorInfo";
   import FlareUp from "@/components/NewSaftyWork/FlareUp";
   import BlindPlate from "@/components/NewSaftyWork/BlindPlate";
+  import HeightWork from "@/components/NewSaftyWork/HeightWork";
+  import BreakGround from "@/components/NewSaftyWork/BreakGround";
   import { listSign } from "@/api/workPermit/workPermitSign";
   import { listDept } from "@/api/system/dept";
   import NewEsign from "@/components/SaftyWork/NewEsign";
@@ -469,6 +492,8 @@
     components:{
       FlareUp,
       BlindPlate,
+      HeightWork,
+      BreakGround,
       NewEsign,
       Editor,
       NewWorkPermitDetail