Merge branch 'dev'

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-22 16:19:59
+ * @LastEditTime: 2023-08-22 16:43:41
 -->
 -->
 <template>
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -151,7 +151,7 @@
           const maxWidth = 336; // 最大宽度限制
           const maxWidth = 336; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           lines.forEach((line, index) => {
           lines.forEach((line, index) => {
-            const y = 463 + (index * 30); // 每行文本的垂直位置
+            const y = 463 + (index * 45); // 每行文本的垂直位置
             let currentLine = '';
             let currentLine = '';
             let arr = [];
             let arr = [];
             for (let word of line) {
             for (let word of line) {
@@ -169,9 +169,9 @@
               context.fillText(line, 129, y + (index * 20)); // 调整行高
               context.fillText(line, 129, y + (index * 20)); // 调整行高
             })
             })
           })
           })
-          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
+          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
           lines1.forEach((line, index) => {
           lines1.forEach((line, index) => {
-            const y = 100 + (index * 27); // 每行文本的垂直位置
+            const y = 100 + (index * 30); // 每行文本的垂直位置
             let currentLine = '';
             let currentLine = '';
             let arr = [];
             let arr = [];
             for (let word of line) {
             for (let word of line) {
@@ -186,7 +186,7 @@
             }
             }
             arr.push(currentLine);
             arr.push(currentLine);
             arr.forEach((line, index) => {
             arr.forEach((line, index) => {
-              context.fillText(line, 580, y + (index * 20)); // 调整行高
+              context.fillText(line, 580, y + (index * 16)); // 调整行高
             })
             })
           })
           })
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
@@ -381,7 +381,7 @@
           })
           })
 
 
           // fj
           // fj
-          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
+          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
           lines1.forEach((line, index) => {
           lines1.forEach((line, index) => {
             const y = 590 + (index * 27); // 每行文本的垂直位置
             const y = 590 + (index * 27); // 每行文本的垂直位置
             let currentLine = '';
             let currentLine = '';

@@ -164,7 +164,7 @@
        * @param {*} value
        * @param {*} value
        * @author: renchao
        * @author: renchao
        */
        */
-      handleupdateDetail (value) {
+          handleupdateDetail (value) {
         let arr = this.tableData.map(item => item.zjh)
         let arr = this.tableData.map(item => item.zjh)
         if (this.isaddupdate) {
         if (this.isaddupdate) {
           if (!arr.includes(value.zjh)) {
           if (!arr.includes(value.zjh)) {
@@ -174,7 +174,7 @@
             this.$message.error('证件号不能重复');
             this.$message.error('证件号不能重复');
           }
           }
         } else {
         } else {
-          if (!arr.includes(value.zjh)) {
+          if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) {
             this.tableDataList[this.dataIndex] = _.cloneDeep(value);
             this.tableDataList[this.dataIndex] = _.cloneDeep(value);
             this.$emit('upDateQlrxxList', this.tableDataList)
             this.$emit('upDateQlrxxList', this.tableDataList)
           } else {
           } else {

 <!--
 <!--
  * @Description: 房屋多幢受理信息
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
  * @Autor: ssq
- * @LastEditTime: 2023-08-22 16:29:23
+ * @LastEditTime: 2023-08-22 16:43:52
 -->
 -->
 <template>
 <template>
   <div class="slxx">
   <div class="slxx">
@@ -178,7 +178,7 @@
             </el-col>
             </el-col>
             <el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
             <el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
               <el-form-item label="持证人：">
               <el-form-item label="持证人：">
-                <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
+                <el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
                   <el-option
                   <el-option
                     v-for="(item,index) in czrOptions"
                     v-for="(item,index) in czrOptions"
                     :key="index"
                     :key="index"
@@ -255,11 +255,15 @@
             ...res.result,
             ...res.result,
             ...res.result.qlxxdatas,
             ...res.result.qlxxdatas,
           };
           };
-          this.ruleForm.qlrList.forEach((item, index) => {
-            if (item.sfczr == 1) {
-              this.$set(this.ruleForm, "czr", item.zjh)
+          this.ruleForm.qlrList.forEach((item) => {
+            if(item.sfczr==1){
+              this.czr=item.sqrmc
             }
             }
           })
           })
+          //初始化发证方式，1：小证，2：大正
+          this.ruleForm.slsq.fzfs == null
+            ? (this.ruleForm.slsq.fzfs = "1")
+            : this.ruleForm.slsq.fzfs;
           this.czrOptions = this.ruleForm.qlrList;
           this.czrOptions = this.ruleForm.qlrList;
         }
         }
       });
       });
@@ -273,6 +277,7 @@
         disabled: true,
         disabled: true,
         tdytOption: [],
         tdytOption: [],
         czrOptions: [],
         czrOptions: [],
+        czr:"",
         ruleForm: {
         ruleForm: {
           flow: {
           flow: {
             ywh: "",
             ywh: "",
@@ -388,7 +393,7 @@
               item.sfczr = "1";
               item.sfczr = "1";
             });
             });
           } else {
           } else {
-            if (!that.ruleForm.czr) {
+            if (!that.czr) {
               that.$message({
               that.$message({
                 showClose: true,
                 showClose: true,
                 message: "请选择持证人",
                 message: "请选择持证人",
@@ -397,7 +402,7 @@
               return false;
               return false;
             }
             }
             this.ruleForm.qlrList.forEach((item, index) => {
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.ruleForm.czr) {
+              if (item.zjh == this.czr) {
                 item.sfczr = "1";
                 item.sfczr = "1";
               } else {
               } else {
                 item.sfczr = "0";
                 item.sfczr = "0";