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

@@ -147,9 +147,11 @@ div:focus {
 .pl-5 {
   padding-left: 5px;
 }
+
 .pt-10 {
   padding-top: 10px;
 }
+
 .block {
   display: block;
 }
@@ -383,7 +385,65 @@ aside {
   transition: 0.5s;
   margin-left: -1px;
   border-top: 0;
+
   .el-checkbox__label {
     font-size: 16px;
   }
 }
+
+
+.linshiIcon {
+  position: relative;
+
+  .icon {
+    position: absolute;
+    top: 12px;
+    right: -5px;
+    transform: rotate(45deg);
+    color: #fff;
+    font-size: 12px;
+    z-index: 10;
+  }
+}
+
+.linshiIcon::after {
+  content: "";
+  display: block;
+  width: 0;
+  height: 0;
+  border-width: 0px 0px 55px 55px;
+  border-style: none solid solid;
+  border-color: transparent transparent #fe9400;
+  position: absolute;
+  top: 0;
+  right: 0;
+  transform: rotate(-90deg);
+}
+
+.xianshiIcon {
+  position: relative;
+
+  .icon {
+    position: absolute;
+    top: 9px;
+    right: 5px;
+    transform: rotate(45deg);
+    color: #fff;
+    font-size: 12px;
+    z-index: 10;
+  }
+}
+
+.xianshiIcon::after {
+  content: "";
+  display: block;
+  width: 0;
+  height: 0;
+  border-width: 0px 0px 55px 55px;
+  border-style: none solid solid;
+  border-color: transparent transparent #67C23A;
+  position: absolute;
+  top: 0;
+  right: 0;
+  transform: rotate(-90deg);
+}
\ No newline at end of file

@@ -107,64 +107,6 @@
                 }
             }
 
-            .linshiIcon {
-                position: relative;
-
-                .icon {
-                    position: absolute;
-                    top: 12px;
-                    right: -5px;
-                    transform: rotate(45deg);
-                    color: #fff;
-                    font-size: 12px;
-                    z-index: 10;
-                }
-            }
-
-            .linshiIcon::after {
-                content: "";
-                display: block;
-                width: 0;
-                height: 0;
-                border-width: 0px 0px 55px 55px;
-                border-style: none solid solid;
-                border-color: transparent transparent #fe9400;
-                position: absolute;
-                top: 0;
-                right: 0;
-                transform: rotate(-90deg);
-            }
-
-            .xianshiIcon {
-                position: relative;
-
-                .icon {
-                    position: absolute;
-                    top: 9px;
-                    right: 5px;
-                    transform: rotate(45deg);
-                    color: #fff;
-                    font-size: 12px;
-                    z-index: 10;
-                }
-            }
-
-            .xianshiIcon::after {
-                content: "";
-                display: block;
-                width: 0;
-                height: 0;
-                border-width: 0px 0px 55px 55px;
-                border-style: none solid solid;
-                border-color: transparent transparent #67C23A;
-                position: absolute;
-                top: 0;
-                right: 0;
-                transform: rotate(-90deg);
-            }
-
-
-
             tr {
                 display: flex;
             }
@@ -209,4 +151,4 @@
             margin-left: 2px;
         }
     }
-}
+}
\ No newline at end of file

@@ -22,13 +22,19 @@
               :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
             ]">
-               <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>
+              <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>
+              </div>
+              <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
+                正在办理
+              </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
               <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
               <span v-else>{{ row[item.prop] }}</span>
@@ -66,9 +72,9 @@
     },
     methods: {
       loadData () {
-          if (this.$parent.addRepairRecord) {
-        this.columns.unshift({ prop: "cz", label: "操作" });
-      }
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({ prop: "cz", label: "操作" });
+        }
         getCfdjList({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -113,28 +119,28 @@
         }
         return name;
       },
-       // 新增一条补录信息
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
-
-          this.$message({
-            type: "success",
-            message: "补录成功!",
-          });
+      // 新增一条补录信息
+      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>

@@ -8,9 +8,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>
@@ -27,25 +25,24 @@
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
                 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
-              ]"
-            >
+                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
+              ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button
                   type="text"
                   icon="el-icon-edit-outline"
