Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-21 10:35:58
+ * @LastEditTime: 2023-08-22 16:19:59
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -12,8 +12,10 @@
       </el-tab-pane>
     </el-tabs>
     <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
-    <canvas ref="zs" width="1024" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="739"></canvas>
-    <canvas ref="zm" width="1169" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="828"></canvas>
+    <div style="width:1180px;">
+      <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
+      <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
+    </div>
   </div>
 </template>
 
@@ -255,7 +257,6 @@
         }
         image.src = this.imgSrc
       },
-      // 不动产证明
       /**
        * @description: 不动产证明
        * @author: renchao
@@ -334,13 +335,33 @@
           this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
             this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
           context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
-
-
           // qlqtzk
-          const maxWidth = 280; // 最大宽度限制
+          const maxWidth = 295; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
-          lines.forEach((line, index) => {
-            const y = 415 + (index * 37); // 每行文本的垂直位置
+          if (lines[0]) {
+            lines[0].split(' ').forEach((line, index) => {
+              const y = 415 + (index * 60); // 每行文本的垂直位置
+              let currentLine = '';
+              let arr = [];
+              for (let word of line) {
+                const testLine = currentLine + word;
+                const lineWidth = context.measureText(testLine).width;
+                if (lineWidth <= maxWidth) {
+                  currentLine = testLine;
+                } else {
+                  arr.push(currentLine);
+                  currentLine = word;
+                }
+              }
+              arr.push(currentLine);
+              arr.forEach((line, index) => {
+                context.fillText(line, 775, y + (index * 23)); // 调整行高
+              });
+            });
+          }
+
+          lines.slice(1).forEach((line, index) => {
+            const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 30); // 每行文本的垂直位置
             let currentLine = '';
             let arr = [];
             for (let word of line) {
@@ -355,12 +376,32 @@
             }
             arr.push(currentLine);
             arr.forEach((line, index) => {
-              context.fillText(line, 775, y + (index * 20)); // 调整行高
-            });
-          });
+              context.fillText(line, 775, y + (index * 16)); // 调整行高
+            })
+          })
+
           // fj
-          context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 775, 600);
-        };
+          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
+          lines1.forEach((line, index) => {
+            const y = 590 + (index * 27); // 每行文本的垂直位置
+            let currentLine = '';
+            let arr = [];
+            for (let word of line) {
+              const testLine = currentLine + word;
+              const lineWidth = context.measureText(testLine).width;
+              if (lineWidth <= maxWidth) {
+                currentLine = testLine;
+              } else {
+                arr.push(currentLine);
+                currentLine = word;
+              }
+            }
+            arr.push(currentLine);
+            arr.forEach((line, index) => {
+              context.fillText(line, 775, y + (index * 20)); // 调整行高
+            })
+          })
+        }
 
         image.src = this.bdczmSrc;
       }

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 13:34:51
+ * @LastEditTime: 2023-08-22 14:25:14
 -->
 <template>
   <div class="slxx">
@@ -185,14 +185,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="竣工时间：">
-              <!-- <el-input v-model="ruleForm.fdcq2.jgsj"></el-input> -->
               <el-date-picker
                 v-model="ruleForm.fdcq2.jgsj"
                 class="width100"
                 type="date"
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd"
-                :disabled="!viewEdit || ableEdit || isJfOperation"></el-date-picker>
+                :disabled="!viewEdit"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -464,10 +463,8 @@
        * @author: renchao
        */
       upDateTdytxxList (val) {
-        this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.key++;
+        this.ruleForm.tdytqxList = _.cloneDeep(val)
       },
-
       /**
        * @description: 更新权利人信息
        * @param {*} val

@@ -311,15 +311,12 @@
         }
       },
       handleLpbClick (item) {
-        this.$popup('楼盘表', 'lpb/index', {
+        console.log("item",item);
+         this.$popup('楼盘表', 'lpb/index', {
           width: '85%',
           formData: {
             bsm: item.bsm,
-            zrzbsm: item.bsm,
-            zdbsm: item.zdbsm,
-            bsmSqyw: this.bsmSqyw,
-            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+
           }
         })
       },

@@ -242,7 +242,7 @@
        * @param {*} row
        * @author: renchao
        */
-      openBook (row) {
+      openDialog (row) {
         var param = {
           bdcdyid: row.bdcdyid,
           qllx: row.qllx,

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-22 09:24:28
+ * @LastEditTime: 2023-08-22 09:28:16
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -97,16 +97,13 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }
-      },
+      }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -192,9 +192,16 @@
        * @author: renchao
        */
       handleLpbClick (item) {
-        this.$popupDialog('楼盘表', 'lpb/index', {
-          bsm: ''
-        }, '85%')
+        console.log("item",item);
+         this.$popup('楼盘表', 'lpb/index', {
+          width: '85%',
+          formData: {
+            bsm: item.zrzbsm,
+            zrzbsm: item.zrzbsm,
+            zdbsm: item.zrzbsm,
+
+          }
+        })
       }
     }
   }

@@ -89,11 +89,20 @@
           }
         })
       },
-      /**
-       * @description: moreQueryClick
-       * @author: renchao
-       */
-      moreQueryClick () { }
+    openDialog(){
+        this.$popup('楼盘表', 'lpb/index', {
+          width: '85%',
+          formData: {
+            bsm: item.bsm,
+            zrzbsm: item.bsm,
+            zdbsm: item.zdbsm,
+            bsmSqyw: this.bsmSqyw,
+            // onlyShow: true,
+            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
+            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+          }
+        })
+      }
     }
   }
 </script>