电子作业票 签字、审核人选择、申请修改 gengdidi

danger-manage-web/src/components/DangerousMark/NewWorkPermitDetail.vue

@@ -50,17 +50,18 @@
             </td>
           </tr>
           <tr>
-            <td rowspan="4" colspan="2">批准人填写</td>
-            <td rowspan="4" colspan="2">许可证</td>
+            <td rowspan="3" colspan="2">批准人填写</td>
+            <td rowspan="3" colspan="2">许可证</td>
             <td colspan="6" style="text-align: left">是否需要进一步的JSA: <input disabled type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" disabled v-model="licenceInfo.jsa.no"/>是  JSA[<input class="editInput" disabled v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
           </tr>
-          <tr>
+          <!--<tr>
             <td colspan="6" style="text-align: left"><input disabled type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
-          </tr>
+          </tr>-->
           <tr>
             <td colspan="6" style="text-align: left">
-              <div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
-              <div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <!--<div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
+              <input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]
             </td>
           </tr>
           <tr>
@@ -68,10 +69,10 @@
               <div><input type="checkbox" disabled v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" disabled v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
               <div><input type="checkbox" disabled v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" disabled v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
               <div><input type="checkbox" disabled v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" disabled v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
-              <div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <!--<div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
               <div><input type="checkbox" disabled v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" disabled v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
               <div><input type="checkbox" disabled v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" disabled v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
-              <div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
             </td>
           </tr>
           <tr>

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

@@ -229,7 +229,7 @@
         <td colspan="3" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
         <td colspan="3" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td colspan="1">签字:</td>
-        <td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
+        <td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="180"/></td>
         <td colspan="2" v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
                           v-model="item.signDate"
@@ -267,9 +267,9 @@
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in leaderUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -295,9 +295,9 @@
           <el-select v-model="workAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in workUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -323,9 +323,9 @@
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in auditUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -351,9 +351,9 @@
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in approvalUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -379,9 +379,9 @@
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in completeUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -403,7 +403,8 @@
 
 <script>
   import { listDept } from "@/api/system/dept";
-  import { listUser } from "@/api/system/user";
+  //import { listUser } from "@/api/system/user";
+  import { listStaff } from "@/api/safetyManagement/staff";
   import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
   import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
   import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
@@ -529,7 +530,7 @@
         },
         //部门切换
         switchDept(deptId,type){
-          listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
+          listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
             if(type == 1){
               this.leaderUserList = response.rows;
             }

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

@@ -277,9 +277,9 @@
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in leaderUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -305,9 +305,9 @@
           <el-select v-model="workAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in workUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -333,9 +333,9 @@
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in auditUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -361,9 +361,9 @@
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in approvalUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -389,9 +389,9 @@
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in completeUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -413,7 +413,8 @@
 
 <script>
   import { listDept } from "@/api/system/dept";
-  import { listUser } from "@/api/system/user";
+  //import { listUser } from "@/api/system/user";
+  import { listStaff } from "@/api/safetyManagement/staff";
   import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
   import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
   import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
@@ -536,7 +537,7 @@
       },
       //部门切换
       switchDept(deptId,type){
-        listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
+        listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
             if(type == 1){
                 this.leaderUserList = response.rows;
             }

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

@@ -373,9 +373,9 @@
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in leaderUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -401,9 +401,9 @@
           <el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in beyondUnitUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -429,9 +429,9 @@
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in auditDeptUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -457,9 +457,9 @@
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in approvalUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -485,9 +485,9 @@
           <el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in fireBeforeUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -513,9 +513,9 @@
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in completeUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -537,7 +537,8 @@
 
 <script>
   import { listDept } from "@/api/system/dept";
-  import { listUser } from "@/api/system/user";
+  //import { listUser } from "@/api/system/user";
+  import { listStaff } from "@/api/safetyManagement/staff";
   import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
   import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
   import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
@@ -731,7 +732,7 @@
       },
       //部门切换
       switchDept(deptId,type){
-        listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
+        listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
           if(type == 1){
             this.leaderUserList = response.rows;
           }

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

@@ -292,9 +292,9 @@
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in leaderUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -320,9 +320,9 @@
           <el-select v-model="workAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in workUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -348,9 +348,9 @@
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in auditUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -376,9 +376,9 @@
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in approvalUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -404,9 +404,9 @@
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
               v-for="item in completeUserList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -429,7 +429,8 @@
 
 <script>
   import { listDept } from "@/api/system/dept";
-  import { listUser } from "@/api/system/user";
+  //import { listUser } from "@/api/system/user";
+  import { listStaff } from "@/api/safetyManagement/staff";
   import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
   import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
   import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
@@ -557,7 +558,7 @@
       },
       //部门切换
       switchDept(deptId,type){
-        listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
+        listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
           if(type == 1){
             this.leaderUserList = response.rows;
           }

danger-manage-web/src/components/SaftyWork/NewEsign.vue

 <template>
   <div>
     <input class="editInput" placeholder="请签名" :disabled="isDisabled" v-if="resultImg == '' || resultImg == null" @click="signName"/>
-    <el-dialog title="签名" :visible.sync="signOpen" :close-on-click-modal="false" :z-index="2000">
+    <el-dialog title="签名" :visible.sync="signOpen" :close-on-click-modal="false" append-to-body :z-index="1800">
       <div style="border: 1px solid #cccccc">
         <vue-esign ref="esign" :width="width" :height="height" :isCrop="isCrop" :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" />
-        <div style="text-align: right">
-          <button @click="handleReset" style="margin-right: 2px">清空</button>
-          <button @click="handleGenerate">确定</button>
-        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleGenerate">确定</el-button>
+        <el-button @click="handleReset" style="margin-right: 2px">清空</el-button>
       </div>
     </el-dialog>
     <div>

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

@@ -206,17 +206,18 @@
           </td>
         </tr>
         <tr>
-          <td rowspan="4" colspan="2">批准人填写</td>
-          <td rowspan="4" colspan="2">许可证</td>
+          <td rowspan="3" colspan="2">批准人填写</td>
+          <td rowspan="3" colspan="2">许可证</td>
           <td colspan="6" style="text-align: left">是否需要进一步的JSA: <input type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" v-model="licenceInfo.jsa.no"/>是  JSA[<input class="editInput" v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
         </tr>
-        <tr>
+        <!--<tr>
           <td colspan="6" style="text-align: left"><input type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
-        </tr>
+        </tr>-->
         <tr>
           <td colspan="6" style="text-align: left">
-            <div><input type="checkbox" v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
-            <div><input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <!--<div><input type="checkbox" v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
+            <input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]
           </td>
         </tr>
         <tr>
