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

@@ -18,21 +18,21 @@
       <div class="xxTableBox rollTable">
         <!-- 固定前三个 -->
         <table class="xxTable">
-          <tr v-for="(item, colindex) in columnsall" :key="colindex">
+          <tr v-for="(item, colindex) in columnsall" :key="colindex" :class="item.bt">
             <td>
               {{ item.label }}
             </td>
-            <td v-for="(row, index) in tableData" :key="index" >
+            <td v-for="(row, index) in tableData" :key="index">
              <div class="setbut" v-if="item.prop == 'bhqk'">
-                 {{ index?"变化前": "变化后"}}
+                 {{ index?"变化后": "变化前"}}
               </div>
               <div
                 v-if="item.prop == 'cz' && row.sjlx != '系统数据'"
               ></div>
-               <span v-if="item.prop == 'qszt'" :class="item.bt">
+               <span v-if="item.prop == 'qszt'" :class="item.co">
                 {{ getQsztName(row[item.prop]) }}
               </span>
-              <span v-else :class="item.bt"> {{ row[item.prop] }}</span>
+              <span v-else :class="item.co"> {{ row[item.prop] }}</span>
             </td>
           </tr>
         </table>
@@ -109,26 +109,28 @@ export default {
     getdata() {
       getDjbQlxxDiff(this.formData.bsmQlxx).then((res) => {
         if (res.code === 200) {
-        this.tableData.push(res.result.currentQlxx)
         this.tableData.push(res.result.ssQlxx)
+        this.tableData.push(res.result.currentQlxx)
+
           this.tableData.map((item) => {
             item.sjlx = getSjlx(item.sjlx);
           });
        for (let key in  this.tableData[0]) {
          this.columnsum=this.columns.filter((item,index) => {
              if(this.tableData[1][key]!==this.tableData[0][key]&&this.columns[index].prop==key){
-               this.columns[index].bt="red"
+               this.columns[index].bt="bgc"
+                this.columns[index].co="red"
              }
-           return this.columns[index].bt=="red"
+           return this.columns[index].bt=="bgc"
            })
        }
           this.columns.unshift({
             prop: "bhqk",
-            label: "变化情况"
+            label: ""
           })
           this.columnsum.unshift({
             prop: "bhqk",
-            label: "变化情况"
+            label: ""
           })
          this.columnsall= this.columns
 
@@ -168,14 +170,18 @@ export default {
 
 <style lang="scss" scoped>
 @import "./qlxxCommon.scss";
-.red{
-    color: #ff0202;
+.bgc{
+
+   td{
+  background-color: rgb(182, 203, 207) !important;
+
+    }
   }
-.black{
-    color: #000000;
+  .red{
+    color: red;
   }
   .setbut{
-    font-weight: 600;
-    color: #ff0202;
+    font-size: 18px;
+    font-weight: 700;
   }
 </style>

@@ -296,7 +296,7 @@
        * @author: renchao
        */
       dataSelectClick () {
-        this.$popup("房屋信息比对", this.BASE_API.SERVERAPI + "/rest/ywbl/fdcq2/slxxCompareDetai",
+        this.$popup("房屋所有权", this.BASE_API.SERVERAPI + "/rest/ywbl/fdcq2/slxxCompareDetai",
           {
             formData: {
               bsmSldy: this.propsParam.bsmSldy,
@@ -360,7 +360,7 @@
      */
     compare() {
       this.$popupDialog(
-        "国有建设用地使用权",
+          this.ruleForm.qlxx.qllxmc,
         "registerBook/comparison",
         { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
          dqqllx: 'FDCQ2',

@@ -328,8 +328,9 @@ export default {
      * @author: renchao
      */
       compare() {
+        console.log("this.ruleForm",this.ruleForm);
      this.$popupDialog(
-        "国有建设用地使用权",
+        this.ruleForm.qlxx.qllxmc,
         "registerBook/comparison",
         { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
          dqqllx: 'JSYDSYQ',

@@ -251,7 +251,7 @@
      */
      compare() {
       this.$popupDialog(
-        "国有建设用地使用权",
+          this.ruleForm.qlxx.qllxmc,
         "registerBook/comparison",
         { bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
          dqqllx: 'YGDJ',

@@ -233,6 +233,23 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+           /**
+       * @description: openBook
+       * @param {*} row
+       * @author: miaofang
+       */
+      openBook (row) {
+        console.log("的急急急急急急");
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -199,6 +199,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -366,7 +366,24 @@
         } else {
           this.$refs.table.toggleRowSelection(row);
         }
-      }
+      },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: miaofang
+       */
+      openBook (row) {
+        console.log("的急急急急急急");
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     }
   }
 </script>

@@ -188,6 +188,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     }
   }
 </script>

@@ -213,6 +213,23 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+          /**
+       * @description: openBook
+       * @param {*} row
+       * @author: miaofang
+       */
+      openBook (row) {
+        console.log("的急急急急急急");
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -229,6 +229,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     }
   }
 </script>

@@ -190,6 +190,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -189,6 +189,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -199,6 +199,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
 
     },
   };

@@ -156,9 +156,10 @@
       /**
        * @description: openBook
        * @param {*} row
-       * @author: renchao
+       * @author: miaofang
        */
       openBook (row) {
+        console.log("的急急急急急急");
         var param = {
           bdcdyid: row.bdcdyid,
           qllx: row.qllx,

@@ -189,6 +189,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -190,6 +190,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -191,6 +191,22 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      },
     },
   };
 </script>

@@ -83,7 +83,20 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
 

@@ -110,6 +110,17 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '130',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
       }
     ]
   }

@@ -122,14 +122,19 @@ class data extends filter {
         minWidth: '130'
       },
       {
-        label: '操作',
-        width: '80',
+        label: '操作111',
+        width: '160',
         align: 'center',
         fixed: 'right',
         render: (h, scope) => {
-          return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
-        }
+          return (
+            <div>
+              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
   dzcolumns () {
@@ -236,16 +241,20 @@ class data extends filter {
       {
         prop: "zl",
         label: "多幢坐落",
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
-      // {
-      //   label: '操作',
-      //   width: '80',
-      //   align: 'center',
-      //   fixed: 'right',
-      //   render: (h, scope) => {
-      //     return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
-      //   }
-      // }
+      },
     ]
   }
 

@@ -103,7 +103,20 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
 

@@ -110,18 +110,17 @@ class data extends filter {
         label: "坐落",
         minWidth: '150'
       },
-      // {
-      //   label: '操作',
-      //   width: '130',
-      //   render: (h, scope) => {
-      //     return (
-      //       <div>
-      //         <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
-      //         <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
-      //       </div>
-      //     )
-      //   }
-      // }
+      {
+        label: '操作',
+        width: '130',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
+      }
     ]
   }
 

@@ -101,7 +101,21 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作111',
+        width: '160',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
 

@@ -100,7 +100,20 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
 

@@ -182,6 +182,19 @@ class datatwo extends filter {
         label: "坐落",
         minWidth: '110'
       },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
+      },
     ]
   }
 

@@ -101,7 +101,20 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
         }
+      },
     ]
   }
 

@@ -109,6 +109,17 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '130'
+      },
+      {
+        label: '操作',
+        width: '130',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
       }
     ]
   }