Merge remote-tracking branch 'origin/master'

package.json

@@ -21,6 +21,7 @@
     "avue-plugin-ueditor": "^0.1.4",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
+    "charts.css": "^0.9.0",
     "classlist-polyfill": "^1.2.0",
     "core-js": "^2.6.12",
     "crypto-js": "^4.0.0",

saber-grid-sys-grid.iml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/components/3DMap/Map3D.vue

@@ -278,10 +278,11 @@ export default {
       //初始化弹框图层
       this.$refs['infoLayer'].onload();
       this.$refs['dangerCircle'].onLoad();
-      // this.addBuildingData('/data/ningxia.json');
+      this.addBuildingData('/data/ningxia.json');
       //添加建筑矢量数据
-      this.addBuildingData('http://139.9.103.171/mapData/zhengzhou/tileset.json')
+      // this.addBuildingData('http://139.9.103.171/mapData/zhengzhou/tileset.json')
       //定位建筑群位置
+      // this.flyToPosition(114.357763,35.924515, 2000.0,0,-20.0,0.0);
       this.flyToPosition(114.357763,35.924515, 2000.0,0,-20.0,0.0);
     },
 

src/components/my-top-menu.vue

@@ -20,7 +20,7 @@
           return {
             tagList: [
               {name: '网格看板',path: '/grid/viewpanel'},
-              {name: '数据大屏',path: '/grid/dataPage'},
+              // {name: '数据大屏',path: '/grid/dataPage'},
               {name: '网格划分',path: '/grid/divide'},
               // {name: '人员管理',path: '/grid/myLayout/memberList'},
               // {name: '设备管理',path: '/grid/myLayout/deviceList'},

src/components/person-tags/disablerTags-detail.vue

@@ -24,323 +24,343 @@
           emptyBtn:false,
           submitBtn:false,
           disabled:true,
-          column: [
+          group:[
             {
-              label: "基本表Id",
-              prop: "parentId",
-              display: false,
-              editDisabled:false,
-              rules: [{
-                required: false,
-                message: "请输入基本表Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label:'姓名',
-              prop:'name',
-            },
-            {
-              label: "居住情况",
-              prop: "livingConditions",
-              type: 'select',
-              multiple: true,
-              dataType:'string',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=living-conditions",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "请选择居住情况",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "监护人",
-              prop: "guardian",
-              rules: [{
-                required: false,
-                message: "请输入监护人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "监护人电话",
-              prop: "guardianPhone",
-              rules: [{
-                required: false,
-                message: "请输入监护人电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "收入来源",
-              prop: "incomeSource",
-              type: 'select',
-              multiple: true,
-              dataType:'string',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=income-source",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "请选择收入来源",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "医疗保障",
-              prop: "healthCare",
-              type: 'select',
-              multiple: true,
-              dataType:'string',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=health-care",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "康复需求",
-              prop: "convalescence",
-              rules: [{
-                required: false,
-                message: "请输入康复需求",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "辅助器具",
-              prop: "assistiveDevices",
-              rules: [{
-                required: false,
-                message: "请输入辅助器具",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "生活爱好",
-              prop: "hobby",
-              rules: [{
-                required: false,
-                message: "请输入生活爱好",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "生活嗜好",
-              prop: "addiction",
-              rules: [{
-                required: false,
-                message: "请输入生活嗜好",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "行为能力",
-              prop: "ability",
-              type: 'select',
-              dataType:'number',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "请选择行为能力",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "社交能力",
-              prop: "socialSkills",
-              type: 'select',
-              dataType:'number',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=social-skills",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "请选择社交能力",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "就业意向",
-              prop: "employmentNeeds",
-              rules: [{
-                required: false,
-                message: "请输入就业意向",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "探访计划",
-              prop: "visitPlan",
-              rules: [{
-                required: false,
-                message: "请输入探访计划",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              rules: [{
-                required: false,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属社区",
-              prop: "agencyId",
-              slot: true,
-              search: true,
-              cascaderItem: ['residentialId'],
-              type: "select",
-              remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区",
-              prop: "residentialId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属小区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼栋",
-              prop: "buildingId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['unitId'],
-              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼栋Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属单元",
-              prop: "unitId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入单元Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼层",
-              prop: "floorId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼层Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属房间",
-              prop: "roomId",
-              slot: true,
-              type: "select",
-              search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入房间Id",
-                trigger: "blur"
-              }]
-            },
-          ]
+              icon:'el-icon-info',
+              label: '基础信息',
+              prop: 'group',
+              column:[
+                {
+                  label: "基本表Id",
+                  prop: "parentId",
+                  display: false,
+                  editDisabled:false,
+                  rules: [{
+                    required: false,
+                    message: "请输入基本表Id",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label:'姓名',
+                  prop:'name',
+                },
+                {
+                  label: "居住情况",
+                  prop: "livingConditions",
+                  type: 'select',
+                  multiple: true,
+                  dataType:'string',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=living-conditions",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "请选择居住情况",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "监护人",
+                  prop: "guardian",
+                  rules: [{
+                    required: false,
+                    message: "请输入监护人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "监护人电话",
+                  prop: "guardianPhone",
+                  rules: [{
+                    required: false,
+                    message: "请输入监护人电话",
+                    trigger: "blur"
+                  }]
+                },
+                // {
+                //   label: "所属社区",
+                //   prop: "agencyId",
+                //   slot: true,
+                //   search: true,
+                //   cascaderItem: ['residentialId'],
+                //   type: "select",
+                //   remote: true,
+                //   dicUrl: "/api/cyzh-community/agency/list",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请选择所属社区",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属小区",
+                //   prop: "residentialId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['buildingId'],
+                //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请选择所属小区",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属楼栋",
+                //   prop: "buildingId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['unitId'],
+                //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入楼栋Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属单元",
+                //   prop: "unitId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['floorId'],
+                //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入单元Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属楼层",
+                //   prop: "floorId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['roomId'],
+                //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入楼层Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属房间",
+                //   prop: "roomId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入房间Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                {
+                  label: "收入来源",
+                  prop: "incomeSource",
+                  type: 'select',
+                  multiple: true,
+                  dataType:'string',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=income-source",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "请选择收入来源",
+                    trigger: "blur"
+                  }]
+                },
+
+                {
+                  label: "探访计划",
+                  prop: "visitPlan",
+                  rules: [{
+                    required: false,
+                    message: "请输入探访计划",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "备注",
+                  prop: "remark",
+                  rules: [{
+                    required: false,
+                    message: "请输入备注",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            },{
+              icon:'el-icon-s-cooperation',
+              label: '医疗需求',
+              prop: 'group',
+              column: [
+                {
+                  label: "医疗保障",
+                  prop: "healthCare",
+                  type: 'select',
+                  multiple: true,
+                  dataType:'string',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=health-care",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "行为能力",
+                  prop: "ability",
+                  type: 'select',
+                  dataType:'number',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "请选择行为能力",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "康复需求",
+                  prop: "convalescence",
+                  rules: [{
+                    required: false,
+                    message: "请输入康复需求",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "辅助器具",
+                  prop: "assistiveDevices",
+                  rules: [{
+                    required: false,
+                    message: "请输入辅助器具",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            },{
+              icon:'el-icon-s-opportunity',
+              label: '社会能力',
+              prop: 'group',
+              column: [
+                {
+                  label: "生活爱好",
+                  prop: "hobby",
+                  rules: [{
+                    required: false,
+                    message: "请输入生活爱好",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "生活嗜好",
+                  prop: "addiction",
+                  rules: [{
+                    required: false,
+                    message: "请输入生活嗜好",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "社交能力",
+                  prop: "socialSkills",
+                  type: 'select',
+                  dataType:'number',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=social-skills",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "请选择社交能力",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "就业意向",
+                  prop: "employmentNeeds",
+                  rules: [{
+                    required: false,
+                    message: "请输入就业意向",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            }
+          ],
         },
       };
     },

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

@@ -8,376 +8,380 @@
 </template>
 
 <script>
-import {add} from "@/api/person/disabler";
-import {update,getDetail} from "@/api/person/basicinfo";
-import done from "../../views/work/done";
-export default {
-  name:'disablerTags-form',
-  props:{
-    closeFn:{type:Function},
-    basicData:{type:Object}
-  },
-  data() {
-    return {
-      form: {},
-      basicDataObject:{},
-      option: {
-        height:'auto',
-        calcHeight: 30,
-        labelWidth: 120,
-        tip: false,
-        submitText:"提交",
-        emptyBtn:false,
-        column: [
-          {
-            label: "基本表Id",
-            prop: "parentId",
-            display: false,
-            rules: [{
-              required: true,
-              message: "请输入基本表Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "居住情况",
-            prop: "livingConditions",
-            type: 'select',
-            multiple: true,
-            dataType:'string',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=living-conditions",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            rules: [{
-              required: true,
-              message: "请选择居住情况",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "监护人",
-            prop: "guardian",
-            rules: [{
-              required: true,
-              message: "请输入监护人",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "监护人电话",
-            prop: "guardianPhone",
-            rules: [{
-              required: true,
-              message: "请输入监护人电话",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "收入来源",
-            prop: "incomeSource",
-            type: 'select',
-            multiple: true,
-            dataType:'string',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=income-source",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            rules: [{
-              required: true,
-              message: "请选择收入来源",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "医疗保障",
-            prop: "healthCare",
-            type: 'select',
-            multiple: true,
-            dataType:'string',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=health-care",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
+  import {add} from "@/api/person/disabler";
+  import {update,getDetail} from "@/api/person/basicinfo";
+
+  export default {
+    name:'disablerTags-form',
+    props:{
+      closeFn:{type:Function},
+      basicData:{type:Object}
+    },
+    data() {
+      return {
+        form: {},
+        basicDataObject:{},
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          labelWidth: 120,
+          tip: false,
+          submitText:"提交",
+          emptyBtn:false,
+          column: [
+            {
+              label: "基本表Id",
+              prop: "parentId",
+              display: false,
+              rules: [{
+                required: true,
+                message: "请输入基本表Id",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请选择医疗保障",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "康复需求",
-            prop: "convalescence",
-            rules: [{
-              required: false,
-              message: "请输入康复需求",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "辅助器具",
-            prop: "assistiveDevices",
-            rules: [{
-              required: false,
-              message: "请输入辅助器具",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "生活爱好",
-            prop: "hobby",
-            rules: [{
-              required: false,
-              message: "请输入生活爱好",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "生活嗜好",
-            prop: "addiction",
-            rules: [{
-              required: false,
-              message: "请输入生活嗜好",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "行为能力",
-            prop: "ability",
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
+            {
+              label: "居住情况",
+              prop: "livingConditions",
+              type: 'select',
+              multiple: true,
+              dataType:'string',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=living-conditions",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请选择居住情况",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请选择行为能力",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "社交能力",
-            prop: "socialSkills",
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=social-skills",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
+            {
+              label: "监护人",
+              prop: "guardian",
+              rules: [{
+                required: false,
+                message: "请输入监护人",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请选择社交能力",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "就业意向",
-            prop: "employmentNeeds",
-            rules: [{
-              required: false,
-              message: "请输入就业意向",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "探访计划",
-            prop: "visitPlan",
-            rules: [{
-              required: false,
-              message: "请输入探访计划",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "备注",
-            prop: "remark",
-            rules: [{
-              required: false,
-              message: "请输入备注",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属社区",
-            prop: "agencyId",
-            slot: true,
-            search: true,
-            cascaderItem: ['residentialId'],
-            type: "select",
-            remote: true,
-            dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "监护人电话",
+              prop: "guardianPhone",
+              rules: [{
+                required: false,
+                message: "请输入监护人电话",
+                trigger: "blur"
+              }]
             },
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "收入来源",
+              prop: "incomeSource",
+              type: 'select',
+              multiple: true,
+              dataType:'string',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=income-source",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: false,
+                message: "请选择收入来源",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请选择所属社区",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属小区",
-            prop: "residentialId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "医疗保障",
+              prop: "healthCare",
+              type: 'select',
+              multiple: true,
+              dataType:'string',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=health-care",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请选择医疗保障",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "康复需求",
+              prop: "convalescence",
+              rules: [{
+                required: false,
+                message: "请输入康复需求",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请选择所属小区",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属楼栋",
-            prop: "buildingId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['unitId'],
-            dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "辅助器具",
+              prop: "assistiveDevices",
+              rules: [{
+                required: false,
+                message: "请输入辅助器具",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "生活爱好",
+              prop: "hobby",
+              rules: [{
+                required: false,
+                message: "请输入生活爱好",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入楼栋Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属单元",
-            prop: "unitId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['floorId'],
-            dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "生活嗜好",
+              prop: "addiction",
+              rules: [{
+                required: false,
+                message: "请输入生活嗜好",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "行为能力",
+              prop: "ability",
+              type: 'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: false,
+                message: "请选择行为能力",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入单元Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属楼层",
-            prop: "floorId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['roomId'],
-            dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "社交能力",
+              prop: "socialSkills",
+              type: 'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=social-skills",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: false,
+                message: "请选择社交能力",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "就业意向",
+              prop: "employmentNeeds",
+              rules: [{
+                required: false,
+                message: "请输入就业意向",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入楼层Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属房间",
-            prop: "roomId",
-            slot: true,
-            type: "select",
-            search: true,
-            dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            // {
+            //   label: "所属社区",
+            //   prop: "agencyId",
+            //   slot: true,
+            //   search: true,
+            //   cascaderItem: ['residentialId'],
+            //   type: "select",
+            //   remote: true,
+            //   dicUrl: "/api/cyzh-community/agency/list",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属社区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属小区",
+            //   prop: "residentialId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['buildingId'],
+            //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属小区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼栋",
+            //   prop: "buildingId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['unitId'],
+            //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼栋Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属单元",
+            //   prop: "unitId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['floorId'],
+            //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入单元Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼层",
+            //   prop: "floorId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['roomId'],
+            //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼层Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属房间",
+            //   prop: "roomId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入房间Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            {
+              label: "探访计划",
+              prop: "visitPlan",
+              type: 'textarea',
+              span:12,
+              rules: [{
+                required: false,
+                message: "请输入探访计划",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "备注",
+              prop: "remark",
+              type: 'textarea',
+              span:12,
+              rules: [{
+                required: false,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入房间Id",
-              trigger: "blur"
-            }]
-          },
-        ]
-      },
-    };
-  },
-  methods: {
-    //提交
-    addEntity(row, done) {
-      row.parentId = this.basicData.id;
-      row.name = this.basicData.name;
-      add(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-        this.LoadAndUpdate();
-        this.closeFn();
-      }, error => {
-        this.$message({
-          type:"fail",
-          message:"操作失败!"
-        });
-        window.console.log(error);
-      });
+          ]
+        },
+      };
     },
-    LoadAndUpdate() {
-      let tags_temp = this.basicData.tags;
-      if (tags_temp) {
-        tags_temp += "，残障人士";
-      } else {
-        tags_temp = "残障人士";
+    methods: {
+      //提交
+      addEntity(row, done) {
+        row.parentId = this.basicData.id;
+        row.name = this.basicData.name;
+        add(row).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+          this.LoadAndUpdate();
+          this.closeFn();
+        }, error => {
+          this.$message({
+            type:"fail",
+            message:"操作失败!"
+          });
+          window.console.log(error);
+        });
+      },
+      LoadAndUpdate() {
+        let tags_temp = this.basicData.tags;
+        if (tags_temp) {
+          tags_temp += "，残障人士";
+        } else {
+          tags_temp = "残障人士";
+        }
+        this.basicData.tags = tags_temp;
+        update(this.basicData).then(()=>{
+          this.closeFn();
+        }, error => {
+          console.log(error);
+        })
       }
-      this.basicData.tags = tags_temp;
-      update(this.basicData).then(()=>{
-        this.closeFn();
-      }, error => {
-        console.log(error);
-      })
     }
-  }
-};
+  };
 </script>
 
 <style>

src/components/person-tags/elderTags-detail.vue

@@ -24,306 +24,327 @@
           submitBtn:false,
           emptyBtn:false,
           disabled:true,
-          column: [
+          group:[
             {
-              label: "基本表Id",
-              prop: "parentId",
-              hide: true,
-              display: false,
-              rules: [{
-                required: false,
-                message: "请输入基本表Id",
-                trigger: "blur"
-              }]
+              icon:'el-icon-info',
+              label: '基础信息',
+              prop: 'group',
+              column:[
+                {
+                  label: "基本表Id",
+                  prop: "parentId",
+                  hide: true,
+                  display: false,
+                  rules: [{
+                    required: false,
+                    message: "请输入基本表Id",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label:'姓名',
+                  prop:'name',
+                  search:true,
+                  editDisplay:false
+                },
+                {
+                  label: "有无子女",
+                  prop: "children",
+                  type: 'select',
+                  dataType: 'number',
+                  hide: true,
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=children",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "有无子女",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "紧急联系人",
+                  prop: "emergencyContactPerson",
+                  rules: [{
+                    required: false,
+                    message: "请输入紧急联系人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "联系人电话",
+                  prop: "emergencyContactPhone",
+                  hide: true,
+                  rules: [{
+                    required: false,
+                    message: "请输入紧急联系人电话",
+                    trigger: "blur"
+                  }]
+                },
+                // {
+                //   label: "所属社区",
+                //   prop: "agencyId",
+                //   slot: true,
+                //   search: true,
+                //   cascaderItem: ['residentialId'],
+                //   type: "select",
+                //   remote: true,
+                //   dicUrl: "/api/cyzh-community/agency/list",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请选择所属社区",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属小区",
+                //   prop: "residentialId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['buildingId'],
+                //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请选择所属小区",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属楼栋",
+                //   prop: "buildingId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['unitId'],
+                //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入楼栋Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属单元",
+                //   prop: "unitId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['floorId'],
+                //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入单元Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属楼层",
+                //   prop: "floorId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   cascaderItem: ['roomId'],
+                //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入楼层Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+                // {
+                //   label: "所属房间",
+                //   prop: "roomId",
+                //   slot: true,
+                //   type: "select",
+                //   search: true,
+                //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+                //   dicFormatter:(res)=>{
+                //     return res.data.records;//返回字典的层级结构
+                //   },
+                //   // dicFlag: false,
+                //   filterable: true,
+                //   props: {
+                //     label: "name",
+                //     value: "id"
+                //   },
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入房间Id",
+                //     trigger: "blur"
+                //   }]
+                // },
+              ]
             },
             {
-              label:'姓名',
-              prop:'name',
-              search:true,
-              editDisplay:false
+              icon:"el-icon-s-cooperation",
+              label:'健康信息',
+              prop: 'group',
+              column: [
+                {
+                  label: "血压",
+                  prop: "bloodPressure",
+                  hide: true,
+                  rules: [{
+                    required: true,
+                    message: "请输入血压",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "血氧",
+                  prop: "bloodOxygen",
+                  hide: true,
+                  rules: [{
+                    required: false,
+                    message: "请输入血氧",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "血糖",
+                  prop: "bloodSugar",
+                  hide: true,
+                  rules: [{
+                    required: false,
+                    message: "请输入血糖",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "既往病史",
+                  prop: "medicalHistory",
+                  rules: [{
+                    required: false,
+                    message: "请输入既往病史",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "行为能力",
+                  prop: "ability",
+                  type: 'select',
+                  dataType: 'number',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: false,
+                    message: "具有的行为能力",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "功能障碍",
+                  prop: "dysfunction",
+                  type: 'select',
+                  multiple: true,
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=dysfunction",
+                  dataType:'string',
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "功能障碍 (可多选)",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "服务需求",
+                  prop: "serviceDemand",
+                  type: 'select',
+                  multiple:true,
+                  dataType:'string',
+                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=service-demand",
+                  props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "服务需求 (可多选)",
+                    trigger: "blur"
+                  }]
+                },
+              ]
             },
             {
-              label: "既往病史",
-              prop: "medicalHistory",
-              rules: [{
-                required: false,
-                message: "请输入既往病史",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "有无子女",
-              prop: "children",
-              type: 'select',
-              dataType: 'number',
-              hide: true,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=children",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "有无子女",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "生活爱好",
-              prop: "hobby",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入生活爱好",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "生活嗜好",
-              prop: "addiction",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入生活嗜好",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "行为能力",
-              prop: "ability",
-              type: 'select',
-              dataType: 'number',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=ability",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: false,
-                message: "具有的行为能力",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "功能障碍",
-              prop: "dysfunction",
-              type: 'select',
-              multiple: true,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=dysfunction",
-              dataType:'string',
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: true,
-                message: "功能障碍 (可多选)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "血压",
-              prop: "bloodPressure",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入血压",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "血氧",
-              prop: "bloodOxygen",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入血氧",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "血糖",
-              prop: "bloodSugar",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入血糖",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "服务需求",
-              prop: "serviceDemand",
-              type: 'select',
-              multiple:true,
-              dataType:'string',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=service-demand",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: true,
-                message: "服务需求 (可多选)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "紧急联系人",
-              prop: "emergencyContactPerson",
-              rules: [{
-                required: false,
-                message: "请输入紧急联系人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "联系人电话",
-              prop: "emergencyContactPhone",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入紧急联系人电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属社区",
-              prop: "agencyId",
-              slot: true,
-              search: true,
-              cascaderItem: ['residentialId'],
-              type: "select",
-              remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区",
-              prop: "residentialId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属小区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼栋",
-              prop: "buildingId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['unitId'],
-              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼栋Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属单元",
-              prop: "unitId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入单元Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼层",
-              prop: "floorId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼层Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属房间",
-              prop: "roomId",
-              slot: true,
-              type: "select",
-              search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入房间Id",
-                trigger: "blur"
-              }]
-            },
-          ]
+              icon:'el-icon-s-opportunity',
+              label: '社会能力',
+              prop: 'group',
+              column: [
+                {
+                  label: "生活爱好",
+                  prop: "hobby",
+                  hide: true,
+                  rules: [{
+                    required: false,
+                    message: "请输入生活爱好",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "生活嗜好",
+                  prop: "addiction",
+                  hide: true,
+                  rules: [{
+                    required: false,
+                    message: "请输入生活嗜好",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            }
+          ],
         },
       };
     },

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

@@ -44,7 +44,7 @@
               label: "既往病史",
               prop: "medicalHistory",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入既往病史",
                 trigger: "blur"
               }]
@@ -92,7 +92,7 @@
                 value: "dictKey"
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "具有的行为能力",
                 trigger: "blur"
               }]
@@ -109,7 +109,7 @@
                 value: "dictKey"
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "功能障碍 (可多选)",
                 trigger: "blur"
               }]
@@ -118,7 +118,7 @@
               label: "血压",
               prop: "bloodPressure",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入血压",
                 trigger: "blur"
               }]
@@ -127,7 +127,7 @@
               label: "血氧",
               prop: "bloodOxygen",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入血氧",
                 trigger: "blur"
               }]
@@ -136,7 +136,7 @@
               label: "血糖",
               prop: "bloodSugar",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入血糖",
                 trigger: "blur"
               }]
@@ -153,7 +153,7 @@
                 value: "dictKey"
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "服务需求 (可多选)",
                 trigger: "blur"
               }]
@@ -177,142 +177,142 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "所属社区",
-              prop: "agencyId",
-              slot: true,
-              search: true,
-              cascaderItem: ['residentialId'],
-              type: "select",
-              remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区",
-              prop: "residentialId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属小区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼栋",
-              prop: "buildingId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['unitId'],
-              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼栋Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属单元",
-              prop: "unitId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入单元Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼层",
-              prop: "floorId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼层Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属房间",
-              prop: "roomId",
-              slot: true,
-              type: "select",
-              search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入房间Id",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "所属社区",
+            //   prop: "agencyId",
+            //   slot: true,
+            //   search: true,
+            //   cascaderItem: ['residentialId'],
+            //   type: "select",
+            //   remote: true,
+            //   dicUrl: "/api/cyzh-community/agency/list",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属社区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属小区",
+            //   prop: "residentialId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['buildingId'],
+            //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属小区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼栋",
+            //   prop: "buildingId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['unitId'],
+            //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼栋Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属单元",
+            //   prop: "unitId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['floorId'],
+            //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入单元Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼层",
+            //   prop: "floorId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['roomId'],
+            //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼层Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属房间",
+            //   prop: "roomId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入房间Id",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
       };

src/components/person-tags/keyPersonTags-detail.vue

@@ -100,6 +100,142 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "所属社区",
+            //   prop: "agencyId",
+            //   slot: true,
+            //   search: true,
+            //   cascaderItem: ['residentialId'],
+            //   type: "select",
+            //   remote: true,
+            //   dicUrl: "/api/cyzh-community/agency/list",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属社区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属小区",
+            //   prop: "residentialId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['buildingId'],
+            //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属小区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼栋",
+            //   prop: "buildingId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['unitId'],
+            //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼栋Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属单元",
+            //   prop: "unitId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['floorId'],
+            //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入单元Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼层",
+            //   prop: "floorId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['roomId'],
+            //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼层Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属房间",
+            //   prop: "roomId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入房间Id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "备注",
               prop: "remark",
@@ -110,142 +246,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "所属社区",
-              prop: "agencyId",
-              slot: true,
-              search: true,
-              cascaderItem: ['residentialId'],
-              type: "select",
-              remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区",
-              prop: "residentialId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属小区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼栋",
-              prop: "buildingId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['unitId'],
-              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼栋Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属单元",
-              prop: "unitId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入单元Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属楼层",
-              prop: "floorId",
-              slot: true,
-              type: "select",
-              search: true,
-              cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入楼层Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属房间",
-              prop: "roomId",
-              slot: true,
-              type: "select",
-              search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              dicFlag: false,
-              filterable: true,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入房间Id",
-                trigger: "blur"
-              }]
-            },
           ]
         },
       };

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

@@ -8,280 +8,281 @@
 </template>
 
 <script>
-import {add} from "@/api/person/keypeople";
-import {update, getDetail} from "@/api/person/basicinfo";
-import done from "../../views/work/done";
-export default {
-  name:'disablerTags-form',
-  props:{
-    closeFn:{type:Function},
-    basicData:{type:Object}
-  },
-  data() {
-    return {
-      form: {},
-      basicDataObject:{},
-      option: {
-        height:'auto',
-        calcHeight: 30,
-        labelWidth: 120,
-        tip: false,
-        submitText:"提交",
-        emptyBtn:false,
-        column: [
-          {
-            label: "基本表Id",
-            prop: "parentId",
-            display: false,
-            rules: [{
-              required: true,
-              message: "请输入基本表Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "重点人员类型",
-            prop: "type",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=key-type",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            type: "select",
-            multiple: true,
-            dataType:'string',
-            rules: [{
-              required: true,
-              message: "请选择重点人员类型",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "是否需要援助",
-            prop: "assistance",
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=assistance",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            rules: [{
-              required: false,
-              message: "是否需要援助",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "是否需要走访",
-            prop: "visit",
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=visit",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            rules: [{
-              required: false,
-              message: "是否需要走访",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "访问人员",
-            prop: "visitPerson",
-            rules: [{
-              required: true,
-              message: "请输入访问人员",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "备注",
-            prop: "remark",
-            type: 'textarea',
-            rules: [{
-              required: false,
-              message: "请输入备注",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属社区",
-            prop: "agencyId",
-            slot: true,
-            search: true,
-            cascaderItem: ['residentialId'],
-            type: "select",
-            remote: true,
-            dicUrl: "/api/cyzh-community/agency/list?name={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: true,
-              message: "请选择所属社区",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属小区",
-            prop: "residentialId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: true,
-              message: "请选择所属小区",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属楼栋",
-            prop: "buildingId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['unitId'],
-            dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: true,
-              message: "请输入楼栋Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属单元",
-            prop: "unitId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['floorId'],
-            dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+  import {add} from "@/api/person/keypeople";
+  import {update, getDetail} from "@/api/person/basicinfo";
+  import done from "../../views/work/done";
+  export default {
+    name:'disablerTags-form',
+    props:{
+      closeFn:{type:Function},
+      basicData:{type:Object}
+    },
+    data() {
+      return {
+        form: {},
+        basicDataObject:{},
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          labelWidth: 120,
+          tip: false,
+          submitText:"提交",
+          emptyBtn:false,
+          column: [
+            {
+              label: "基本表Id",
+              prop: "parentId",
+              display: false,
+              rules: [{
+                required: true,
+                message: "请输入基本表Id",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "重点人员类型",
+              prop: "type",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=key-type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              type: "select",
+              multiple: true,
+              dataType:'string',
+              rules: [{
+                required: true,
+                message: "请选择重点人员类型",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入单元Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属楼层",
-            prop: "floorId",
-            slot: true,
-            type: "select",
-            search: true,
-            cascaderItem: ['roomId'],
-            dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "是否需要援助",
+              prop: "assistance",
+              type: 'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=assistance",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: false,
+                message: "是否需要援助",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "是否需要走访",
+              prop: "visit",
+              type: 'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=visit",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: false,
+                message: "是否需要走访",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入楼层Id",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属房间",
-            prop: "roomId",
-            slot: true,
-            type: "select",
-            search: true,
-            dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
+            {
+              label: "访问人员",
+              prop: "visitPerson",
+              rules: [{
+                required: false,
+                message: "请输入访问人员",
+                trigger: "blur"
+              }]
             },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
+            // {
+            //   label: "所属社区",
+            //   prop: "agencyId",
+            //   slot: true,
+            //   search: true,
+            //   cascaderItem: ['residentialId'],
+            //   type: "select",
+            //   remote: true,
+            //   dicUrl: "/api/cyzh-community/agency/list",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属社区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属小区",
+            //   prop: "residentialId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['buildingId'],
+            //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择所属小区",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼栋",
+            //   prop: "buildingId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['unitId'],
+            //   dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}`,
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼栋Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属单元",
+            //   prop: "unitId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['floorId'],
+            //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入单元Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属楼层",
+            //   prop: "floorId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   cascaderItem: ['roomId'],
+            //   dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入楼层Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "所属房间",
+            //   prop: "roomId",
+            //   slot: true,
+            //   type: "select",
+            //   search: true,
+            //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   // dicFlag: false,
+            //   filterable: true,
+            //   props: {
+            //     label: "name",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入房间Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            {
+              label: "备注",
+              prop: "remark",
+              type: 'textarea',
+              span:18,
+              rules: [{
+                required: false,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
             },
-            rules: [{
-              required: true,
-              message: "请输入房间Id",
-              trigger: "blur"
-            }]
-          },
-        ]
-      },
-    };
-  },
-  methods: {
-    //提交
-    addEntity(row, done) {
-      row.parentId = this.basicData.id;
-      row.name = this.basicData.name;
-      add(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-        this.LoadAndUpdate();
-        this.closeFn();
-      }, error => {
-        this.$message({
-          type:"fail",
-          message:"操作失败!"
-        });
-        window.console.log(error);
-      });
+          ]
+        },
+      };
     },
-    LoadAndUpdate() {
-      let tags_temp = this.basicData.tags;
-      if (tags_temp) {
-        tags_temp += "，重点人员";
-      } else {
-        tags_temp = "重点人员";
+    methods: {
+      //提交
+      addEntity(row, done) {
+        row.parentId = this.basicData.id;
+        row.name = this.basicData.name;
+        add(row).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+          this.LoadAndUpdate();
+          this.closeFn();
+        }, error => {
+          this.$message({
+            type:"fail",
+            message:"操作失败!"
+          });
+          window.console.log(error);
+        });
+      },
+      LoadAndUpdate() {
+        let tags_temp = this.basicData.tags;
+        if (tags_temp) {
+          tags_temp += "，重点人员";
+        } else {
+          tags_temp = "重点人员";
+        }
+        this.basicData.tags = tags_temp;
+        update(this.basicData).then(()=>{
+          this.closeFn();
+        }, error => {
+          console.log(error);
+        })
       }
-      this.basicData.tags = tags_temp;
-      update(this.basicData).then(()=>{
-        this.closeFn();
-      }, error => {
-        console.log(error);
-      })
     }
-  }
-};
+  };
 </script>
 
 <style>

src/config/website.js

@@ -20,7 +20,8 @@ export default {
   isFirstPage: false,
   fistPage: {
     label: "网格看板",
-    value: "/grid/viewpanel",
+    // value: "/grid/viewpanel",
+    value:'/grid/dataPage',
     params: {},
     query: {},
     meta: {

src/mock/menu.js

@@ -2,7 +2,8 @@ import Mock from 'mockjs'
 
 const top = [{
   label: "首页",
-  path: "/wel/index",
+  // path: "/wel/index",
+  value: "/grid/dataPage",
   icon: 'el-icon-menu',
   meta: {
     i18n: 'dashboard',

src/page/index/top/top-menu.vue

@@ -25,7 +25,7 @@
 
         tagListLeft: [
           {name: '网格看板',path: '/grid/viewpanel'},
-          {name: '数据大屏',path: '/grid/dataPage'},
+          // {name: '数据大屏',path: '/grid/dataPage'},
           {name: '网格划分',path: '/grid/divide'},
         ],
         tagListRight: [

src/styles/sidebar.scss

@@ -63,12 +63,12 @@
             margin-right: 10px;
         }
         i,span{
-            color:hsla(0,0%,100%,.7);
+            color: hsla(245, 100%, 72%, 0.7);
         }
         &:hover{
             background: transparent;
             i,span{
-               color:#fff;
+               color: #7072cc;
             }
         }
         &.is-active {
@@ -78,12 +78,12 @@
                 left: 0;
                 bottom: 0;
                 width: 4px;
-                background: #ffffff;
+                background: #978dff;
                 position: absolute;
             }
-            background-color: rgba(0,0,0,.8);
+            background-color: rgba(181, 188, 255, 0.8);
             i,span{
-                color:#fff;
+                color: #7c71ff;
             }
         }
     }

src/views/device/doordevice.vue

@@ -88,27 +88,27 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "设备编号",
-              prop: "cameraCode",
-              width: 135,
-              rules: [{
-                required: true,
-                message: "请输入设备编号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "名称",
-              prop: "cameraName",
-              search: true,
-              overHidden: true,
-              rules: [{
-                required: true,
-                message: "请输入名称",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "设备编号",
+            //   prop: "cameraCode",
+            //   width: 135,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入设备编号",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "名称",
+            //   prop: "cameraName",
+            //   search: true,
+            //   overHidden: true,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入名称",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "所属省",
               prop: "provinceCode",

src/views/device/iotdevice.vue

@@ -43,35 +43,35 @@
         <!--</el-tab-pane>-->
       </el-tabs>
     </el-dialog>
-    <el-container>
-      <el-main>
-        <template>
-          <el-carousel :interval="5000" type="card" height="200px">
-            <el-carousel-item v-for="item in deviceCount" :key="item">
-              <el-container>
-                <el-header style="background-color: rgb(29,67,58);height: 65px">
-                  <div class="titleLabel">
-                    <el-row :gutter="40">
-                      <div @click="deviceClick(item.deviceType)">
-                        <el-col :span="20"><div class="titleText">{{item.deviceTypeName}}</div></el-col>
-                        <el-col :span="4"><div class="titleCount">{{item.deviceCount}}</div></el-col>
-                      </div>
-                    </el-row>
-                  </div>
-                </el-header>
-                <el-main>
-                  <div style="margin-left: 100px">
-                    <avue-data-display :option="dataShow(item)"></avue-data-display>
-                  </div>
-                </el-main>
-              </el-container>
-            </el-carousel-item>
-          </el-carousel>
-        </template>
+<!--    <el-container>-->
+<!--      <el-main>-->
+<!--        <template>-->
+<!--          <el-carousel :interval="5000" type="card" height="200px">-->
+<!--            <el-carousel-item v-for="item in deviceCount" :key="item">-->
+<!--              <el-container>-->
+<!--                <el-header style="background-color: rgb(29,67,58);height: 65px">-->
+<!--                  <div class="titleLabel">-->
+<!--                    <el-row :gutter="40">-->
+<!--                      <div @click="deviceClick(item.deviceType)">-->
+<!--                        <el-col :span="20"><div class="titleText">{{item.deviceTypeName}}</div></el-col>-->
+<!--                        <el-col :span="4"><div class="titleCount">{{item.deviceCount}}</div></el-col>-->
+<!--                      </div>-->
+<!--                    </el-row>-->
+<!--                  </div>-->
+<!--                </el-header>-->
+<!--                <el-main>-->
+<!--                  <div style="margin-left: 100px">-->
+<!--                    <avue-data-display :option="dataShow(item)"></avue-data-display>-->
+<!--                  </div>-->
+<!--                </el-main>-->
+<!--              </el-container>-->
+<!--            </el-carousel-item>-->
+<!--          </el-carousel>-->
+<!--        </template>-->
 
-      </el-main>
+<!--      </el-main>-->
 
-    </el-container>
+<!--    </el-container>-->
 
     <el-divider class="divider-bottom"></el-divider>
 
@@ -1082,9 +1082,9 @@
       },
     },
     created() {
-      deviceListCount({deviceUsage : 20}).then(res =>{
-        this.deviceCount = res.data.data;
-      })
+      // deviceListCount({deviceUsage : 20}).then(res =>{
+      //   this.deviceCount = res.data.data;
+      // })
     },
     mounted() {
       this.option.column[4].search = this.permission.bind_enterprises;

src/views/enterprise/enterprise.vue

@@ -26,7 +26,7 @@
                    v-if="permission.enterprise_delete"
                    @click="handleDelete">删 除
         </el-button>
-        <cy-excel-import :flag="2" file-name="企业信息导入模板" @success="onLoad(page)"></cy-excel-import>
+<!--        <cy-excel-import :flag="2" file-name="企业信息导入模板" @success="onLoad(page)"></cy-excel-import>-->
       </template>
       <template slot="residentialId" slot-scope="scope">{{scope.row.residentialName}}</template>
       <template slot="mapSelectForm" slot-scope="scope">

src/views/estate/car.vue

@@ -190,7 +190,7 @@
               prop: "properties",
               type: "select",
               hide: true,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=car-properties",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=car_properties",
               props: {
                 label: "dictValue",
                 value: "dictKey",

src/views/party/activity.vue

@@ -28,7 +28,7 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{row}">
-        <el-button type="text" size="mini" icon="el-icon-s-comment" @click="show(row,1)">报名</el-button>
+        <el-button type="text" size="mini" icon="el-icon-s-comment" @click="show(row,1)">报名列表</el-button>
       </template>
       <template slot="content" slot-scope="{row}">
         <el-button size="mini" @click="show(row,2)">查看活动内容</el-button>
@@ -41,13 +41,18 @@
           <el-tag>{{ row.peopleCount }}</el-tag>
         </el-tooltip>
       </template>
-      <template slot="activityStatus" slot-scope="{row}">
-        <avue-switch v-model="row.activityStatus"
-                   :active-value=1 active-text="开启"
-                   :inactive-value=0 inactive-text="关闭"
-                   @change="statusChange(row)">
-        </avue-switch>
+      <template slot="activityStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.activityStatus===0" type="info">待开始</el-tag>
+        <el-tag v-if="scope.row.activityStatus===1" type="success">已开始</el-tag>
+        <el-tag v-if="scope.row.activityStatus===2" type="danger">已结束</el-tag>
       </template>
+      <!--      <template slot="activityStatus" slot-scope="{row}">-->
+      <!--        <el-switch v-model="row.activityStatus"-->
+      <!--                   :active-value=1 active-text="开启"-->
+      <!--                   :inactive-value=0 inactive-text="关闭"-->
+      <!--                   @change="statusChange(row)">-->
+      <!--        </el-switch>-->
+      <!--      </template>-->
     </avue-crud>
 
     <el-drawer :title="form.name" :visible.sync="showEnroll" size="23%" direction="ltr"
@@ -110,14 +115,14 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
-          labelWidth: 120,
+          // labelWidth: 120,
           menuWidth:450,
           column: [
             {
               label: "活动名称",
               prop: "name",
               row: true,
-              width: 200,
+              // width: 200,
               search: true,
               rules: [{
                 required: true,
@@ -131,43 +136,44 @@
               type: 'upload',
               hide: true,
               row: true,
+              listType: 'picture-img',
               propsHttp: {
                 res: "data",
-                url: 'link'
+                url: "link"
               },
-              listType: 'picture-img',
-              action: '/api/blade-resource/oss/endpoint/put-file',
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              tip: '只能生产jpg/png图片，且不超过500kb',
               display: true
             },
-            {
-              label: "活动内容",
-              prop: "content",
-              component: 'AvueUeditor',
-              options: {
-                action: '/api/blade-resource/oss/endpoint/put-file',
-                props: {
-                  res: "data",
-                  url: "link",
-                }
-              },
-              minRows: 6,
-              width: 150,
-              span: 18,
-              row: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入活动内容",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "活动内容",
+            //   prop: "content",
+            //   component: 'AvueUeditor',
+            //   options: {
+            //     action: '/api/blade-resource/oss/endpoint/put-file',
+            //     props: {
+            //       res: "data",
+            //       url: "link",
+            //     }
+            //   },
+            //   minRows: 6,
+            //   width: 150,
+            //   span: 18,
+            //   row: true,
+            //   slot: true,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入活动内容",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "活动时间",
               prop: "activityTime",
               type: "datetimerange",
               format: "yyyy-MM-dd hh:mm:ss",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width: 290,
+              // width: 290,
               row: true,
               slot: true,
               change: ({value, column}) => {
@@ -184,7 +190,7 @@
               label: "报名截止时间",
               prop: "deadlineTime",
               type: "datetime",
-              width: 160,
+              // width: 160,
               row: true,
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               rules: [{
@@ -198,7 +204,7 @@
               prop: "peopleCount",
               type: "number",
               row: true,
-              width: 120,
+              // width: 120,
               slot: true,
               rules: [{
                 required: true,
@@ -210,16 +216,25 @@
               label: "验证身份证",
               prop: "idVerification",
               type: "radio",
-              width: 100,
+              // width: 100,
               row: true,
               search: true,
               searchLabelWidth: 100,
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
+              // dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              dicData:[
+                {
+                  label:'是',
+                  value:1
+                },{
+                  label: '否',
+                  value:0
+                }
+              ],
               dataType: "number",
-              props: {
-                label: "dictValue",
-                value: "dictKey",
-              },
+              // props: {
+              //   label: "dictValue",
+              //   value: "dictKey",
+              // },
               rules: [{
                 required: true,
                 message: "请输入是否需要验证身份证",
@@ -229,31 +244,18 @@
             {
               label: "活动状态",
               prop: "activityStatus",
-              // type: "switch",
-              type:'select',
-              dicData:[
-                {
-                  label:"开始",
-                  value:1
-                },{
-                  label:'未开始',
-                  value:2
-                },{
-                  label:'已结束',
-                  value:3
-                }
-              ],
-              width: 150,
+              type: "select",
+              // width: 150,
               row: true,
               search: true,
-              // slot: true,
-              // dicUrl: "/api/blade-system/dict/dictionary?code=on_off",
+              slot: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=on_off",
               dataType: "number",
-              value: 2,
-              // props: {
-              //   label: "dictValue",
-              //   value: "dictKey",
-              // },
+              value: 0,
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
               rules: [{
                 required: true,
                 message: "请选择活动状态",
@@ -264,9 +266,10 @@
               label: "排序",
               prop: "sort",
               row: true,
-              width: 100,
+              hide:true,
+              // width: 100,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入排序",
                 trigger: "blur"
               }]
@@ -309,6 +312,7 @@
       },
       show(row, type) {
         //type : 1、报名   2、活动内容
+        console.log(type)
         this.form = row;
         this.activityId = row.id;
         switch (type) {

src/views/party/branch.vue

@@ -27,21 +27,21 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
-<!--      <template slot="menu" slot-scope="scope">-->
-<!--        <el-button type="text" size="small" icon="el-icon-setting">-->
-<!--          <el-dropdown @command="tip">-->
-<!--            <span class="el-dropdown-link">-->
-<!--              操作<i class="el-icon-arrow-down el-icon&#45;&#45;right"> </i>-->
-<!--            </span>-->
-<!--            <el-dropdown-menu slot="dropdown">-->
-<!--              <el-dropdown-item divided @click.native="detail(scope.row)" icon="el-icon-office-building">详情-->
-<!--              </el-dropdown-item>-->
-<!--              <el-dropdown-item divided @click.native="edit(scope.row)" icon="el-icon-school">编辑</el-dropdown-item>-->
-<!--              <el-dropdown-item divided @click.native="manage(scope.row)" icon="el-icon-s-order">管理</el-dropdown-item>-->
-<!--            </el-dropdown-menu>-->
-<!--          </el-dropdown>-->
-<!--        </el-button>-->
-<!--      </template>-->
+      <!--      <template slot="menu" slot-scope="scope">-->
+      <!--        <el-button type="text" size="small" icon="el-icon-setting">-->
+      <!--          <el-dropdown @command="tip">-->
+      <!--            <span class="el-dropdown-link">-->
+      <!--              操作<i class="el-icon-arrow-down el-icon&#45;&#45;right"> </i>-->
+      <!--            </span>-->
+      <!--            <el-dropdown-menu slot="dropdown">-->
+      <!--              <el-dropdown-item divided @click.native="detail(scope.row)" icon="el-icon-office-building">详情-->
+      <!--              </el-dropdown-item>-->
+      <!--              <el-dropdown-item divided @click.native="edit(scope.row)" icon="el-icon-school">编辑</el-dropdown-item>-->
+      <!--              <el-dropdown-item divided @click.native="manage(scope.row)" icon="el-icon-s-order">管理</el-dropdown-item>-->
+      <!--            </el-dropdown-menu>-->
+      <!--          </el-dropdown>-->
+      <!--        </el-button>-->
+      <!--      </template>-->
       <template slot="activities" slot-scope="{row}">
         <el-button size="mini" @click="show(row,1)">查看党内活动</el-button>
       </template>
@@ -108,7 +108,7 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
-          menuWidth:450,
+          menuWidth:350,
           column: [
             {
               label: "党支部名称",
@@ -153,7 +153,6 @@
               prop: "branchIntroduce",
               type: "textarea",
               labelWidth: 100,
-              span: 24,
               row: true,
               hide: true,
               rules: [{
@@ -178,9 +177,7 @@
                   value: 2
                 }
               ],
-              labelWidth: 100,
               span: 24,
-
               row: true,
               rules: [{
                 required: false,
@@ -250,7 +247,7 @@
           }
         ];
         let resourceIds = this.findObject(this.option.column, "resourceIds");
-        resourceIds.dicUrl = `/api/agency/agency/select?size=10&name={{key}}`
+        resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=500&name={{key}}`
       } else if (tenantType == 2) {//社区
         this.resourceTypeDefault = 1;
         resouceTypeColumn.dicData = [
@@ -265,8 +262,15 @@
       }
     },
     watch: {
-      "resourceType": function (val) {
-        console.log(val)
+      'form.resourceType': {
+        handler(val) {
+          let resourceIds = this.findObject(this.option.column, "resourceIds");
+          if (val == 1) {
+            resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=500&name={{key}}`
+          } else {
+            resourceIds.dicUrl = "/api/cyzh-community/residential/list?size=99999";
+          }
+        }
       }
     },
     methods: {

src/views/party/news.vue

@@ -185,7 +185,7 @@
               },
               rules: [{
                 required: true,
-                message: "请输入会议分类id",
+                message: "请选择资讯分类",
                 trigger: "blur"
               }]
             },

src/views/person/adolescent.vue

@@ -56,12 +56,15 @@
           border: true,
           index: true,
           viewBtn: true,
+          addBtn:false,
           selection: true,
           dialogClickModal: false,
           column: [
             {
               label: "基本表id",
               prop: "parentId",
+              hide:true,
+              display:false,
               rules: [{
                 required: true,
                 message: "请输入基本表id",
@@ -71,6 +74,7 @@
             {
               label: "姓名",
               prop: "name",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入姓名",
@@ -78,11 +82,17 @@
               }]
             },
             {
-              label: "人员类型：闲散青少年；不良行为的青少年；流浪乞讨青少年；服刑在教人员未成年子女；农村留守儿童；其他",
+              label: "人员类型",
               prop: "type",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=adolescent_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入人员类型：闲散青少年；不良行为的青少年；流浪乞讨青少年；服刑在教人员未成年子女；农村留守儿童；其他",
+                message: "请输入人员类型",
                 trigger: "blur"
               }]
             },
@@ -90,7 +100,7 @@
               label: "监护人姓名",
               prop: "guardianName",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入监护人姓名",
                 trigger: "blur"
               }]
@@ -99,7 +109,7 @@
               label: "监护人身份证号码",
               prop: "guardianIdCard",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入监护人身份证号码",
                 trigger: "blur"
               }]
@@ -108,7 +118,7 @@
               label: "监护人详细地址",
               prop: "guardianAddress",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入监护人详细地址",
                 trigger: "blur"
               }]
@@ -116,8 +126,9 @@
             {
               label: "监护人联系方式",
               prop: "guardianPhone",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入监护人联系方式",
                 trigger: "blur"
               }]
@@ -125,8 +136,9 @@
             {
               label: "帮扶人姓名",
               prop: "helperName",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶人姓名",
                 trigger: "blur"
               }]
@@ -134,62 +146,86 @@
             {
               label: "帮扶人联系方式",
               prop: "helperPhone",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶人联系方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "家庭情况：低收入家庭；单亲家庭；流动家庭；家庭成员的不良行为多；与父母关系不融洽；抚养人受教育水平较低；其他",
+              label: "家庭情况",
               prop: "situation",
+              hide:true,
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=family_situation",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入家庭情况：低收入家庭；单亲家庭；流动家庭；家庭成员的不良行为多；与父母关系不融洽；抚养人受教育水平较低；其他",
+                message: "请输入家庭情况",
                 trigger: "blur"
               }]
             },
             {
               label: "与监护人关系",
               prop: "relation",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入与监护人关系",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否违法犯罪：0 - 是； 1 - 否",
+              label: "是否违法犯罪",
               prop: "crime",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否违法犯罪：0 - 是； 1 - 否",
+                message: "请输入是否违法犯罪",
                 trigger: "blur"
               }]
             },
             {
               label: "违法犯罪情况",
               prop: "crimeDetail",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入违法犯罪情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "帮扶手段：教育矫治；思想引导；困难帮扶；心理关爱；其他",
+              label: "帮扶手段",
               prop: "helpWay",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=helpWay",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入帮扶手段：教育矫治；思想引导；困难帮扶；心理关爱；其他",
+                message: "请输入帮扶手段",
                 trigger: "blur"
               }]
             },
             {
               label: "帮扶情况",
               prop: "helpSituation",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶情况",
                 trigger: "blur"
               }]
@@ -197,8 +233,9 @@
             {
               label: "备注",
               prop: "remark",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入备注",
                 trigger: "blur"
               }]

src/views/person/aids.vue

@@ -57,6 +57,7 @@
           border: true,
           index: true,
           viewBtn: true,
+          addBtn:false,
           selection: true,
           dialogClickModal: false,
           column: [

src/views/person/basicinfo.vue

@@ -159,6 +159,18 @@
           dialogClickModal: false,
           menuWidth:500,
           column: [
+            {
+              label: "身份证号",
+              labelWidth: 150,
+              prop: "idCard",
+              search:true,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入身份证号码",
+                trigger: "blur"
+              }]
+            },
             {
               label: "姓名",
               prop: "name",
@@ -169,6 +181,25 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "人员标签",
+              prop: "tags",
+              type:'checkbox',
+              search:true,
+              multiple:true,
+              span: 24,
+              dataType:'string',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=person-tag",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入标签",
+                trigger: "blur"
+              }]
+            },
             {
               label: "照片",
               prop: "imageUri",
@@ -187,22 +218,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "性别",
-              prop: "sex",
-              type: 'select',
-              dataType:"number",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              rules: [{
-                required: true,
-                message: "请选择性别",
-                trigger: "blur"
-              }]
-            },
             {
               label: "所属社区",
               prop: "agencyId",
@@ -347,16 +362,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "身份证号码",
-              prop: "idCard",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入身份证号码",
-                trigger: "blur"
-              }]
-            },
             {
               label: "生日",
               prop: "birthday",
@@ -524,23 +529,22 @@
               }]
             },
             {
-              label: "人员标签",
-              prop: "tags",
-              type:'checkbox',
-              multiple:true,
-              span: 24,
-              dataType:'string',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=person-tag",
+              label: "性别",
+              prop: "sex",
+              type: 'select',
+              dataType:"number",
+              search:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
               props: {
                 label: "dictValue",
                 value: "dictKey"
               },
               rules: [{
                 required: true,
-                message: "请输入标签",
+                message: "请选择性别",
                 trigger: "blur"
               }]
-            }
+            },
           ]
         },
         data: []

src/views/person/correctionalstaff.vue

@@ -56,32 +56,46 @@
           border: true,
           index: true,
           viewBtn: true,
+          addBtn:false,
           selection: true,
           dialogClickModal: false,
           column: [
             {
               label: "基本表Id",
               prop: "parentId",
+              hide:true,
+              display:false,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入基本表Id",
                 trigger: "blur"
               }]
             },
             {
-              label: "矫正类别 {1：管制；2：缓刑；3：假释；4：暂予以监外执行；5：其他}",
+              label: "姓名",
+              prop: "name",
+              search:true,
+              rules: [{
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "矫正类别",
               prop: "correctType",
               rules: [{
                 required: true,
-                message: "请输入矫正类别 {1：管制；2：缓刑；3：假释；4：暂予以监外执行；5：其他}",
+                message: "请输入矫正类别",
                 trigger: "blur"
               }]
             },
             {
               label: "矫正人员编号",
               prop: "correctPersonCode",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入矫正人员编号",
                 trigger: "blur"
               }]
@@ -89,8 +103,9 @@
             {
               label: "原羁押场所",
               prop: "detentionPlace",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入原羁押场所",
                 trigger: "blur"
               }]
@@ -98,8 +113,9 @@
             {
               label: "案件类型",
               prop: "caseType",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入案件类型",
                 trigger: "blur"
               }]
@@ -107,8 +123,9 @@
             {
               label: "具体罪名",
               prop: "specificCharges",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入具体罪名",
                 trigger: "blur"
               }]
@@ -116,15 +133,19 @@
             {
               label: "原判刑期",
               prop: "originalSentence",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入原判刑期",
                 trigger: "blur"
               }]
             },
             {
               label: "原判刑开始日期",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
               prop: "startdateSentence",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入原判刑开始日期",
@@ -134,6 +155,9 @@
             {
               label: "原判刑结束日期",
               prop: "enddateSentence",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入原判刑结束日期",
@@ -143,107 +167,159 @@
             {
               label: "矫正开始日期",
               prop: "startdateCorrection",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入矫正开始日期",
                 trigger: "blur"
               }]
             },
             {
-              label: "矫正开始日期",
+              label: "矫正结束日期",
               prop: "enddateCorrection",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入矫正开始日期",
                 trigger: "blur"
               }]
             },
             {
-              label: "接收方式",
-              prop: "receivingMode",
-              rules: [{
-                required: true,
-                message: "请输入接收方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "报道方式{1：自行报到；2：寓所押送；3：当庭交接；4:其他}",
+              label: "报道方式",
               prop: "checkinMode",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=checkin_mode",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入报道方式{1：自行报到；2：寓所押送；3：当庭交接；4:其他}",
+                message: "请输入报道方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否累惯犯{0：否；1：是}",
+              label: "是否累惯犯",
               prop: "isRecidivist",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否累惯犯{0：否；1：是}",
+                message: "请输入是否累惯犯",
                 trigger: "blur"
               }]
             },
             {
-              label: "“四史”情况{1：吸毒史；2：逃脱史；3：袭警史；4：自杀史}",
+              label: "“四史”情况",
               prop: "fourHistories",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=four_histories",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "string",
               rules: [{
-                required: true,
-                message: "请输入“四史”情况{1：吸毒史；2：逃脱史；3：袭警史；4：自杀史}",
+                required: false,
+                message: "请选择“四史”情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "“五涉”情况{1：涉恐；2：涉邪；3：涉黑；4：涉枪；5：涉毒}",
+              label: "“五涉”情况",
               prop: "fiveSituation",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=five_situation",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入“五涉”情况{1：涉恐；2：涉邪；3：涉黑；4：涉枪；5：涉毒}",
+                required: false,
+                message: "请输入“五涉”情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否建立矫正小组{0：否；1：是}",
+              label: "是否建立矫正小组",
               prop: "isTeamEstablished",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否建立矫正小组{0：否；1：是}",
+                message: "请输入是否建立矫正小组",
                 trigger: "blur"
               }]
             },
             {
-              label: "矫正小组人员组成情况{1：司法工作者人员；2：社会工作者；3：志愿者；4：村(居)委会；5：所在单位人员；6：就读学校人员；7：家庭成员监护人；8：保证人；9：其他}",
+              label: "矫正小组人员组成情况",
               prop: "teamComposition",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=team_composition",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入矫正小组人员组成情况{1：司法工作者人员；2：社会工作者；3：志愿者；4：村(居)委会；5：所在单位人员；6：就读学校人员；7：家庭成员监护人；8：保证人；9：其他}",
+                required: false,
+                message: "请输入矫正小组人员组成情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "矫正解除（终止）类型{1：期满解除；2：收监执行；3：死亡；4：其他}",
+              label: "矫正解除（终止）类型",
               prop: "reliefType",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=relief_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入矫正解除（终止）类型{1：期满解除；2：收监执行；3：死亡；4：其他}",
+                required: false,
+                message: "请输入矫正解除（终止）类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否有脱管{0：否；1：是}",
+              label: "是否有脱管",
               prop: "isGetRid",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否有脱管{0：否；1：是}",
+                message: "请输入是否有脱管",
                 trigger: "blur"
               }]
             },
             {
               label: "脱管原因",
               prop: "reasonGetRid",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入脱管原因",
                 trigger: "blur"
               }]
@@ -251,8 +327,9 @@
             {
               label: "检查监督托管情况",
               prop: "inspectGetRid",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入检查监督托管情况",
                 trigger: "blur"
               }]
@@ -260,26 +337,37 @@
             {
               label: "脱管纠正情况",
               prop: "correctGetRid",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入脱管纠正情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否有漏管{0：否；1：是}",
+              label: "是否有漏管",
               prop: "isUnmanaged",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入是否有漏管{0：否；1：是}",
+                required: false,
+                message: "请输入是否有漏管",
                 trigger: "blur"
               }]
             },
             {
               label: "漏管原因",
               prop: "reasonUnmanage",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入漏管原因",
                 trigger: "blur"
               }]
@@ -287,8 +375,10 @@
             {
               label: "检查监督漏管情况",
               prop: "inspectUnmanage",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入检查监督漏管情况",
                 trigger: "blur"
               }]
@@ -296,8 +386,10 @@
             {
               label: "漏管纠正情况",
               prop: "correctUnmanage",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入漏管纠正情况",
                 trigger: "blur"
               }]
@@ -305,8 +397,10 @@
             {
               label: "奖惩情况（国标）",
               prop: "rewardsAndPunishments",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入奖惩情况（国标）",
                 trigger: "blur"
               }]
@@ -314,26 +408,36 @@
             {
               label: "刑罚变更执行情况",
               prop: "penaltyChange",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入刑罚变更执行情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否重新犯罪{0：否；1：是}",
+              label: "是否重新犯罪",
               prop: "newCrime",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否重新犯罪{0：否；1：是}",
+                message: "请输入是否重新犯罪",
                 trigger: "blur"
               }]
             },
             {
               label: "重新犯罪名称",
               prop: "nameOfRecidivism",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入重新犯罪名称",
                 trigger: "blur"
               }]
@@ -341,8 +445,9 @@
             {
               label: "刑法执行类别",
               prop: "categoryOfLaw",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入刑法执行类别",
                 trigger: "blur"
               }]
@@ -350,18 +455,25 @@
             {
               label: "管控等级",
               prop: "controlLevel",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入管控等级",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否重点监控{0：否；1：是}",
+              label: "是否重点监控",
               prop: "isKeyMonitoring",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否重点监控{0：否；1：是}",
+                message: "请输入是否重点监控",
                 trigger: "blur"
               }]
             },

src/views/person/drug.vue

@@ -56,12 +56,15 @@
           border: true,
           index: true,
           viewBtn: true,
+          addBtn:false,
           selection: true,
           dialogClickModal: false,
           column: [
             {
               label: "基本表ID",
               prop: "parentId",
+              hide:true,
+              display:false,
               rules: [{
                 required: true,
                 message: "请输入基本表ID",
@@ -71,6 +74,7 @@
             {
               label: "姓名",
               prop: "name",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入姓名",
@@ -78,91 +82,128 @@
               }]
             },
             {
-              label: "吸毒原因：亲友影响；好奇；人生受挫；寻求刺激；被诱骗；被逼迫；治病引起；遗传；其他",
+              label: "吸毒原因",
               prop: "reason",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=drug_reason",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入吸毒原因：亲友影响；好奇；人生受挫；寻求刺激；被诱骗；被逼迫；治病引起；遗传；其他",
+                required: false,
+                message: "请输入吸毒原因",
                 trigger: "blur"
               }]
             },
             {
-              label: "毒品来源：黑市购买；亲朋提供；偷窃；医生处方；其他",
+              label: "毒品来源",
               prop: "source",
+              hide:true,
               rules: [{
-                required: true,
-                message: "请输入毒品来源：黑市购买；亲朋提供；偷窃；医生处方；其他",
+                required: false,
+                message: "请输入毒品来源",
                 trigger: "blur"
               }]
             },
             {
-              label: "戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；社区戒毒；其他",
+              label: "戒毒情况",
               prop: "detoxification",
+              hide:true,
               rules: [{
-                required: true,
-                message: "请输入戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；社区戒毒；其他",
+                required: false,
+                message: "请输入戒毒情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "关注程度：0 - 一般；1 - 中等；2 - 严重",
+              label: "关注程度",
               prop: "attention",
+              hide:true,
               rules: [{
-                required: true,
-                message: "请输入关注程度：0 - 一般；1 - 中等；2 - 严重",
+                required: false,
+                message: "请输入关注程度",
                 trigger: "blur"
               }]
             },
             {
-              label: "吸毒状态：0 - 在吸；1 - 停吸",
+              label: "吸毒状态",
               prop: "drugStatus",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入吸毒状态：0 - 在吸；1 - 停吸",
+                message: "请输入吸毒状态",
                 trigger: "blur"
               }]
             },
             {
-              label: "吸毒人员类型：在册类；社区矫正报道类；社区康复类；其他社会面吸毒人员",
+              label: "吸毒人员类型",
               prop: "type",
+              hide:true,
               rules: [{
-                required: true,
-                message: "请输入吸毒人员类型：在册类；社区矫正报道类；社区康复类；其他社会面吸毒人员",
+                required: false,
+                message: "请输入吸毒人员类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "吸毒后果：危害身体；危害家庭；其他",
+              label: "吸毒后果",
               prop: "consequence",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=drug_consequence",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入吸毒后果：危害身体；危害家庭；其他",
+                message: "请输入吸毒后果",
                 trigger: "blur"
               }]
             },
             {
-              label: "滥用毒品种类：鸦片；吗啡；海洛因；大麻；杜冷丁；古柯；可卡因；冰毒；摇头丸；K粉；咖啡因；三唑抡；其他",
+              label: "滥用毒品种类",
               prop: "species",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=drug_species",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入滥用毒品种类：鸦片；吗啡；海洛因；大麻；杜冷丁；古柯；可卡因；冰毒；摇头丸；K粉；咖啡因；三唑抡；其他",
+                message: "请输入滥用毒品种类",
                 trigger: "blur"
               }]
             },
             {
-              label: "管控情况：在控；失控；死亡；出国（境）；社会面戒断三年未复吸；社会面戒断不满三年",
+              label: "管控情况",
               prop: "controlSituation",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=drug_controlSituation",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
-                required: true,
-                message: "请输入管控情况：在控；失控；死亡；出国（境）；社会面戒断三年未复吸；社会面戒断不满三年",
+                required: false,
+                message: "请输入管控情况",
                 trigger: "blur"
               }]
             },
             {
               label: "管控人姓名",
               prop: "controllerName",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入管控人姓名",
                 trigger: "blur"
               }]
@@ -170,8 +211,9 @@
             {
               label: "管控人联系方式",
               prop: "controllerPhone",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入管控人联系方式",
                 trigger: "blur"
               }]
@@ -179,17 +221,19 @@
             {
               label: "帮扶情况",
               prop: "helpSituation",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶情况",
                 trigger: "blur"
               }]
             },
             {
-              label: "帮夫人姓名",
+              label: "帮扶人姓名",
               prop: "helperName",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮夫人姓名",
                 trigger: "blur"
               }]
@@ -197,26 +241,37 @@
             {
               label: "帮扶人联系方式",
               prop: "helperPhone",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶人联系方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否服用美沙酮戒毒：0 - 否；1 - 是；",
+              label: "是否服用美沙酮戒毒",
               prop: "methadone",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否服用美沙酮戒毒：0 - 否；1 - 是；",
+                message: "请输入是否服用美沙酮戒毒",
                 trigger: "blur"
               }]
             },
             {
               label: "查获日期",
               prop: "date",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入查获日期",
                 trigger: "blur"
               }]
@@ -224,35 +279,47 @@
             {
               label: "初次发现日期",
               prop: "findDate",
+              type:'date',
+              valueFormat:"yyyy-MM-dd",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入初次发现日期",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否有犯罪史：0 - 否；1 - 是；",
+              label: "是否有犯罪史",
               prop: "criminalHistory",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入是否有犯罪史：0 - 否；1 - 是；",
+                message: "请输入是否有犯罪史",
                 trigger: "blur"
               }]
             },
             {
-              label: "犯罪情况；（当选择有犯罪实时必填）",
+              label: "犯罪情况",
               prop: "crime",
+              hide:true,
               rules: [{
-                required: true,
-                message: "请输入犯罪情况；（当选择有犯罪实时必填）",
+                required: false,
+                message: "请输入犯罪情况",
                 trigger: "blur"
               }]
             },
             {
               label: "行动趋向",
               prop: "action",
+              hide:true,
+              type:'textarea',
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入行动趋向",
                 trigger: "blur"
               }]
@@ -261,7 +328,7 @@
               label: "生活状况",
               prop: "living",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入生活状况",
                 trigger: "blur"
               }]
@@ -269,8 +336,9 @@
             {
               label: "社会关系",
               prop: "relationship",
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入社会关系",
                 trigger: "blur"
               }]
@@ -278,8 +346,10 @@
             {
               label: "现实表现",
               prop: "performance",
+              type:'textarea',
+              hide:true,
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入现实表现",
                 trigger: "blur"
               }]

src/views/person/enterprisestaff.vue

@@ -64,6 +64,7 @@
           addBtn:false,
           selection: true,
           dialogClickModal: false,
+          menuWidth:350,
           column: [
             {
               label: "姓名",

src/views/person/establishfilecard.vue

@@ -62,17 +62,29 @@
             {
               label: "基本表Id",
               prop: "parentId",
+              hide:true,
+              display:false,
               rules: [{
                 required: true,
                 message: "请输入基本表Id",
                 trigger: "blur"
               }]
             },
+            {
+              label: "姓名",
+              prop: "name",
+              search:true,
+              rules: [{
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur"
+              }]
+            },
             {
               label: "测算年度",
               prop: "calculationYear",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入测算年度",
                 trigger: "blur"
               }]
@@ -81,7 +93,7 @@
               label: "户编号",
               prop: "familyCode",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入户编号",
                 trigger: "blur"
               }]
@@ -90,7 +102,7 @@
               label: "帮扶干部",
               prop: "helpingCadres",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶干部",
                 trigger: "blur"
               }]
@@ -99,7 +111,7 @@
               label: "帮扶干部单位",
               prop: "helpingCadreUnits",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶干部单位",
                 trigger: "blur"
               }]
@@ -108,7 +120,7 @@
               label: "帮扶干部电话",
               prop: "helpingCadresPhone",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入帮扶干部电话",
                 trigger: "blur"
               }]
@@ -117,7 +129,7 @@
               label: "建档立卡人口",
               prop: "registrationPopulation",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入建档立卡人口",
                 trigger: "blur"
               }]
@@ -126,7 +138,7 @@
               label: "贫困属性",
               prop: "povertyAttribute",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入贫困属性",
                 trigger: "blur"
               }]
@@ -135,7 +147,7 @@
               label: "识别年月",
               prop: "identifyMonth",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入识别年月",
                 trigger: "blur"
               }]
@@ -144,7 +156,7 @@
               label: "脱贫年度",
               prop: "povertyAlleviationYear",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入脱贫年度",
                 trigger: "blur"
               }]
@@ -153,53 +165,83 @@
               label: "家庭劳动力",
               prop: "familyLaborForce",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入家庭劳动力",
                 trigger: "blur"
               }]
             },
             {
-              label: "有无养老保险{0：无；1：有}",
+              label: "是否有养老保险",
               prop: "isEndowmentInsurance",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入有无养老保险{0：无；1：有}",
+                message: "请输入有无养老保险",
                 trigger: "blur"
               }]
             },
             {
-              label: "有无医疗保障{0：无；1：有}",
+              label: "是否有医疗保障",
               prop: "isMedicalSecurity",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入有无医疗保障{0：无；1：有}",
+                message: "请输入有无医疗保障",
                 trigger: "blur"
               }]
             },
             {
-              label: "有无在校学生{0：否；1：是}",
+              label: "是否有在校学生",
               prop: "isSchoolStudents",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入有无在校学生{0：否；1：是}",
+                message: "请输入有无在校学生",
                 trigger: "blur"
               }]
             },
             {
-              label: "有无教育保障{0：无；1：有}",
+              label: "是否有教育保障",
               prop: "isEducationGuarantee",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入有无教育保障{0：无；1：有}",
+                message: "请输入有无教育保障",
                 trigger: "blur"
               }]
             },
             {
-              label: "收入情况{1：生产经营性收入；2：工资性收入；3：转移性收入；4：财产性收入}",
+              label: "收入情况",
               prop: "income",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=income",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入收入情况{1：生产经营性收入；2：工资性收入；3：转移性收入；4：财产性收入}",
+                message: "请输入收入情况",
                 trigger: "blur"
               }]
             },

src/views/person/fertilewoman.vue

@@ -59,6 +59,16 @@
           selection: true,
           dialogClickModal: false,
           column: [
+            {
+              label: "姓名",
+              prop: "name",
+              search:true,
+              rules: [{
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur"
+              }]
+            },
             {
               label: "婚次",
               prop: "marriageTimes",

src/views/person/psychiatric.vue

@@ -81,7 +81,7 @@
               },
               rules: [{
                 required: true,
-                message: "请输入家庭经济状况：无固定经济来源；有固定经济来源；低收入家庭；贫困；其他",
+                message: "请输入家庭经济状况",
                 trigger: "blur"
               }]
             },

src/views/person/serveruser.vue

@@ -27,6 +27,9 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot="residentialId" slot-scope="scope">
+        <div>{{scope.row.residentialName}}</div>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -69,17 +72,32 @@
               }]
             },
             {
-              label: "性别  0-未定义  1-男 2-女",
+              label: "性别",
               prop: "sex",
+              type:'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType:'number',
               rules: [{
                 required: true,
-                message: "请输入性别  0-未定义  1-男 2-女",
+                message: "请选择性别",
                 trigger: "blur"
               }]
             },
             {
               label: "省",
               prop: "regionProvince",
+              type: "select",
+              dicUrl: "/api/blade-system/region/lazy-tree?parentCode=000000",
+              cascaderItem:["regionCity"],
+              props:{
+                label:"title",
+                value: "id"
+              },
+              value: "null",
               rules: [{
                 required: true,
                 message: "请输入省",
@@ -89,6 +107,14 @@
             {
               label: "市",
               prop: "regionCity",
+              type: "select",
+              width: 100,
+              cascaderItem: ["regionArea"],
+              dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
+              props:{
+                label: "title",
+                value: "id"
+              },
               rules: [{
                 required: true,
                 message: "请输入市",
@@ -98,6 +124,13 @@
             {
               label: "区",
               prop: "regionArea",
+              type: "select",
+              cascaderItem: ["residentialId"],
+              dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
+              props:{
+                label: "title",
+                value: "id"
+              },
               rules: [{
                 required: true,
                 message: "请输入区",
@@ -114,29 +147,50 @@
               }]
             },
             {
-              label: "所属小区id",
+              label: "所属小区",
               prop: "residentialId",
+              type: "select",
+              search: true,
+              slot:true,
+              // searchFilterable: true,
+              // dicUrl: "/api/cyzh-community/residential/list?regionArea={{key}}",
+              dicUrl: "/api/cyzh-community/residential/list?size=99999",
+              dicFormatter:(res)=>{
+                return res.data.records;//返回字典的层级结构
+              },
+              props: {
+                label: "name",
+                value: "id"
+              },
+              filterable: true,
               rules: [{
                 required: true,
-                message: "请输入所属小区id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属小区名称",
-              prop: "residentialName",
-              rules: [{
-                required: true,
-                message: "请输入所属小区名称",
+                message: "请输入所属小区",
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "所属小区名称",
+            //   prop: "residentialName",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入所属小区名称",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "人员类型：0-保安 1-快递 2-外卖 3-清洁 4-其他",
+              label: "人员类型",
               prop: "type",
+              type:'select',
+              dicUrl:'/api/blade-system/dict-biz/dictionary?code=service_people_type',
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType:'number',
               rules: [{
                 required: true,
-                message: "请输入人员类型：0-保安 1-快递 2-外卖 3-清洁 4-其他",
+                message: "请输入人员类型",
                 trigger: "blur"
               }]
             },
@@ -152,6 +206,7 @@
             {
               label: "身份证",
               prop: "idCard",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入身份证",
@@ -168,8 +223,15 @@
               }]
             },
             {
-              label: "0-启用  1-禁用",
+              label: "是否启用",
               prop: "isEnable",
+              type:'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=on_off",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType:'number',
               rules: [{
                 required: true,
                 message: "请输入0-启用  1-禁用",
@@ -177,44 +239,32 @@
               }]
             },
             {
-              label: "存储位置（通过该字段快速查询，所有的子节点）",
-              prop: "orgPosition",
-              rules: [{
-                required: true,
-                message: "请输入存储位置（通过该字段快速查询，所有的子节点）",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "人脸启用状态：0-待启用 1-已启动 2-已禁用",
+              label: "人脸启用状态",
               prop: "faceEnable",
+              type:'select',
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=face_enable",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType:'number',
               rules: [{
                 required: true,
                 message: "请输入人脸启用状态：0-待启用 1-已启动 2-已禁用",
                 trigger: "blur"
               }]
             },
-            {
-              label: "单元名称集合",
-              prop: "unitNames",
-              rules: [{
-                required: true,
-                message: "请输入单元名称集合",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "单元id集合-若无则该服务人员可以进入该小区所有单元",
-              prop: "unitIds",
-              rules: [{
-                required: true,
-                message: "请输入单元id集合-若无则该服务人员可以进入该小区所有单元",
-                trigger: "blur"
-              }]
-            },
             {
               label: "人脸图片",
               prop: "imageUri",
+              type:'upload',
+              listType: 'picture-img',
+              propsHttp: {
+                res: "data",
+                url: "link"
+              },
+              tip: '只能生产jpg/png图片，且不超过500kb',
+              action: "/api/blade-resource/oss/endpoint/put-file",
               rules: [{
                 required: true,
                 message: "请输入人脸图片",
@@ -222,17 +272,10 @@
               }]
             },
             {
-              label: "图片md5",
-              prop: "imageMd5",
-              rules: [{
-                required: true,
-                message: "请输入图片md5",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "人脸有效开始时间·",
+              label: "人脸有效开始时间",
               prop: "beginDate",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入人脸有效开始时间·",
@@ -242,6 +285,8 @@
             {
               label: "人脸有效截止时间",
               prop: "endDate",
+              type:'datetime',
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入人脸有效截止时间",

src/views/person/veterans.vue

@@ -60,6 +60,16 @@
           selection: true,
           dialogClickModal: false,
           column: [
+            {
+              label: "姓名",
+              prop: "name",
+              search:true,
+              rules: [{
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur"
+              }]
+            },
             {
               label: "是否独生子女",
               prop: "onlyChild",

vue.config.js

@@ -33,8 +33,10 @@ module.exports = {
         }
       },
       '/api': {
-        // target: 'http://192.168.1.128',
-        target: 'http://36.103.227.152:1777/api',
+        target: 'http://localhost',
+        //测试环境地址
+
+        // target: 'http://36.103.227.152:1777/api',
         ws: true,
         pathRewrite: {
           '^/api': '/'