Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/saber-grid-sys

 Conflicts:

	vue.config.js

package.json

@@ -14,11 +14,14 @@
     "@amap/amap-jsapi-loader": "0.0.7",
     "@amap/amap-vue": "^2.0.11",
     "@jiaminghi/charts": "^0.2.18",
+    "@jiaminghi/data-view": "^2.10.0",
+    "avue-plugin-map": "^1.0.1",
     "avue-data": "^2.0.0",
     "avue-plugin-ueditor": "^0.1.4",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",
+    "core-js": "^2.6.12",
     "crypto-js": "^4.0.0",
     "element-ui": "^2.13.2",
     "jquery": "^3.6.0",

src/components/staff/review-staff.vue

@@ -0,0 +1,138 @@
+<template>
+  <basic-container>
+    <avue-form :option="option" v-model="reviewDetail">
+      <template slot-scope="scope" slot="face">
+        <el-image :src="reviewDetail.face" style="width:180px; height:180px" alt="" :preview-src-list="reviewDetail.face"></el-image>
+      </template>
+      <template slot-scope="scope" slot="sex">
+        <el-input placeholder="未选择性别" :disabled="true" v-model="reviewDetail.$sex"></el-input>
+      </template>
+    </avue-form>
+    <div>
+      <el-row>
+        <el-col span="24" align="center">
+          <el-button type="warning" icon="el-icon-edit" size="small" @click="reviewExamine(0)">待审核</el-button>
+          <el-button type="primary" icon="el-icon-check" size="small" @click="reviewExamine(1)">通过</el-button>
+          <el-button type="info" icon="el-icon-delete" size="small" @click="reviewExamine(2)">不通过</el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+  import {update} from "@/api/enterprise/staff";
+  export default {
+    props: {
+      reviewDetail: {},
+      url: '',
+      reviewVisible: ''
+    },
+    data() {
+      return {
+        option:{
+          menuBtn: false,
+          group:[
+            {
+              icon:'el-icon-user',
+              label: '个人信息认证',
+              prop: 'group1',
+              column: [{
+                label: '姓名',
+                prop: 'realName',
+                placeholder: "未提交姓名",
+                readonly: true
+              },{
+                label: '性别',
+                prop: 'sex',
+                placeholder: "未选择性别",
+                formslot: true,
+                readonly: true,
+              },{
+                label: '身份证号',
+                prop: 'idcard',
+                placeholder: "未输入有效的身份证号",
+                readonly: true
+              },{
+                label: '手机号',
+                prop: 'phone',
+                placeholder: "未输入有效的手机号",
+                readonly: true
+              },{
+                label: '脸部信息',
+                prop: 'face',
+                type: 'upload',
+                listType: 'picture-img',
+                formslot: true,
+                disabled: true
+              }]
+            },{
+              icon:'el-icon-office-building',
+              label: '企业信息认证',
+              prop: 'group2',
+              column: [{
+                label: '公司园区',
+                prop: 'agencyName',
+                placeholder: "未选择公司园区",
+                readonly: true
+              },{
+                label: '园区区域',
+                prop: 'residentialName',
+                placeholder: "未选择园区区域",
+                readonly: true
+              },{
+                label: '所属企业',
+                prop: 'enterpriseName',
+                placeholder: "未输入企业名称",
+                readonly: true
+              }]
+            },{
+              icon:'el-icon-chat-line-square',
+              label: '其他信息',
+              prop: 'group2',
+              column: [{
+                label: '备注',
+                prop: 'remarks',
+                type: "textarea",
+                maxRows: 4,
+                minRows: 2
+              }]
+            }
+          ]
+        }
+      }
+    },
+    methods: {
+      reviewExamine(examine, loading ){
+        this.reviewDetail.examine = examine;
+        update(this.reviewDetail).then(() => {
+          this.reviewVisible = false;
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$emit('visibleemit', this.reviewVisible);
+        }, error => {
+          this.$message({
+            type: "error",
+            message: "操作失败!"
+          });
+          loading();
+          console.log(error);
+        });
+      }
+    }
+  }
+
+</script>
+
+<style scoped>
+
+</style>
+
+
+
+
+
+
+

src/main.js

@@ -22,6 +22,7 @@ import basicBlock from './components/basic-block/main';
 import basicContainer from './components/basic-container/main';
 import thirdRegister from './components/third-register/main';
 import avueUeditor from 'avue-plugin-ueditor';
+import AvueMap from 'avue-plugin-map';
 import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
 import dataV from '@jiaminghi/data-view'
@@ -33,7 +34,8 @@ import layer from "layui-layer";
 window.$crudCommon = crudCommon;
 // 加载Vue拓展
 Vue.use(router);
-Vue.use(dataV)
+Vue.use(dataV);
+Vue.use(AvueMap);
 Vue.use(VueAxios, axios);
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value)

src/views/community/agency.vue

@@ -26,6 +26,11 @@
                    v-if="permission.agency_delete"
                    @click="handleDelete">删 除
         </el-button>
+        <el-button type="info"
+                   size="small"
+                   icon="el-icon-download"
+                   plain>导 入
+        </el-button>
       </template>
     </avue-crud>
   </basic-container>
