所属企业 改为string

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupMajorHazard.java

@@ -48,16 +48,16 @@ public class TSupMajorHazard extends BaseEntity
     @Excel(name = "分级情况")
     private String fLevel;
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 创建时间 */
     private Date fCreateTime;

zh-baseversion-system/src/main/java/com/zehong/system/domain/TVehicleInfo.java

@@ -54,7 +54,7 @@ public class TVehicleInfo extends BaseEntity
 
     /** 所属企业 */
     @Excel(name = "所属企业")
-    private int beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 责任人 */
     @Excel(name = "责任人")
@@ -265,11 +265,11 @@ public class TVehicleInfo extends BaseEntity
         return vehicleInspect;
     }
 
-    public int getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(int beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-web/src/views/majorpollsourcelevel/record/index.vue

@@ -94,7 +94,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -106,7 +106,7 @@
     <!-- 添加或修改重大危险源监管对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        
+
         <el-row>
           <el-col :span="11">
             <el-form-item label="名称" prop="fName">
@@ -161,7 +161,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="所属单位" prop="beyondEnterpriseId">
-          <el-select v-model="form.beyondEnterpriseId" placeholder="请选择所属单位名称" style="width: 100%" @change="selectworkAssignEnterprose($event)">
+          <el-select v-model="form.beyondEnterpriseId" placeholder="请选择所属单位名称" style="width: 100%" >
             <el-option
               v-for="item in enterprises"
               :key="item.enterpriseId"
@@ -183,7 +183,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    
+
     <GetPos
       :dialogVisible.sync="dialogTableVisibles"
       device=""
@@ -252,7 +252,7 @@ export default {
             { required: true, message: "请输入责任人", trigger: "blur" },
           ],
       },
-      
+
       /**--------------地图使用数据---------------*/
       dialogTableVisibles: false,
       devicePos: []
@@ -270,16 +270,16 @@ export default {
     // fLevelFormat(row, column) {
     //   return this.selectDictLabel(this.fLevelOptions, row.fLevel);
     // },
-    fLevelFormat(row){ 
+    fLevelFormat(row){
       let obj=this.fLevelOptions.find(item=>{
         return item.dictValue==row.fLevel;
       })
 
       if(obj!=undefined || obj!=null){
         return obj.dictLabel;
-      } 
+      }
     },
-    beyondEnterpriseFormat(row){ 
+    beyondEnterpriseFormat(row){
       let info = this.enterprises.find(item => item.enterpriseId == row.beyondEnterpriseId);
       return info?info.enterpriseName:"-";
     },
@@ -420,15 +420,15 @@ export default {
       this.form.longitude = res[0];
       this.form.latitude = res[1];
     },
-      getInspectionUserList(enterpriseId){
-        getInspectionUsers(enterpriseId,"se").then(response =>{
-          this.inspectors = response.data;
-      })
-      },
-
-      selectworkAssignEnterprose(enterpriseId){
-        this.getInspectionUserList(enterpriseId);
-      },
+      // getInspectionUserList(enterpriseId){
+      //   getInspectionUsers(enterpriseId,"se").then(response =>{
+      //     this.inspectors = response.data;
+      // })
+      // },
+      //
+      // selectworkAssignEnterprose(enterpriseId){
+      //   this.getInspectionUserList(enterpriseId);
+      // },
       //所属单位
       getEnterpriseLists(){
         const param = {};