@@ -224,10 +225,10 @@
             <div><input type="checkbox" v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
             <div><input type="checkbox" v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
             <div><input type="checkbox" v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
-            <div><input type="checkbox" v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
+           <!-- <div><input type="checkbox" v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
             <div><input type="checkbox" v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
             <div><input type="checkbox" v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
-            <div><input type="checkbox" v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
           </td>
         </tr>
         <tr>
@@ -269,9 +270,9 @@
           <el-select v-model="produceComfirm.monitorId" filterable placeholder="请选择生产组当班班长">
             <el-option
               v-for="item in userList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -284,7 +285,7 @@
     </el-dialog>
 
     <!-- 作业单申请 -->
-    <el-dialog title="作业单申请" :visible.sync="certificateApprovalApplyOpen" append-to-body :close-on-click-modal="false" @close="cancelCertificateApply">
+    <el-dialog title="作业单申请" :visible.sync="certificateApprovalApplyOpen" append-to-body :close-on-click-modal="false" @close="cancelCertificateApply" :z-index="2000">
       <div class="tags_box">
         <div v-for="item in tags" class="tags">
           <div :class="{isActive:item.name==active}" @click="handelToogel(item.name,'1')">{{item.name}}</div>
@@ -322,7 +323,7 @@
     </el-dialog>
 
     <!-- 作业单审核 -->
-    <el-dialog title="作业单审核" :visible.sync="certificateApprovalOpen" append-to-body :close-on-click-modal="false">
+    <el-dialog title="作业单审核" :visible.sync="certificateApprovalOpen" append-to-body :close-on-click-modal="false" :z-index="1000">
       <div class="tags_box">
         <div v-for="item in specialWorkPermits" class="tags">
           <div :class="{isActive:item.specialWorkType==approvalActive}" @click="handelToogel(item.specialWorkType,'2')">{{ getTagName(item.specialWorkType) }}</div>
@@ -477,6 +478,7 @@
   import { listPermit, selectTWorkPermitListByLoginUser, getPermit, delPermit, addPermit, updatePermit, exportPermit } from "@/api/workPermit/permit";
   import { getSpecialWorkPermitByWorkPermitId,addBatchSpecialPermit } from "@/api/workPermit/specialPermit";
   import { listUser,getAllUserName } from "@/api/system/user";
+  import { listStaff } from "@/api/safetyManagement/staff";
   import { listAll } from "@/api/contractor/contractorInfo";
   import FlareUp from "@/components/NewSaftyWork/FlareUp";
   import BlindPlate from "@/components/NewSaftyWork/BlindPlate";
@@ -1011,7 +1013,7 @@
       //部门切换
       switchDept(){
         this.produceComfirm.monitorId = "";
-        listUser({ pageNum: 1,pageSize: 99999,deptId:this.produceComfirm.leaderDeptId}).then(response => {
+        listStaff({ pageNum: 1,pageSize: 99999,deptId:this.produceComfirm.leaderDeptId}).then(response => {
             this.userList = response.rows;
         });
       },

danger-manage-web/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: process.env.VUE_APP_TARGET,
-         target: `http://192.168.31.87:8908/dangerManage`,
+        target: process.env.VUE_APP_TARGET,
+        //target: `http://192.168.31.87:8908/dangerManage`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''