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

@@ -208,10 +208,16 @@ aside {
 }
 
 .ellipsis-line {
-  width: 200px;
+  display: inline-block;
+  width: 300px !important;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  /* 这里是超出几行省略 */
   overflow: hidden;
-  text-overflow: ellipsis; //文本溢出显示省略号
-  white-space: nowrap; //文本不会换行
+  margin: 0 auto;
 }
 
 .tooltip-width {

@@ -40,7 +40,7 @@
   }
 
   .menu-con {
-    width: 87%;
+    width: 93%;
   }
 
   .batchDel {
@@ -55,8 +55,10 @@
 
   .title-detail {
     display: flex;
-    flex-wrap: wrap;
     width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis; //文本溢出显示省略号
+    white-space: nowrap; //文本不会换行
   }
 
   .title-batch {
@@ -209,7 +211,8 @@
       box-sizing: border-box;
       width: 70px;
       margin: 0 5px;
-      .icon{
+
+      .icon {
         font-size: 10px;
       }
     }
@@ -229,4 +232,4 @@
   position: absolute;
   left: 0;
   bottom: 0;
-}
+}
\ No newline at end of file

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:13
+ * @LastEditTime: 2023-08-25 17:06:44
 -->
 <template>
   <div class="djxxTable">
@@ -50,11 +50,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -58,13 +58,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 15:54:23
+ * @LastEditTime: 2023-08-25 17:12:43
 -->
 <template>
   <div class="djxxTable">
@@ -52,13 +52,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -52,7 +52,9 @@
                 </span>
               </el-tooltip>
 
-              <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
+              <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)">
+                {{ row[item.prop] }}
+              </span>
               <div class="many" v-if="judge(item.label)">
                 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
                   {{ label[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:14:57
+ * @LastEditTime: 2023-08-25 17:17:06
 -->
 <template>
   <div class="djxxTable">
@@ -58,13 +58,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -47,13 +47,13 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 11:29:20
+ * @LastEditTime: 2023-08-25 17:16:32
 -->
 <template>
   <div class="djxxTable">
@@ -13,8 +13,7 @@
             <el-checkbox
               v-for="item in qsztList"
               :key="item.value"
-              :label="item.value"
-            >{{ item.label }}</el-checkbox>
+              :label="item.value">{{ item.label }}</el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -35,8 +34,7 @@
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
-              ]"
-            >
+              ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
@@ -45,9 +43,19 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
-              <span v-else>{{ row[item.prop] }}</span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+              <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
+
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>
@@ -58,122 +66,122 @@
 </template>
   
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
-import { getLqList } from "@/api/djbDetail.js";
-export default {
-  data() {
-    return {
-      title: "林权登记信息",
-      qsztList: datas.columns().qsztList,
-      checkList: datas.columns().checkList,
-      //传递参数
-      propsParam: this.$attrs,
-      //列表数据
-      tableData: [],
-      //空列值个数
-      emptycolNum: datas.columns().emptycolNum,
-      //列名称对象
-      columns: datas.columns().LDSYQ,
-    };
-  },
-  created() {
-    this.loadData();
-  },
-  methods: {
-    /**
-     * @description: loadData
-     * @author: renchao
-     */
-    loadData() {
-      if (this.$parent.addRepairRecord) {
-        this.columns.unshift({
-          prop: "cz",
-          label: "操作",
-        });
-      }
-      getLqList({
-        bdcdyid: this.propsParam.bdcdyid,
-        qllx: this.propsParam.qllx,
-        qszt: this.checkList,
-      }).then((res) => {
-        if (res.code === 200) {
-          this.tableData = res.result;
-          this.tableData.forEach((item) => {
-            item.sjlx = getSjlx(item.sjlx);
-            item.ldsyqxz = getDictLeabel(item.ldsyqxz, 'A45')
-            item.lz = getDictLeabel(item.lz, 'A26')
-            item.qy = getDictLeabel(item.qy, 'A52')
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
+  import { getLqList } from "@/api/djbDetail.js";
+  export default {
+    data () {
+      return {
+        title: "林权登记信息",
+        qsztList: datas.columns().qsztList,
+        checkList: datas.columns().checkList,
+        //传递参数
+        propsParam: this.$attrs,
+        //列表数据
+        tableData: [],
+        //空列值个数
+        emptycolNum: datas.columns().emptycolNum,
+        //列名称对象
+        columns: datas.columns().LDSYQ,
+      };
+    },
+    created () {
+      this.loadData();
+    },
+    methods: {
+      /**
+       * @description: loadData
+       * @author: renchao
+       */
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作",
           });
-          if (this.tableData.length < datas.columns().emptycolNum) {
-            this.emptycolNum =
-              datas.columns().emptycolNum - this.tableData.length;
-          } else {
-            this.emptycolNum = 0;
+        }
+        getLqList({
+          bdcdyid: this.propsParam.bdcdyid,
+          qllx: this.propsParam.qllx,
+          qszt: this.checkList,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableData = res.result;
+            this.tableData.forEach((item) => {
+              item.sjlx = getSjlx(item.sjlx);
+              item.ldsyqxz = getDictLeabel(item.ldsyqxz, 'A45')
+              item.lz = getDictLeabel(item.lz, 'A26')
+              item.qy = getDictLeabel(item.qy, 'A52')
+            });
+            if (this.tableData.length < datas.columns().emptycolNum) {
+              this.emptycolNum =
+                datas.columns().emptycolNum - this.tableData.length;
+            } else {
+              this.emptycolNum = 0;
+            }
           }
+        });
+      },
+      /**
+       * @description: checkChange
+       * @author: renchao
+       */
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
         }
-      });
-    },
-    /**
-     * @description: checkChange
-     * @author: renchao
-     */
-    checkChange() {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
-    },
-    /**
-     * @description: getQsztName
-     * @param {*} code
-     * @author: renchao
-     */
-    getQsztName(code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+      },
+      /**
+       * @description: getQsztName
+       * @param {*} code
+       * @author: renchao
+       */
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
         }
-      }
-      return name;
-    },
-    // 新增一条补录信息
-    /**
-     * @description: 新增一条补录信息
-     * @param {*} row
-     * @param {*} del
-     * @author: renchao
-     */
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
-
-          this.$message({
-            type: "success",
-            message: "补录成功!",
-          });
+        return name;
+      },
+      // 新增一条补录信息
+      /**
+       * @description: 新增一条补录信息
+       * @param {*} row
+       * @param {*} del
+       * @author: renchao
+       */
+      editDialog (row, del) {
+        this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消编辑",
+          .then(() => {
+            this.$parent.addRepairRecord(row, del);
+
+            this.$message({
+              type: "success",
+              message: "补录成功!",
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消编辑",
+            });
           });
-        });
+      },
     },