-                  @click="editDialog(row)"
-                  >编辑</el-button
-                >
+                  @click="editDialog(row)">编辑</el-button>
                 <el-button
                   type="text"
                   icon="el-icon-edit-outline"
-                  @click="editDialog(row, 'D')"
-                  >删除</el-button
-                >
+                  @click="editDialog(row, 'D')">删除</el-button>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -61,96 +58,95 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getDiyaqList } from "@/api/registerBook.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().DYAQ,
-    };
-  },
-  created() {
-    this.loadData();
-  },
-  methods: {
-    loadData() {
-      if (this.$parent.addRepairRecord) {
-        this.columns.unshift({ prop: "cz", label: "操作" });
-      }
-      getDiyaqList({
-        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;
-          }
-        }
-      });
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getDiyaqList } from "@/api/registerBook.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().DYAQ,
+      };
     },
-    checkChange() {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
+    created () {
+      this.loadData();
     },
-    getQsztName(code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+    methods: {
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({ prop: "cz", label: "操作" });
         }
-      }
-      return name;
-    },
-    // 新增一条补录信息
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
-
-          this.$message({
-            type: "success",
-            message: "补录成功!",
-          });
+        getDiyaqList({
+          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;
+            }
+          }
+        });
+      },
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
+        }
+      },
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
+        }
+        return name;
+      },
+      // 新增一条补录信息
+      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>

@@ -8,9 +8,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>
@@ -27,15 +25,18 @@
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
                 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
-              ]"
-            >
+                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
+              ]">
               <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>
+                <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>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -51,96 +52,96 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getDiyiqList } from "@/api/registerBook.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().DYIQ,
-    };
-  },
-  created() {
-    this.loadData();
-  },
-  methods: {
-    loadData() {
-      if (this.$parent.addRepairRecord) {
-        this.columns.unshift({ prop: "cz", label: "操作" });
-      }
-      getDiyiqList({
-        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;
-          }
-        }
-      });
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getDiyiqList } from "@/api/registerBook.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().DYIQ,
+      };
     },
-    checkChange() {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
+    created () {
+      this.loadData();
     },
-    getQsztName(code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+    methods: {
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({ prop: "cz", label: "操作" });
         }
-      }
-      return name;
-    },
-     // 新增一条补录信息
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
-
-          this.$message({
-            type: "success",
-            message: "补录成功!",
-          });
+        getDiyiqList({
+          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;
+            }
+          }
+        });
+      },
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
+        }
+      },
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
+        }
+        return name;
+      },
+      // 新增一条补录信息
+      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>

@@ -11,117 +11,118 @@
   </div>
 </template>
 <script>
