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

@@ -69,10 +69,8 @@
         }
     }
 
-
-
     .el-form-item--small.el-form-item {
-        margin-bottom: 0px;
+        margin-bottom: 5px;
     }
 }
 

@@ -15,6 +15,9 @@ export default {
     if (this.fetchData) {
       this.fetchData()
     }
+    if (this.queryClick) {
+      this.queryClick()
+    }
   },
   methods: {
     handleSizeChange (val) {

 <template>
   <div>
-    <el-form :model="ruleForm" label-width="120px">
+    <el-form :model="form" boder label-width="120px">
       <el-row>
         <el-col :span="24" style="margin-bottom: 15px">
           <div class="slxx_title title-block">
-            申请信息
+            查询情况
             <div class="triangle"></div>
           </div>
         </el-col>
       </el-row>
 
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="查询用途" label-width="90px">
-            <el-input v-model="ruleForm.cxyt" class="width200px"></el-input>
+        <el-col :span="6">
+          <el-form-item label="查询来源：" label-width="90px">{{form.djSqcxDO.cxly}}
           </el-form-item>
         </el-col>
-        <el-col :span="16">
-          <el-form-item label="与产权人的关系">
-            <el-radio-group v-model="ruleForm.ycyrgx">
-              <el-radio :label="1">房屋权利人</el-radio>
-              <el-radio :label="2">产权利害关系人</el-radio>
-              <el-radio :label="3">委托人</el-radio>
-            </el-radio-group>
+        <el-col :span="6">
+          <el-form-item label="查询类型：">{{form.djSqcxDO.cxlx}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="查询人员：" label-width="90px">{{form.djSqcxDO.cxr}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="查询时间：">{{form.djSqcxDO.cxsj}}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="查询编号：" label-width="90px">{{form.djSqcxDO.cxbh}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="查询用途：" label-width="90px">{{form.djSqcxDO.cxyt}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="与产权人的关系：">{{form.djSqcxDO.ycqrgxmc}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="不动产权证号：">{{form.djSqcxDO.bdcqzh}}
           </el-form-item>
         </el-col>
       </el-row>
-
+      <el-row>
+        <el-col :span="24" style="margin-bottom: 15px">
+          <div class="slxx_title title-block">
+            申请人
+            <div class="triangle"></div>
+          </div>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col>
-          <lb-table :column="sqrData.columns" border :data="sqrData.data" :maxHeight="200" heightNumSetting
+          <lb-table :column="sqrData.columns" border :data="form.sqrList" :maxHeight="200" heightNumSetting
             :pagination="false">
           </lb-table>
         </el-col>
       </el-row>
-
       <el-row>
         <el-col :span="24" style="margin-bottom: 15px">
           <div class="slxx_title title-block">
@@ -45,7 +71,7 @@
       </el-row>
       <el-row>
         <el-col>
-          <lb-table :column="qlrData.columns" border :data="qlrData.data" :maxHeight="200" heightNumSetting
+          <lb-table :column="qlrData.columns" border :data="form.qlrList" :maxHeight="200" heightNumSetting
             :pagination="false">
           </lb-table>
         </el-col>
@@ -61,13 +87,22 @@
       </el-row>     
       <el-row>
         <el-col>
-          <p>查询编号：{{ cxbh }}</p>
+          <lb-table :column="cxjgData.columns" :data="form.cxjgList" :maxHeight="200" heightNumSetting
+            :pagination="false">
+          </lb-table>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24" style="margin-bottom: 15px">
+          <div class="slxx_title title-block">
+            打印记录
+            <div class="triangle"></div>
+          </div>
         </el-col>
       </el-row>
       <el-row>
         <el-col>
-          <lb-table :column="cxjgData.columns" :data="cxjgData.data" :maxHeight="200" heightNumSetting
-            :pagination="false">
+          <lb-table :column="dyjlcolumns" :data="form.dyjlList" :maxHeight="200" heightNumSetting :pagination="false">
           </lb-table>
         </el-col>
       </el-row>
@@ -86,13 +121,14 @@ export default {
   // },
   props: ["formData"],
 
-  created () {
+  created() {
     // debugger;
     // alert(this.formData.sqcxBsm);
   },
 
-  data () {
+  data() {
     return {
+      form: {},
       ruleForm: {
         cxyt: "",
         ycyrgx: 1,
@@ -113,26 +149,27 @@ export default {
         columns: datas.qlrcolumns(),
         data: [],
       },
+      dyjlcolumns: datas.dyjlcolumns(),
     };
   },
 
-  mounted () {
+  mounted() {
     sendThis(this);
     var sqcxBsm = this.formData.sqcxBsm;
 
     getJtfcInfo({ sqcxBsm: sqcxBsm })
       .then((res) => {
         if (res.code == 200) {
+          this.form = res.result;
           this.sqrData.data = res.result.sqxx;
           this.qlrData.data = res.result.qlrxx;
           this.cxjgData.data = res.result.djSqcxCxjgDOList;
           this.cxbh = res.result.djSqcxDO.cxbh;
-
         }
       })
       .catch((error) => {
         console.log(error);
-      })
+      });
   },
   methods: {},
 };

@@ -126,7 +126,22 @@ class data extends filter {
       },
     ]
   }
-
+  dyjlcolumns () {
+    return [
+      {
+        prop: 'sqrxm',
+        label: '打印类型',
+      },
+      {
+        prop: 'sqrzjlxmc',
+        label: '打印人员',
+      },
+      {
+        prop: 'sqrzjhm',
+        label: '打印时间',
+      }
+    ]
+  }
 }
 
 

@@ -4,19 +4,45 @@
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">       
         <el-row>
-          <el-col :span="5">
+          <el-col :span="3">
+            <el-form-item label="查询来源">
+              <el-select v-model="queryForm.cxbh" placeholder="请选择活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="查询类型">
+              <el-select v-model="queryForm.cxbh" placeholder="请选择活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
             <el-form-item label="查询编号">
               <el-input placeholder="请输入编号" @clear="queryClick" v-model="queryForm.cxbh" class="width100" clearable>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <el-form-item label="申请人">
               <el-input placeholder="请输入申请人" @clear="queryClick" v-model="queryForm.sqr" class="width100" clearable>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14" class="btnColRight">
+          <el-col :span="8">
+            <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="3" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
@@ -41,11 +67,11 @@ import { getJtfcPage } from "@/api/sqcx";
 export default {
   name: "sqcxjl",
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
-    this.queryClick()
+    this.queryClick();
   },
-  data () {
+  data() {
     return {
       queryForm: {
         cxbh: "",
@@ -60,7 +86,7 @@ export default {
   },
   methods: {
     // 初始化数据
-    queryClick () {
+    queryClick() {
       this.$startLoading();
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
@@ -71,18 +97,18 @@ export default {
         }
       });
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
     },
     // 查看
-    handleViewClick (scope) {
+    handleViewClick(scope) {
       var sqcxBsm = scope.row.bsmSqcx;
       this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
         formData: {
           sqcxBsm: sqcxBsm,
         },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () { },
+        cancel: function () {}, //取消事件的回调
+        confirm: function () {},
       });
     },
   },

@@ -105,7 +105,6 @@ export default {
   },
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   watch: {
     queryForm: {

@@ -41,7 +41,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -82,7 +82,6 @@ export default {
   mixins: [table, searchMin],
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   computed: {
     ...mapGetters(['dictData'])

 <template>
   <div class="from-clues">
-    <div class="from-clues-header">
-      <el-tabs v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick"  v-if="!isJump">
         <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
         <el-tab-pane label="多幢" name="h"></el-tab-pane>
       </el-tabs>
+
+    <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="110px">
         <el-row>
           <el-col :span="7">
             <el-form-item label="宗地代码">
-              <el-input placeholder="宗地代码" v-model="queryForm.zddm" clearable>
+              <el-input placeholder="请输入宗地代码" v-model="queryForm.zddm" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="土地证号">
-              <el-input placeholder="土地证号" v-model="queryForm.bdcqzh" clearable>
+              <el-input placeholder="请输入土地证号" v-model="queryForm.bdcqzh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="土地坐落">
-              <el-input placeholder="土地坐落" v-model="queryForm.zl" clearable>
+              <el-input placeholder="请输入土地坐落" v-model="queryForm.zl" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -30,25 +31,25 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="自然幢号">
-              <el-input placeholder="自然幢号" v-model="queryForm.zrzh" clearable>
+              <el-input placeholder="请输入自然幢号" v-model="queryForm.zrzh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="项目名称">
-              <el-input v-model="queryForm.xmmc"></el-input>
+              <el-input placeholder="请输入项目名称" v-model="queryForm.xmmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="建筑物名称">
-              <el-input placeholder="建筑物名称" v-model="queryForm.jzwmc" clearable>
+              <el-input placeholder="请输入建筑物名称" v-model="queryForm.jzwmc" clearable>
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="3" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -112,7 +113,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       if (!this.isJump) {
         //从业务办理进入
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
@@ -148,7 +149,7 @@ export default {
     },
     handleTabClick () {
       this.pageData.currentPage = 1;
-      this.fetchData();
+      this.queryClick();
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {
@@ -209,4 +210,5 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/public.scss";
+
 </style>

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -78,7 +78,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -75,7 +75,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -33,7 +33,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -103,7 +103,7 @@ export default {
       this.$emit("closeDialog");
     },
     //默认加载表格信息
-    fetchData() {
+    queryClick() {
       this.queryForm.bsmSqyw = this.bsmSqyw;
       selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -80,7 +80,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -88,7 +88,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,9 +79,6 @@ export default {
       this.$emit("closeDialog");
     },
     queryClick() {
-      this.fetchData();
-    },
-    fetchData() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdj100({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -36,7 +36,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>

@@ -38,7 +38,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,7 +64,6 @@ export default {
   mixins: [table],
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   computed: {
     ...mapGetters(['dictData'])

@@ -32,7 +32,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -57,7 +57,6 @@ export default {
   mixins: [table],
   mounted () {
     sendThis(this)
-    this.queryClick()
   },
   data () {
     return {

@@ -6,32 +6,32 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="不动产权证号" label-width="100px">
-              <el-input placeholder="请输入不动产权证号" class="width100" @clear="queryClick()" v-model="queryForm.bdcqzh">
+              <el-input placeholder="请输入不动产权证号" class="width100" @clear="queryClick" v-model="queryForm.bdcqzh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="印刷序列号" label-width="100px">
-              <el-input placeholder="请输入印刷序列号" class="width100" @clear="queryClick()" v-model="queryForm.ysxlh">
+              <el-input placeholder="请输入印刷序列号" class="width100" @clear="queryClick" v-model="queryForm.ysxlh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" class="width100" @clear="queryClick()" v-model="queryForm.ywh">
+              <el-input placeholder="请输入业务号" class="width100" @clear="queryClick" v-model="queryForm.ywh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="领取人">
-              <el-input placeholder="请输入领取人" class="width100" @clear="queryClick()" v-model="queryForm.lqr">
+              <el-input placeholder="请输入领取人" class="width100" @clear="queryClick" v-model="queryForm.lqr">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4" class="btnColRight">
             <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-form-item>
           </el-col>

@@ -33,10 +33,10 @@
             <el-form-item>
               <el-button
                 type="primary"
-                @click="queryClick()"
+                @click="queryClick"
                 >查询</el-button
               >
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>