-  },
-};
+  };
 </script>
   
   <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>
   
\ No newline at end of file

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:15:05
+ * @LastEditTime: 2023-08-25 17:19:17
 -->
 <template>
   <div class="djxxTable">
@@ -47,13 +47,13 @@
               <div class="icon" v-if="row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
@@ -93,13 +93,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -23,8 +23,7 @@
             <el-checkbox
               v-for="item in qsztList"
               :key="item.value"
-              :label="item.value"
-            >{{ item.label }}</el-checkbox>
+              :label="item.value">{{ item.label }}</el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -45,8 +44,7 @@
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
-              ]"
-            >
+              ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
@@ -55,9 +53,23 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
-              <span v-else>{{ row[item.prop] }}</span>
+              <!-- <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
+              <span v-else>{{ row[item.prop] }}</span> -->
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
+              <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
+
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>
@@ -68,119 +80,119 @@
 </template>
   
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getLqList } from "@/api/djbDetail.js";
-export default {
-  data() {
-    return {
-      title: "林权登记信息",
-      qsztList: datas.columns().qsztList,
-      checkList: datas.columns().checkList,
-      //传递参数
-      propsParam: this.$attrs,
-      //列表数据
-      tableData: [],
-      //空列值个数
-      emptycolNum: datas.columns().emptycolNum,
-      //列名称对象
-      columns: datas.columns().LDSYQ,
-    };
-  },
-  created() {
-    this.loadData();
-  },
-  methods: {
-    /**
-     * @description: loadData
-     * @author: renchao
-     */
-    loadData() {
-      if (this.$parent.addRepairRecord) {
-        this.columns.unshift({
-          prop: "cz",
-          label: "操作",
-        });
-      }
-      getLqList({
-        bdcdyid: this.propsParam.bdcdyid,
-        qllx: this.propsParam.qllx,
-        qszt: this.checkList,
-      }).then((res) => {
-        if (res.code === 200) {
-          this.tableData = res.result;
-          this.tableData.forEach((item) => {
-            item.sjlx = getSjlx(item.sjlx);
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getLqList } from "@/api/djbDetail.js";
+  export default {
+    data () {
+      return {
+        title: "林权登记信息",
+        qsztList: datas.columns().qsztList,
+        checkList: datas.columns().checkList,
+        //传递参数
+        propsParam: this.$attrs,
+        //列表数据
+        tableData: [],
+        //空列值个数
+        emptycolNum: datas.columns().emptycolNum,
+        //列名称对象
+        columns: datas.columns().LDSYQ,
+      };
+    },
+    created () {
+      this.loadData();
+    },
+    methods: {
+      /**
+       * @description: loadData
+       * @author: renchao
+       */
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作",
           });
-          if (this.tableData.length < datas.columns().emptycolNum) {
-            this.emptycolNum =
-              datas.columns().emptycolNum - this.tableData.length;
-          } else {
-            this.emptycolNum = 0;
+        }
+        getLqList({
+          bdcdyid: this.propsParam.bdcdyid,
+          qllx: this.propsParam.qllx,
+          qszt: this.checkList,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableData = res.result;
+            this.tableData.forEach((item) => {
+              item.sjlx = getSjlx(item.sjlx);
+            });
+            if (this.tableData.length < datas.columns().emptycolNum) {
+              this.emptycolNum =
+                datas.columns().emptycolNum - this.tableData.length;
+            } else {
+              this.emptycolNum = 0;
+            }
           }
+        });
+      },
+      /**
+       * @description: checkChange
+       * @author: renchao
+       */
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
         }
-      });
-    },
-    /**
-     * @description: checkChange
-     * @author: renchao
-     */
-    checkChange() {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
-    },
-    /**
-     * @description: getQsztName
-     * @param {*} code
-     * @author: renchao
-     */
-    getQsztName(code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+      },
+      /**
+       * @description: getQsztName
+       * @param {*} code
+       * @author: renchao
+       */
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
         }