-import { getBdcqljqtsx } from "@/api/registerBook.js";
-import { loadTreeData, getNode } from "./djbFrameData.js";
-export default {
-  data () {
-    return {
-      //接收参数
-      // propsParam: this.$attrs,
-      //左侧目录
-      catalog: {},
-      //选择加载哪一个组件
-      componentTag: "",
-      //子组件接收参数
-      currentSelectProps: {},
-      //左侧树形结构数据
-      treedata: [],
-      defaultNode: "",
-      defaultProps: {
-        value: "id",
-        children: "children",
-        label: "label",
-      },
-      showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
-    };
-  },
-  props: ["formData"],
-  mounted () {
-    this.loadData();
-  },
-  methods: {
-    loadData () {
-      getBdcqljqtsx({
-        bdcdyid: this.formData.bdcdyid,
-        bdcdyh: this.formData.bdcdyh,
-      }).then((res) => {
-        if (res.code === 200) {
-          this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
-          this.$nextTick(function () {
-            this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
-            this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
-            this.loadComponent(this.defaultNode.form);
-          });
-        }
-      });
-      this.currentSelectProps = {
-        bdcdyid: this.formData.bdcdyid,
-        bdcdyh: this.formData.bdcdyh,
-        qllx: this.formData.qllx,
-        bsmQlxx: this.formData.bsmQlxx,
+  import { getBdcqljqtsx } from "@/api/registerBook.js";
+  import { loadTreeData, getNode } from "./djbFrameData.js";
+  export default {
+    data () {
+      return {
+        //接收参数
+        // propsParam: this.$attrs,
+        //左侧目录
+        catalog: {},
+        //选择加载哪一个组件
+        componentTag: "",
+        //子组件接收参数
+        currentSelectProps: {},
+        //左侧树形结构数据
+        treedata: [],
+        defaultNode: "",
+        defaultProps: {
+          value: "id",
+          children: "children",
+          label: "label",
+        },
+        showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
       };
     },
-    handleNodeClick (data, node, elem) {
-      this.loadComponent(data.form);
+    props: ["formData"],
+    mounted () {
+      this.loadData();
     },
-    loadComponent (form) {
-      this.componentTag = (r) =>
-        require.ensure([], () => r(require("@/views/registerBook/" + form)));
+    methods: {
+      loadData () {
+        getBdcqljqtsx({
+          bdcdyid: this.formData.bdcdyid,
+          bdcdyh: this.formData.bdcdyh,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
+            this.$nextTick(function () {
+              this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
+              this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
+              this.loadComponent(this.defaultNode.form);
+            });
+          }
+        });
+        this.currentSelectProps = {
+          bdcdyid: this.formData.bdcdyid,
+          bdcdyh: this.formData.bdcdyh,
+          qllx: this.formData.qllx,
+          bsmQlxx: this.formData.bsmQlxx,
+        };
+      },
+      handleNodeClick (data, node, elem) {
+        this.loadComponent(data.form);
+      },
+      loadComponent (form) {
+        console.log(form, 'formformformform');
+        this.componentTag = (r) =>
+          require.ensure([], () => r(require("@/views/registerBook/" + form)));
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped lang="scss">
-/deep/.rollTable {
-  height: calc(100vh - 240px) !important;
-}
+  /deep/.rollTable {
+    height: calc(100vh - 240px) !important;
+  }
 
-.content {
-  width: 100%;
-  height: 100%;
-  display: flex;
+  .content {
+    width: 100%;
+    height: 100%;
+    display: flex;
 
-  .left {
-    width: 256px;
-    height: 704px;
-    background-color: #f5f5f5;
-    color: #333;
-    border: 1px solid rgb(228, 228, 228);
-  }
+    .left {
+      width: 256px;
+      height: 704px;
+      background-color: #f5f5f5;
+      color: #333;
+      border: 1px solid rgb(228, 228, 228);
+    }
 
-  .right {
-    width: calc(100% - 256px);
-    height: 704px;
-    // overflow-y: scroll;
-    overflow: auto;
-    background-color: #f5f5f5;
-    border: 1px solid rgb(228, 228, 228);
+    .right {
+      width: calc(100% - 256px);
+      height: 704px;
+      // overflow-y: scroll;
+      overflow: auto;
+      background-color: #f5f5f5;
+      border: 1px solid rgb(228, 228, 228);
+    }
   }
-}
 
-/deep/ .expanded.el-tree-node__expand-icon,
-/deep/ .el-tree-node__expand-icon {
-  visibility: hidden;
-}
+  /deep/ .expanded.el-tree-node__expand-icon,
+  /deep/ .el-tree-node__expand-icon {
+    visibility: hidden;
+  }
 
-/deep/ .el-tree-node__content {
-  border: 1px solid rgb(228, 228, 228);
-  height: 45px;
-}
+  /deep/ .el-tree-node__content {
+    border: 1px solid rgb(228, 228, 228);
+    height: 45px;
+  }
 
-/deep/ .el-tree-node:focus>.el-tree-node__content {
-  background-color: #f5f5f5;
-  color: #0079fe;
-  border-right: 4px solid #0079fe;
-}
+  /deep/ .el-tree-node:focus > .el-tree-node__content {
+    background-color: #f5f5f5;
+    color: #0079fe;
+    border-right: 4px solid #0079fe;
+  }
 
-/deep/.el-tree-node {
-  white-space: pre-wrap;
-}
+  /deep/.el-tree-node {
+    white-space: pre-wrap;
+  }
 
-/deep/ .is-current>.el-tree-node__content {
-  background-color: #f5f5f5;
-  color: #0079fe;
-  border-right: 4px solid #0079fe;
-}
+  /deep/ .is-current > .el-tree-node__content {
+    background-color: #f5f5f5;
+    color: #0079fe;
+    border-right: 4px solid #0079fe;
+  }
 </style>

@@ -8,9 +8,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>
@@ -27,25 +25,24 @@
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
                 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
-              ]"
-            >
-               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
+                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
+              ]">
+              <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button
                   type="text"
                   icon="el-icon-edit-outline"
-                  @click="editDialog(row)"
-                  >编辑</el-button
-                >
+                  @click="editDialog(row)">编辑</el-button>
                 <el-button
                   type="text"
                   icon="el-icon-edit-outline"
-                  @click="editDialog(row, 'D')"
-                  >删除</el-button
-                >
+                  @click="editDialog(row, 'D')">删除</el-button>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -61,91 +58,91 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getFdcq2List } from "@/api/registerBook.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().FDCQ2,
-    };
-  },
-  created() {
-    this.loadData();
-  },
-  methods: {
-    loadData() {
-      if (this.$parent.addRepairRecord) {
-        this.columns.unshift({ prop: "cz", label: "操作" });
-      }
-      getFdcq2List({
-        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;
-          }
-        }
-      });
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getFdcq2List } from "@/api/registerBook.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().FDCQ2,
+      };
     },
-    checkChange() {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
+    created () {
+      this.loadData();
     },
-    getQsztName(code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+    methods: {
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({ prop: "cz", label: "操作" });
         }
-      }
-      return name;
-    },
-    // 新增一条补录信息
-    editDialog(row, del) {
-      this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$parent.addRepairRecord(row, del);
+        getFdcq2List({
+          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;
+            }
+          }
+        });
+      },
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
+        }
+      },
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
+        }
+        return name;
+      },
+      // 新增一条补录信息
+      editDialog (row, del) {
+        this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消",
+          .then(() => {
+            this.$parent.addRepairRecord(row, del);
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消",
+            });
           });
