Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 10:32:29
+ * @LastEditTime: 2024-01-17 14:28:40
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -480,49 +480,8 @@
             })
           }
 
-
           // 义务人
-          let ywrlines = this.bdcqz.ywr ? this.bdcqz.ywr.split(' ') : [];
-          if (getByteLen(this.bdcqz.ywr) > 37) {
-            ywrlines.forEach((line, index) => {
-              let currentLine = '';
-              let arr = [];
-              for (let word of line) {
-                const testLine = currentLine + word;
-                const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 295) {
-                  currentLine = testLine;
-                } else {
-                  arr.push(currentLine);
-                  currentLine = word;
-                }
-              }
-              arr.push(currentLine);
-              arr.forEach((line, index) => {
-                context.fillText(line, 775, 265 + (index * 20)); // 调整行高
-              })
-            })
-          } else {
-            ywrlines.forEach((line, index) => {
-              let currentLine = '';
-              let arr = [];
-              for (let word of line) {
-                const testLine = currentLine + word;
-                const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 295) {
-                  currentLine = testLine;
-                } else {
-                  arr.push(currentLine);
-                  currentLine = word;
-                }
-              }
-              arr.push(currentLine);
-              arr.forEach((line, index) => {
-                context.fillText(line, 775, 275 + (index * 20)); // 调整行高
-              })
-            })
-          }
-
+          context.fillText(this.bdcqz.ywr ? this.bdcqz.ywr : '', 775, 275);
           // context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 775, 325);
 
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 10:00:41
+ * @LastEditTime: 2024-01-17 14:18:01
 -->
 <template>
   <div class="from-clues">
@@ -15,12 +15,18 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item label="不动产权证号">
               <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="坐落">
+              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -29,13 +35,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="坐落">
-              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
+          <el-col :span="8">
+            <el-form-item label="证件号">
+              <el-input placeholder="请输入证件号" v-model="queryForm.zjh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="8" class="btnColRight">
             <el-form-item>
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button type="primary" @click="resetForm(true)">重置</el-button>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 13:26:03
+ * @LastEditTime: 2024-01-17 14:17:17
 -->
 <template>
   <div class="from-clues">
@@ -10,7 +10,7 @@
       <el-form :model="queryForm" ref="queryForm">
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="宗地代码">
+            <el-form-item label="宗地代码" label-width="80px">
               <el-input placeholder="请输入宗地代码" maxlength="19" v-model="queryForm.zddm" clearable class="width100">
               </el-input>
             </el-form-item>
@@ -27,9 +27,24 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="权利人">
+              <el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="证件号" label-width="80px">
+              <el-input placeholder="请输入证件号" v-model="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18" class="btnColRight">
             <el-form-item>
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -75,8 +90,8 @@
           columns: datas.columns(),
           data: [],
         },
-        bdcdysz: [],
-      };
+        bdcdysz: []
+      }
     },
     mounted () {
       sendThis(this);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-16 14:00:39
+ * @LastEditTime: 2024-01-17 14:17:21
 -->
 <template>
   <div class="from-clues">
@@ -15,12 +15,19 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item label="不动产权证号">
               <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="坐落">
+              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -29,13 +36,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="坐落">
-              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
+          <el-col :span="8">
+            <el-form-item label="证件号">
+              <el-input placeholder="请输入证件号" v-model="queryForm.zjh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="8" class="btnColRight">
             <el-form-item>
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button type="primary" @click="resetForm(true)">重置</el-button>

@@ -23,6 +23,8 @@ class data extends filter {
       bdcqzh: "",
       fwfl: "",
       zl: "",
+      qlr: "",
+      zjh: ""
     }
   }
 }