Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -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) => {
-          if (i == h.bsm) {
-            list.push(
-              {
-                bdcdyh:h.bdcdyh,
-                bsm:h.bsm,
-                dyhbsm:h.dyhbsm
-              }
-            )
-          }
+          c.hs.forEach((h) => {
+            if (i == h.bsm) {
+              list.push(
+                {
+                  bdcdyh:h.bdcdyh,
+                  bsm:h.bsm,
+                  dyhbsm:h.dyhbsm,
+                  bdcdyid:h.dyhbsm,
+                  bdcdylx:'7',
+                  flag:this.compFlag
+                }
+              )
+            }
+          });
         });
-      });
       })
-      this.getBsmList(list)
+      this.getBsmList(list,this.compFlag)
     },
     changeChoosedObj: {
       handler(val) {

@@ -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){
-      this.bsmList = bsmList;
+    getBsmList(bsmList,compFlag){
+      // 根据本次传入的组件标识删除之前对应组件标识存入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.bsmList.forEach(item=>{
-        item['bdcdyid'] = item.dyhbsm;
-        item['bdcdylx'] = '7';
-      })
+      this.loading = true;
       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(){

@@ -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>
 

@@ -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() {

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxcfdj" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -12,6 +12,7 @@
       style="page-break-after: always"
     >
       <div class="title">{{ title }}</div>
+      <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
       <table class="xxTable">
         <tr v-for="item in columns" :key="item.name">
           <td>
@@ -50,18 +51,14 @@ export default {
     };
   },
   props: {
-    propsParam: {
-      type: Object,
-      default: () => {},
-    },
     tableData: {
       type: Array,
       default: () => [],
     },
-    render:{
+    render: {
       type: Boolean,
-        default: false,
-    }
+      default: false,
+    },
   },
   created() {},
   watch: {
@@ -70,11 +67,11 @@ export default {
         this.tableData = newValue;
       },
     },
-      render: {
+    render: {
       handler(newValue, oldValue) {
-            if(newValue){
+        if (newValue) {
           this.loadData();
-            }
+        }
       },
     },
     immediate: true,
@@ -87,13 +84,13 @@ export default {
      */
     loadData() {
       getFieldListByQlxx({
-        qllx: this.propsParam.qllx,
+        qllx: this.tableData[0].qllx,
       }).then((res) => {
         if (res.code === 200) {
           this.columns = res.result;
         }
       });
-      if (this.tableData.length&&this.datass.length==0) {
+      if (this.tableData.length && this.datass.length == 0) {
         for (let i = 0; i < this.tableData.length; i += 4) {
           this.datass.push(this.tableData.slice(i, i + 4));
         }
@@ -113,8 +110,13 @@ export default {
 <style lang="scss" scoped>
 .tbalede {
   width: 100%;
-  // height: 1123px;
   margin: auto;
+  position: relative;
+  .num {
+   position: absolute;
+   right: 10px;
+   top: 0px;
+  }
   .title {
     width: 100%;
     font-weight: 700;
@@ -140,16 +142,15 @@ export default {
       padding: 5px;
     }
     td {
-   width: 20px!important;
+      width: 20px !important;
       word-break: break-all;
       //       /* 方法一：使用 word-break */
-// word-break: break-all;
-// // /* 方法二：使用 white-space */
-// // white-space: pre-wrap;
-// // /* 方法三：使用 overflow-wrap */
-// // overflow-wrap: break-word;
+      // word-break: break-all;
+      // // /* 方法二：使用 white-space */
+      // // white-space: pre-wrap;
+      // // /* 方法三：使用 overflow-wrap */
+      // // overflow-wrap: break-word;
     }
-
   }
 }
 </style>

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxdiyaq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate id="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate id="boxdiyiq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -8,7 +8,7 @@
     <div v-show="false">
       <printTemplate
         id="boxfdcq"
-       :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -5,10 +5,9 @@
 -->
 <template>
   <div class="djxxTable">
-    <div>
+    <div v-show="false">
       <printTemplate
         id="boxfdcq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxjsydsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxldsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxnydsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -18,7 +18,6 @@
     <div v-show="false">
       <printTemplate
         id="boxsllmsyq"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-       <printTemplate  id="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+       <printTemplate  id="boxtdsyq" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -6,7 +6,7 @@
 <template>
   <div class="djxxTable">
     <div v-show="false">
-        <printTemplate  id="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
+        <printTemplate  id="boxygdj" :tableData="tableData" :render="render"/>
     </div>
     <div class="tableBox">
       <div class="title">

@@ -8,7 +8,6 @@
     <div v-show="false">
       <printTemplate
         id="boxyydj"
-        :propsParam="propsParam"
         :tableData="tableData"
         :render="render"
       />

@@ -103,18 +103,46 @@
           </el-col>
         </el-row>
         <el-row :gutter="10" v-if="ruleForm.fdcq1">
-          <el-col :span="8">
+           <el-col :span="8">
             <el-form-item label="独用土地面积：">
-              <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.dytdmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.fdcq1.dytdmj"
+                  :disabled="!viewEdit"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="分摊土地面积：">
-              <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.fttdmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.fdcq1.fttdmj"
+                  :disabled="!viewEdit"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
+
             <el-form-item label="房地产交易价格：">
               <div class="flex">
                 <el-input
@@ -298,6 +326,7 @@
         disabled: true,
         tdytOption: [],
         czrOptions: [],
+        mjdw: "1",
         czr: "",
         ruleForm: {
           flow: {