-        });
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

@@ -23,8 +23,8 @@
                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
             ]">
               <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>
+                <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>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
@@ -51,10 +51,14 @@
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
               item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
             ]">
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -100,11 +104,12 @@
     },
     methods: {
       loadData () {
-      if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
-        })
-      }
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
+          })
+        }
         getNydsyqList({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -142,14 +147,14 @@
         }
         return name;
       },
-       // 新增一条补录信息
-        editDialog(row,del){
-            this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+      // 新增一条补录信息
+      editDialog (row, del) {
+        this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$parent.addRepairRecord(row,del)
+          this.$parent.addRepairRecord(row, del)
 
           this.$message({
             type: 'success',

@@ -19,14 +19,18 @@
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
               item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
             ]">
-            <div class="setbut" v-if="item.prop == 'cz'">
-                   <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>
+              <div class="setbut" v-if="item.prop == 'cz'">
+                <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>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -42,77 +46,78 @@
 </template>
 
 <script>
-import { getYgdjList } from "@/api/registerBook.js";
-import { datas } from "./qlxxFormData.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().YGDJ,
-    };
-  },
-  created () {
-    this.loadData();
-  },
-  methods: {
-    loadData () {
-      // 判断是否在登记簿补录调的子页面
-          if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
-        })
-      }
-      getYgdjList({
-        bdcdyid: this.propsParam.bdcdyid,
-        qllx: this.propsParam.qllx,
-        qszt: this.checkList,
-      }).then((res) => {
-        if (res.code === 200) {
-          this.tableData = res.result;
-          if (this.tableData.length < datas.columns().emptycolNum) {
-            this.emptycolNum =
-              datas.columns().emptycolNum - this.tableData.length;
-          } else {
-            this.emptycolNum = 0;
-          }
-        }
-      });
+  import { getYgdjList } from "@/api/registerBook.js";
+  import { datas } from "./qlxxFormData.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().YGDJ,
+      };
     },
