Merge branch 'dev'

@@ -256,15 +256,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
             this.tableData.splice(index, 1);
-          })
-          .catch(() => { });
       },
 
       // 身份证读取

@@ -255,15 +255,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
             this.tableData.splice(index, 1);
-          })
-          .catch(() => { });
       },
 
       // 身份证读取

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 09:22:33
+ * @LastEditTime: 2023-08-29 09:50:32
 -->
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -185,15 +185,16 @@
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
               if (that.ruleForm.tmpno == 'zsdy') {
                 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
-                LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
-                LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4", 1);
               } else if (that.ruleForm.tmpno == 'zmdy') {
                 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcdjzm.jpg'>");
-                LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
               }
+              LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
               that.loadStatus = '2';
             }, 1000);
           };
+        if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) {
+          LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 设置为横向打印
+        }
         LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
       }
     }

@@ -41,9 +41,9 @@
             <el-input v-model="ruleForm.dh" :disabled="!showButton" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="份数" prop="qlbl">
-            <el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          <el-col :span="8">
+          <el-form-item label="权利比例" prop="qlbl">
+            <el-input v-model="ruleForm.qlbl" :disabled="!showButton||this.ruleForm.gyfs==1"></el-input>
           </el-form-item>
         </el-col>
 
@@ -67,16 +67,12 @@
       </el-row>
 
       <el-row>
-        <el-col :span="16">
+        <el-col :span="24">
           <el-form-item label="地址" prop="txdz">
             <el-input v-model="ruleForm.txdz" :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="邮编" prop="yb">
-            <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
-          </el-form-item>
-        </el-col>
+
       </el-row>
 
       <el-row>
@@ -90,11 +86,12 @@
             <el-input v-model="ruleForm.dzyj" :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="权利比例" prop="qlbl">
-            <el-input v-model="ruleForm.qlbl" :disabled="!showButton"></el-input>
+           <el-col :span="8">
+          <el-form-item label="邮编" prop="yb">
+            <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
+
       </el-row>
 
       <el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-28 17:22:23
+ * @LastEditTime: 2023-08-29 13:11:05
 -->
 <template>
   <div>
@@ -154,6 +154,7 @@
       drawTextOnImage () {
         function getByteLen (val) {
           var len = 0;
+          if (!val) return len;
           for (var i = 0; i < val.length; i++) {
             var length = val.charCodeAt(i);
             if (length >= 0 && length <= 128) {
@@ -382,6 +383,7 @@
       drawTextzmImage () {
         function getByteLen (val) {
           var len = 0;
+          if (!val) return len;
           for (var i = 0; i < val.length; i++) {
             var length = val.charCodeAt(i);
             if (length >= 0 && length <= 128) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 09:24:13
+ * @LastEditTime: 2023-08-29 13:12:03
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -124,6 +124,7 @@
       drawTextOnImage () {
         function getByteLen (val) {
           var len = 0;
+          if (!val) return len;
           for (var i = 0; i < val.length; i++) {
             var length = val.charCodeAt(i);
             if (length >= 0 && length <= 128) {
@@ -353,6 +354,7 @@
       drawTextzmImage () {
         function getByteLen (val) {
           var len = 0;
+          if (!val) return len;
           for (var i = 0; i < val.length; i++) {
             var length = val.charCodeAt(i);
             if (length >= 0 && length <= 128) {

@@ -145,7 +145,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="环节名称"
+          label="环节状态"
           prop="name"
           minWidth="100"
           align="center" />
@@ -440,6 +440,9 @@
             item.comments[item.comments.length - 1].message;
           // 操作方式
           let controls = "";
+          // 正在办理
+          // 已完结
+          // 已退回
           switch (type) {
             case "COMPLETE":
               controls = "完成";

@@ -124,12 +124,12 @@
           let that = this
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
-              // that.tableDataList = _.cloneDeep([{
-              //   sqrmc: '',
-              //   dlrzjlx: '',
-              //   dlrzjh: '',
-              //   fr: ''
-              // }])
+              that.tableDataList = _.cloneDeep([{
+                sqrmc: '',
+                dlrzjlx: '',
+                dlrzjh: '',
+                fr: ''
+              }])
             } else {
               that.tableDataList = _.cloneDeep(val)
             }
@@ -205,14 +205,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm('确定要删除吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
           this.tableData.splice(index, 1)
-        }).catch(() => {
-        });
       },
 
       /**
@@ -250,9 +243,12 @@
        * @author: renchao
        */
       editClick (index, row) {
+        this.details = row
+        this.details.gyfs=this.gyfs
         this.dataIndex = index
         this.dialog = true
-        this.details = row
+
+
         this.isaddupdate = false
       },
       /**
@@ -262,8 +258,10 @@
        * @author: renchao
        */
       queryViewClick (index, row) {
-        this.dialog = true
+        // this.details.gyfs=this.gyfs
         this.details = row
+        this.dialog = true
+
       }
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 15:38:52
+ * @LastEditTime: 2023-08-29 10:03:25
 -->
 <template>
   <div class="szxx">
@@ -136,9 +136,9 @@
         store.dispatch('user/reWorkFresh', false)
         if (type == 1) {
           //证书预览
-          this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
+          this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
         } else {
-          this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "75%", true);
+          this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
         }
       },
       //再次打印
@@ -298,6 +298,10 @@
     .szxx_header {
       color: #303133;
     }
+    // 证书背景色
+    /deep/.el-card__header {
+      background-color: #e2dfe0;
+    }
   }
   .bg-red {
     .szxx_header {

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 10:00:18
+ * @LastEditTime: 2023-08-29 12:55:07
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -40,10 +40,15 @@ class data extends filter {
           }
         },
         {
-          prop: "qllx",
-          label: "权利类型",
+           label: "权利类型",
           width: '100',
-          showOverflowTooltip: true
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.qllx} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.qllx}</span>
+              </el-tooltip>
+            )
+          }
         },
         {
           prop: "ysxlh",
@@ -64,16 +69,26 @@ class data extends filter {
           label: "义务人"
         },
         {
-          prop: "mj",
           label: "面积（㎡）",
           width: '100',
-          showOverflowTooltip: true
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.mj} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.mj}</span>
+              </el-tooltip>
+            )
+          }
         },
         {
-          prop: "zl",
           label: "坐落",
-          width: '100',
-          showOverflowTooltip: true
+          minWidth: '150',
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.zl}</span>
+              </el-tooltip>
+            )
+          }
         },
         {
           prop: "fzsj",
@@ -130,10 +145,15 @@ class data extends filter {
           label: "义务人"
         },
         {
-          prop: "mj",
           label: "面积（㎡）",
           width: '100',
-          showOverflowTooltip: true
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.mj} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.mj}</span>
+              </el-tooltip>
+            )
+          }
         },
         {
           prop: "zl",

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 09:06:19
+ * @LastEditTime: 2023-08-29 13:04:29
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -57,10 +57,15 @@ class data extends filter {
         width: '112'
       },
       {
-        prop: "cznr",
         label: "操作内容",
         width: '500',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.cznr} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.cznr}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

