Browse Source

merge master

haojianlong 5 năm trước cách đây
mục cha
commit
cca53dc193

+ 3 - 2
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -148,7 +148,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "N2", "X"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }
@@ -161,7 +161,8 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let data = showTools.showHeaderTypes(arr, this.onlyRead, false, this.allMess)
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
+      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift({
       //   data: "SpaceCount",
       //   readOnly: this.onlyRead

+ 2 - 2
src/views/rent/rentlist/index.vue

@@ -364,8 +364,8 @@ export default {
       }
       //点击关联的元空间
       if (val === "RoomCount") {
-        if(infos && infos.LeaseInfo && infos.LeaseInfo.RoomID) {
-          this.roomId = infos.LeaseInfo.RoomID
+        if(infos && infos.RoomID) {
+          this.roomId = infos.RoomID
         } else {
           this.roomId = ""
         }

+ 3 - 2
src/views/rent/rentlist/rentadd/index.vue

@@ -147,7 +147,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "N2", "X"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }
@@ -160,7 +160,8 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let data = showTools.showHeaderTypes(arr, this.onlyRead, false, this.allMess)
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
+      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift({
       //   data: "SpaceCount",
       //   readOnly: this.onlyRead