style:综合查询

任超
Showing 6 changed files with 51 additions and 45 deletions
src/utils/mixin/table.js
src/views/sqcx/jtfc/jtfc.vue
src/views/ywbl/dbx/dbx.vue
src/views/zhcx/djbcx/djbcx.vue
src/views/zhcx/jdcx/jdcx.vue
src/views/zhcx/lpcx/lpcx.vue
--- a/src/utils/mixin/table.js
View file @d2dcfc6
+++ b/src/utils/mixin/table.js
View file @d2dcfc6
@@ -12,17 +12,29 @@ export default {
    ...mapGetters(['dictData']),
  },
  created () {
+    if (this.fetchData) {
      this.fetchData()
+    }
  },
  methods: {
    handleSizeChange (val) {
      this.pageData.currentPage = 1
      this.pageData.pageSize = val
+      if (this.fetchData) {
        this.fetchData()
+      }
+      if (this.queryClick) {
+        this.queryClick()
+      }
    },
    handleCurrentChange (val) {
      this.pageData.currentPage = val
+      if (this.fetchData) {
        this.fetchData()
+      }
+      if (this.queryClick) {
+        this.queryClick()
+      }
    },
    handleDel () {
      let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)
--- a/src/views/sqcx/jtfc/jtfc.vue
View file @d2dcfc6
+++ b/src/views/sqcx/jtfc/jtfc.vue
View file @d2dcfc6
@@ -25,7 +25,7 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border class="loadingtext" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current"
        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
        :column="tableData.columns" :data="tableData.data">
      </lb-table>
--- a/src/views/ywbl/dbx/dbx.vue
View file @d2dcfc6
+++ b/src/views/ywbl/dbx/dbx.vue
View file @d2dcfc6
@@ -56,7 +56,7 @@
      </el-form>
    </div>
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" class="loadingtext" border @sort-change="handleSort"
+      <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
        :current-page.sync="pageData.currentPage" :heightNum="300" :total="tableData.total"
        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
        :data="tableData.data">
@@ -103,8 +103,8 @@ export default {
    queryClick () {
      this.$startLoading()
      searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
-        if (res.code === 200) {
        this.$endLoading()
+        if (res.code === 200) {
          let { total, records } = res.result
          records.forEach(item => {
            item.qlrmc = item.qlrmc.join(',')
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @d2dcfc6
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @d2dcfc6
@@ -6,8 +6,7 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable class="width100" @change="queryClick()" clearable
+              <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
-                placeholder="请选择权利类型">
                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -15,28 +14,28 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="不动产单元号" label-width="105px">
-              <el-input placeholder="请输入不动产单元号" @clear="queryClick()" v-model="queryForm.bdcdyh" clearable
+              <el-input placeholder="请输入不动产单元号" @clear="queryClick" v-model="queryForm.bdcdyh" clearable
                class="width100">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="不动产权证号" label-width="105px">
-              <el-input placeholder="请输入不动产权证号" @clear="queryClick()" v-model="queryForm.bdcqzh" clearable
+              <el-input placeholder="请输入不动产权证号" @clear="queryClick" v-model="queryForm.bdcqzh" clearable
                class="width100">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" @clear="queryClick()" v-model="queryForm.ywh" clearable class="width100">
+              <el-input placeholder="请输入业务号" @clear="queryClick" v-model="queryForm.ywh" clearable class="width100">
              </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>
@@ -45,9 +44,9 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
-        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
-        :column="tableData.columns" :data="tableData.data">
+        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
      </lb-table>
    </div>
  </div>
@@ -63,6 +62,7 @@ export default {
  mixins: [table],
  mounted () {
    sendThis(this);
+    this.queryClick()
  },
  data () {
    return {
@@ -91,8 +91,10 @@ export default {
  },
  methods: {
    // 初始化数据
-    fetchData () {
+    queryClick () {
+      this.$startLoading()
      getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading()
        if (res.code === 200) {
          let { total, records } = res.result;
          this.tableData.data = records;
@@ -103,10 +105,6 @@ export default {
    handleSort (name, sort) {
      console.log(name, sort);
    },
-    // 查询
-    queryClick () {
-      this.fetchData();
-    },
    // 高级查询
    moreQueryClick () { },
    openDialog (scroll) {
--- a/src/views/zhcx/jdcx/jdcx.vue
View file @d2dcfc6
+++ b/src/views/zhcx/jdcx/jdcx.vue
View file @d2dcfc6
@@ -6,8 +6,7 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="业务来源">
-              <el-select v-model="queryForm.ywly" class="width100" @change="fetchData()" filterable clearable
+              <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源">
-                placeholder="请选择业务来源">
                <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -15,8 +14,7 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" class="width100" @change="fetchData()" filterable clearable
+              <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
-                placeholder="请选择权利类型">
                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -24,8 +22,7 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" class="width100" @change="fetchData()" filterable clearable
+              <el-select v-model="queryForm.djlx" class="width100" filterable clearable placeholder="请选择登记类型">
-                placeholder="请选择登记类型">
                <el-option v-for="item in  dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -33,14 +30,14 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="fetchData()" clearable class="width200px">
+              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="queryClick" clearable class="width200px">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4" class="btnColRight">
            <el-form-item>
-              <el-button type="primary" native-type="submit" @click="fetchData()">查询</el-button>
+              <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
              <el-button @click="moreQueryClick()">高级查询</el-button>
            </el-form-item>
          </el-col>
@@ -49,7 +46,7 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table border :page-size="pageData.pageSize" @sort-change="handleSort"
+      <lb-table :page-size="pageData.pageSize" class="loadingtext" @sort-change="handleSort"
        :current-page.sync="pageData.currentPage" :total="pageData.total" @size-change="handleSizeChange"
        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
      </lb-table>
@@ -67,6 +64,7 @@ export default {
  mixins: [table],
  mounted () {
    sendThis(this);
+    this.queryClick()
  },
  computed: {
    ...mapGetters(['dictData'])
@@ -92,8 +90,10 @@ export default {
  },
  methods: {
    // 初始化数据
-    fetchData () {
+    queryClick () {
+      this.$startLoading()
      getJdcxBysearch({ ...this.queryForm, ...this.pageData }).then(res => {
+        this.$endLoading()
        if (res.code === 200) {
          let { total, records } = res.result
          let str = ''
@@ -108,7 +108,7 @@ export default {
            if (item.ywrmc.length != 0) {
              item.ywrmcStr = String(item.ywrmc)
            }
-            if(item.zlList.length != 0){
+            if (item.zlList.length != 0) {
              item.zlStr = String(item.zlList)
            }
          })
--- a/src/views/zhcx/lpcx/lpcx.vue
View file @d2dcfc6
+++ b/src/views/zhcx/lpcx/lpcx.vue
View file @d2dcfc6
@@ -6,32 +6,32 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="项目名称">
-              <el-input placeholder="请输入项目名称" @clear="queryClick()" v-model="queryForm.xmmc" clearable class="width100">
+              <el-input placeholder="请输入项目名称" @clear="queryClick" v-model="queryForm.xmmc" clearable class="width100">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="项目编号">
-              <el-input placeholder="请输入项目编号" @clear="queryClick()" v-model="queryForm.xmbh" clearable class="width100">
+              <el-input placeholder="请输入项目编号" @clear="queryClick" v-model="queryForm.xmbh" clearable class="width100">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="宗地代码">
-              <el-input placeholder="请输入宗地代码" @clear="queryClick()" v-model="queryForm.zddm" clearable class="width100">
+              <el-input placeholder="请输入宗地代码" @clear="queryClick" v-model="queryForm.zddm" clearable class="width100">
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="自然幢号">
-              <el-input placeholder="请输入自然幢号" @clear="queryClick()" v-model="queryForm.zrzh" clearable class="width100">
+              <el-input placeholder="请输入自然幢号" @clear="queryClick" v-model="queryForm.zrzh" clearable class="width100">
              </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>
@@ -40,9 +40,9 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
-        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
-        :column="tableData.columns" :data="tableData.data">
+        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
      </lb-table>
    </div>
  </div>
@@ -56,7 +56,8 @@ export default {
  components: {},
  mixins: [table],
  mounted () {
-    sendThis(this);
+    sendThis(this)
+    this.queryClick()
  },
  data () {
    return {
@@ -78,25 +79,20 @@ export default {
    };
  },
  methods: {
-    //查询
-    queryClick () {
-      this.fetchData();
-    },
    // 初始化数据
-    fetchData () {
+    queryClick () {
+      this.$startLoading();
      getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading();
        if (res.code === 200) {
          this.pageData.total = res.result.total;
          this.tableData.data = res.result.records;
        }
      });
    },
    handleSort (name, sort) {
      console.log(name, sort);
    },
    //打开楼盘表
    openlpbClick (scope) {
      // var zrzbsm = scope.row.bsm;