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

@@ -16,8 +16,17 @@
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
-          <el-col :span="14" class="btnColRight">
+          <el-col :span="10">
+            <el-form-item label="查询时间">
+              <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
+                clearable>
+              </el-date-picker> 至
+              <el-date-picker v-model="queryForm.sqr" type="date" placeholder="结束日期" value-format="yyyy-MM-dd"
+                clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
@@ -44,14 +53,14 @@ import { getJtfcPage } from "@/api/sqcx";
 export default {
 export default {
   name: "dydjb",
   name: "dydjb",
   mixins: [table],
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
-    this.queryClick()
+    this.queryClick();
   },
   },
   computed: {
   computed: {
     ...mapGetters(["dictData"]),
     ...mapGetters(["dictData"]),
   },
   },
-  data () {
+  data() {
     return {
     return {
       queryForm: {
       queryForm: {
         cxbh: "",
         cxbh: "",
@@ -66,7 +75,7 @@ export default {
   },
   },
   methods: {
   methods: {
     // 初始化数据
     // 初始化数据
-    queryClick () {
+    queryClick() {
       this.$startLoading();
       this.$startLoading();
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         this.$endLoading();
@@ -77,12 +86,12 @@ export default {
         }
         }
       });
       });
     },
     },
-    dydjbClick (scope) {
+    dydjbClick(scope) {
       popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
       popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
         sqcxdata: scope.row,
         sqcxdata: scope.row,
-      })
+      });
     },
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
   },
   },

@@ -50,17 +50,8 @@ class data extends filter {
         label: "申请人",
         label: "申请人",
       },
       },
       {
       {
-        label: "与权利人的关系",
-        render: (h, scope) => {
-          switch (scope.row.ycyrgx) {
-            case '1':
-              return <div>房屋权利人</div>
-            case '2':
-              return <div>产权利害关系人</div>
-            case '3':
-              return <div>委托人</div>
-          }
-        }
+        prop: "ycyrgxmc",
+        label: "与产权人的关系",
       },
       },
       {
       {
         prop: "qlrxm",
         prop: "qlrxm",

@@ -8,7 +8,7 @@ class data extends filter {
   constructor() {
   constructor() {
     super()
     super()
   }
   }
-  columns () {
+  columns() {
     return [
     return [
       {
       {
         label: '序号',
         label: '序号',
@@ -16,13 +16,30 @@ class data extends filter {
         width: '50'
         width: '50'
       },
       },
       {
       {
+        label: "查询来源",
+        render: (h, scope) => {
+          switch (scope.row.cxly) {
+            case '1':
+              return <div>办事大厅</div>
+            case '2':
+              return <div>自助查询机</div>
+            case '3':
+              return <div>政务一体化平台</div>
+            case '4':
+              return <div>互联网</div>
+            case '5':
+              return <div>微信公众号</div>
+          }
+        }
+      },
+      {
         label: "查询类型",
         label: "查询类型",
         render: (h, scope) => {
         render: (h, scope) => {
           switch (scope.row.cxlx) {
           switch (scope.row.cxlx) {
             case '1':
             case '1':
               return <div>家庭房产</div>
               return <div>家庭房产</div>
             case '2':
             case '2':
-              return <div>登记簿</div>
+              return <div>房屋明细</div>
           }
           }
         }
         }
       },
       },
@@ -44,7 +61,7 @@ class data extends filter {
       },
       },
       {
       {
         prop: "ycqrgxmc",
         prop: "ycqrgxmc",
-        label: "与权利人的关系",
+        label: "与产权人的关系",
       },
       },
       {
       {
         prop: "qlrxm",
         prop: "qlrxm",