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

@@ -201,9 +201,8 @@ export default {
         pageSize: 10,
         current: 1
       },
-      // 业务名称
-      statusOptions: []
-    }
+      title: "",
+    };
   },
   methods: {
     // 初始化数据

@@ -8,21 +8,21 @@
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in xzqOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="汇交时间" prop="reportStartTime">
+            <el-form-item label="汇交时间" prop="startTime">
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                    clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
+                    clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker>
                 </el-col>
                 <el-col :span="12">
                   <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                    clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+                    clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker>
                 </el-col>
               </el-row>
             </el-form-item>
@@ -95,7 +95,7 @@ export default {
   components: {
     dataDetails,
   },
-  data () {
+  data() {
     return {
       isShow: false,
       // 开始结束日期限制
@@ -120,18 +120,21 @@ export default {
       },
       // 头部搜索
       form: {
-        estatenum: "",
-        reportStartTime: "",
-        reportEndTime: "",
-        ywmc: "",
-        state: "",
-        pcode: "",
+        qxdm: "", // 行政区
+        exchangeStartTime: "", // 开始日期
+        exchangeEndTime: "", // 结束日期
+        bdcdyh: "", // 不动产单元号
+        ywh: "", // 业务号
+        qllx: "", // 权利类型
+        djlx: "", // 登记类型
+        jcjg: "", // 检查结果
+        rkjg: "", //入库结果
+        currentPage: 1,
       },
       // table数据
       tableData: {
         // 表头数据
-        columns: datas.columns()
-          .concat([
+        columns: datas.columns().concat([
           {
             label: "操作",
             width: "80",
@@ -155,38 +158,19 @@ export default {
         total: 0,
         data: [{}],
       },     
-      // 行政区
-      xzqOptions: [
-        {
-          value: "632321",
-          label: "同仁县",
-        },
-        {
-          value: "632322",
-          label: "尖扎县",
-        },
-        {
-          value: "632323",
-          label: "泽库县",
-        },
-        {
-          value: "632324",
-          label: "河南县",
-        },
-      ],
-      title: ''
+      title: "",
     };
   },
-  mounted () {
+  mounted() {
     sendThis(this);
   },
   methods: {
     // 重置表单
-    resetForm () {
+    resetForm() {
       this.$refs.ruleForm.resetFields();
     },
     // 初始化数据
-    queryClick () {
+    queryClick() {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -196,12 +180,12 @@ export default {
       });
     },
     // 多选
-    handleSelectionChange (val) { },
+    handleSelectionChange(val) {},
     // 上报
-    handleEscalation () { },
+    handleEscalation() {},
     // 详情
-    handleDetail (row) {
-      this.title = row.rectypeName
+    handleDetail(row) {
+      this.title = row.rectypeName;
       this.$refs.editLog.isShow(row);
     },
   },

@@ -132,19 +132,19 @@ export default {
         //     )
         //   }
         // },
-        {
-          prop: 'isenable',
-          width: '160',
-          label: '是否禁用',
-          render: (h, scope) => {
-            return (
-              <el-radio-group disabled={this.details.isenable == 2} v-model={scope.row.isenable}>
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="0">禁用</el-radio>
-              </el-radio-group>
-            )
-          }
-        },
+        // {
+        //   prop: 'isenable',
+        //   width: '160',
+        //   label: '是否禁用',
+        //   render: (h, scope) => {
+        //     return (
+        //       <el-radio-group disabled={this.details.isenable == 2} v-model={scope.row.isenable}>
+        //         <el-radio label="1">启用</el-radio>
+        //         <el-radio label="0">禁用</el-radio>
+        //       </el-radio-group>
+        //     )
+        //   }
+        // },
         {
           width: '130',
           label: '移动',

@@ -30,21 +30,21 @@ class data extends filter {
         prop: "DNAME",
         label: "字典类型名称",
       },
-      {
-        label: "是否允许修改",
-        width: '150',
-        render: (h, scope) => {
-          return (
-            <div>
-              {
-                scope.row.ISENABLE == '1' ?
-                  <div class='allow'>允许</div> :
-                  <div class='prohibit'>禁止</div>
-              }
-            </div>
-          )
-        }
-      }
+      // {
+      //   label: "是否允许修改",
+      //   width: '150',
+      //   render: (h, scope) => {
+      //     return (
+      //       <div>
+      //         {
+      //           scope.row.ISENABLE == '1' ?
+      //             <div class='allow'>允许</div> :
+      //             <div class='prohibit'>禁止</div>
+      //         }
+      //       </div>
+      //     )
+      //   }
+      // }
     ]
   }