@@ -62,6 +67,7 @@
             {
               label: "社区名称",
               prop: "name",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入社区名称",
@@ -69,55 +75,27 @@
               }]
             },
             {
-              label: "所属省",
-              prop: "regionProvince",
+              label: "选择地址",
+              hide: true,
+              type: 'map',
+              //高德初始化参数
+              params:{
+                zoom: 10,
+                zoomEnable: false,
+                dragEnable: false,
+              },
               rules: [{
-                required: true,
-                message: "请输入所属省",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属市",
-              prop: "regionCity",
-              rules: [{
-                required: true,
-                message: "请输入所属市",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属区",
-              prop: "regionArea",
-              rules: [{
-                required: true,
-                message: "请输入所属区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属街道",
-              prop: "regionStreet",
-              rules: [{
-                required: true,
-                message: "请输入所属街道",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "详细地址",
-              prop: "address",
-              rules: [{
-                required: true,
-                message: "请输入详细地址",
+                required: false,
+                message: "请选择地址",
                 trigger: "blur"
               }]
             },
             {
               label: "经度",
               prop: "longitude",
+              hide: true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入经度",
                 trigger: "blur"
               }]
@@ -125,129 +103,111 @@
             {
               label: "纬度",
               prop: "latitude",
+              hide: true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入纬度",
                 trigger: "blur"
               }]
             },
             {
-              label: "负责人名称",
-              prop: "personName",
-              rules: [{
-                required: true,
-                message: "请输入负责人名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "负责人联系方式",
-              prop: "personPhone",
-              rules: [{
-                required: true,
-                message: "请输入负责人联系方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区数量",
-              prop: "residentialCount",
+              label: "所属省",
+              prop: "regionProvince",
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入小区数量",
+                message: "请选择所属省",
                 trigger: "blur"
               }]
             },
             {
-              label: "楼栋数",
-              prop: "buildingCount",
+              label: "所属市",
+              prop: "regionCity",
+              type: "select",
               rules: [{
-                required: true,
-                message: "请输入楼栋数",
+                required: false,
+                message: "请选择所属市",
                 trigger: "blur"
               }]
             },
             {
-              label: "单元数量",
-              prop: "unitCount",
+              label: "所属区",
+              prop: "regionArea",
+              type: "select",
               rules: [{
-                required: true,
-                message: "请输入单元数量",
+                required: false,
+                message: "请选择所属区",
                 trigger: "blur"
               }]
             },
             {
-              label: "楼层数",
-              prop: "floorCount",
+              label: "所属街道",
+              prop: "regionStreet",
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入楼层数",
+                message: "请选择所属街道",
                 trigger: "blur"
               }]
             },
             {
-              label: "房间数量",
-              prop: "roomCount",
+              label: "详细地址",
+              prop: "address",
+              search: true,
               rules: [{
-                required: true,
-                message: "请输入房间数量",
+                required: false,
+                message: "请输入详细地址",
                 trigger: "blur"
               }]
             },
             {
-              label: "人员数量",
-              prop: "personCount",
+              label: "负责人名称",
+              prop: "personName",
               rules: [{
-                required: true,
-                message: "请输入人员数量",
+                required: false,
+                message: "请输入名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "车辆数量",
-              prop: "carCount",
+              label: "联系方式",
+              prop: "personPhone",
               rules: [{
-                required: true,
-                message: "请输入车辆数量",
+                required: false,
+                message: "请输入负责人联系方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "社区背景图",
-              prop: "pic",
+              label: "背景图",
+              prop: "imageUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              row: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
-                required: true,
-                message: "请输入社区背景图",
+                required: false,
+                message: "请输入脸部照片url（没有域名）",
                 trigger: "blur"
               }]
             },
             {
               label: "备注",
               prop: "remark",
+              hide: true,
+              type: "textarea",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入备注",
                 trigger: "blur"
               }]
             },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "旧平台id",
-              prop: "oldId",
-              rules: [{
-                required: true,
-                message: "请输入旧平台id",
-                trigger: "blur"
-              }]
-            },
           ]
         },
         data: []

src/views/community/building.vue

@@ -71,6 +71,8 @@
             {
               label: "社区id",
               prop: "agencyId",
+              hide: true,
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入社区id",
@@ -80,6 +82,8 @@
             {
               label: "社区名称",
               prop: "agencyName",
+              hide: true,
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入社区名称",
@@ -89,6 +93,8 @@
             {
               label: "小区id",
               prop: "residentialId",
+              hide: true,
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入小区id",
@@ -98,15 +104,18 @@
             {
               label: "小区名称",
               prop: "residentialName",
+              search: true,
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入小区名称",
+                message: "请选择小区名称",
                 trigger: "blur"
               }]
             },
             {
               label: "单元数",
               prop: "unitCount",
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入单元数",
@@ -116,6 +125,7 @@
             {
               label: "楼层数",
               prop: "floorCount",
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入楼层数",
@@ -125,6 +135,7 @@
             {
               label: "房间数",
               prop: "roomCount",
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入房间数",
@@ -134,6 +145,7 @@
             {
               label: "住户数",
               prop: "userCount",
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入住户数",
@@ -142,16 +154,28 @@
             },
             {
               label: "图片",
-              prop: "pic",
+              prop: "imageUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              row: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
-                required: true,
-                message: "请输入图片",
+                required: false,
+                message: "请输入脸部照片url（没有域名）",
                 trigger: "blur"
               }]
             },
             {
               label: "旧平台id",
               prop: "oldId",
+              hide: true,
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入旧平台id",
@@ -161,6 +185,8 @@
             {
               label: "机构路径",
               prop: "orgPosition",
+              hide: true,
+              addDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入机构路径",

src/views/community/floor.vue

@@ -62,114 +62,108 @@
             {
               label: "楼层名称",
               prop: "name",
+
               rules: [{
                 required: true,
                 message: "请输入楼层名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "社区id",
-              prop: "agencyId",
-              rules: [{
-                required: true,
-                message: "请输入社区id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "社区名称",
               prop: "agencyName",
+              type: "select",
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入社区名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "小区id",
-              prop: "residentialId",
-              rules: [{
-                required: true,
-                message: "请输入小区id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "小区名称",
               prop: "residentialName",
+              type:'select',
+              search: true,
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
                 message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "楼栋id",
-              prop: "buildingId",
-              rules: [{
-                required: true,
-                message: "请输入楼栋id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "楼栋名称",
               prop: "buildingName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['unitId'],
+              // dicUrl: "/api/building/building/list?residentialId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
                 message: "请输入楼栋名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "单元id",
-              prop: "unitId",
-              rules: [{
-                required: true,
-                message: "请输入单元id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "单元名称",
               prop: "unitName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['floorId'],
+              // dicFlag: false,
+              // dicUrl: "/api/community/unit/list?buildingId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入单元名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "负责人姓名",
-              prop: "personName",
-              rules: [{
-                required: true,
-                message: "请输入负责人姓名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "负责人电话",
-              prop: "personTel",
-              rules: [{
-                required: true,
-                message: "请输入负责人电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "建筑年代",
-              prop: "builtYear",
-              rules: [{
-                required: true,
-                message: "请输入建筑年代",
-                trigger: "blur"
-              }]
-            },
             {
               label: "有无电梯",
               prop: "includingElevator",
+              type: 'select',
+              dicData : [
+                {
+                  label: "有",
+                  value: 1,
+                },
+                {
+                  label: "无",
+                  value: 0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入有无电梯",
@@ -195,29 +189,39 @@
               }]
             },
             {
-              label: "备注",
-              prop: "remark",
+              label: "负责人姓名",
+              prop: "personName",
               rules: [{
                 required: true,
-                message: "请输入备注",
+                message: "请输入负责人姓名",
                 trigger: "blur"
               }]
             },
             {
-              label: "机构路径",
-              prop: "orgPosition",
+              label: "负责人电话",
+              prop: "personTel",
               rules: [{
                 required: true,
-                message: "请输入机构路径",
+                message: "请输入负责人电话",
                 trigger: "blur"
               }]
             },
             {
-              label: "原数据的Id",
-              prop: "oldId",
+              label: "建筑年代",
+              prop: "builtYear",
+              hide: true,
               rules: [{
-                required: true,
-                message: "请输入原数据的Id",
+                required: false,
+                message: "请输入建筑年代",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "请输入备注",
                 trigger: "blur"
               }]
             },

src/views/community/houseuser.vue

@@ -69,107 +69,214 @@
               }]
             },
             {
-              label: "社区id",
-              prop: "agencyId",
+              label: "性别",
+              prop: "sex",
+              type: "radio",
+              dicData:[
+                {
+                  label:'男',
+                  value: 1
+                },{
+                  label:'女',
+                  value: 2
+                },{
+                  label:'未定义',
+                  value: 0
+                }
+              ],
+              // dicUrl: "/api/blade-system/dict/dictionary?code=sex",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey"
+              // },
               rules: [{
                 required: true,
-                message: "请输入社区id",
+                message: "请输入性别  0-未定义  1-男 2-女",
                 trigger: "blur"
               }]
             },
             {
-              label: "社区名称",
-              prop: "agencyName",
+              label: "手机号",
+              prop: "tel",
               rules: [{
                 required: true,
-                message: "请输入社区名称",
+                message: "请输入手机号",
                 trigger: "blur"
               }]
             },
             {
-              label: "小区id",
-              prop: "residentialId",
+              label: "证件号码",
+              prop: "idCard",
               rules: [{
                 required: true,
-                message: "请输入小区id",
+                message: "请输入证件号码 中国大陆:身份证；中国香港/澳门:港澳居民来往内地通行证；中国台湾:台湾居民来往内地通行证；海外:护照",
                 trigger: "blur"
               }]
             },
             {
-              label: "小区名称",
-              prop: "residentialName",
+              label: "住户来源",
+              prop: "createType",
+              type: "select",
+              // display: false,
+              // dicUrl: "/api/blade-system/dict-biz/dictionary?code=create_type",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey",
+              // },
+              // dataType: "number",
               rules: [{
                 required: true,
-                message: "请输入小区名称",
+                message: "请输入住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加",
                 trigger: "blur"
               }]
             },
             {
-              label: "楼栋id",
-              prop: "buildingId",
+              label: "住户类型",
+              prop: "type",
+              type: "radio",
+              dicData:[
+                {
+                  label:'业主',
+                  value: 1
+                },{
+                  label: '成员',
+                  value: 2
+                }
+                ,{
+                  label: '租户',
+                  value: 3
+                }
+              ],
+              width:80,
+              // dicUrl: "/api/blade-system/dict-biz/dictionary?code=house_user_type",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey",
+              // },
+              dataType: "number",
               rules: [{
                 required: true,
-                message: "请输入楼栋id",
+                message: "请输入住户类型 1-业主 2-成员 3-租户",
                 trigger: "blur"
               }]
             },
             {
-              label: "楼栋名称",
-              prop: "buildingName",
+              label: "社区名称",
+              prop: "agencyName",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入楼栋名称",
+                message: "请输入社区名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "单元id",
-              prop: "unitId",
+              label: "小区名称",
+              prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入单元id",
+                message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "单元名称",
-              prop: "unitName",
+              label: "楼栋名称",
+              prop: "buildingName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['unitId'],
+              // dicUrl: "/api/building/building/list?residentialId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
-                message: "请输入单元名称",
+                message: "请输入楼栋名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "楼层id",
-              prop: "floorId",
+              label: "单元名称",
+              prop: "unitName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['floorId'],
+              // dicFlag: false,
+              // dicUrl: "/api/community/unit/list?buildingId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入楼层id",
+                message: "请输入单元名称",
                 trigger: "blur"
               }]
             },
             {
               label: "楼层名称",
               prop: "floorName",
+              type: "select",
+              search: true,
+              // dicFlag: false,
+              // cascaderItem: ["roomId"],
+              // dicUrl: "/api/floor/floor/list?unitId={{key}}&size=900000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入楼层名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "房间id",
-              prop: "roomId",
-              rules: [{
-                required: true,
-                message: "请输入房间id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "房间名称",
               prop: "roomName",
+              type: "select",
+              search: true,
+              // dicFlag: false,
+              // dicUrl: "/api/community/room/list?floorId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入房间名称",
@@ -177,17 +284,24 @@
               }]
             },
             {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "审核状态：，0-待审核 1-审核通过 2-审核不通过",
+              label: "审核状态",
               prop: "checkState",
+              type: 'select',
+              search :true,
+              dicData: [
+                {
+                  label: '待审核',
+                  value: 0
+                },
+                {
+                  label: '审核通过',
+                  value: 1
+                },
+                {
+                  label: '审核不通过',
+                  value: 2
+                },
+              ],
               rules: [{
                 required: true,
                 message: "请输入审核状态：，0-待审核 1-审核通过 2-审核不通过",
@@ -198,14 +312,15 @@
               label: "审核意见",
               prop: "checkOpinion",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入审核意见",
                 trigger: "blur"
               }]
             },
             {
-              label: "人员分类：常住；重点。。。。",
+              label: "人员分类",
               prop: "personType",
+              type: 'select',
               rules: [{
                 required: true,
                 message: "请输入人员分类：常住；重点。。。。",
@@ -213,17 +328,15 @@
               }]
             },
             {
-              label: "手机号",
-              prop: "tel",
-              rules: [{
-                required: true,
-                message: "请输入手机号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "国籍，0 中国大陆 1 中国香港/澳门 2 中国台湾 3海外",
+              label: "国籍",
               prop: "nationality",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationality",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              dataType: "number",
               rules: [{
                 required: true,
                 message: "请输入国籍，0 中国大陆 1 中国香港/澳门 2 中国台湾 3海外",
@@ -231,62 +344,44 @@
               }]
             },
             {
-              label: "证件号码 中国大陆:身份证；中国香港/澳门:港澳居民来往内地通行证；中国台湾:台湾居民来往内地通行证；海外:护照",
-              prop: "idCard",
-              rules: [{
-                required: true,
-                message: "请输入证件号码 中国大陆:身份证；中国香港/澳门:港澳居民来往内地通行证；中国台湾:台湾居民来往内地通行证；海外:护照",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "籍贯（nationality = 0时,国籍为中国大陆）",
+              label: "籍贯",
               prop: "birthPlace",
+              hide: true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入籍贯（nationality = 0时,国籍为中国大陆）",
                 trigger: "blur"
               }]
             },
             {
-              label: "护照照片url",
-              prop: "passportImgUri",
-              rules: [{
-                required: true,
-                message: "请输入护照照片url",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "入境证明url",
-              prop: "entryImgUri",
-              rules: [{
-                required: true,
-                message: "请输入入境证明url",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "性别  0-未定义  1-男 2-女",
-              prop: "sex",
-              rules: [{
-                required: true,
-                message: "请输入性别  0-未定义  1-男 2-女",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remark",
+              label: "民族",
+              prop: "nation",
+              type: 'select',
+              // hide: true,
+              // dataType: "number",
+              // dicUrl: "/api/blade-system/dict/dictionary?code=nation",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey"
+              // },
               rules: [{
                 required: true,
-                message: "请输入备注",
+                message: "请输入民族",
                 trigger: "blur"
               }]
             },
             {
-              label: "脸部照片url（没有域名）",
+              label: "脸部照片",
               prop: "imageUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
                 message: "请输入脸部照片url（没有域名）",
@@ -294,89 +389,88 @@
               }]
             },
             {
-              label: "根据图片生成的faceId",
-              prop: "faceCode",
-              rules: [{
-                required: true,
-                message: "请输入根据图片生成的faceId",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区省（id）",
-              prop: "regionProvince",
-              rules: [{
-                required: true,
-                message: "请输入小区省（id）",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区市（id）",
-              prop: "regionCity",
-              rules: [{
-                required: true,
-                message: "请输入小区市（id）",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区区/县（id）",
-              prop: "regionArea",
-              rules: [{
-                required: true,
-                message: "请输入小区区/县（id）",
+              label: "护照照片",
+              prop: "passportImgUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
+              rules: [{
+                required: false,
+                message: "请输入护照照片url",
                 trigger: "blur"
               }]
             },
             {
-              label: "住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加",
-              prop: "createType",
-              rules: [{
-                required: true,
-                message: "请输入住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加",
+              label: "入境证明",
+              prop: "entryImgUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
+              rules: [{
+                required: false,
+                message: "请输入入境证明url",
                 trigger: "blur"
               }]
             },
             {
               label: "创建时间",
               prop: "createDate",
+              addDisplay:false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入创建时间",
                 trigger: "blur"
               }]
             },
-            {
-              label: "是否激活App",
-              prop: "isMember",
-              rules: [{
-                required: true,
-                message: "请输入是否激活App",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "住户类型 1-业主 2-成员 3-租户",
-              prop: "type",
-              rules: [{
-                required: true,
-                message: "请输入住户类型 1-业主 2-成员 3-租户",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "民族",
-              prop: "nation",
-              rules: [{
-                required: true,
-                message: "请输入民族",
-                trigger: "blur"
-              }]
-            },
             {
               label: "政治面貌",
               prop: "political",
+              type: 'select',
+              /**设置远程字典
+               * 01 中共党员
+               02 中共预备党员
+               03共青团员
+               04 民革党员
+               05 民盟盟员
+               06 民建会员
+               07 民进会员
+               08 农工党党员
+               09 致公党党员
+               10 九三学社社员
+               11 台盟盟员
+               12 无党派人士
+               13群众（现称普通居民，与居民身份证相对应）
+               */
+              dicData: [
+                {
+                  label:'中共党员',
+                  value: 1
+                },{
+                  label:'中共预备党员',
+                  value: 2
+                },{
+                  label:'共青团员',
+                  value: 3
+                },{
+                  label:'民革党员',
+                  value: 4
+                },{
+                  label:'民盟盟员',
+                  value: 5
+                },
+              ],
               rules: [{
                 required: true,
                 message: "请输入政治面貌",
@@ -386,6 +480,13 @@
             {
               label: "文化程度",
               prop: "education",
+              type: 'select',
+              // hide: true,
+              // dicUrl: "/api/blade-system/dict/dictionary?code=education",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey"
+              // },
               rules: [{
                 required: true,
                 message: "请输入文化程度",
@@ -393,20 +494,28 @@
               }]
             },
             {
-              label: "旧平台id",
-              prop: "oldId",
+              label: "人员标签",
+              prop: "personTag",
+              type: "select",
+              // multiple: true,
+              // dicUrl: "/api/blade-system/dict-biz/dictionary?code=person_tag",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey",
+              // },
+              // dataType: "string",
               rules: [{
                 required: true,
-                message: "请输入旧平台id",
+                message: "请输入人员标签",
                 trigger: "blur"
               }]
             },
             {
-              label: "人员标签",
-              prop: "personTag",
+              label: "备注",
+              prop: "remark",
               rules: [{
-                required: true,
-                message: "请输入人员标签",
+                required: false,
+                message: "请输入备注",
                 trigger: "blur"
               }]
             },

src/views/community/residential.vue

@@ -50,6 +50,7 @@
         option: {
           height:'auto',
           calcHeight: 30,
+          labelWidth: 120,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -60,8 +61,9 @@
           dialogClickModal: false,
           column: [
             {
-              label: "小区名字",
+              label: "名称",
               prop: "name",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入小区名字",
@@ -69,82 +71,122 @@
               }]
             },
             {
-              label: "社区id",
-              prop: "agencyId",
+              label: "经度",
+              prop: "longitude",
+              hide: true,
               rules: [{
-                required: true,
-                message: "请输入社区id",
+                required: false,
+                message: "请输入经度",
                 trigger: "blur"
               }]
             },
             {
-              label: "社区名称",
-              prop: "agencyName",
+              label: "纬度",
+              prop: "latitude",
+              hide: true,
               rules: [{
-                required: true,
-                message: "请输入社区名称",
+                required: false,
+                message: "请输入纬度",
                 trigger: "blur"
               }]
             },
             {
-              label: "省（id）",
-              prop: "regionProvince",
+              label: "所属社区",
+              prop: "community",
+              type: "select",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入省（id）",
+                message: "请选择所属物业名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "详细地址",
+              prop: "address",
+              rules: [{
+                required: false,
+                message: "请输入详细地址",
                 trigger: "blur"
               }]
             },
             {
-              label: "市（id）",
-              prop: "regionCity",
+              label: "物业名称",
+              prop: "estateName",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入市（id）",
+                message: "请输入所属物业名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "区/县（id）",
-              prop: "regionArea",
+              label: "物业电话",
+              prop: "estatePhone",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入区/县（id）",
+                message: "请输入所属物业联系方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "详细地址",
-              prop: "address",
+              label: "负责人名称",
+              prop: "majorName",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入详细地址",
+                message: "请输入负责人名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "经度",
-              prop: "longitude",
+              label: "负责人电话",
+              prop: "majorPhone",
+              hide: true,
+              row: true,
               rules: [{
                 required: true,
-                message: "请输入经度",
+                message: "请输入负责人电话",
                 trigger: "blur"
               }]
             },
             {
-              label: "纬度",
-              prop: "latitude",
+              label: "图片",
+              prop: "imageUri",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              row: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
+              rules: [{
+                required: false,
+                message: "请输入脸部照片url（没有域名）",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              prop: "remark",
+              hide: true,
+              type: "textarea",
               rules: [{
                 required: true,
-                message: "请输入纬度",
+                message: "请输入备注",
                 trigger: "blur"
               }]
             },
             {
               label: "楼栋总数",
               prop: "buildingCount",
+              addDisplay: false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入楼栋总数",
                 trigger: "blur"
               }]
@@ -152,8 +194,9 @@
             {
               label: "单元总数",
               prop: "unitCount",
+              addDisplay: false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入单元总数",
                 trigger: "blur"
               }]
@@ -161,8 +204,9 @@
             {
               label: "楼层总数",
               prop: "floorCount",
+              addDisplay: false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入楼层总数",
                 trigger: "blur"
               }]
@@ -170,8 +214,9 @@
             {
               label: "房间总数",
               prop: "roomCount",
+              addDisplay: false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入房间总数",
                 trigger: "blur"
               }]
@@ -179,66 +224,13 @@
             {
               label: "住户总数",
               prop: "userCount",
+              addDisplay: false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入住户总数",
                 trigger: "blur"
               }]
             },
-            {
-              label: "所属物业名称",
-              prop: "estateName",
-              rules: [{
-                required: true,
-                message: "请输入所属物业名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属物业联系方式",
-              prop: "estatePhone",
-              rules: [{
-                required: true,
-                message: "请输入所属物业联系方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区图片",
-              prop: "pic",
-              rules: [{
-                required: true,
-                message: "请输入小区图片",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "旧平台id",
-              prop: "oldId",
-              rules: [{
-                required: true,
-                message: "请输入旧平台id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
           ]
         },
         data: []

src/views/enterprise/enterprise.vue

@@ -27,6 +27,10 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+<!--      地图选择经纬度-->
+      <template slot="mapSelectForm" slot-scope="scope">
+        <avue-map v-model="scope.row.mapSelect"></avue-map>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -60,20 +64,59 @@
           dialogClickModal: false,
           column: [
             {
-              label: "企业类型",
-              prop: "enterpriseType",
+              label: "企业名称",
+              prop: "enterpriseName",
               rules: [{
                 required: true,
-                message: "请输入企业类型",
+                message: "请输入企业名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "企业名称",
-              prop: "enterpriseName",
+              label: "企业类型",
+              prop: "enterpriseType",
+              type: 'select',
+              dicData:[
+                {
+                  label:'国有企业',
+                  value:'国有企业'
+                },
+                {
+                  label:'集体所有制',
+                  value:'集体所有制'
+                },
+                {
+                  label:'私营企业',
+                  value:'私营企业'
+                },
+                {
+                  label:'股份制企业',
+                  value:'股份制企业'
+                },
+                {
+                  label:'有限合伙企业',
+                  value:'有限合伙企业'
+                },
+                {
+                  label:'联营企业',
+                  value:'联营企业'
+                },
+                {
+                  label:'外商投资企业',
+                  value:'外商投资企业'
+                },
+                {
+                  label:'港、澳、台',
+                  value:'港、澳、台'
+                },
+                {
+                  label:'股份合作企业',
+                  value:'股份合作企业'
+                },
+              ],
               rules: [{
                 required: true,
-                message: "请输入企业名称",
+                message: "请输入企业类型",
                 trigger: "blur"
               }]
             },
@@ -90,7 +133,7 @@
               label: "组织机构代码",
               prop: "organizationCode",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入组织机构代码",
                 trigger: "blur"
               }]
@@ -98,8 +141,9 @@
             {
               label: "注册资金",
               prop: "registeredCapital",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入注册资金",
                 trigger: "blur"
               }]
@@ -107,8 +151,9 @@
             {
               label: "注册地址",
               prop: "registeredAddress",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入注册地址",
                 trigger: "blur"
               }]
@@ -116,6 +161,7 @@
             {
               label: "法定代表人",
               prop: "representative",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入法定代表人",
@@ -125,8 +171,10 @@
             {
               label: "成立日期",
               prop: "registeredDate",
+              type:'date',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入成立日期",
                 trigger: "blur"
               }]
@@ -134,6 +182,7 @@
             {
               label: "办公电话",
               prop: "officeNum",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入办公电话",
@@ -143,21 +192,13 @@
             {
               label: "详细地址",
               prop: "region",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入详细地址",
                 trigger: "blur"
               }]
             },
-            {
-              label: "logo",
-              prop: "logo",
-              rules: [{
-                required: true,
-                message: "请输入logo",
-                trigger: "blur"
-              }]
-            },
             {
               label: "企业简介",
               prop: "enterpriseIntroduce",
@@ -168,13 +209,11 @@
               }]
             },
             {
-              label: "营业执照",
-              prop: "businessLicense",
-              rules: [{
-                required: true,
-                message: "请输入营业执照",
-                trigger: "blur"
-              }]
+              //地图map
+              label:'',
+              prop:'mapSelect',
+              formslot: true,
+              hide: true,
             },
             {
               label: "经度",
@@ -195,29 +234,78 @@
               }]
             },
             {
-              label: "园区id",
-              prop: "agencyId",
+              label: "企业logo",
+              prop: "logo",
+              type:'upload',
+              listType: 'picture-img',
+              span: 12,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
-                message: "请输入园区id",
+                message: "请输入logo",
                 trigger: "blur"
               }]
             },
             {
-              label: "区域id",
-              prop: "residentialId",
+              label: "营业执照",
+              prop: "businessLicense",
+              type:'upload',
+              listType: 'picture-img',
+              span: 12,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
-                message: "请输入区域id",
+                message: "请输入营业执照",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "所属园区",
+              prop: "agencyId",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
+              rules: [{
+                required: true,
+                message: "请选择",
                 trigger: "blur"
               }]
             },
             {
-              label: "机构路径",
-              prop: "orgPosition",
+              label: "所属区域",
+              prop: "residentialId",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入机构路径",
+                message: "请选择",
                 trigger: "blur"
               }]
             },
@@ -244,6 +332,18 @@
         return ids.join(",");
       }
     },
+    watch: {
+      'form.mapSelect': {
+        handler: function (value) {
+          if (!value) {
+            return
+          } else {
+            this.form.longitude = this.form.mapSelect.longitude;
+            this.form.latitude = this.form.mapSelect.latitude;
+          }
+        },
+      },
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

src/views/enterprise/project.vue

@@ -69,8 +69,10 @@
               }]
             },
             {
+              //企业列表模糊查询
               label: "企业id",
               prop: "enterpriseId",
+              type:'select',
               rules: [{
                 required: true,
                 message: "请输入企业id",
@@ -90,7 +92,7 @@
               label: "项目就业人数",
               prop: "employmentNumber",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入项目就业人数",
                 trigger: "blur"
               }]
@@ -117,7 +119,7 @@
               label: "项目投资收益",
               prop: "investmentReturn",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入项目投资收益",
                 trigger: "blur"
               }]
@@ -144,7 +146,7 @@
               label: "项目上缴税金",
               prop: "taxes",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入项目上缴税金",
                 trigger: "blur"
               }]
@@ -153,7 +155,7 @@
               label: "已申请奖补金额",
               prop: "taward",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入已申请奖补金额",
                 trigger: "blur"
               }]
@@ -162,7 +164,7 @@
               label: "已发放奖补金额",
               prop: "tawardCompleted",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入已发放奖补金额",
                 trigger: "blur"
               }]

src/views/enterprise/staff.vue

@@ -1,5 +1,9 @@
 <template>
   <basic-container>
+    <el-dialog :modal-append-to-body="false" title = "员工信息审核" :visible.sync = "reviewVisible" width="60%"
+               :close-on-click-modal="false" >
+      <review-staff :reviewDetail="reviewDetail" @visibleemit="visibleUpdate"></review-staff>
+    </el-dialog>
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
@@ -27,6 +31,29 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot="menu" slot-scope="scope">
+        <el-button type="text" size="small" 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 divided v-if="permission.staff_view" @click.native="detail(scope.row)" icon="el-icon-view">查看
+              </el-dropdown-item>
+              <el-dropdown-item divided v-if="permission.estaff_edit" @click.native="edit(scope.row)" icon="el-icon-edit">编辑
+              </el-dropdown-item>
+              <el-dropdown-item style="color: limegreen" divided v-if="!!scope.row.face && scope.row.auditStatus == 1" @click.native="pushUserFaceToDevice(scope.row)" icon="el-icon-sort-down">人脸下发
+              </el-dropdown-item>
+              <el-dropdown-item divided icon="el-icon-s-order" @click.native="reviewHandler(scope.row)" :class=" [scope.row.auditStatus === 0 ? '' : 'recheck']">{{scope.row.auditStatus===0?'审核':'重审'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-button>
+      </template>
+      <template slot="examine" slot-scope="scope">
+        <span v-if="scope.row.auditStatus===0" style="color: #2b373d">待审核</span>
+        <span v-if="scope.row.auditStatus===1" style="color: limegreen">审核通过</span>
+        <span v-if="scope.row.auditStatus===2" style="color: red">审核不通过</span>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -38,6 +65,9 @@
   export default {
     data() {
       return {
+        reviewVisible: false,
+        reviewDetail: {},
+        url: '',
         form: {},
         query: {},
         loading: true,
@@ -60,20 +90,20 @@
           dialogClickModal: false,
           column: [
             {
-              label: "昵称",
-              prop: "name",
+              label: "真实姓名",
+              prop: "realName",
               rules: [{
                 required: true,
-                message: "请输入昵称",
+                message: "真实姓名",
                 trigger: "blur"
               }]
             },
             {
-              label: "真名",
-              prop: "realName",
+              label: "昵称",
+              prop: "name",
               rules: [{
-                required: true,
-                message: "请输入真名",
+                required: false,
+                message: "请输入昵称",
                 trigger: "blur"
               }]
             },
@@ -87,26 +117,28 @@
               }]
             },
             {
-              label: "头像",
-              prop: "avatar",
+              label: "手机号码",
+              prop: "phone",
               rules: [{
                 required: true,
-                message: "请输入头像",
+                message: "请输入手机号码",
                 trigger: "blur"
               }]
             },
             {
-              label: "手机",
-              prop: "phone",
+              label: "身份证号码",
+              labelWidth: 100,
+              prop: "idcard",
               rules: [{
                 required: true,
-                message: "请输入手机",
+                message: "请输入身份证号码",
                 trigger: "blur"
               }]
             },
             {
               label: "生日",
               prop: "birthday",
+              type: 'date',
               rules: [{
                 required: true,
                 message: "请输入生日",
@@ -114,26 +146,61 @@
               }]
             },
             {
-              label: "人脸信息",
-              prop: "face",
+              label: "头像",
+              prop: "avatar",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 12,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
-                required: true,
-                message: "请输入人脸信息",
+                required: false,
+                message: "请输入头像",
                 trigger: "blur"
               }]
             },
             {
-              label: "身份证号码",
-              prop: "idcard",
+              label: "人脸信息",
+              prop: "face",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 12,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
-                message: "请输入身份证号码",
+                message: "请输入人脸信息",
                 trigger: "blur"
               }]
             },
             {
               label: "性别",
               prop: "sex",
+              type: "radio",
+              dicData:[
+                {
+                  label:'男',
+                  value: 1
+                },{
+                  label:'女',
+                  value: 2
+                },{
+                  label:'未定义',
+                  value: 0
+                }
+              ],
+              // dicUrl: "/api/blade-system/dict/dictionary?code=sex",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey"
+              // },
               rules: [{
                 required: true,
                 message: "请输入性别",
@@ -152,6 +219,7 @@
             {
               label: "审核时间",
               prop: "auditTime",
+              type: 'datetime',
               rules: [{
                 required: true,
                 message: "请输入审核时间",
@@ -159,8 +227,25 @@
               }]
             },
             {
-              label: "是否审核通过（0待审核，1审核通过，2审核不通过）",
+              label: "审核状态",
               prop: "auditStatus",
+              search:"true",
+              slot:true,
+              display: false,
+              type:'select',
+              dicData:[
+                {
+                  label:'待审核',
+                  value:0,
+                  color:'red'
+                },{
+                  label:'审核通过',
+                  value:1
+                },{
+                  label:'审核不通过',
+                  value:2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入是否审核通过（0待审核，1审核通过，2审核不通过）",
@@ -177,53 +262,78 @@
               }]
             },
             {
-              label: "所属企业",
-              prop: "enterpriseId",
-              rules: [{
-                required: true,
-                message: "请输入所属企业",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "企业名称",
-              prop: "enterpriseName",
-              rules: [{
-                required: true,
-                message: "请输入企业名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "园区id",
+              label: "所属园区",
               prop: "agencyId",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入园区id",
+                message: "请选择所属园区",
                 trigger: "blur"
               }]
             },
             {
-              label: "区域id",
+              label: "所属区域",
               prop: "residentialId",
+              type:'select',
+              search:"true",
+              // cascaderItem: ['enterpriseId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
-                message: "请输入区域id",
+                message: "请选择所属区域",
                 trigger: "blur"
               }]
             },
             {
-              label: "小程序openId",
-              prop: "openId",
+              label: "所属企业",
+              prop: "enterpriseId",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
-                message: "请输入小程序openId",
+                message: "请输入所属企业",
                 trigger: "blur"
               }]
             },
             {
-              label: "部门id",
+              label: "部门",
               prop: "deptId",
+              type: 'select',
+              //远程字典
+              dicData: [
+                {
+                  label: '研发部',
+                  value: 1
+                },{
+                  label: '财务部',
+                  value :2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入部门id",
@@ -231,8 +341,19 @@
               }]
             },
             {
-              label: "岗位id",
+              label: "岗位",
               prop: "postId",
+              type: 'select',
+              //远程字典
+              dicData: [
+                {
+                  label: '普通员工',
+                  value: 1
+                },{
+                  label: '总经理',
+                  value :2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入岗位id",
@@ -240,17 +361,18 @@
               }]
             },
             {
-              label: "备注",
-              prop: "remarks",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建方式（来源）{0：后台，1：小程序}",
+              label: "创建方式",
               prop: "createType",
+              type: 'select',
+              dicData: [
+                {
+                  label: '后台',
+                  value: 0
+                },{
+                  label: '小程序',
+                  value: 1
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入创建方式（来源）{0：后台，1：小程序}",
@@ -258,17 +380,20 @@
               }]
             },
             {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否为小程序园区管理员：0-否 1-是",
+              label: "是否为小程序园区管理员",
+              labelWidth: 200,
+              span:24,
               prop: "isAgencyManager",
+              type: 'radio',
+              dicData: [
+                {
+                  label: '是',
+                  value: 1
+                },{
+                  label: '否',
+                  value: 0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入是否为小程序园区管理员：0-否 1-是",
@@ -276,26 +401,41 @@
               }]
             },
             {
-              label: "若为园区管理员时的小程序登录账号",
+              label: "园区管理员小程序登录账号",
+              labelWidth: 200,
+              labelPosition:'left',
               prop: "agencyAccount",
               rules: [{
-                required: true,
                 message: "请输入若为园区管理员时的小程序登录账号",
                 trigger: "blur"
               }]
             },
             {
-              label: "若为园区管理员时的小程序登录密码",
+              label: "园区管理员的小程序登录密码",
+              labelWidth: 200,
+              labelPosition:'left',
               prop: "agencyPassword",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入若为园区管理员时的小程序登录密码",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否为企业管理员：0-否 1-是",
+              label: "是否为小程序企业管理员",
+              labelWidth: 200,
               prop: "isEnterpriseManager",
+              type: 'radio',
+              span: 24,
+              dicData: [
+                {
+                  label: '是',
+                  value: 1
+                },{
+                  label: '否',
+                  value: 0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入是否为企业管理员：0-否 1-是",
@@ -303,23 +443,36 @@
               }]
             },
             {
-              label: "若为企业管理员时的小程序登录账号",
+              label: "企业管理员的小程序登录账号",
+              labelWidth: 200,
+              labelPosition: 'left',
               prop: "enterpriseAccount",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入若为企业管理员时的小程序登录账号",
                 trigger: "blur"
               }]
             },
             {
-              label: "若为企业管理员时的小程序登录密码",
+              label: "企业管理员的小程序登录密码",
+              labelWidth: 200,
+              labelPosition: 'left',
               prop: "enterprisePassword",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入若为企业管理员时的小程序登录密码",
                 trigger: "blur"
               }]
             },
+            {
+              label: "备注",
+              prop: "remarks",
+              rules: [{
+                required: true,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
+            },
           ]
         },
         data: []
@@ -345,6 +498,8 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        //校验是否选了是管理员却没有填写账号密码
+        // if ()
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -452,10 +607,33 @@
           this.loading = false;
           this.selectionClear();
         });
-      }
+      },
+      reviewHandler(row) {
+        this.reviewDetail = row;
+        this.reviewVisible = true;
+        this.url = row.face;
+      },
+      pushUserFaceToDevice(row){
+        //下发人脸到测温系统和设备
+        pushUserFace(row).then(res => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      },
     }
   };
 </script>
 
 <style>
+  .el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+    font-size: small;
+    margin-left: 10px;
+  }
+  .recheck{
+    color: #e8bf6a;
+  }
 </style>

src/views/estate/accessrecord.vue

@@ -59,15 +59,6 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "用户id",
-              prop: "userId",
-              rules: [{
-                required: true,
-                message: "请输入用户id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "用户姓名",
               prop: "userName",
@@ -77,36 +68,18 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "社区id",
-              prop: "agencyId",
-              rules: [{
-                required: true,
-                message: "请输入社区id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小区id",
-              prop: "residentialId",
-              rules: [{
-                required: true,
-                message: "请输入小区id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "企业id",
-              prop: "enterpriseId",
-              rules: [{
-                required: true,
-                message: "请输入企业id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "人脸",
               prop: "faceUrl",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 12,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
                 message: "请输入人脸",
@@ -114,8 +87,9 @@
               }]
             },
             {
-              label: "设备唯一标识",
+              label: "设备编号",
               prop: "deviceId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入设备唯一标识",
@@ -125,6 +99,8 @@
             {
               label: "开门时间",
               prop: "openTime",
+              type: 'datetime',
+              editDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入开门时间",
@@ -132,8 +108,18 @@
               }]
             },
             {
-              label: "开门方式{1->人脸，2->远程}",
+              label: "开门方式",
               prop: "openType",
+              type:'select',
+              dicData:[
+                {
+                  label: '人脸',
+                  value: 1
+                },{
+                  label: '远程',
+                  value: 2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入开门方式{1->人脸，2->远程}",
@@ -150,32 +136,73 @@
               }]
             },
             {
-              label: "小区名字",
-              prop: "residentialName",
+              label: "社区名称",
+              prop: "agencyName",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入小区名字",
+                message: "请输入社区名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "企业名称",
-              prop: "enterpriseName",
+              label: "小区名字",
+              prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['enterpriseId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
-                message: "请输入企业名称",
+                message: "请输入小区名字",
                 trigger: "blur"
               }]
             },
             {
-              label: "机构类型",
-              prop: "agencyType",
+              label: "企业名称",
+              prop: "enterpriseName",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
-                message: "请输入机构类型",
+                message: "请输入企业名称",
                 trigger: "blur"
               }]
             },
+            //？？？
+            // {
+            //   label: "机构类型",
+            //   prop: "agencyType",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入机构类型",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "设备位置",
               prop: "deviceAddress",
@@ -185,17 +212,9 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "机构名称",
-              prop: "agencyName",
-              rules: [{
-                required: true,
-                message: "请输入机构名称",
-                trigger: "blur"
-              }]
-            },
             {
               label: "设备mac码",
+              labelWidth: 100,
               prop: "deviceMac",
               rules: [{
                 required: true,
@@ -203,15 +222,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
           ]
         },
         data: []

src/views/estate/article.vue

@@ -28,6 +28,9 @@
         </el-button>
       </template>
     </avue-crud>
+    <avue-ueditor>
+
+    </avue-ueditor>
   </basic-container>
 </template>
 
@@ -60,47 +63,68 @@
           dialogClickModal: false,
           column: [
             {
-              label: "动态内容",
-              prop: "content",
+              label: "园区名称",
+              prop: "agencyId",
+              type: 'select',
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入动态内容",
+                message: "请选择园区名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "园区id",
-              prop: "agencyId",
+              label: "文章标题",
+              prop: "title",
               rules: [{
                 required: true,
-                message: "请输入园区id",
+                message: "请输入文章标题",
                 trigger: "blur"
               }]
             },
             {
-              label: "阅读数量",
-              prop: "reader",
+              label: "图片",
+              prop: "image",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 12,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
-                message: "请输入阅读数量",
+                message: "请输入图片",
                 trigger: "blur"
               }]
             },
             {
-              label: "文章标题",
-              prop: "title",
+              label: "阅读数量",
+              prop: "reader",
               rules: [{
-                required: true,
-                message: "请输入文章标题",
+                required: false,
+                message: "请输入阅读数量",
                 trigger: "blur"
               }]
             },
             {
-              label: "图片",
-              prop: "image",
+              label: "动态内容",
+              prop: "content",
+              component: 'avueUeditor',
+              overHidden: true,
+              span:24,
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入图片",
+                message: "请输入动态内容",
                 trigger: "blur"
               }]
             },
@@ -130,6 +154,8 @@
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {
+          let Base64 = require('js-base64').Base64;
+          row.content =Base64.encode(row.content);
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -142,6 +168,8 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        let Base64 = require('js-base64').Base64;
+        row.content =Base64.encode(row.content);
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({

src/views/estate/car.vue

@@ -68,9 +68,39 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "车主姓名",
+              prop: "personName",
+              search:true,
+              rules: [{
+                required: true,
+                message: "请输入车主姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "车主电话",
+              prop: "personPhone",
+              rules: [{
+                required: true,
+                message: "请输入车主电话",
+                trigger: "blur"
+              }]
+            },
             {
               label: "车辆类型",
               prop: "type",
+              type: 'select',
+              //远程字典
+              dicData: [
+                {
+                  label: '小汽车',
+                  value: 1
+                },{
+                  label: '大货车',
+                  value: 2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车辆类型",
@@ -78,11 +108,30 @@
               }]
             },
             {
-              label: "车辆性质(货运、客运、营运、非运营,出租)",
+              label: "车辆性质",
               prop: "properties",
+              type: 'select',
+              dicData: [
+                {
+                  label: '货运',
+                  value: 1
+                },{
+                  label: '客运',
+                  value: 2
+                },{
+                  label: '营运',
+                  value: 3
+                },{
+                  label: '非运营',
+                  value: 4
+                },{
+                  label: '出租',
+                  value: 5
+                },
+              ],
               rules: [{
                 required: true,
-                message: "请输入车辆性质(货运、客运、营运、非运营,出租)",
+                message: "请输入车辆性质(货运、客运、营运、非运营、出租)",
                 trigger: "blur"
               }]
             },
@@ -98,6 +147,26 @@
             {
               label: "燃油类别",
               prop: "fuelCategory",
+              type:'select',
+              dicData:[
+                {
+                  label: '汽油',
+                  value:1
+                },{
+                  label: '电力',
+                  value:2
+                },{
+                  label: '柴油',
+                  value:3
+                },{
+                  label: '油电混动',
+                  value:4
+                },
+                {
+                  label: '其他',
+                  value:5
+                },
+              ],
               rules: [{
                 required: true,
                 message: "请输入燃油类别",
@@ -114,26 +183,18 @@
               }]
             },
             {
-              label: "车主姓名",
-              prop: "personName",
-              rules: [{
-                required: true,
-                message: "请输入车主姓名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "车主电话",
-              prop: "personPhone",
-              rules: [{
-                required: true,
-                message: "请输入车主电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "社区ID",
+              label: "所属社区",
               prop: "agencyId",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入社区ID",
@@ -141,8 +202,19 @@
               }]
             },
             {
-              label: "小区id",
+              label: "所属小区",
               prop: "residentialId",
+              type:'select',
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入小区id",
@@ -150,62 +222,120 @@
               }]
             },
             {
-              label: "车辆照片",
-              prop: "carImg",
-              rules: [{
-                required: true,
-                message: "请输入车辆照片",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "企业id",
+              label: "所属企业",
               prop: "enterpriseId",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
                 message: "请输入企业id",
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "车主id",
+            //   prop: "personId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入车主id:若为社区租户则为住户id，若为园区租户则为员工id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "机构路径",
-              prop: "orgPosition",
+              label: "所属停车场",
+              labelWidth:100,
+              prop: "parkingLotId",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: ``,
+              props: {
+                label: "parkingLotName",
+                value: "id"
+              },
               rules: [{
                 required: true,
-                message: "请输入机构路径",
+                message: "请输入所属停车场id",
                 trigger: "blur"
               }]
             },
             {
-              label: "车主id:若为社区租户则为住户id，若为园区租户则为员工id",
-              prop: "personId",
+              label: "车辆照片",
+              prop: "carImg",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
-                message: "请输入车主id:若为社区租户则为住户id，若为园区租户则为员工id",
+                message: "请输入车辆照片",
                 trigger: "blur"
               }]
             },
             {
-              label: "所属停车场id",
-              prop: "parkingLotId",
+              label: "行驶证正面图片",
+              prop: "vehicleDrivingLicense1",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
-                message: "请输入所属停车场id",
+                message: "请输入行驶证正面图片地址",
                 trigger: "blur"
               }]
             },
             {
-              label: "行驶证正面图片地址",
-              prop: "vehicleDrivingLicense1",
+              label: "行驶证背面图片",
+              prop: "vehicleDrivingLicense2",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
-                message: "请输入行驶证正面图片地址",
+                message: "请输入行驶证背面图片地址",
                 trigger: "blur"
               }]
             },
             {
-              label: "审核状态：-1 审核不通过  0-待审核 1-审核通过",
+              label: "审核状态",
               prop: "auditStatus",
+              type:'select',
+              dicData:[
+                {
+                  label:'审核不通过',
+                  value:-1
+                },{
+                  label:'待审核',
+                  value:0
+                },{
+                  label:'审核通过',
+                  value:1
+                },
+              ],
               rules: [{
                 required: true,
                 message: "请输入审核状态：-1 审核不通过  0-待审核 1-审核通过",
@@ -221,15 +351,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "行驶证背面图片地址",
-              prop: "vehicleDrivingLicense2",
-              rules: [{
-                required: true,
-                message: "请输入行驶证背面图片地址",
-                trigger: "blur"
-              }]
-            },
           ]
         },
         data: []

src/views/estate/carenterrecord.vue

@@ -60,11 +60,12 @@
           dialogClickModal: false,
           column: [
             {
-              label: "索引ID",
-              prop: "indexId",
+              label:'订单号',
+              prop:'orderNo',
+              addDisplay:false,
               rules: [{
-                required: true,
-                message: "请输入索引ID",
+                required: false,
+                message: "请输入	车场唯一编号",
                 trigger: "blur"
               }]
             },
@@ -86,18 +87,20 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "订单号",
-              prop: "orderNo",
-              rules: [{
-                required: true,
-                message: "请输入订单号",
-                trigger: "blur"
-              }]
-            },
             {
               label: "车辆类型",
               prop: "carTypeNo",
+              type: 'select',
+              //远程字典
+              dicData: [
+                {
+                  label: '小汽车',
+                  value: 1
+                },{
+                  label: '大货车',
+                  value: 2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车辆类型",
@@ -107,6 +110,7 @@
             {
               label: "入场时间	",
               prop: "enterTime",
+              type:'datetime',
               rules: [{
                 required: true,
                 message: "请输入入场时间	",
@@ -114,7 +118,7 @@
               }]
             },
             {
-              label: "入口车道名称	",
+              label: "入口车道名称",
               prop: "enterGateName",
               rules: [{
                 required: true,
@@ -123,7 +127,7 @@
               }]
             },
             {
-              label: "入口操作员	",
+              label: "入口操作员",
               prop: "enterOperatorName",
               rules: [{
                 required: true,
@@ -132,8 +136,18 @@
               }]
             },
             {
-              label: "车辆状态（0-未锁 1-锁定）",
+              label: "车辆状态",
               prop: "lockCar",
+              type:'radio',
+              dicData:[
+                {
+                  label: '未锁',
+                  value: 0
+                },{
+                  label: '锁定',
+                  value: 1
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车辆状态（0-未锁 1-锁定）",
@@ -143,6 +157,14 @@
             {
               label: "入场图片	",
               prop: "enterImgPath",
+              type:'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
                 message: "请输入入场图片	",
@@ -159,17 +181,38 @@
               }]
             },
             {
-              label: "社区id",
+              label: "所属社区",
               prop: "agencyId",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入社区id",
+                message: "请输入社区ID",
                 trigger: "blur"
               }]
             },
             {
-              label: "小区id",
+              label: "所属小区",
               prop: "residentialId",
+              type:'select',
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入小区id",
@@ -177,23 +220,33 @@
               }]
             },
             {
-              label: "企业id",
+              label: "所属企业",
               prop: "enterpriseId",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
                 message: "请输入企业id",
                 trigger: "blur"
               }]
             },
-            {
-              label: "路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入路径",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "路径",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入路径",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
         data: []

src/views/estate/caroutrecord.vue

@@ -59,15 +59,15 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "索引ID",
-              prop: "indexId",
-              rules: [{
-                required: true,
-                message: "请输入索引ID",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "索引ID",
+            //   prop: "indexId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入索引ID",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "车场唯一编号",
               prop: "parkKey",
@@ -89,6 +89,7 @@
             {
               label: "订单号",
               prop: "orderNo",
+              addDisplay:false,
               rules: [{
                 required: true,
                 message: "请输入订单号",
@@ -98,6 +99,17 @@
             {
               label: "车辆类型",
               prop: "carTypeNo",
+              type: 'select',
+              //远程字典
+              dicData: [
+                {
+                  label: '小汽车',
+                  value: 1
+                },{
+                  label: '大货车',
+                  value: 2
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车辆类型",
@@ -105,8 +117,9 @@
               }]
             },
             {
-              label: "入场时间（V1.1版本返回字段）",
+              label: "入场时间",
               prop: "enterTime",
+              type:'datetime',
               rules: [{
                 required: true,
                 message: "请输入入场时间（V1.1版本返回字段）",
@@ -114,7 +127,7 @@
               }]
             },
             {
-              label: "入口车道名称（V1.1版本返回字段）",
+              label: "入口车道名称",
               prop: "enterGateName",
               rules: [{
                 required: true,
@@ -123,7 +136,7 @@
               }]
             },
             {
-              label: "出场时间	",
+              label: "出场时间",
               prop: "outTime",
               rules: [{
                 required: true,
@@ -132,7 +145,7 @@
               }]
             },
             {
-              label: "出口车道名称	",
+              label: "出口车道名称",
               prop: "outGateName",
               rules: [{
                 required: true,
@@ -141,7 +154,7 @@
               }]
             },
             {
-              label: "出口操作员	",
+              label: "出口操作员",
               prop: "outOperatorName",
               rules: [{
                 required: true,
@@ -150,8 +163,18 @@
               }]
             },
             {
-              label: "车辆状态（0-未锁 1-锁定）",
+              label: "车辆状态",
               prop: "lockCar",
+              type:'radio',
+              dicData:[
+                {
+                  label: '未锁',
+                  value: 0
+                },{
+                  label: '锁定',
+                  value: 1
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车辆状态（0-未锁 1-锁定）",
@@ -159,8 +182,16 @@
               }]
             },
             {
-              label: "出场图片	",
+              label: "出场图片",
               prop: "outImgPath",
+              type:'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
               rules: [{
                 required: true,
                 message: "请输入出场图片	",
@@ -168,7 +199,7 @@
               }]
             },
             {
-              label: "订单总金额（单位元）",
+              label: "订单总金额",
               prop: "totalAmount",
               rules: [{
                 required: true,
@@ -186,17 +217,38 @@
               }]
             },
             {
-              label: "社区id",
+              label: "所属社区",
               prop: "agencyId",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入社区id",
+                message: "请输入社区ID",
                 trigger: "blur"
               }]
             },
             {
-              label: "小区id",
+              label: "所属小区",
               prop: "residentialId",
+              type:'select',
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入小区id",
@@ -204,23 +256,33 @@
               }]
             },
             {
-              label: "企业id",
+              label: "所属企业",
               prop: "enterpriseId",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
                 message: "请输入企业id",
                 trigger: "blur"
               }]
             },
-            {
-              label: "路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入路径",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "路径",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入路径",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
         data: []

src/views/estate/guest.vue

@@ -78,8 +78,26 @@
               }]
             },
             {
-              label: "性别  0-未定义  1-男 2-女",
+              label: "性别",
               prop: "guestSex",
+              type: "radio",
+              dicData:[
+                {
+                  label:'男',
+                  value: 1
+                },{
+                  label:'女',
+                  value: 2
+                },{
+                  label:'未定义',
+                  value: 0
+                }
+              ],
+              // dicUrl: "/api/blade-system/dict/dictionary?code=sex",
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey"
+              // },
               rules: [{
                 required: true,
                 message: "请输入性别  0-未定义  1-男 2-女",
@@ -96,89 +114,102 @@
               }]
             },
             {
-              label: "所属社区id",
-              prop: "agencyId",
-              rules: [{
-                required: true,
-                message: "请输入所属社区id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属社区名称",
+              label: "社区名称",
               prop: "agencyName",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入所属社区名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区id",
-              prop: "residentialId",
-              rules: [{
-                required: true,
-                message: "请输入所属小区id",
+                message: "请输入社区名称",
                 trigger: "blur"
               }]
             },
             {
               label: "小区名称",
               prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "楼栋id",
-              prop: "buildingId",
-              rules: [{
-                required: true,
-                message: "请输入楼栋id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "楼栋名称",
               prop: "buildingName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['unitId'],
+              // dicUrl: "/api/building/building/list?residentialId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
               rules: [{
                 required: true,
                 message: "请输入楼栋名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "所属单元id",
-              prop: "unitId",
-              rules: [{
-                required: true,
-                message: "请输入所属单元id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "单元名称",
               prop: "unitName",
+              type: 'select',
+              search: true,
+              // cascaderItem: ['floorId'],
+              // dicFlag: false,
+              // dicUrl: "/api/community/unit/list?buildingId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入单元名称",
                 trigger: "blur"
               }]
             },
-            {
-              label: "楼层id",
-              prop: "floorId",
-              rules: [{
-                required: true,
-                message: "请输入楼层id",
-                trigger: "blur"
-              }]
-            },
             {
               label: "楼层名称",
               prop: "floorName",
+              type: "select",
+              search: true,
+              // dicFlag: false,
+              // cascaderItem: ["roomId"],
+              // dicUrl: "/api/floor/floor/list?unitId={{key}}&size=900000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
                 message: "请输入楼层名称",
@@ -186,20 +217,22 @@
               }]
             },
             {
-              label: "所属房间id",
-              prop: "roomId",
-              rules: [{
-                required: true,
-                message: "请输入所属房间id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属房间名称",
+              label: "房间名称",
               prop: "roomName",
+              type: "select",
+              search: true,
+              // dicFlag: false,
+              // dicUrl: "/api/community/room/list?floorId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入所属房间名称",
+                message: "请输入房间名称",
                 trigger: "blur"
               }]
             },
@@ -212,45 +245,62 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "访问的住户的id",
+            //   prop: "userId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入访问的住户的id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "访问的住户的id",
-              prop: "userId",
-              rules: [{
-                required: true,
-                message: "请输入访问的住户的id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "企业id",
-              prop: "enterpriseId",
-              rules: [{
-                required: true,
-                message: "请输入企业id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "企业名称",
+              label: "所属企业",
               prop: "enterpriseName",
+              type: "select",
+              width: 160,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              dicUrl: `/api/enterprise/enterprise/getList`,
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
               rules: [{
                 required: true,
-                message: "请输入企业名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "存储位置（通过该字段快速查询，所有的子节点）",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入存储位置（通过该字段快速查询，所有的子节点）",
+                message: "请输入企业id",
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "存储位置",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入存储位置（通过该字段快速查询，所有的子节点）",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "审核状态：0-待审核 1-审核通过 2-审核不通过",
+              label: "审核状态",
               prop: "checkState",
+              type: 'select',
+              search :true,
+              dicData: [
+                {
+                  label: '待审核',
+                  value: 0
+                },
+                {
+                  label: '审核通过',
+                  value: 1
+                },
+                {
+                  label: '审核不通过',
+                  value: 2
+                },
+              ],
               rules: [{
                 required: true,
                 message: "请输入审核状态：0-待审核 1-审核通过 2-审核不通过",
@@ -258,26 +308,36 @@
               }]
             },
             {
-              label: "脸部照片url（没有域名）",
+              label: "脸部照片",
               prop: "imageUri",
+              type:'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
                 message: "请输入脸部照片url（没有域名）",
                 trigger: "blur"
               }]
             },
-            {
-              label: "openId",
-              prop: "openId",
-              rules: [{
-                required: true,
-                message: "请输入openId",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "openId",
+            //   prop: "openId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入openId",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "访问时间",
               prop: "interviewTime",
+              type:'datetime',
               rules: [{
                 required: true,
                 message: "请输入访问时间",

src/views/estate/parkinglot.vue

@@ -59,15 +59,15 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "索引ID",
-              prop: "indexId",
-              rules: [{
-                required: true,
-                message: "请输入索引ID",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "索引ID",
+            //   prop: "indexId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入索引ID",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "车场唯一编号",
               prop: "parkKey",
@@ -78,20 +78,42 @@
               }]
             },
             {
-              label: "所属社区",
-              prop: "agencyId",
+              label: "社区名称",
+              prop: "agencyName",
+              type: "select",
+              search: true,
+              // overHidden: true,
+              // remote: true,
+              // cascaderItem: ['residentialId'],
+              // dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              // props: {
+              //   label: "agencyName",
+              //   value: "id"
+              // },
               rules: [{
                 required: true,
-                message: "请输入所属社区",
+                message: "请输入社区名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "所属小区",
-              prop: "residentialId",
+              label: "小区名称",
+              prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入所属小区",
+                message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
@@ -107,6 +129,7 @@
             {
               label: "车场纬度",
               prop: "parkLatitude",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入车场纬度",
@@ -116,6 +139,7 @@
             {
               label: "车场经度",
               prop: "parkLongitude",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入车场经度",
@@ -152,6 +176,7 @@
             {
               label: "免费分钟数	",
               prop: "parkFreeTime",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入免费分钟数	",
@@ -161,6 +186,7 @@
             {
               label: "免费超时分钟数	",
               prop: "parkFreeTimeout",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入免费超时分钟数	",
@@ -170,6 +196,7 @@
             {
               label: "车场收费说明	",
               prop: "chargesDesc",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入车场收费说明	",
@@ -177,8 +204,20 @@
               }]
             },
             {
-              label: "停车场是否启用预定功能",
+              label: "否启用预定功能",
+              labelWidth:150,
               prop: "reserveStatus",
+              hide:true,
+              type:'radio',
+              dicData:[
+                {
+                  label:'是',
+                  value:1
+                },{
+                  label:'否',
+                  value:0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入停车场是否启用预定功能",
@@ -188,6 +227,8 @@
             {
               label: "注册时间	",
               prop: "regTime",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入注册时间	",
@@ -197,6 +238,8 @@
             {
               label: "停车场有效期止日	",
               prop: "validTime",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入停车场有效期止日	",
@@ -204,8 +247,9 @@
               }]
             },
             {
-              label: "停车场可容纳的车位总数",
+              label: "车位总数",
               prop: "spaceTotal",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入停车场可容纳的车位总数",
@@ -213,8 +257,9 @@
               }]
             },
             {
-              label: "车牌地区简称	",
+              label: "车牌地区简称",
               prop: "cityShortName",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入车牌地区简称	",
@@ -224,21 +269,22 @@
             {
               label: "空余车位",
               prop: "remainSpace",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入空余车位",
                 trigger: "blur"
               }]
             },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "机构路径",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入机构路径",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
         data: []

src/views/estate/parkingspace.vue

@@ -60,8 +60,24 @@
           dialogClickModal: false,
           column: [
             {
-              label: "车位类型（微型，小型，中型，大型）跟车辆类型对应",
+              label: "车位类型",
               prop: "type",
+              type:'select',
+              dicData:[
+                {
+                  label:'微型',
+                  value:1
+                },{
+                  label: '小型',
+                  value: 2
+                },{
+                  label:'中型',
+                  value:3
+                },{
+                  label: '大型',
+                  value: 4
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入车位类型（微型，小型，中型，大型）跟车辆类型对应",
@@ -89,6 +105,16 @@
             {
               label: "是否室内",
               prop: "isIndoor",
+              type:'select',
+              dicData: [
+                {
+                  label:'是',
+                  value: 1
+                },{
+                  label: '否',
+                  value: 0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入是否室内",
@@ -96,11 +122,23 @@
               }]
             },
             {
-              label: "小区id",
-              prop: "residentialId",
+              label: "小区名称",
+              prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入小区id",
+                message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
@@ -113,27 +151,37 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "机构路径",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入机构路径",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "",
+            //   prop: "parkinglotId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "机构路径",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "",
-              prop: "parkinglotId",
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否占用: 1-已占用 0-未占用",
+              label: "是否占用",
               prop: "isUsed",
+              type:'select',
+              dicData: [
+                {
+                  label:'是',
+                  value: 1
+                },{
+                  label: '否',
+                  value: 0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入是否占用: 1-已占用 0-未占用",

src/views/estate/repair.vue

@@ -79,6 +79,7 @@
             },
             {
               label: "上报人电话",
+              labelWidth: 100,
               prop: "reportPhone",
               rules: [{
                 required: true,
@@ -89,6 +90,7 @@
             {
               label: "上报时间",
               prop: "reportTime",
+              type:'datetime',
               rules: [{
                 required: true,
                 message: "请输入上报时间",
@@ -107,6 +109,7 @@
             {
               label: "处理人电话",
               prop: "handlerPhone",
+              labelWidth: 100,
               rules: [{
                 required: true,
                 message: "请输入处理人电话",
@@ -116,6 +119,16 @@
             {
               label: "工单状态",
               prop: "jobStatus",
+              type:'select',
+              dicData:[
+                {
+                  label:'处理中',
+                  value:0
+                },{
+                  label:'已处理',
+                  value:1
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入工单状态",
@@ -123,26 +136,39 @@
               }]
             },
             {
-              label: "小区id",
-              prop: "residentialId",
-              rules: [{
-                required: true,
-                message: "请输入小区id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
+              label: "小区名称",
+              prop: "residentialName",
+              type:'select',
+              // cascaderItem: ['buildingId'],
+              // dicUrl: "/api/community/residential/list?agencyId={{key}}&size=9000000",
+              // dicFormatter: (res)=>{
+              //   return res.data.records;
+              // },
+              // props: {
+              //   label: "name",
+              //   value: "id"
+              // },
+              // dicFlag: false,
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入机构路径",
+                message: "请输入小区名称",
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "机构路径",
+            //   prop: "orgPosition",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入机构路径",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "报修位置",
               prop: "reportPosition",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入报修位置",
@@ -152,6 +178,8 @@
             {
               label: "预约开始时间",
               prop: "beginTime",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入预约开始时间",
@@ -161,6 +189,8 @@
             {
               label: "预约结束时间",
               prop: "endTime",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入预约结束时间",
@@ -168,8 +198,20 @@
               }]
             },
             {
-              label: "0-未评价  1-已评价",
+              label: "是否已评价",
               prop: "estimateStatus",
+              labelWidth:100,
+              hide:true,
+              type:'select',
+              dicData:[
+                {
+                  label:'是',
+                  value:1
+                },{
+                  label:'否',
+                  value:0
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入0-未评价  1-已评价",
@@ -177,8 +219,9 @@
               }]
             },
             {
-              label: "用户对处理结果的评论",
+              label: "用户评论",
               prop: "comment",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入用户对处理结果的评论",
@@ -188,33 +231,35 @@
             {
               label: "处理时间",
               prop: "handleTime",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入处理时间",
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "物业系统id",
+            //   prop: "oldId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入物业系统id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "小区名称",
-              prop: "residentialName",
-              rules: [{
-                required: true,
-                message: "请输入小区名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "物业系统id",
-              prop: "oldId",
-              rules: [{
-                required: true,
-                message: "请输入物业系统id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "图片-多张图片用“，”切割",
+              label: "图片",
               prop: "pic",
+              type:'upload',
+              listType: 'picture-img',
+              span: 12,
+              hide: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
                 required: true,
                 message: "请输入图片-多张图片用“，”切割",
@@ -224,6 +269,7 @@
             {
               label: "报修详情",
               prop: "reportDetail",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入报修详情",

src/views/party/branch.vue

@@ -50,6 +50,7 @@
         option: {
           height:'auto',
           calcHeight: 30,
+          labelWidth: 120,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -69,17 +70,19 @@
               }]
             },
             {
-              label: "党支部介绍",
-              prop: "branchIntroduce",
+              label: "关联的小区",
+              prop: "residentialIds",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入党支部介绍",
+                message: "请输入党支部关联的小区id，多个用“，”隔开",
                 trigger: "blur"
               }]
             },
             {
               label: "负责人名称",
               prop: "leaderName",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入负责人名称",
@@ -89,6 +92,7 @@
             {
               label: "负责人联系方式",
               prop: "leaderPhone",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入负责人联系方式",
@@ -96,29 +100,31 @@
               }]
             },
             {
-              label: "党支部关联的小区id，多个用“，”隔开",
-              prop: "residentialIds",
+              label: "小区名称",
+              prop: "residentialNames",
+              hide: true,
               rules: [{
-                required: true,
-                message: "请输入党支部关联的小区id，多个用“，”隔开",
+                required: false,
+                message: "请输入党支部关联的小区名称，多个用“，”隔开",
                 trigger: "blur"
               }]
             },
             {
-              label: "党支部关联的小区名称，多个用“，”隔开",
-              prop: "residentialNames",
+              label: "机构路径",
+              prop: "orgPositions",
               rules: [{
-                required: true,
-                message: "请输入党支部关联的小区名称，多个用“，”隔开",
+                required: false,
+                message: "请输入机构路径：由关联的小区的机构路径组成，多个小区用“，”隔开",
                 trigger: "blur"
               }]
             },
             {
-              label: "机构路径：由关联的小区的机构路径组成，多个小区用“，”隔开",
-              prop: "orgPositions",
+              label: "党支部介绍",
+              prop: "branchIntroduce",
+              type: "textarea",
               rules: [{
-                required: true,
-                message: "请输入机构路径：由关联的小区的机构路径组成，多个小区用“，”隔开",
+                required: false,
+                message: "请输入党支部介绍",
                 trigger: "blur"
               }]
             },

src/views/party/member.vue

@@ -60,7 +60,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "",
+              label: "党员名称",
               prop: "name",
               rules: [{
                 required: true,
@@ -69,11 +69,12 @@
               }]
             },
             {
-              label: "性别： 0-未定义 1-男 2-女",
+              label: "性别",
               prop: "sex",
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入性别： 0-未定义 1-男 2-女",
+                message: "请选择性别",
                 trigger: "blur"
               }]
             },
@@ -87,7 +88,7 @@
               }]
             },
             {
-              label: "住址",
+              label: "详细住址",
               prop: "address",
               rules: [{
                 required: true,
@@ -105,26 +106,29 @@
               }]
             },
             {
-              label: "所属党支部id",
+              label: "所属党支部",
               prop: "branchId",
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入所属党支部id",
+                message: "请选择所属党支部",
                 trigger: "blur"
               }]
             },
             {
-              label: "党员状态：1-正常 2-转出 3-失联 4-死亡 5-清退",
+              label: "党员状态",
               prop: "memberStatus",
+              type: "select",
               rules: [{
                 required: true,
-                message: "请输入党员状态：1-正常 2-转出 3-失联 4-死亡 5-清退",
+                message: "请选择党员状态",
                 trigger: "blur"
               }]
             },
             {
               label: "入党时间",
               prop: "enterTime",
+              type: "datetime",
               rules: [{
                 required: true,
                 message: "请输入入党时间",
@@ -134,35 +138,48 @@
             {
               label: "党员证件图像",
               prop: "memberPic",
+              type: 'upload',
+              listType: 'picture-img',
+              span: 8,
+              hide: true,
+              row: true,
+              propsHttp: {
+                url: "data"
+              },
+              action: "/api/upload/putfile",
+              tip: "只能上传jpg/png图片，且不超过500kb",
               rules: [{
-                required: true,
-                message: "请输入党员证件图像",
+                required: false,
+                message: "请输入脸部照片url（没有域名）",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否为优秀党员： 1-是 0-否",
+              label: "是否为优秀党员",
               prop: "isExcellent",
+              type: 'select',
               rules: [{
                 required: true,
-                message: "请输入是否为优秀党员： 1-是 0-否",
+                message: "是否为优秀党员",
                 trigger: "blur"
               }]
             },
             {
-              label: "审核状态  -1:审核不通过  0:待审核 1:审核通过",
+              label: "审核状态",
               prop: "auditStatus",
+              type: 'select',
               rules: [{
-                required: true,
-                message: "请输入审核状态  -1:审核不通过  0:待审核 1:审核通过",
+                required: false,
+                message: "请选择审核状态",
                 trigger: "blur"
               }]
             },
             {
               label: "审核意见",
               prop: "auditOpinion",
+              type: 'textarea',
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入审核意见",
                 trigger: "blur"
               }]
@@ -171,7 +188,7 @@
               label: "机构路径",
               prop: "orgPosition",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入机构路径",
                 trigger: "blur"
               }]