-    checkChange () {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
+    created () {
+      this.loadData();
     },
-    getQsztName (code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+    methods: {
+      loadData () {
+        // 判断是否在登记簿补录调的子页面
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
+          })
         }
-      }
-      return name;
-    },
-         // 新增一条补录信息
-        editDialog(row,del){
-            this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+        getYgdjList({
+          bdcdyid: this.propsParam.bdcdyid,
+          qllx: this.propsParam.qllx,
+          qszt: this.checkList,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableData = res.result;
+            if (this.tableData.length < datas.columns().emptycolNum) {
+              this.emptycolNum =
+                datas.columns().emptycolNum - this.tableData.length;
+            } else {
+              this.emptycolNum = 0;
+            }
+          }
+        });
+      },
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
+        }
+      },
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
+        }
+        return name;
+      },
+      // 新增一条补录信息
+      editDialog (row, del) {
+        this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$parent.addRepairRecord(row,del)
+          this.$parent.addRepairRecord(row, del)
 
           this.$message({
             type: 'success',
@@ -126,10 +131,10 @@ export default {
         });
 
       },
-  },
-};
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

@@ -19,14 +19,18 @@
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
               item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
             ]">
-             <div class="setbut" v-if="item.prop == 'cz'">
-                   <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>
+              <div class="setbut" v-if="item.prop == 'cz'">
+                <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>
               </div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
@@ -42,76 +46,77 @@
 </template>
 
 <script>
-import { getYydjList } from "@/api/registerBook.js";
-import { datas } from "./qlxxFormData.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().YYDJ,
-    };
-  },
-  created () {
-    this.loadData();
-  },
-  methods: {
-    loadData () {
-        if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
-        })
-      }
-      getYydjList({
-        bdcdyid: this.propsParam.bdcdyid,
-        qllx: this.propsParam.qllx,
-        qszt: this.checkList,
-      }).then((res) => {
-        if (res.code === 200) {
-          this.tableData = res.result;
-          if (this.tableData.length < datas.columns().emptycolNum) {
-            this.emptycolNum =
-              datas.columns().emptycolNum - this.tableData.length;
-          } else {
-            this.emptycolNum = 0;
-          }
-        }
-      });
+  import { getYydjList } from "@/api/registerBook.js";
+  import { datas } from "./qlxxFormData.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().YYDJ,
+      };
     },
-    checkChange () {
-      if (this.checkList.length === 0) {
-        this.tableData = [];
-        this.emptycolNum = datas.columns().emptycolNum;
-      } else {
-        this.loadData();
-      }
+    created () {
+      this.loadData();
     },
-    getQsztName (code) {
-      let name = "";
-      for (let item of this.qsztList) {
-        if (item.value == code) {
-          name = item.label;
-          break;
+    methods: {
+      loadData () {
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
+          })
         }
-      }
-      return name;
-    },
-          // 新增一条补录信息
-        editDialog(row,del){
-            this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+        getYydjList({
+          bdcdyid: this.propsParam.bdcdyid,
+          qllx: this.propsParam.qllx,
+          qszt: this.checkList,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableData = res.result;
+            if (this.tableData.length < datas.columns().emptycolNum) {
+              this.emptycolNum =
+                datas.columns().emptycolNum - this.tableData.length;
+            } else {
+              this.emptycolNum = 0;
+            }
+          }
+        });
+      },
+      checkChange () {
+        if (this.checkList.length === 0) {
+          this.tableData = [];
+          this.emptycolNum = datas.columns().emptycolNum;
+        } else {
+          this.loadData();
+        }
+      },
+      getQsztName (code) {
+        let name = "";
+        for (let item of this.qsztList) {
+          if (item.value == code) {
+            name = item.label;
+            break;
+          }
+        }
+        return name;
+      },
+      // 新增一条补录信息
+      editDialog (row, del) {
+        this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$parent.addRepairRecord(row,del)
+          this.$parent.addRepairRecord(row, del)
 
           this.$message({
             type: 'success',
@@ -125,10 +130,10 @@ export default {
         });
 
       },
-  },
-};
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:43:41
+ * @LastEditTime: 2023-06-30 17:09:35
 -->
 <template>
   <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
@@ -28,10 +28,14 @@
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
                 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
+                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
               ]">
               <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
                 正在办理
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+                有效
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>