1、修改表单

src/api/estate/applyuser.js

@@ -48,7 +48,7 @@ export const update = (row) => {
   })
 }
 
-export const updateByCheckStatus = (row) => {
+export const updateByAuditStatus = (row) => {
   return request({
     url: '/api/cyzh-estate/applyuser/update',
     method: 'post',

src/components/agency/form/residential.vue

@@ -118,7 +118,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               width: 150,
               overHidden: true,
@@ -137,7 +137,7 @@
               },
               rules: [{
                 required: true,
-                message: "请输入所属园区名称",
+                message: "请输入所属社区名称",
                 trigger: "blur"
               }]
 

src/components/houseuser/houseuser-check.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import {updateByCheckStatus, getDetail} from "@/api/estate/applyuser";
+import {updateByAuditStatus, getDetail} from "@/api/estate/applyuser";
 import {validatePhone} from "../../util/validator";
 import done from "@/views/work/done";
 export default {
@@ -229,7 +229,7 @@ export default {
           },
           {
             label: "联系电话",
-            prop: "tel",
+            prop: "phone",
             editDisplay: false,
             addDisplay: false,
             disabled: true,
@@ -243,7 +243,7 @@ export default {
           },
           {
             label: "审核状态",
-            prop: "checkState",
+            prop: "auditStatus",
             type: 'select',
             disabled: !this.reviewType,
             dicData:[
@@ -294,7 +294,7 @@ export default {
           },
           {
             label: "人脸图片",
-            prop: "imageUri",
+            prop: "faceUrl",
             hide: true,
             disabled: true,
             type: 'upload',
@@ -338,8 +338,8 @@ export default {
         })
         return;
       }
-      this.reviewDetail.checkState = examine;
-      updateByCheckStatus(this.reviewDetail).then(()=>{
+      this.reviewDetail.auditStatus = examine;
+      updateByAuditStatus(this.reviewDetail).then(()=>{
         this.$message({
           type: "success",
           message: "操作成功!"

src/components/map/comps/door-device-form.vue

@@ -69,7 +69,7 @@
             label: '所属信息',
             prop: 'group2',
             column: [{
-                label: "所属园区",
+                label: "所属社区",
                 prop: "agencyId",
                 type: "select",
                 search: true,

src/components/person-tags/adolescent-form.vue

@@ -79,7 +79,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               search: true,
               cascaderItem: ['residentialId'],
@@ -95,7 +95,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }]
             },

src/components/person-tags/allowancespeople-form.vue

@@ -79,7 +79,7 @@
                   }]
                 },
                 {
-                  label: "所属园区",
+                  label: "所属社区",
                   prop: "agencyId",
                   search: true,
                   cascaderItem: ['residentialId'],
@@ -95,7 +95,7 @@
                   },
                   rules: [{
                     required: true,
-                    message: "请选择所属园区",
+                    message: "请选择所属社区",
                     trigger: "blur"
                   }]
                 },

src/components/person-tags/basicinfo-add.vue

@@ -77,7 +77,7 @@
                 }]
               },
               {
-                label: "所属园区",
+                label: "所属社区",
                 prop: "agencyId",
                 search: true,
                 cascaderItem: ['residentialId'],
@@ -93,7 +93,7 @@
                 },
                 rules: [{
                   required: true,
-                  message: "请选择所属园区",
+                  message: "请选择所属社区",
                   trigger: "blur"
                 }]
               },

src/components/person-tags/disabler-form.vue

@@ -79,7 +79,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               search: true,
               cascaderItem: ['residentialId'],
@@ -95,7 +95,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }]
             },

src/components/person-tags/elderlyPeople-form.vue

@@ -79,7 +79,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               search: true,
               cascaderItem: ['residentialId'],
@@ -95,7 +95,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }]
             },

src/views/accesscontrolmng/comps/door-device.vue

