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;
             }

@@ -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>
-              <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</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>
 
               <span v-else>{{ row[item.prop] }}</span>
@@ -114,7 +120,7 @@
         return name;
       },
       // 新增一条补录信息
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

@@ -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,11 +58,11 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getDiyaqList } from "@/api/registerBook.js";
-export default {
-  data() {
+  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,
@@ -80,11 +77,11 @@ export default {
         columns: datas.columns().DYAQ,
       };
     },
-  created() {
+    created () {
       this.loadData();
     },
     methods: {
-    loadData() {
+      loadData () {
         if (this.$parent.addRepairRecord) {
           this.columns.unshift({ prop: "cz", label: "操作" });
         }
@@ -107,7 +104,7 @@ export default {
           }
         });
       },
-    checkChange() {
+      checkChange () {
         if (this.checkList.length === 0) {
           this.tableData = [];
           this.emptycolNum = datas.columns().emptycolNum;
@@ -115,7 +112,7 @@ export default {
           this.loadData();
         }
       },
-    getQsztName(code) {
+      getQsztName (code) {
         let name = "";
         for (let item of this.qsztList) {
           if (item.value == code) {
@@ -126,7 +123,7 @@ export default {
         return name;
       },
       // 新增一条补录信息
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -134,7 +131,6 @@ export default {
         })
           .then(() => {
             this.$parent.addRepairRecord(row, del);
-
             this.$message({
               type: "success",
               message: "补录成功!",
@@ -148,9 +144,9 @@ export default {
           });
       },
     },
-};
+  };
 </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,8 +25,8 @@
                 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>
@@ -36,6 +34,9 @@
               <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,11 +52,11 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getDiyiqList } from "@/api/registerBook.js";
-export default {
-  data() {
+  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,
@@ -70,11 +71,11 @@ export default {
         columns: datas.columns().DYIQ,
       };
     },
-  created() {
+    created () {
       this.loadData();
     },
     methods: {
-    loadData() {
+      loadData () {
         if (this.$parent.addRepairRecord) {
           this.columns.unshift({ prop: "cz", label: "操作" });
         }
@@ -97,7 +98,7 @@ export default {
           }
         });
       },
-    checkChange() {
+      checkChange () {
         if (this.checkList.length === 0) {
           this.tableData = [];
           this.emptycolNum = datas.columns().emptycolNum;
@@ -105,7 +106,7 @@ export default {
           this.loadData();
         }
       },
-    getQsztName(code) {
+      getQsztName (code) {
         let name = "";
         for (let item of this.qsztList) {
           if (item.value == code) {
@@ -116,7 +117,7 @@ export default {
         return name;
       },
       // 新增一条补录信息
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -138,9 +139,9 @@ export default {
           });
       },
     },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

@@ -11,9 +11,9 @@
   </div>
 </template>
 <script>
-import { getBdcqljqtsx } from "@/api/registerBook.js";
-import { loadTreeData, getNode } from "./djbFrameData.js";
-export default {
+  import { getBdcqljqtsx } from "@/api/registerBook.js";
+  import { loadTreeData, getNode } from "./djbFrameData.js";
+  export default {
     data () {
       return {
         //接收参数
@@ -65,18 +65,19 @@ export default {
         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 {
+  /deep/.rollTable {
     height: calc(100vh - 240px) !important;
-}
+  }
 
-.content {
+  .content {
     width: 100%;
     height: 100%;
     display: flex;
@@ -97,31 +98,31 @@ export default {
       background-color: #f5f5f5;
       border: 1px solid rgb(228, 228, 228);
     }
-}
+  }
 
-/deep/ .expanded.el-tree-node__expand-icon,
-/deep/ .el-tree-node__expand-icon {
+  /deep/ .expanded.el-tree-node__expand-icon,
+  /deep/ .el-tree-node__expand-icon {
     visibility: hidden;
-}
+  }
 
-/deep/ .el-tree-node__content {
+  /deep/ .el-tree-node__content {
     border: 1px solid rgb(228, 228, 228);
     height: 45px;
-}
+  }
 
-/deep/ .el-tree-node:focus>.el-tree-node__content {
+  /deep/ .el-tree-node:focus > .el-tree-node__content {
     background-color: #f5f5f5;
     color: #0079fe;
     border-right: 4px solid #0079fe;
-}
+  }
 
-/deep/.el-tree-node {
+  /deep/.el-tree-node {
     white-space: pre-wrap;
-}
+  }
 
-/deep/ .is-current>.el-tree-node__content {
+  /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' : '',
-              ]"
-            >
+                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,11 +58,11 @@
 </template>
 
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getFdcq2List } from "@/api/registerBook.js";
-export default {
-  data() {
+  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,
@@ -80,11 +77,11 @@ export default {
         columns: datas.columns().FDCQ2,
       };
     },
-  created() {
+    created () {
       this.loadData();
     },
     methods: {
-    loadData() {
+      loadData () {
         if (this.$parent.addRepairRecord) {
           this.columns.unshift({ prop: "cz", label: "操作" });
         }
@@ -107,7 +104,7 @@ export default {
           }
         });
       },
-    checkChange() {
+      checkChange () {
         if (this.checkList.length === 0) {
           this.tableData = [];
           this.emptycolNum = datas.columns().emptycolNum;
@@ -115,7 +112,7 @@ export default {
           this.loadData();
         }
       },
-    getQsztName(code) {
+      getQsztName (code) {
         let name = "";
         for (let item of this.qsztList) {
           if (item.value == code) {
@@ -126,7 +123,7 @@ export default {
         return name;
       },
       // 新增一条补录信息
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -143,9 +140,9 @@ export default {
           });
       },
     },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

@@ -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,9 +104,10 @@
     },
     methods: {
       loadData () {
-      if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
           })
         }
         getNydsyqList({
@@ -143,13 +148,13 @@
         return name;
       },
       // 新增一条补录信息
-        editDialog(row,del){
+      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,6 +19,7 @@
               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>
@@ -27,6 +28,9 @@
               <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,9 +46,9 @@
 </template>
 
 <script>
-import { getYgdjList } from "@/api/registerBook.js";
-import { datas } from "./qlxxFormData.js";
-export default {
+  import { getYgdjList } from "@/api/registerBook.js";
+  import { datas } from "./qlxxFormData.js";
+  export default {
     data () {
       return {
         title: "预告登记信息",
@@ -66,9 +70,10 @@ export default {
     methods: {
       loadData () {
         // 判断是否在登记簿补录调的子页面
-          if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
           })
         }
         getYgdjList({
@@ -106,13 +111,13 @@ export default {
         return name;
       },
       // 新增一条补录信息
-        editDialog(row,del){
+      editDialog (row, del) {
         this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$parent.addRepairRecord(row,del)
+          this.$parent.addRepairRecord(row, del)
 
           this.$message({
             type: 'success',
@@ -127,9 +132,9 @@ export default {
 
       },
     },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>

@@ -19,6 +19,7 @@
               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>
@@ -27,6 +28,9 @@
               <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,9 +46,9 @@
 </template>
 
 <script>
-import { getYydjList } from "@/api/registerBook.js";
-import { datas } from "./qlxxFormData.js";
-export default {
+  import { getYydjList } from "@/api/registerBook.js";
+  import { datas } from "./qlxxFormData.js";
+  export default {
     data () {
       return {
         title: "异议登记信息",
@@ -65,9 +69,10 @@ export default {
     },
     methods: {
       loadData () {
-        if(this.$parent.addRepairRecord){
-        this.columns.unshift({prop:"cz",
-           label:"操作"
+        if (this.$parent.addRepairRecord) {
+          this.columns.unshift({
+            prop: "cz",
+            label: "操作"
           })
         }
         getYydjList({
@@ -105,13 +110,13 @@ export default {
         return name;
       },
       // 新增一条补录信息
-        editDialog(row,del){
+      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,9 +131,9 @@ 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>