src/views/base/companyInfo-detail.vue

@@ -27,10 +27,35 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属园区" prop="parentId">
+              <el-select
+                v-model="formModel.parentId"
+                filterable
+                placeholder="请选择"
+                style="width:280px"
+              >
+                <el-option
+                  v-for="company in companyResult"
+                  :key="company.id"
+                  :label="company.name"
+                  :value="company.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model="formModel.remark" :rows="2" style="width:80%;" placeholder="请输入备注"></el-input>
+              <el-input
+                type="textarea"
+                v-model="formModel.remark"
+                :rows="2"
+                style="width:80%;"
+                placeholder="请输入备注"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -98,7 +123,7 @@ import companyInfoApi from "@/api/base/companyInfo";
 import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "title", "companyResult"],
   data() {
     return {
       formModel: {},

src/views/base/companyInfo-list.vue

@@ -56,7 +56,7 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="sortNo" label="序号" width="80"></el-table-column>
-      <el-table-column prop="logo" label="公司logo" width="120">
+      <!-- <el-table-column prop="logo" label="公司logo" width="120">
         <template slot-scope="{row}">
           <a :href="row.logo" target="_blank">
             <el-avatar
@@ -66,7 +66,8 @@
             ></el-avatar>
           </a>
         </template>
-      </el-table-column>
+      </el-table-column>-->
+      <el-table-column prop="parentId" label="园区" width="230"></el-table-column>
       <el-table-column prop="name" label="公司名称" width="230"></el-table-column>
       <!-- <el-table-column prop="position1Name" label="一级位置" width="180"></el-table-column>
       <el-table-column prop="position2Name" label="二级位置" width="180"></el-table-column>
@@ -92,6 +93,7 @@
     <companyInfo-detail
       v-if="showModal"
       :businessKey="businessKey"
+      :companyResult="companyResult"
       :title="modalTitle"
       @close="onDetailModalClose"
     ></companyInfo-detail>
@@ -124,7 +126,8 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
-      tableHeight:""
+      tableHeight: "",
+      companyResult: ""
     };
   },
   created() {
@@ -255,7 +258,14 @@ export default {
     }
   },
   mounted: function() {
+    var self = this;
     this.changePage(1);
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
   },
   components: {
     "companyInfo-detail": companyInfoDetail

src/views/base/personInfo-list.vue

@@ -57,6 +57,19 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否上传照片" prop="companyId">
+          <el-select
+            v-model="queryModel.isUploadPhoto"
+            size="mini"
+            filterable
+            placeholder="请选择"
+            style="width:120px"
+          >
+            <el-option value label="全部"></el-option>
+            <el-option value="1" label="已上传"></el-option>
+            <el-option value="0" label="未上传"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否同步" prop="companyId">
           <el-select
             v-model="queryModel.faceBound"
@@ -65,6 +78,7 @@
             placeholder="请选择"
             style="width:120px"
           >
+            <el-option value label="全部"></el-option>
             <el-option value="1" label="已同步"></el-option>
             <el-option value="0" label="未同步"></el-option>
           </el-select>
@@ -384,7 +398,8 @@ export default {
         name: "",
         phone: "",
         idCard: "",
-        faceBound:""
+        faceBound: "",
+        isUploadPhoto:""
       },
       loading: false,
       tableData: [],
@@ -496,7 +511,7 @@ export default {
       formData.append("phone", self.queryModel.phone);
       formData.append("idCard", self.queryModel.idCard);
       formData.append("faceBound", self.queryModel.faceBound);
-      
+      formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
 
       if (this.field != null) {
         formData.append("field", this.field);