Explorar o código

增加是否允许注册审核查询

zhengqiang %!s(int64=4) %!d(string=hai) anos
pai
achega
287818ba63

+ 47 - 6
src/views/base/personInfo-list.vue

@@ -112,11 +112,10 @@
           <el-select
             v-model="queryModel.isUploadPhoto"
             size="mini"
-            filterable
+            clearable
             placeholder="请选择"
-            style="width: 120px"
+            style="width: 100px"
           >
-            <el-option value label="全部"></el-option>
             <el-option value="1" label="已上传"></el-option>
             <el-option value="0" label="未上传"></el-option>
           </el-select>
@@ -125,15 +124,39 @@
           <el-select
             v-model="queryModel.faceBound"
             size="mini"
-            filterable
+            clearable
             placeholder="请选择"
-            style="width: 120px"
+            style="width: 100px"
           >
             <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="enableAttendance">
+          <el-select
+            v-model="queryModel.enableAttendance"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 100px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否允许审核注册用户" prop="enableRegisterExamine">
+          <el-select
+            v-model="queryModel.enableRegisterExamine"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 100px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
@@ -764,7 +787,9 @@ export default {
         position5: "",
         derviceName: "",
         parkId: "",
-        roleId:""
+        roleId:"",
+        enableAttendance: null,
+        enableRegisterExamine: null
       },
       loading: false,
       tableData: [],
@@ -976,6 +1001,14 @@ export default {
       formData.append("faceBound", self.queryModel.faceBound);
       formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
 
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
       formData.append("position1", self.queryModel.position1);
       formData.append("position2", self.queryModel.position2);
       formData.append("position3", self.queryModel.position3);
@@ -1213,6 +1246,14 @@ export default {
       formData.append("faceBound", self.queryModel.faceBound);
       formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
 
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
       formData.append("position1", self.queryModel.position1);
       formData.append("position2", self.queryModel.position2);
       formData.append("position3", self.queryModel.position3);

+ 2 - 2
src/views/base/personPopedom-detail.vue

@@ -29,7 +29,7 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="机构" prop="companyStructureId">
+        <!-- <el-form-item label="机构" prop="companyStructureId">
           <el-select-tree
             :props="companyStructureProps"
             :options="companyStructureResult"
@@ -37,7 +37,7 @@
             height="200"
             size=""
           ></el-select-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="关联场景" prop="sceneId">
           <el-select
             v-model="formModel.sceneId"

+ 20 - 6
src/views/base/personPopedom-list.vue

@@ -42,18 +42,18 @@
       >
         <el-table-column
           prop="companyName"
-          label="公司"
+          label="单位"
           width="200"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="companyStructureName"
           label="机构"
           width="120"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="roleName"
           label="身份"
-          width="120"
+          width="100"
         ></el-table-column>
         <!-- <el-table-column
           prop="serviceCompanyName"
@@ -68,13 +68,27 @@
         <el-table-column
           prop="popularizePersonName"
           label="推广者"
-          width="120"
+          width="100"
         ></el-table-column>
         <el-table-column
           prop="remark"
           label="备注信息"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="enableRegisterExamine"
+          label="是否允许审核注册用户"
           width="120"
-        ></el-table-column>        
+        >
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.enableRegisterExamine"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="handleUpdate(row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="enableAttendance"
           label="是否要求考勤"