@@ -101,6 +101,7 @@ export default {
           {
             label: "设备名称",
             prop: "name",
+            width: 150,
             overHidden: true,
             rules: [{
               required: true,
@@ -115,7 +116,7 @@ export default {
             width:150,
             rules: [{
               required: true,
-              message: "请输入Mac编码",
+              message: "请输入设备序列号",
               trigger: "blur"
             }]
           },
@@ -149,7 +150,6 @@ export default {
             prop: "isOut",
             type: "select",
             width: 80,
-            hide: true,
             align: "center",
             dicData:[
               {
@@ -168,13 +168,13 @@ export default {
             }]
           },
           {
-            label: "所属园区",
+            label: "所属社区",
             prop: "agencyName",
             addDisplay: false,
             editDisplay: false
           },
           {
-            label: "所属区域",
+            label: "所属小区",
             prop: "residentialName",
             addDisplay: false,
             editDisplay: false,
@@ -209,7 +209,7 @@ export default {
             hide: true,
           },
           {
-            label: "所属园区",
+            label: "所属社区",
             prop: "agencyId",
             type: "select",
             search: true,
@@ -229,12 +229,12 @@ export default {
             },
             rules: [{
               required: true,
-              message: "请选择所属区域",
+              message: "请选择所属社区",
               trigger: "change"
             }],
           },
           {
-            label: "所属区域",
+            label: "所属小区",
             prop: "residentialId",
             type: "select",
             search: true,
@@ -253,7 +253,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "请选择所属区域",
+              message: "请选择所属小区",
               trigger: "change"
             }],
           },

src/views/accesscontrolmng/device.vue

@@ -16,7 +16,7 @@
 </template>
 <script>
   import divide from "../../components/map/divide";
-  import doorDevice from "../device/doordevice";
+  import doorDevice from "./comps/door-device.vue";
   import videoManage from "../videoapply/comp/videomanage";
 
   export default {

src/views/businessmng/agencymng/agency.vue

@@ -2,8 +2,8 @@
   <basic-container>
 
     <!--卡片数据展示-->
-    <el-card style="margin-bottom: 20px">
-      <el-tabs type="border-card">
+<!--    <el-card style="margin-bottom: 20px">-->
+      <el-tabs type="border-card" style="margin-bottom: 20px">
         <el-tab-pane label="社区数据统计" v-if="tenantType == 0">
           <div>
             <avue-data-box :option="communityStatistics"></avue-data-box>
@@ -15,7 +15,7 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-    </el-card>
+<!--    </el-card>-->
 
     <avue-crud :option="option" :table-loading="loading" :data="data" :page="page" :permission="permissionList"
       :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
@@ -280,7 +280,7 @@
             },
             {
               label: "详细地址",
-              search: true,
+              search: false,
               prop: "address",
               type: "textarea",
               maxRows: 2,
@@ -562,14 +562,14 @@
           if(this.tenantType == 0){
             this.communityCount = res.data.data;
             this.communityStatistics.data[0].count = this.communityCount.agencyCount;
-            this.communityStatistics.data[1].count = this.communityCount.buildingCount;
-            this.communityStatistics.data[2].count = this.communityCount.enterpriseCount;
+            this.communityStatistics.data[1].count = this.communityCount.residentialCount;
+            this.communityStatistics.data[2].count = this.communityCount.buildingCount;
             this.communityStatistics.data[3].count = this.communityCount.houseUserCount;
           }else{
             this.parkCount = res.data.data;
             this.parkStatistics.data[0].count = this.parkCount.agencyCount;
             this.parkStatistics.data[1].count = this.parkCount.residentialCount;
-            this.parkStatistics.data[2].count = this.parkCount.buildingCount;
+            this.parkStatistics.data[2].count = this.parkCount.enterpriseCount
             this.parkStatistics.data[3].count = this.parkCount.staffCount;
           }
         });

src/views/businessmng/estatemng/feedback.vue

@@ -61,6 +61,7 @@
           index: true,
           viewBtn: true,
           selection: true,
+          addBtn: true,
           dialogClickModal: false,
           column: [
             {
@@ -73,8 +74,33 @@
               prop: "phone",
             },
             {
-              label: "所属园区",
-              prop: "agencyName",
+              label: "所属小区",
+              prop: "residentialId",
+              type: "select",
+              dicUrl: "/api/cyzh-community/residential/select?size=20&&name={{key}}",
+              remote: true,
+              filterable: true,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              hide:true,
+              viewDisplay: false,
+              editDisplay: true,
+              addDisplay: true
+            },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              viewDisplay: false,
+              editDisplay: false,
+              addDisplay: false
+            },
+            {
+              label: "反馈时间",
+              prop: "createTime",
+              type: 'datetime',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
             },
             {
               label: "反馈内容",
@@ -82,7 +108,7 @@
               type: "textarea"
             },
             {
-              label: "图片",
+              label: "反馈图片",
               prop: "images",
               type: "upload",
               dataType: 'string',
@@ -92,6 +118,74 @@
                 url: "link"
               },
             },
+            {
+              label: "处理状态",
+              prop: "isHandle",
+              type: "select",
+              align:"center",
+              editDisplay: false,
+              addDisplay: false,
+              viewDisplay: false,
+              dicData: [
+                {
+                  label: "未处理",
+                  value: 0
+                },
+                {
+                  label: "已处理",
+                  value: 1
+                },
+                {
+                  label: "已关闭",
+                  value: 2
+                }
+              ]
+            },
+          ],
+          group:[
+            {
+              icon:'el-icon-info',
+              label: '投诉处理',
+              prop: 'group',
+              column:[
+                {
+                  label: "处理状态",
+                  prop: "isHandle",
+                  type: "select",
+                  align:"center",
+                  dicData: [
+                    {
+                      label: "未处理",
+                      value: 0
+                    },
+                    {
+                      label: "已处理",
+                      value: 1
+                    },
+                    {
+                      label: "已关闭",
+                      value: 2
+                    }
+                  ]
+                },
+                {
+                  label: "处理时间",
+                  prop: "handleDate",
+                  type: 'date',
+                  valueFormat: 'yyyy-MM-dd HH:mm:ss',
+                  rules: [{
+                    required: false,
+                    message: "处理时间	",
+                    trigger: "blur"
+                  }],
+                },
+                {
+                  label: "处理意见",
+                  prop: "handleOpinion",
+                  type: "textarea"
+                }
+              ]
+            }
           ]
         },
         data: []

