1、支部管理

src/views/device/elevatordevice.vue

@@ -248,6 +248,16 @@
         return ids.join(",");
       }
     },
+    created(){
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0) {
+        let nbhdNameProp = this.findObject(this.option.column, "nbhdName");
+        nbhdNameProp.label = "所属小区"
+      }else if(tenantType == 1){
+        let nbhdNameProp = this.findObject(this.option.column, "nbhdName");
+        nbhdNameProp.label = "所属区域"
+      }
+    },
     methods: {
       handleSync(){
         this.loading = true;

src/views/enterprise/dept.vue

@@ -112,7 +112,9 @@
                 required: true,
                 message: "请输入企业id",
                 trigger: "blur"
-              }]
+              }],
+              hide: true,
+              viewDisplay: false
             },
             {
               label: "备注",
@@ -148,6 +150,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.enterpriseName = row.$enterpriseId;
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -161,6 +164,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        row.enterpriseName = row.$enterpriseId;
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({

src/views/order/publicevent.vue

@@ -146,11 +146,11 @@ export default {
             }]
           },
           {
-            label: "受理人",
-            prop: "auditor",
+            label: "审核员",
+            prop: "auditorName",
             rules: [{
               required: true,
-              message: "请输入受理人",
+              message: "请输入审核员",
               trigger: "blur"
             }]
           },
@@ -165,7 +165,7 @@ export default {
           },
           {
             label: "处理人",
-            prop: "handlePerson",
+            prop: "handlePersonName",
             rules: [{
               required: true,
               message: "请输入处理人",

src/views/party/branch.vue

@@ -186,21 +186,26 @@
             },
             {
               label:"关联对象",
-              prop:"resourceName",
+              prop:"resourceNames",
+              type: "textarea",
               addDisplay:false,
               editDisplay:false,
+              // row: true,
+              span: 24
             },
 
             {
               label: "关联对象",
               prop: "resourceIds",
               type: "select",
+              multiple: true,
               hide:true,
               viewDisplay:false,
-              span:24,
+              remote: true,
+              span: 24,
               // dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
               // dicUrl: "/api/cyzh-community/residential/list?size=500",
-              dicUrl: "/api/cyzh-community/agency/list?size=1000",
+              dicUrl: "/api/cyzh-community/agency/list?size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -322,7 +327,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
-        row.residentialIds = row.residentialIds.toString();
+        row.resourceIds = row.resourceIds.toString();
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({