园区等修改

src/api/base/companyInfo.js

@@ -1,8 +1,14 @@
 import request from '@/utils/request'
 import constant from '@/constant'
 
-function list() {
-  return request.post(constant.serverUrl + "/base/companyInfo/list");
+function list(obj) {
+  var formData = new FormData();
+
+  for(var key in obj){
+    formData.append(key,obj[key]);
+  }
+  
+  return request.post(constant.serverUrl + "/base/companyInfo/list",formData);
 }
 
 function pageList(formData) {

src/views/base/personInfo-detail.vue

@@ -9,28 +9,20 @@
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="false"
-    style="text-align:left;"
+    style="text-align: left"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
-      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="单位" prop="companyId">
-              <!-- <el-select
-                v-model="formModel.companyId"
-                filterable
-                placeholder="请选择"
-                style="width:90%"
-              >
-                <el-option
-                  v-for="company in companyResult"
-                  :key="company.id"
-                  :label="company.name"
-                  :value="company.id"
-                ></el-option>
-              </el-select>-->
               <el-select-tree
                 :props="props"
                 :options="companyResult"
@@ -42,19 +34,41 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model="formModel.name" placeholder="请输入姓名"></el-input>
+              <el-input
+                v-model="formModel.name"
+                placeholder="请输入姓名"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="园区" prop="parkId">
+              <el-select-tree
+                :props="props"
+                :options="parkList"
+                :value="formModel.parkId"
+                @getValue="getSelectedParkValue($event)"
+                height="200"
+              ></el-select-tree>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号" prop="phone">
-              <el-input v-model="formModel.phone" placeholder="请输入手机号"></el-input>
+              <el-input
+                v-model="formModel.phone"
+                placeholder="请输入手机号"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="身份证" prop="idCard">
-              <el-input v-model="formModel.idCard" placeholder="请输入身份证"></el-input>
+              <el-input
+                v-model="formModel.idCard"
+                placeholder="请输入身份证"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -66,7 +80,7 @@
                 filterable
                 multiple
                 placeholder="请选择"
-                style="width:100%"
+                style="width: 100%"
               >
                 <el-option
                   v-for="popedom in popedomList"
@@ -86,7 +100,7 @@
                 filterable
                 multiple
                 placeholder="请选择"
-                style="width:100%"
+                style="width: 100%"
               >
                 <el-option
                   v-for="company in companyResult"
@@ -120,10 +134,14 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="开放权限">
-              <el-checkbox v-model="formModel.faceEnabled">人脸识别</el-checkbox>
+              <el-checkbox v-model="formModel.faceEnabled"
+                >人脸识别</el-checkbox
+              >
               <el-checkbox v-model="formModel.cardEnabled">门禁卡</el-checkbox>
               <el-checkbox v-model="formModel.appEnabled">手机开锁</el-checkbox>
-              <el-checkbox v-model="formModel.guestEnabled">访客权限</el-checkbox>
+              <el-checkbox v-model="formModel.guestEnabled"
+                >访客权限</el-checkbox
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,31 +178,46 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="companyPosition1" prop="position1">
-              <el-input v-model="formModel.position1" placeholder="请输入一级位置"></el-input>
+              <el-input
+                v-model="formModel.position1"
+                placeholder="请输入一级位置"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="companyPosition2" prop="position2">
-              <el-input v-model="formModel.position2" placeholder="请输入二级位置"></el-input>
+              <el-input
+                v-model="formModel.position2"
+                placeholder="请输入二级位置"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="companyPosition3" prop="position3">
-              <el-input v-model="formModel.position3" placeholder="请输入三级位置"></el-input>
+              <el-input
+                v-model="formModel.position3"
+                placeholder="请输入三级位置"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="companyPosition4" prop="position4">
-              <el-input v-model="formModel.position4" placeholder="请输入四级位置"></el-input>
+              <el-input
+                v-model="formModel.position4"
+                placeholder="请输入四级位置"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="companyPosition5" prop="position5">
-              <el-input v-model="formModel.position5" placeholder="请输入五级位置"></el-input>
+              <el-input
+                v-model="formModel.position5"
+                placeholder="请输入五级位置"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -192,7 +225,9 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
     </span>
   </el-dialog>
 </template>
@@ -215,7 +250,7 @@ export default {
     "companyPosition2",
     "companyPosition3",
     "companyPosition4",
-    "companyPosition5"
+    "companyPosition5",
   ],
   data() {
     let checkIdCard = (rule, value, callback) => {
@@ -243,8 +278,8 @@ export default {
         //   }
         // ]
         popedom: [
-          { required: true, message: "请选择用户身份", trigger: "blur" }
-        ]
+          { required: true, message: "请选择用户身份", trigger: "blur" },
+        ],
       },
       showDialog: true,
       loading: false,
@@ -253,11 +288,11 @@ export default {
       //上传地址
       uploadUrl: Constant.serverUrl + "/uploadPicture",
       uploadData: {
-        subFolder: "personInfo"
+        subFolder: "personInfo",
       },
       fileUrl: "",
       headers: {
-        Authorization: getToken()
+        Authorization: getToken(),
       },
       popedomList: [],
       treeData: [],
@@ -265,20 +300,31 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
-      }
+        children: "children",
+      },
+      parkList:[]
     };
   },
   created() {
+    var self = this;
+
+    companyInfoApi.list({type:"3"}).then(response => {
+      var jsonData = response.data;
+      this.parkList = jsonData.data;
+    });
+
     this.loadTree();
   },
   methods: {
     getSelectedValue(value) {
       this.formModel.companyId = value;
     },
+    getSelectedParkValue(value){
+      this.formModel.parkId = value;
+    },
     loadTree() {
       var formData = new FormData();
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -292,7 +338,7 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -308,9 +354,9 @@ export default {
     handleSubmit() {
       var self = this;
 
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          (function() {
+          (function () {
             var id = self.formModel.id;
             //数组转换为字符串
             //用户身份
@@ -344,20 +390,20 @@ export default {
             } else {
               return personInfoApi.update(self.formModel);
             }
-          })().then(function(response) {
+          })().then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
               self.$message({
                 message: "保存成功!",
-                type: "success"
+                type: "success",
               });
 
               self.$emit("close", true);
             } else {
               self.$message({
                 message: jsonData.message + "",
-                type: "warning"
+                type: "warning",
               });
 
               self.$emit("close", false);
@@ -383,18 +429,18 @@ export default {
         this.$message.error("上传头像图片大小不能超过 2MB!");
       }
       return isJPG && isLt2M;
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
-    (function() {
+    (function () {
       if (self.businessKey.length == 0) {
         return personInfoApi.create();
       } else {
         return personInfoApi.edit(self.businessKey);
       }
     })()
-      .then(response => {
+      .then((response) => {
         var jsonData = response.data;
         self.loading = false;
 
@@ -431,7 +477,7 @@ export default {
           } else {
             formData.append("catalogName", "用户身份");
           }
-          dataDictionaryApi.findByCatalogName(formData).then(response => {
+          dataDictionaryApi.findByCatalogName(formData).then((response) => {
             var jsonData = response.data;
             this.popedomList = jsonData.data;
           });
@@ -439,12 +485,12 @@ export default {
           self.$message.error(jsonData.message + "");
         }
       })
-      .catch(error => {
+      .catch((error) => {
         self.$message.error(error + "");
       });
   },
   components: {
-    "el-select-tree": SelectTree
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>

src/views/base/personInfo-list.vue

@@ -217,6 +217,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="companyName" label="单位" width="250"></el-table-column>
+      <el-table-column prop="parkName" label="园区" width="250"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="180"></el-table-column>
       <el-table-column prop="idCard" label="身份证" width="100" show-overflow-tooltip></el-table-column>
       <el-table-column prop="deviceName" label="绑定设备" width="150" show-overflow-tooltip></el-table-column>