src/views/businessmng/estatemng/parkrepair.vue

@@ -178,7 +178,6 @@
               label: "受理状态",
               prop: "acceptStatus",
               type: "select",
-              disabled: true,
               addDisplay: false,
               width: 100,
               dicData:[
@@ -205,6 +204,7 @@
               searchSpan: 4,
               width: 100,
               slot: true,
+              datatype: "number",
               dicData:[
                 {
                   label: "未处理",
@@ -225,8 +225,8 @@
               ],
             },
             {
-              label: "所属园区",
-              prop: "agencyName",
+              label: "所属小区",
+              prop: "residentialName",
               addDisplay: false,
               editDisplay: false,
             },
@@ -241,7 +241,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               search: true,
               type: "select",
@@ -258,7 +258,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }]
             },

src/views/businessmng/workordermng/repairworkorder.vue

@@ -135,6 +135,8 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+              dataType: "number",
+              align: "center",
               rules: [{
                 required: true,
                 message: "请输入处理状态",
@@ -164,6 +166,7 @@
               prop: "eventDesc",
               type: "textarea",
               row: true,
+              overHidden: true,
               rules: [{
                 required: true,
                 message: "请输入事件描述",

src/views/dashboard/smartoperationcenter/comps/grid_list.vue

@@ -26,10 +26,21 @@
     </avue-crud>
     <el-dialog :modal-append-to-body="true" :append-to-body="true" :visible.sync="crudDialogShow"
       :title="crudDialogTitle" width="80%" center @close="dialogClose">
-     <avue-crud v-if="activeItem.name!='住户审核'" ref="crud2" :table-loading="loading" :option="option" @search-change="searchChange"
+      <!--<avue-crud v-if="activeItem.name!='住户审核'" ref="crud2" :table-loading="loading" :option="option" @search-change="searchChange"
         @row-update="submit" :page.sync="page" :data="data" @on-load="onLoad" @current-change="currentChange">
-      </avue-crud>
-      <applyUser v-else ref="applyUser"></applyUser>
+       <template slot="registerSource" slot-scope="{row}">
+         <el-tag v-if="row.registerSource===1">小程序</el-tag>
+         <el-tag v-if="row.registerSource===2">管理后台</el-tag>
+         <el-tag v-if="row.registerSource===3">访客机</el-tag>
+       </template>
+       <template slot="auditStatus" slot-scope="{row}">
+         <el-tag v-if="row.auditStatus===0" type="warning">待审核</el-tag>
+         <el-tag v-if="row.auditStatus===1" type="success">审核通过</el-tag>
+         <el-tag v-if="row.auditStatus===2" type="danger">审核不通过</el-tag>
+       </template>
+      </avue-crud>-->
+      <guestRecord v-if="activeItem.name === '访客审核'"></guestRecord>
+      <applyUser ref="applyUser"></applyUser>
     </el-dialog>
 
     <service-form ref="serviceForm"></service-form>
@@ -50,6 +61,7 @@
   import basicinfoOption from '../option/basicinfo-option.js'
   import serviceForm from "@/views/smartaccess/form/server.vue"
   import applyUser from "../form/applyUser.vue"
+  import guestRecord from "../form/guestrecord.vue"
   import {
     save as houseUserEntry
   } from "@/api/person/basicinfo";
@@ -60,7 +72,8 @@
     components: {
       editPolygonMap,
       serviceForm,
-      applyUser
+      applyUser,
+      guestRecord
     },
     computed: {
       ...mapGetters(['tenantType']),
@@ -189,7 +202,7 @@
               method: "get",
               url: "/api/cyzh-estate/guestrecord/list"
             },
-            option: fkshOption
+            // option: fkshOption
           },
           {
             tenantType: 1,
@@ -255,7 +268,7 @@
           currentPage: 1,
           total: 0
         };
-        if (this.activeItem.name == '服务人员录入') {
+        if (this.activeItem.name === '服务人员录入') {
           this.$refs.serviceForm.showAddForm()
           return
         }
@@ -272,12 +285,12 @@
           this.crudDialogTitle = item.name;
           this.crudDialogShow = true;
           //加载列表
-          this.dataLoad.method = item.dataLoad.method;
-          this.dataLoad.url = item.dataLoad.url;
+          this.dataLoad.method = null;
+          this.dataLoad.url = null;
           //初始化表单参数
           this.dataSubmit.method = null;
           this.dataSubmit.url = null;
-          this.onLoad(this.page, {});
+          // this.onLoad(this.page, {});
         }
       },
       onLoad(page, params = {}) {

src/views/dashboard/smartoperationcenter/form/applyUser.vue

@@ -6,7 +6,7 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
 
       <template slot="menu" slot-scope="scope">
-        <el-button icon="el-icon-s-order" style="color: red" v-if="scope.row.checkState===0" size="small"
+        <el-button icon="el-icon-s-order" style="color: red" v-if="scope.row.auditStatus===0" size="small"
           @click.native="showType('审核',scope.row)" type="text">
           审核
         </el-button>
@@ -14,13 +14,13 @@
           详情
         </el-button>
       </template>
-      
-      
-      <template slot="checkState" slot-scope="scope">
-        <el-tag v-if="scope.row.checkState===-1" type="info">未上传</el-tag>
-        <el-tag v-if="scope.row.checkState===0">待审核</el-tag>
-        <el-tag v-if="scope.row.checkState===1" type="success">审核通过</el-tag>
-        <el-tag v-if="scope.row.checkState===2" type="danger">审核不通过</el-tag>
+
+
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus===-1" type="info">未上传</el-tag>
+        <el-tag v-if="scope.row.auditStatus===0">待审核</el-tag>
+        <el-tag v-if="scope.row.auditStatus===1" type="success">审核通过</el-tag>
+        <el-tag v-if="scope.row.auditStatus===2" type="danger">审核不通过</el-tag>
       </template>
 
       <template slot="residentialId" slot-scope="scope">

src/views/dashboard/smartoperationcenter/form/guestrecord.vue

@@ -0,0 +1,252 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.guestrecord_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus===0" type="info">待审核</el-tag>
+        <el-tag v-if="scope.row.auditStatus===1" type="success">审核通过</el-tag>
+        <el-tag v-if="scope.row.auditStatus===2" type="danger">审核不通过</el-tag>
+      </template>
+      <template slot="registerSource" slot-scope="{row}">
+        <el-tag v-if="row.registerSource===1">小程序</el-tag>
+        <el-tag v-if="row.registerSource===2">管理后台</el-tag>
+        <el-tag v-if="row.registerSource===3">访客机</el-tag>
+      </template>
+      <template slot="menu" slot-scope="{row}">
+        <el-button size="mini" type="text" icon="el-icon-setting">
+          <el-dropdown>
+            <span class="el-dropdown-link">
+              更多<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="color: limegreen" type="text" @click.native="pushFace(row)" icon="el-icon-sort-down">人脸下发</el-dropdown-item>
+              <el-dropdown-item style="color: red" type="text" @click.native="deleteFace(row)" icon="el-icon-sort-up">人脸禁用</el-dropdown-item>
+            </el-dropdown-menu>
+
+          </el-dropdown>
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, pushGuestFace, deleteGuestFace} from "@/api/estate/guestrecord";
+  import {mapGetters} from "vuex";
+  import guestOptionYq from "@/views/estate/guestmng/option/guestOption-yq.js"
+  import guestOptionSq from "@/views/estate/guestmng/option/guestOption-sq.js"
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {},
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission",'tenantType']),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.guestrecord_add, false),
+          viewBtn: this.vaildData(this.permission.guestrecord_view, false),
+          delBtn: this.vaildData(this.permission.guestrecord_delete, false),
+          editBtn: this.vaildData(this.permission.guestrecord_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    created() {
+      if (this.tenantType==1) {
+        this.option=guestOptionYq
+      }else{
+        this.option=guestOptionSq
+      }
+    },
+    methods: {
+      pushFace(row){
+        //下发人脸到测温系统和设备
+        pushGuestFace(row).then(res => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      },
+      deleteFace(row){
+        this.$confirm("确定禁用人脸吗?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return deleteGuestFace(row);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      rowSave(row, done, loading) {
+        row.agencyName = row.$agencyId;
+        row.enterpriseName = row.$enterpriseId;
+        row.auditStatus = 1;
+        row.registerSource = 2;
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        row.agencyName = row.$agencyId;
+        row.enterpriseName = row.$enterpriseId;
+        row.registerSource = 2;
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/dashboard/smartoperationcenter/option/fkshOption.js

@@ -18,6 +18,7 @@ export default {
       prop: "beginTime",
       type: "datetime",
       width: 130,
+      labelWidth: 110,
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss"
     },
@@ -26,6 +27,7 @@ export default {
       prop: "endTime",
       type: "datetime",
       width: 130,
+      labelWidth: 110,
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss"
     },
@@ -67,14 +69,15 @@ export default {
       }]
     },
     {
-      label: "拜访园区",
+      label: "拜访社区",
       prop: "agencyId",
-      cascaderItem: ['enterpriseId'],
+      cascaderItem: ['residentialId'],
       type: "select",
       remote: true,
-      hide: true,
       search: true,
+      datatype: "number",
       viewDisplay: false,
+      hide:true,
       dicUrl: "/api/cyzh-community/agency/list",
       dicFormatter: (res) => {
         return res.data.records; //返回字典的层级结构
@@ -85,16 +88,41 @@ export default {
       },
       rules: [{
         required: true,
-        message: "请选择拜访园区",
+        message: "请选择拜访社区",
         trigger: "blur"
       }]
     },
     {
+      label: "拜访小区",
+      prop: "residentialId",
+      type: "select",
+      search: true,
+      viewDisplay: false,
+      hide:true,
+      datatype: "number",
+      dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+      dicFormatter: (res) => {
+        return res.data.records; //返回字典的层级结构
+      },
+      // dicFlag: false,
+      filterable: true,
+      props: {
+        label: "name",
+        value: "id"
+      },
+      rules: [{
+        required: true,
+        message: "请选择拜访小区",
+        trigger: "blur"
+      }]
+    },
+    /*{
       label: "拜访企业",
       prop: "enterpriseId",
       type: "select",
+      display: false,
+      hide:true,
       search: true,
-      hide: true,
       viewDisplay: false,
       dicUrl: "/api/cyzh-enterprise/enterprise/list?agencyId={{key}}",
       dicFormatter: (res) => {
@@ -111,22 +139,30 @@ export default {
         message: "请选择拜访企业",
         trigger: "blur"
       }]
-    },
+    },*/
     {
-      label: "拜访园区",
+      label: "拜访社区",
       prop: "agencyName",
       editDisplay: false,
       addDisplay: false,
     },
+    {
+      label: "拜访小区",
+      prop: "residentialName",
+      editDisplay: false,
+      addDisplay: false,
+    },
     {
       label: "拜访企业",
       prop: "enterpriseName",
       editDisplay: false,
       addDisplay: false,
+      display: false,
+      hide:true,
     },
     {
       label: "审核状态",
-      prop: "checkState",
+      prop: "auditStatus",
       slot: true,
       type: 'select',
       addDisplay: false,

src/views/device/doordevice.vue → src/views/device/doordevice-bak.vue

@@ -117,7 +117,7 @@ export default {
             overHidden: true,
             hide:true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入经度",
               trigger: "blur"
             }]
@@ -129,15 +129,16 @@ export default {
             overHidden: true,
             hide:true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入纬度",
               trigger: "blur"
             }]
           },
           {
             label: "设备序列号",
-            prop: "macAddress",
+            prop: "serialNum",
             width: 200,
+            labelWidth:110,
             rules: [{
               required: true,
               message: "请输入Mac编码",

src/views/estate/applyuser.vue

@@ -29,18 +29,18 @@
       </template>
 
       <template slot="menu" slot-scope="scope">
-        <el-button icon="el-icon-s-order" style="color: red" v-if="scope.row.checkState===0" size="small" @click.native="showType('审核',scope.row)" type="text">
+        <el-button icon="el-icon-s-order" style="color: red" v-if="scope.row.auditStatus===0" size="small" @click.native="showType('审核',scope.row)" type="text">
           审核
         </el-button>
         <el-button icon="el-icon-view" size="small" @click.native="showType('详情',scope.row)" v-else type="text">
           详情
         </el-button>
       </template>
-      <template slot="checkState" slot-scope="scope">
-        <el-tag v-if="scope.row.checkState===-1" type="info">未上传</el-tag>
-        <el-tag v-if="scope.row.checkState===0">待审核</el-tag>
-        <el-tag v-if="scope.row.checkState===1" type="success">审核通过</el-tag>
-        <el-tag v-if="scope.row.checkState===2" type="danger">审核不通过</el-tag>
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus===-1" type="info">未上传</el-tag>
+        <el-tag v-if="scope.row.auditStatus===0">待审核</el-tag>
+        <el-tag v-if="scope.row.auditStatus===1" type="success">审核通过</el-tag>
+        <el-tag v-if="scope.row.auditStatus===2" type="danger">审核不通过</el-tag>
       </template>
 
       <template slot="residentialId" slot-scope="scope">

src/views/estate/guestmng/guestrecord.vue

@@ -27,10 +27,10 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
-      <template slot="checkState" slot-scope="scope">
-        <el-tag v-if="scope.row.checkState===0" type="info">待审核</el-tag>
-        <el-tag v-if="scope.row.checkState===1" type="success">审核通过</el-tag>
-        <el-tag v-if="scope.row.checkState===2" type="danger">审核不通过</el-tag>
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus===0" type="info">待审核</el-tag>
+        <el-tag v-if="scope.row.auditStatus===1" type="success">审核通过</el-tag>
+        <el-tag v-if="scope.row.auditStatus===2" type="danger">审核不通过</el-tag>
       </template>
       <template slot="registerSource" slot-scope="{row}">
         <el-tag v-if="row.registerSource===1">小程序</el-tag>
@@ -131,7 +131,7 @@
       rowSave(row, done, loading) {
         row.agencyName = row.$agencyId;
         row.enterpriseName = row.$enterpriseId;
-        row.checkState = 1;
+        row.auditStatus = 1;
         row.registerSource = 2;
         add(row).then(() => {
           this.onLoad(this.page);

src/views/estate/guestmng/option/guestOption-sq.js

@@ -278,7 +278,7 @@ export default {
       },
       {
         label: "审核状态",
-        prop: "checkState",
+        prop: "auditStatus",
         slot: true,
         type: 'select',
         addDisplay: false,

src/views/estate/guestmng/option/guestOption-yq.js

@@ -154,7 +154,7 @@ export default {
       },
       {
         label: "审核状态",
-        prop: "checkState",
+        prop: "auditStatus",
         slot: true,
         type: 'select',
         addDisplay: false,

src/views/estate/options/apply-user-option.js

@@ -7,7 +7,7 @@ import {
       menuWidth: 120,
       calcHeight: 30,
       tip: false,
-      searchShow: false,
+      searchShow: true,
       searchMenuSpan: 6,
       border: true,
       index: true,
@@ -89,7 +89,7 @@ import {
         },
         {
           label: "联系电话",
-          prop: "tel",
+          prop: "phone",
           search: true,
           width: 100,
           rules: [{
@@ -130,7 +130,8 @@ import {
           slot: true,
           searchFilterable: true,
           cascaderItem: ['buildingId'],
-          dicUrl: "/api/cyzh-community/residential/select?size=500",
+          remote: true,
+          dicUrl: "/api/cyzh-community/residential/select?size=100",
           // dicFormatter:(res)=>{
           //   return res.data.records;//返回字典的层级结构
           // },
@@ -153,6 +154,7 @@ import {
           type: "select",
           search: true,
           cascaderItem: ['unitId'],
+          remote: true,
           dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
           dicFormatter: (res) => {
             return res.data.records; //返回字典的层级结构
@@ -222,7 +224,7 @@ import {
           prop: "roomId",
           type: "select",
           width: 60,
-          search: true,
+          search: false,
           dicUrl: "/api/cyzh-community/room/list?unitId={{key}}",
           dicFormatter: (res) => {
             return res.data.records; //返回字典的层级结构
@@ -266,17 +268,18 @@ import {
           },
           rules: [{
             required: true,
-            message: "请输入住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加",
+            message: "请选择住户来源",
             trigger: "blur"
           }]
         },
         {
           label: "审核状态",
-          prop: "checkState",
+          prop: "auditStatus",
           search: true,
           editDisplay: false,
-          width: 100,
+          width: 110,
           type: 'select',
+          slot: true,
           dicData: [{
               label: '未上传',
               value: -1
@@ -299,13 +302,13 @@ import {
           }]
         },
         {
-          label: "i_check_state=2(审核不通过)时必填",
+          label: "审核意见=",
           prop: "checkOpinion",
           display: false,
           hide: true,
           rules: [{
-            required: true,
-            message: "请输入i_check_state=2(审核不通过)时必填",
+            required: false,
+            message: "请输入审核意见",
             trigger: "blur"
           }]
         },
@@ -391,7 +394,7 @@ import {
         },
         {
           label: "人脸图片",
-          prop: "imageUri",
+          prop: "faceUrl",
           hide: true,
           display: false,
           span: 8,

src/views/smartaccess/form/guest.vue

@@ -3,7 +3,7 @@
     <el-dialog :modal-append-to-body="true" :append-to-body="true" :title="title" center :visible.sync="dialogShow"
       width="45%" :close-on-click-modal="false" top="4%">
       <avue-form ref="avueForm" :option="option" v-model="model" @submit="submit"></avue-form>
-      <div v-if="model&&model.checkState==0">
+      <div v-if="model&&model.auditStatus==0">
         <el-row>
           <el-col span="24" align="right">
             <el-button type="success" icon="el-icon-check" size="small" @click="audit(1)">通过</el-button>
@@ -18,9 +18,9 @@
       :append-to-body="true" center>
       <el-input v-model="auditOpinion" placeholder="请输入审核意见(选填)"></el-input>
       <span slot="footer" class="dialog-footer">
-        <el-button v-if="auditObj.checkState==1" type="success" @click="doAudit" style="background-color:#19be6b">
+        <el-button v-if="auditObj.auditStatus==1" type="success" @click="doAudit" style="background-color:#19be6b">
           确定审核通过</el-button>
-        <el-button v-if="auditObj.checkState==2" type="danger" @click="doAudit">
+        <el-button v-if="auditObj.auditStatus==2" type="danger" @click="doAudit">
           确定审核不通过</el-button>
       </span>
     </el-dialog>
@@ -306,7 +306,7 @@
       },
       audit(auditStatus) {
         this.auditObj = deepClone(this.model)
-        this.auditObj.checkState = auditStatus;
+        this.auditObj.auditStatus = auditStatus;
         this.dialogShow = false;
         setTimeout(() => {
           this.auditDialogShow = true
@@ -315,7 +315,7 @@
       //给外部调用的审核
       auditref(obj, status) {
         this.auditObj = deepClone(obj)
-        this.auditObj.checkState = status
+        this.auditObj.auditStatus = status
         this.auditDialogShow = true
       },
       doAudit() {

src/views/smartaccess/form/server.vue

@@ -261,7 +261,7 @@
       },
       audit(auditStatus) {
         this.auditObj = deepClone(this.model)
-        this.auditObj.checkState = auditStatus;
+        this.auditObj.auditStatus = auditStatus;
         this.dialogShow = false;
         setTimeout(() => {
           this.auditDialogShow = true
@@ -270,7 +270,7 @@
       //给外部调用的审核
       auditref(obj, status) {
         this.auditObj = deepClone(obj)
-        this.auditObj.checkState = status
+        this.auditObj.auditStatus = status
         this.auditDialogShow = true
       },
       doAudit() {

src/views/smartaccess/form/snap.vue

@@ -243,7 +243,7 @@
       },
       audit(auditStatus) {
         this.auditObj = deepClone(this.model)
-        this.auditObj.checkState = auditStatus;
+        this.auditObj.auditStatus = auditStatus;
         this.dialogShow = false;
         setTimeout(() => {
           this.auditDialogShow = true
@@ -252,7 +252,7 @@
       //给外部调用的审核
       auditref(obj, status) {
         this.auditObj = deepClone(obj)
-        this.auditObj.checkState = status
+        this.auditObj.auditStatus = status
         this.auditDialogShow = true
       },
       doAudit() {

src/views/smartaccess/guestrecordmng.vue

@@ -27,10 +27,10 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
-      <template slot="checkState" slot-scope="scope">
-        <el-tag v-if="scope.row.checkState===0" type="info">待审核</el-tag>
-        <el-tag v-if="scope.row.checkState===1" type="success">审核通过</el-tag>
-        <el-tag v-if="scope.row.checkState===2" type="danger">审核不通过</el-tag>
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus===0" type="info">待审核</el-tag>
+        <el-tag v-if="scope.row.auditStatus===1" type="success">审核通过</el-tag>
+        <el-tag v-if="scope.row.auditStatus===2" type="danger">审核不通过</el-tag>
       </template>
       <template slot="registerSource" slot-scope="{row}">
         <el-tag v-if="row.registerSource===1">小程序</el-tag>
@@ -199,7 +199,7 @@
             },
             {
               label: "审核状态",
-              prop: "checkState",
+              prop: "auditStatus",
               slot: true,
               type:'select',
               addDisplay: false,
@@ -338,7 +338,7 @@
       rowSave(row, done, loading) {
         row.agencyName = row.$agencyId;
         row.enterpriseName = row.$enterpriseId;
-        row.checkState = 1;
+        row.auditStatus = 1;
         row.registerSource = 2;
         add(row).then(() => {
           this.onLoad(this.page);