-      }
-      return name;
-    },
-    // 新增一条补录信息
-    /**
-     * @description: 新增一条补录信息
-     * @param {*} row
-     * @param {*} del
-     * @author: renchao
-     */
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
-
-          this.$message({
-            type: "success",
-            message: "补录成功!",
-          });
+        return name;
+      },
+      // 新增一条补录信息
+      /**
+       * @description: 新增一条补录信息
+       * @param {*} row
+       * @param {*} del
+       * @author: renchao
+       */
+      editDialog (row, del) {
+        this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消编辑",
+          .then(() => {
+            this.$parent.addRepairRecord(row, del);
+
+            this.$message({
+              type: "success",
+              message: "补录成功!",
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消编辑",
+            });
           });
-        });
+      },
     },
-  },
-};
+  };
 </script>
   
   <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>
   
\ No newline at end of file

@@ -47,13 +47,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:15:42
+ * @LastEditTime: 2023-08-25 17:14:29
 -->
 <template>
   <div class="djxxTable">
@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 16:42:26
+ * @LastEditTime: 2023-08-28 09:02:00
 -->
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -120,7 +120,6 @@
           }
         })
       },
-      //编辑
       /**
        * @description: 编辑
        * @author: renchao
@@ -184,6 +183,12 @@
             );
             setTimeout(() => {
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
+              debugger
+              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");
+              }
               that.loadStatus = '2';
             }, 1000);
           };

@@ -70,11 +70,11 @@
             label: "权利性质"
           },
           {
-            prop: "ytmc",
+            prop: "qlytmc",
             label: "用途"
           },
           {
-            prop: "mjmc",
+            prop: "qlmjmc",
             label: "面积"
           },
           {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 10:34:46
+ * @LastEditTime: 2023-08-25 16:25:57
 -->
 <template>
   <div>
@@ -26,6 +26,10 @@
         <canvas ref="zs" width="1000" class="zsyl" height="700"></canvas>
       </div>
     </div>
+    <!-- 打印模板需要此模块 -->
+    <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" v-show="false">
+      <embed id="LODOP_EM" type="application/x-print-lodop" width="1180" height="720" pluginspage="install_lodop32.exe" />
+    </object>
     <div class="text-center pt-10">
       <el-button @click="$popupCacel">取消</el-button>
       <el-button type="primary" @click="handleSubmit">确定</el-button>
@@ -36,6 +40,8 @@
 <script>
   import store from '@/store/index.js'
   import { datas } from "../../javascript/zsyl.js";
+  import { getPrintTemplateByCode } from "@/api/print";
+  import { getLodop } from "@/utils/LodopFuncs"
   import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js";
   export default {
     props: {
@@ -89,7 +95,6 @@
           }
         })
       },
-      //获取受理申请下全部不动产权证
       /**
        * @description: 获取受理申请下全部不动产权证
        * @author: renchao
@@ -189,30 +194,32 @@
               })
             })
           }
-
-          // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
-          // qlqtzk
-          const maxWidth = 330; // 最大宽度限制
+          // 权利其他状态
+          const maxWidth = 332; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
-          lines.forEach((line, index) => {
-            const y = 463 + (index * 40); // 每行文本的垂直位置
-            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;
+          for (let i = 0; i < lines.length; i++) {
+            if (getByteLen(lines[i]) > 41) {
+              let currentLine = '';
+              let arr = [];
+              for (let word of lines[i]) {
+                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, 129, 490 + (28 * (i - 1)) + (index * 14)); // 调整行高
+              })
+            } else {
+              context.fillText(lines[i] ? lines[i] : '', 129, 495 + (30 * (i - 1)));
             }
-            arr.push(currentLine);
-            arr.forEach((line, index) => {
-              context.fillText(line, 129, y + (index * 20)); // 调整行高
-            })
-          })
+          }
+
           let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
           lines1.forEach((line, index) => {
             const y = 100 + (index * 30); // 每行文本的垂直位置
@@ -328,19 +335,44 @@
       handleSubmit () {
         this.savePrintRecord()
       },
-      //保存打印记录
       /**
        * @description: 保存打印记录
        * @author: renchao
        */
       savePrintRecord () {
+        let that = this
         this.ruleForm.bsmBdcqz = this.formData.bdcqz.bsmBdcqz;
         this.ruleForm.bdcqzlx = this.formData.bdcqz.bdcqzlx;
         this.ruleForm.szzh = this.formData.bdcqz.bdcqzh;
         certificate(this.ruleForm).then((res) => {
           if (res.code === 200) {
-            this.$popupCacel()
-            this.$message.success("提交成功")
+            that.$popupCacel()
+            // this.$message.success("提交成功")
+            getPrintTemplateByCode({ tmpno: 'zsdy' }).then(res => {
+              if (res.code == 200) {
+                getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(infoRes => {
+                  if (infoRes.code == 200) {
+                    if (infoRes.result && infoRes.result.length > 0) {
+                      //打开模板设计
+                      let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
+                      LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); //装载模板
+
+                      infoRes.result[0].bdcdyh1 = infoRes.result[0].bdcdyh.slice(0, 6) + ' ' + infoRes.result[0].bdcdyh.slice(6, 12) + ' ' +
+                        infoRes.result[0].bdcdyh.slice(12, 19) + ' ' + infoRes.result[0].bdcdyh.slice(19, infoRes.result[0].bdcdyh.length)
+                      //todo 调取后端接口获取数据 循环set
+                      for (let key in infoRes.result[0]) {
+                        LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[0][key]);
+                      }
+                      LODOP.PREVIEW();
+                      that.$popupCacel()
+                    }
+                  }
+                })
+              } else {
+                this.$message.error(res.message)
+              }
+            })
+
             //刷新列表
             store.dispatch('user/reWorkFresh', true)
           } else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 10:44:31
+ * @LastEditTime: 2023-08-25 14:10:54
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -201,28 +201,51 @@
             })
           }
           // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
