Explorar o código

1、小区管理

billisme %!s(int64=4) %!d(string=hai) anos
pai
achega
6d00834aa5

+ 9 - 9
src/components/person-tags/veterans-form.vue

@@ -77,8 +77,8 @@
               search: true,
               cascaderItem: ['residentialId'],
               type: "select",
-              // remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?size=9999",
+              remote: true,
+              dicUrl: "/api/cyzh-community/agency/list?size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -98,7 +98,7 @@
               type: "select",
               search: true,
               cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -121,7 +121,7 @@
               // slot:true,
               search: true,
               cascaderItem: ['unitId'],
-              dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
+              dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -144,7 +144,7 @@
               // slot:true,
               search: true,
               cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -167,7 +167,7 @@
               // slot:true,
               search: true,
               cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=50",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -189,7 +189,7 @@
               type: "select",
               // slot:true,
               search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -456,7 +456,7 @@
               prop: "enlistmentTime",
               type: 'date',
               hide:true,
-              valueFormat: 'yyyy-MM-dd',
+              format: 'yyyy-MM-dd',
               rules: [{
                 required: true,
                 message: "请输入入伍日期",
@@ -467,7 +467,7 @@
               label: "退伍日期",
               prop: "dischargeTime",
               type: 'date',
-              valueFormat: 'yyyy-MM-dd',
+              format: 'yyyy-MM-dd',
               rules: [{
                 required: true,
                 message: "请输入退伍日期",

+ 22 - 14
src/views/community/residentialManage.vue

@@ -210,6 +210,9 @@ export default {
   },
   data() {
     return {
+      selectBuildingId: "",
+      selectUnitId: "",
+      selectFloorId: "",
       permissionDataList: [],
       loading: false,
       batchVisible: false,
@@ -283,7 +286,7 @@ export default {
             type:'select',
             hide: true,
             // slot: true,
-            dicUrl: "/api/cyzh-community/residential/list?size=9000000",
+            dicUrl: "/api/cyzh-community/residential/list?size=100",
             props: {
               label: "name",
               value: "id"
@@ -402,7 +405,7 @@ export default {
             hide: true,
             cascaderItem: ['buildingId'],
             // slot: true,
-            dicUrl: "/api/cyzh-community/residential/list?size=9000000",
+            dicUrl: "/api/cyzh-community/residential/list?size=100",
             props: {
               label: "name",
               value: "id"
@@ -543,7 +546,7 @@ export default {
             hide: true,
             // slot: true,
             cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/list?size=9000000",
+            dicUrl: "/api/cyzh-community/residential/list?size=100",
             props: {
               label: "name",
               value: "id"
@@ -563,7 +566,7 @@ export default {
             // slot: true,
             type:'select',
             disabled: true,
-            dicUrl: `/api/cyzh-community/building/list?size=500&residentialId={{key}}`,
+            dicUrl: `/api/cyzh-community/building/list?size=100&residentialId={{key}}`,
             props: {
               label: "name",
               value: "id"
@@ -720,7 +723,7 @@ export default {
             cascaderIndex:0,
             searchFilterable:true,
             // dicUrl: "/grid/estate/getResidentialList",
-            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=100",
             dicFormatter: (res)=>{
               return res.data.records;
             },
@@ -745,7 +748,7 @@ export default {
             disabled: true,
             searchFilterable:true,
             cascaderIndex:1,
-            dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
+            dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}&size=100",
             dicFormatter: (res)=>{
               return res.data.records;
             },
@@ -768,7 +771,7 @@ export default {
             dicFlag: false,
             cascaderItem: ["floorId"],
             // dicUrl: "/api/cyzh-community/residential/list?residentialId={{key}}",
-            dicUrl: "/api/cyzh-community/unit/list?residentialId={{key}}",
+            dicUrl: "/api/cyzh-community/unit/list?residentialId={{key}&size=100",
             dicFormatter: (res)=>{
               return res.data.records;
             },
@@ -792,7 +795,7 @@ export default {
             hide: true,
             cascaderIndex:1,
             // dicUrl: "/grid/estate/getUnitList",
-            dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=900000",
+            dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=50",
             dicFormatter: (res)=>{
               return res.data.records;
             },
@@ -1115,10 +1118,12 @@ export default {
       }
     },
     beforeOpen(done, type) {
-
       console.log('------------->>>' + type);
       console.log('------------->>>' + JSON.stringify(this.form));
-
+      this.form["residentialId"] = this.residentialId;
+      this.form["buildingId"] = this.selectBuildingId;
+      this.form["unitId"] = this.selectUnitId;
+      this.form["floorId"] = this.selectFloorId;
       if (['edit', 'view'].includes(type)) {
         if (this.form.type == this.typeBuilding) {
           buildingGetDetail(this.form.id).then(res => {
@@ -1160,7 +1165,7 @@ export default {
       };
       params.residentialId = id;
       console.log("residential")
-      getBuildingListByResidentialOldId(1,99999999,params).then(res => {
+      getBuildingListByResidentialOldId(1,100,params).then(res => {
         this.data = res.data.data.records;
         this.initTreeDatasByBuilding(this.data);
         this.loading = false;
@@ -1169,7 +1174,7 @@ export default {
     onLoadUnit(buildingId,params={}) {
       this.loading = true;
       params.buildingId = buildingId;
-      getUnitListByBuildingOldId(1,999999999,params).then(res => {
+      getUnitListByBuildingOldId(1,100,params).then(res => {
         this.data = res.data.data.records;
         this.initTreeDatasByUnit(this.data, buildingId);
         this.loading = false;
@@ -1178,7 +1183,7 @@ export default {
     onLoadFloor(buildingId, unitId,params={}) {
       this.loading = true;
       params.unitId = unitId;
-      getFloorListByUnitOldId(1,999999999,params).then(res => {
+      getFloorListByUnitOldId(1,50,params).then(res => {
         this.data = res.data.data.records;
         this.initTreeDatasByFloor(this.data, buildingId, unitId);
         this.loading = false;
@@ -1188,7 +1193,7 @@ export default {
       this.loading = true;
       params.floorId = floorId;
       console.log("楼层id:"+floorId)
-      getRoomListByFloorOldId(1, 99999999, params).then(res => {
+      getRoomListByFloorOldId(1, 100, params).then(res => {
         this.data = res.data.data.records;
         // debugger
         for (let data of this.data) data.type = this.typeRoom;
@@ -1215,6 +1220,7 @@ export default {
         residentialId: this.residentialId,
         buildingId: data.id
       };
+      this.selectBuildingId = data.id;
       this.initUnitDicData(data.id, this.optionUnit);
       this.$set(this, 'form', this.form);
       this.$set(this, 'option', this.optionUnit);
@@ -1228,6 +1234,7 @@ export default {
         buildingId: data.buildingId,
         unitId: data.id
       };
+      this.selectUnitId = data.id;
       this.initFloorDicDatas(data.buildingId, data.id, this.optionFloor);
       this.$set(this, 'form', this.form);
       this.$set(this, 'option', this.optionFloor);
@@ -1242,6 +1249,7 @@ export default {
         unitId: data.unitId,
         floorId: data.id
       };
+      this.selectFloorId = data.id;
       this.initRoomDicData(data.buildingId, data.unitId, data.id);
       this.$set(this, 'form', this.form);
       this.$set(this, 'option', this.optionRoom);

+ 10 - 10
src/views/person/veterans.vue

@@ -156,7 +156,7 @@
               label: "入伍日期",
               prop: "enlistmentTime",
               type: 'date',
-              valueFormat: 'yyyy-MM-dd',
+              format: 'yyyy-MM-dd',
               rules: [{
                 required: true,
                 message: "请输入入伍日期",
@@ -167,7 +167,7 @@
               label: "退伍日期",
               prop: "dischargeTime",
               type: 'date',
-              valueFormat: 'yyyy-MM-dd',
+              format: 'yyyy-MM-dd',
               rules: [{
                 required: true,
                 message: "请输入退伍日期",
@@ -319,7 +319,7 @@
                   cascaderItem: ['residentialId'],
                   type: "select",
                   // remote: true,
-                  dicUrl: "/api/cyzh-community/agency/list?size=9999",
+                  dicUrl: "/api/cyzh-community/agency/list?size=500",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -339,7 +339,7 @@
                   type: "select",
                   search: true,
                   cascaderItem: ['buildingId'],
-                  dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+                  dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=100",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -362,7 +362,7 @@
                   // slot:true,
                   search: true,
                   cascaderItem: ['unitId'],
-                  dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
+                  dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}&size=200",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -385,7 +385,7 @@
                   // slot:true,
                   search: true,
                   cascaderItem: ['floorId'],
-                  dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+                  dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}&size=100",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -408,7 +408,7 @@
                   // slot:true,
                   search: true,
                   cascaderItem: ['roomId'],
-                  dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+                  dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=50",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -430,7 +430,7 @@
                   type: "select",
                   // slot:true,
                   search: true,
-                  dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+                  dicUrl: "/api/cyzh-community/room/list?floorId={{key}}&size=100",
                   dicFormatter:(res)=>{
                     return res.data.records;//返回字典的层级结构
                   },
@@ -717,7 +717,7 @@
                   prop: "enlistmentTime",
                   type: 'date',
                   hide:true,
-                  valueFormat: 'yyyy-MM-dd',
+                  format: 'yyyy-MM-dd',
                   rules: [{
                     required: true,
                     message: "请输入入伍日期",
@@ -728,7 +728,7 @@
                   label: "退伍日期",
                   prop: "dischargeTime",
                   type: 'date',
-                  valueFormat: 'yyyy-MM-dd',
+                  format: 'yyyy-MM-dd',
                   rules: [{
                     required: true,
                     message: "请输入退伍日期",