楼盘表选中户修改

yangwei
Showing 4 changed files with 81 additions and 35 deletions
src/views/lpb/lpbContent/ch.vue
src/views/lpb/lpbContent/index.vue
src/views/lpb/lpbContent/ljzs.vue
src/views/lpb/lpbContent/zdys.vue
--- a/src/views/lpb/lpbContent/ch.vue
View file @cc7683e
+++ b/src/views/lpb/lpbContent/ch.vue
View file @cc7683e
@@ -2,7 +2,7 @@
 * @Author: yangwei
 * @Date: 2023-02-28 15:47:12
 * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:39:12
+ * @LastEditTime: 2023-09-14 15:04:20
 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
 * @Description:
 *
@@ -108,13 +108,15 @@ export default {
      // 边框颜色
      borderColor:'rgb(230, 230, 230)',
      // 申请单元列表数据
-      unitIdList:[]
+      unitIdList:[],
+      // 组件标识
+      compFlag:Math.random()
    };
  },
  mounted() {
    // 根据申请单元列表数据处理选中户
    console.log("window.unitData",window.unitData);
-    if(window.unitData.length){
+    if(window.unitData && window.unitData.length){
      window.unitData.forEach(e => {
        this.unitIdList.push(e.bdcdyid)
      })
@@ -256,24 +258,27 @@ export default {
      immediate: true,
      deep: true,
    },
-    hbsmList(val){
+    hbsmList(val){ 
      let list = []
      val.length && val.forEach((i)=>{
        this.ch.forEach((c) => {
-        c.hs.forEach((h) => {
+          c.hs.forEach((h) => {
-          if (i == h.bsm) {
+            if (i == h.bsm) {
-            list.push(
+              list.push(
-              {
+                {
-                bdcdyh:h.bdcdyh,
+                  bdcdyh:h.bdcdyh,
-                bsm:h.bsm,
+                  bsm:h.bsm,
-                dyhbsm:h.dyhbsm
+                  dyhbsm:h.dyhbsm,
-              }
+                  bdcdyid:h.dyhbsm,
-            )
+                  bdcdylx:'7',
-          }
+                  flag:this.compFlag
+                }
+              )
+            }
+          });
        });
-      });
      })
-      this.getBsmList(list)
+      this.getBsmList(list,this.compFlag)
    },
    changeChoosedObj: {
      handler(val) {
--- a/src/views/lpb/lpbContent/index.vue
View file @cc7683e
+++ b/src/views/lpb/lpbContent/index.vue
View file @cc7683e
@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
 import zdyCpn from "./zdys.vue";
 import ljzsCpn from "./ljzs.vue";
 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
+import jump from "../../ywbl/ywsq/components/mixin/jump";
+import store from '@/store/index.js'
+import { ywPopupCacel } from "@/utils/popup.js";
 export default {
+  mixins: [jump],
  provide() {
    return {
      openMenu: this.openMenu,
@@ -74,6 +78,7 @@ export default {
      type: Object,
       default: () => { } 
    },
+    isJump: { type: Boolean, default: false },
  },
  data() {
    return {
@@ -111,8 +116,12 @@ export default {
     * @param {Array} bsmList
     * @author: renchao
     */
-    getBsmList(bsmList){
+    getBsmList(bsmList,compFlag){
-      this.bsmList = bsmList;
+      // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
+      this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
+      // 合并本次数据
+      this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
+      // })
    },
    /**
     * @description: 保存当前楼盘表
@@ -229,11 +238,7 @@ export default {
          this.$message.error("请至少选择一条数据");
          return;
        }
-      this.loading = true
+      this.loading = true;
-      this.bsmList.forEach(item=>{
-        item['bdcdyid'] = item.dyhbsm;
-        item['bdcdylx'] = '7';
-      })
      startBusinessFlow({
        bsmSqyw: this.sqywInfo.bsmSqyw,
        bdcdysz: this.bsmList,
@@ -250,7 +255,7 @@ export default {
          } else {
            store.dispatch('user/refreshPage', true);
          }
-          this.$popupCacel()
+          this.close()
        } else {
          if (res.result && res.result.length > 0) {
            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
@@ -262,6 +267,14 @@ export default {
        this.loading = false
      })
    },
+    /**
+     * @description: close
+     * @param {*} val
+     * @author: renchao
+     */
+    close(){
+      ywPopupCacel()
+    },
  },
  computed:{
    lpbContentHeight(){
--- a/src/views/lpb/lpbContent/ljzs.vue
View file @cc7683e
+++ b/src/views/lpb/lpbContent/ljzs.vue
View file @cc7683e
@@ -2,7 +2,7 @@
 * @Author: yangwei
 * @Date: 2023-02-28 17:25:45
 * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:59:46
+ * @LastEditTime: 2023-09-14 14:35:19
 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
 * @Description: 
 * 
@@ -21,12 +21,14 @@
          >
            <!-- 逻辑幢名称 -->
            <p class="lpb-xmmc ljz-xmmc">
-              <span>{{ljz.ljzmc}}</span>
+              <el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
+                ljz.ljzmc
+              }}</el-checkbox>
            </p>
            <!-- 独立层户 -->
-            <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" />
+            <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
            <!-- 幢单元 -->
-            <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
+            <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
          </div>
        </div>
      </div>
@@ -38,11 +40,15 @@
        v-else
      >
        <!-- 逻辑幢名称 -->
-        <p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p>
+        <p class="lpb-xmmc ljz-xmmc">
+          <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
+            ljzarr[0].ljzmc
+          }}</el-checkbox>
+        </p>
        <!-- 独立层户 -->
-        <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" />
+        <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
        <!-- 幢单元 -->
-        <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
+        <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
      </div>
    </div>
  </div>
@@ -90,7 +96,20 @@ export default {
      return tempArr.filter(Boolean)
    },
  },
-  methods: {},
+  methods: {
+    /**
+     * @description: 逻辑幢全选
+     * @param {*} val
+     * @param {*} r
+     * @return {*}
+     */
+    zdySelectAll(val,r) {
+      // 逻辑幢下的独立层户全选
+      this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
+      // 逻辑幢下的幢单元全选
+      this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
+    }
+  },
 };
 </script>
--- a/src/views/lpb/lpbContent/zdys.vue
View file @cc7683e
+++ b/src/views/lpb/lpbContent/zdys.vue
View file @cc7683e
@@ -2,7 +2,7 @@
 * @Author: yangwei
 * @Date: 2023-02-28 16:29:04
 * @LastEditors: yangwei
- * @LastEditTime: 2023-07-21 14:55:30
+ * @LastEditTime: 2023-09-14 14:36:51
 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
 * @Description:
 *
@@ -13,10 +13,9 @@
    <div v-for="zdy in realZdys" :key="zdy.bsm">
      <!-- 幢单元名称 -->
      <p class="lpb-xmmc">
-        <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
+        <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
          zdy.zdymc
        }}</el-checkbox>
-        <span v-else>aaa{{zdy.zdymc}}</span>
      </p>
      <!-- 每个幢单元下的层户 -->
      <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
@@ -58,6 +57,16 @@ export default {
    zdySelectAll(val,r) {
      this.$refs[r][0].zdySelectAll(val)
    },
+    /**
+     * @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
+     * @param {*} val
+     * @return {*}
+     */
+    selectAll(val){
+      this.realZdys.forEach(i=>{
+        this.zdySelectAll(val,i.bsm)
+      })
+    }
  },
  computed: {
    realZdys() {