Merge branch 'master' into dev

@@ -86,6 +86,7 @@ export default {
         areacode: '',
         areacode: '',
         startTime: '',
         startTime: '',
         endTime: '',
         endTime: '',
+        currentPage: 1
       },
       },
       // 分页
       // 分页
       pageData: {
       pageData: {

@@ -10,18 +10,6 @@ class data extends filter {
   columns () {
   columns () {
     return [
     return [
       {
       {
-        label: '序号',
-        type: 'index',
-        width: '50',
-        render: (h, scope) => {
-          return (
-            <div>
-              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
-            </div>
-          )
-        }
-      },
-      {
         label: '汇交状态',
         label: '汇交状态',
         width: '110',
         width: '110',
         render: (h, scope) => {
         render: (h, scope) => {

@@ -26,8 +26,8 @@
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
               <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
               <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
-                :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
-                value-format="yyyy-MM-dd HH:mm:ss"  @change="endTimeChange"></el-date-picker>
+                :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" value-format="yyyy-MM-dd HH:mm:ss"
+                @change="endTimeChange"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
@@ -91,7 +91,7 @@ import tableMixin from "@/mixins/tableMixin.js";
 import dataDetails from "@/components/EditDialog";
 import dataDetails from "@/components/EditDialog";
 import { getDataReportPage } from "@/api/dataReport.js";
 import { getDataReportPage } from "@/api/dataReport.js";
 //引入日期处理方法
 //引入日期处理方法
-import {timeFormat } from "@/utils/operation";
+import { timeFormat } from "@/utils/operation";
 export default {
 export default {
   name: "sbbwcx",
   name: "sbbwcx",
   mixins: [tableMixin],
   mixins: [tableMixin],
@@ -123,14 +123,14 @@ export default {
         qxdm: "", // 行政区
         qxdm: "", // 行政区
         exchangeStartTime: "", // 开始日期
         exchangeStartTime: "", // 开始日期
         exchangeEndTime: "", // 结束日期
         exchangeEndTime: "", // 结束日期
-        hjjg:"", //汇交状态
+        hjjg: "", //汇交状态
         bdcdyh: "", // 不动产单元号
         bdcdyh: "", // 不动产单元号
         ywh: "", // 业务号
         ywh: "", // 业务号
         qllx: "", // 权利类型
         qllx: "", // 权利类型
         djlx: "", // 登记类型
         djlx: "", // 登记类型
         jcjg: "", // 检查结果
         jcjg: "", // 检查结果
         rkjg: "", //入库结果
         rkjg: "", //入库结果
-        currentPage: 1,
+        currentPage: 1
       },
       },
       // 分页
       // 分页
       pageData: {
       pageData: {
@@ -141,27 +141,35 @@ export default {
       // table数据
       // table数据
       tableData: {
       tableData: {
         // 表头数据
         // 表头数据
-        columns: datas.columns().concat([
+        columns: [
           {
           {
-            label: "操作",
-            width: "80",
-            render: (h, scope) => {
-              return (
-                <div>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    onClick={() => {
-                      this.handleDetail(scope.row);
-                    }}
-                  >
-                    详情
-                  </el-button>
-                </div>
-              );
-            },
-          },
-        ]),
+            label: "序号",
+            type: "index",
+            width: "50",
+            index: this.indexMethod,
+          }
+        ]
+          .concat(datas.columns().concat([
+            {
+              label: "操作",
+              width: "80",
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      onClick={() => {
+                        this.handleDetail(scope.row);
+                      }}
+                    >
+                      详情
+                    </el-button>
+                  </div>
+                );
+              },
+            }
+          ])),
         total: 0,
         total: 0,
         data: [],
         data: [],
       },
       },
@@ -173,8 +181,8 @@ export default {
   },
   },
   methods: {
   methods: {
     //截止日期变化
     //截止日期变化
-    endTimeChange(val){
-      this.form.exchangeEndTime = timeFormat(new Date(val),true)
+    endTimeChange (val) {
+      this.form.exchangeEndTime = timeFormat(new Date(val), true)
     },
     },
     // 初始化数据
     // 初始化数据
     queryClick () {
     queryClick () {