楼层

package-lock.json

@@ -2149,6 +2149,17 @@
         }
       }
     },
+    "avue-plugin-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/avue-plugin-map/-/avue-plugin-map-1.0.1.tgz",
+      "integrity": "sha512-QpGiCJZxF/DptoJrZnZWwQSxA2oBI7S8Wog3CEh9EhwrAKb+I0Ct8PWO+hBH2Q+tXTv/glhSWMh9aUbQa0/YIg==",
+      "requires": {
+        "axios": "^0.18.0",
+        "element-ui": "^2.4.6",
+        "vue": "^2.5.17",
+        "vue-router": "^3.0.1"
+      }
+    },
     "avue-plugin-ueditor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/avue-plugin-ueditor/-/avue-plugin-ueditor-0.1.7.tgz",

package.json

@@ -15,6 +15,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",

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/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

@@ -162,7 +162,9 @@
             },
             {
               label: "社区名称",
+              prop: "agencyName",
               type: "select",
+              search: true,
               // overHidden: true,
               // remote: true,
               // cascaderItem: ['residentialId'],
@@ -318,6 +320,7 @@
             {
               label: "人员分类",
               prop: "personType",
+              type: 'select',
               rules: [{
                 required: true,
                 message: "请输入人员分类：常住；重点。。。。",

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",