-import { log } from "bpmn-js-token-simulation"
 
 /*
  * @Description:
@@ -13,7 +12,6 @@ export default {
   watch: {
     'ruleForm.sldy.gyfs': {
       handler: function (val, oldVal) {
-        console.log("单独所有",val,oldVal);
         if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) {
           this.ruleForm.sldy.gyfs = oldVal
           this.$message({

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 14:51:40
+ * @LastEditTime: 2023-08-29 13:04:44
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -46,10 +46,15 @@ class data extends filter {
         }
       },
       {
-        prop: "bdcqzh",
         label: "不动产证明号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "bdcdyh",

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 11:21:48
+ * @LastEditTime: 2023-08-29 13:05:13
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -50,20 +50,30 @@ class data extends filter {
         label: "土地证号",
       },
       {
-        prop: "qllxmc",
-        showOverflowTooltip: true,
         width: '100',
         label: "权利类型",
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qllxmc} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.qllxmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "xmmc",
         label: "项目名称",
       },
       {
-        prop: "zrzh",
         label: "自然幢号",
         width: '90',
-        showOverflowTooltip: true,
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zrzh} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.zrzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "jzwmc",
@@ -112,10 +122,16 @@ class data extends filter {
         width: '70',
       },
       {
-        prop: "zl",
         label: "自然幢坐落",
         minWidth: '120',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
+
       },
       {
         label: '操作',

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 14:56:57
+ * @LastEditTime: 2023-08-29 13:06:12
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -45,22 +45,37 @@ class data extends filter {
         }
       },
       {
-        prop: "qllxmc",
         label: "权利类型",
         width: '120',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qllxmc} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.qllxmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcdyh",
         label: "不动产单元号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.bdcdyh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "gyqk",
@@ -97,10 +112,15 @@ class data extends filter {
         label: "用途",
       },
       {
-        prop: "zl",
         label: "坐落",
-        width: '130',
-        showOverflowTooltip: true
+        minWidth: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

@@ -78,16 +78,26 @@ class data extends filter {
         width: '90',
       },
       {
-        prop: "bdcdyh",
         label: "不动产单元号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcdyh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlrmc",
@@ -108,10 +118,15 @@ class data extends filter {
         minWidth: '130'
       },
       {
-        prop: "zl",
         label: "坐落",
-        width: '150',
-        showOverflowTooltip: true
+        minWidth: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 11:00:16
+ * @LastEditTime: 2023-08-29 13:08:08
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -54,20 +54,30 @@ class data extends filter {
         minWidth: '130'
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "gyqk",
         label: "共有情况",
       },
       {
-        prop: "qlrmc",
         label: "权利人",
         width: '120',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlrzjhm",
@@ -78,20 +88,30 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "qlytmc",
         label: "用途",
         width: '120',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlytmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlytmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlmjmc",
         label: "面积",
       },
       {
-        prop: "zl",
         label: "坐落",
-        width: '130',
-        showOverflowTooltip: true
+        minWidth: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-10 15:35:50
+ * @LastEditTime: 2023-08-29 13:09:15
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -54,10 +54,15 @@ class data extends filter {
         minWidth: '150'
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
-        showOverflowTooltip: true,
-        width: '150'
+        width: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "gyqk",

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 14:49:24
+ * @LastEditTime: 2023-08-29 13:09:45
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -44,16 +44,26 @@ class data extends filter {
         label: "权利类型",
       },
       {
-        prop: "bdcdyh",
         label: "不动产单元号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcdyh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlrmc",

 /*
 * @Description: 土地所有权对象处理
 * @Autor: ssq
- * @LastEditTime: 2023-07-14 17:00:11
+ * @LastEditTime: 2023-08-29 13:10:12
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -49,16 +49,26 @@ class data extends filter {
         label: "权利类型",
       },
       {
-        prop: "bdcdyh",
         label: "不动产单元号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcdyh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcqzh",
         label: "不动产权证号",
         width: '150',
-        showOverflowTooltip: true
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "gyqk",