-          // qlqtzk
-          const maxWidth = 330; // 最大宽度限制
+          // 权利其他状态
+          const maxWidth = 332; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
-          lines.forEach((line, index) => {
-            const y = 463 + (index * 40); // 每行文本的垂直位置
-            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;
+          // lines.forEach((line, index) => {
+          //   const y = 463 + (index * 33); // 每行文本的垂直位置
+          //   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, 129, y + (index * 17)); // 调整行高
+          //   })
+          // })
+          for (let i = 0; i < lines.length; i++) {
+            if (getByteLen(lines[i]) > 41) {
+              let currentLine = '';
+              let arr = [];
+              for (let word of lines[i]) {
+                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, 129, 485 + (28 * (i - 1)) + (index * 14)); // 调整行高
+              })
+            } else {
+              context.fillText(lines[i] ? lines[i] : '', 129, 495 + (25 * (i - 1)));
             }
-            arr.push(currentLine);
-            arr.forEach((line, index) => {
-              context.fillText(line, 129, y + (index * 20)); // 调整行高
-            })
-          })
+          }
+
           let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
           lines1.forEach((line, index) => {
             const y = 100 + (index * 30); // 每行文本的垂直位置
@@ -383,7 +406,7 @@
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           if (lines[0]) {
             lines[0].split(' ').forEach((line, index) => {
-              const y = 415 + (index * 60); // 每行文本的垂直位置
+              const y = 415 + (index * 30); // 每行文本的垂直位置
               let currentLine = '';
               let arr = [];
               for (let word of line) {
@@ -398,13 +421,13 @@
               }
               arr.push(currentLine);
               arr.forEach((line, index) => {
-                context.fillText(line, 775, y + (index * 23)); // 调整行高
+                context.fillText(line, 775, y + (index * 14)); // 调整行高
               });
             });
           }
 
           lines.slice(1).forEach((line, index) => {
-            const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 30); // 每行文本的垂直位置
+            const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 20); // 每行文本的垂直位置
             let currentLine = '';
             let arr = [];
             for (let word of line) {

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 14:55:49
+ * @LastEditTime: 2023-08-28 08:44:31
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -20,7 +20,9 @@
           <p class="dot" v-if="item.issave == '0'"></p>
           <div class="menu-con">
             <p>{{ item.bdcdyh }}</p>
-            <p class="title-detail">{{ item.zl }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
+              <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 14:52:40
+ * @LastEditTime: 2023-08-28 08:46:04
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -19,7 +19,9 @@
         <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index">
           <div>
             <p>{{ item.bdcdyh }}</p>
-            <p class="title-detail">{{ item.zl }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
+              <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>
@@ -33,7 +35,9 @@
           <span class="dot" v-if="item.issave == '0'"></span>
           <div>
             <p>{{ item.bdcdyh }}</p>
-            <p class="title-detail">{{ item.zl }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
+              <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>

@@ -5,7 +5,7 @@
 -->
 <template>
   <div class="szxx">
-    <el-card class="box-card" v-for="(item, index) in tableData" :key="index">
+    <el-card :class="item.szcs == 0 ? 'box-card':'box-card bg-red'" v-for="(item, index) in tableData" :key="index">
       <div slot="header" class="szxx_header">
         <span class="header_type">{{
             item.bdcqzlx == 1 ? "不动产权证书" : "不动产登记证明"
@@ -49,7 +49,7 @@
           <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button>
         </div>
         <div class="text" v-else>
-          <el-button class="operation_button" type="text" @click="openZsylDialog(item, 2)">证书打印1（{{ item.szcs
+          <el-button class="operation_button" type="text" @click="openZsylDialog(item, 2)">证书打印（{{ item.szcs
           }}）</el-button>
           <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button>
         </div>
@@ -75,6 +75,7 @@
 <script>
   import { mapGetters } from 'vuex'
   import store from '@/store/index.js'
+  import { getPrintTemplateByCode } from "@/api/print";
   import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
   export default {
     props: {},
@@ -210,7 +211,7 @@
   }
 
   .szxx_header {
-    color: #ffffff;
+    // color: #ffffff;
     font-weight: bolder;
     font-size: 16px;
 
@@ -291,9 +292,18 @@
       justify-content: flex-end;
     }
   }
-
-  /deep/.el-card__header {
-    background-color: rgb(198, 67, 83);
+  .box-card{
+   .szxx_header{
+    color: #303133; 
+   }
+  }
+  .bg-red{
+   .szxx_header{
+    color: #FFF; 
+   }
+    /deep/.el-card__header {
+      background-color: rgb(198, 67, 83);
+    }
   }
 
   /deep/.el-card__body {

@@ -40,7 +40,7 @@
   }
 
   .menu-con {
-    width: 87%;
+    width: 93%;
   }
 
   .batchDel {
@@ -54,8 +54,10 @@
   }
 
   .title-detail {
-    word-wrap: break-word;
     width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis; //文本溢出显示省略号
+    white-space: nowrap; //文本不会换行
   }
 
   .title-batch {
@@ -208,7 +210,8 @@
       box-sizing: border-box;
       width: 70px;
       margin: 0 5px;
-      .icon{
+
+      .icon {
         font-size: 10px;
       }
     }
@@ -228,4 +231,4 @@
   position: absolute;
   left: 0;
   bottom: 0;
-}
+}
\ No newline at end of file

@@ -133,12 +133,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="用途：">
-              <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="面积：">
-              <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">
-                {{ getQsztName(row[item.prop]) }}
-              </span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -104,7 +104,7 @@ class data extends filter {
         minWidth: '150',
       },
       {
-        prop: "mjmc",
+        prop: "qlmjmc",
         label: "面积",
         width: '130'
       },
@@ -114,7 +114,7 @@ class data extends filter {
         minWidth: '130'
       },
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "用途",
         minWidth: '130'
       },