联调测试系统功能

@@ -47,11 +47,12 @@ class data extends filter {
       {
         prop: 'jcjg',
         label: '检查结果',
+        width: 100,
         render: (h, scope) => {
           return (
             <div>
               {
-                scope.row.jcjg
+                scope.row.receiveState
                   ? <span class='adopt'>通过</span>
                   : <span>通过1</span>
               }
@@ -62,11 +63,12 @@ class data extends filter {
       {
         prop: 'rkjg',
         label: '入库结果',
+        width: 100,
         render: (h, scope) => {
           return (
             <div>
               {
-                scope.row.jcjg
+                scope.row.storageState
                   ? <span class='warehousing'>入库</span>
                   : <span>入库1</span>
               }

@@ -69,7 +69,7 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+      <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
@@ -141,7 +141,7 @@ export default {
             type: "index",
             width: "50",
             index: this.indexMethod,
-          },
+          },          
         ]
           .concat(data.columns())
           .concat([
@@ -166,7 +166,8 @@ export default {
             },
           ]),
         // 表格列表数据
-        data: [{ jcjg: 1 }],
+         total: 0,
+        data: [{}],
       },
       // 分页
       pageData: {

@@ -4,38 +4,53 @@ class data extends filter {
     super()
   }
   columns () {
-    return [
+    return [      
       {
-        type: 'selection'
+        prop: "areacode",
+        label: "行政区代码",
+        width: 100,
       },
       {
-        prop: "pcode",
-        label: "行政区代码",
+        prop: "areaName",
+        label: "行政区名称",
+        width: 100,
       },
       {
-        prop: "estatenum",
-        label: "不动产单元号",
+        prop: "bizMsgid",
+        label: "业务报文ID",
       },
       {
-        prop: "pcode",
-        label: "行政区名称",
+        prop: "createdate",
+        label: "创建时间",
+      },
+      {
+        prop: "recflowid",
+        label: "业务流水号",
+      },
+      {
+        prop: "estatenum",
+        label: "不动产单元号",
+        width: 240,
       },
       {
         prop: "rectype",
         label: "业务编码",
       },
       {
+        prop: "rectypeName",
+        label: "业务名称",
+      },      
+      {
         prop: "uploadtime",
-        label: "上报时间",
+        label: "汇交时间",
       },
-      {
-        prop: 'sbjg',
-        label: '上报结果',
+      {        
+        label: '汇交状态',
         render: (h, scope) => {
           return (
             <div>
               {
-                !scope.row.successflag ? '' : scope.row.successflag == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span>
+                scope.row.exchangeState == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span>
               }
             </div>
           )

@@ -6,25 +6,24 @@
       <el-form ref="ruleForm" :model="form" label-width="100px">
         <el-row class="marginbtm5">
           <el-col :span="6">
-            <el-form-item label="不动产单元号" prop="estatenum">
-              <el-input v-model="form.estatenum" class="width100" placeholder="不动产单元号"></el-input>
+            <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>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="开始日期" prop="reportStartTime">
+            <el-form-item label="汇交时间" prop="reportStartTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
                 clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束日期" prop="reportEndTime">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
                 clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="业务名称" prop="ywmc">
-              <el-select v-model="form.ywmc" class="width100" clearable placeholder="业务名称">
+            <el-form-item label="汇交状态" prop="state">
+              <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
                 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -32,27 +31,10 @@
           </el-col>
         </el-row>
         <el-row class="mt-10">
-          <el-col :span="6">
-            <el-form-item label="响应结果" prop="state">
-              <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
-                <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <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>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <!-- 操作按钮 -->
           <el-col :span="12" class="btnColRight">
             <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn>
             <btn nativeType="cx" @click="queryClick">查询</btn>
-            <btn nativeType="sb" @click="handleEscalation">上报</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -72,11 +54,11 @@
 <script>
 // 上报报文查询
 // 引入表头数据
-import data from "./data"
+import data from "./data";
 // 引入表格混入方法
-import table from "@/utils/mixin/table"
+import table from "@/utils/mixin/table";
 // 引入详情弹框
-import dataDetails from '@/components/dataDetails/edit-dialog'
+import dataDetails from "@/components/dataDetails/edit-dialog";
 import { getDataReportPage } from "@/api/sbbwcx.js";
 
 export default {
@@ -84,9 +66,9 @@ export default {
   mixins: [table],
   // 注册组件
   components: {
-    dataDetails
+    dataDetails,
   },
-  data () {
+  data() {
     return {
       isShow: false,
       // 开始结束日期限制
@@ -97,7 +79,7 @@ export default {
               time.getTime() >= new Date(this.form.reportEndTime).getTime()
             );
           }
-        }
+        },
       },
       // 结束日期限制
       pickerOptionsEnd: {
@@ -107,89 +89,99 @@ export default {
               time.getTime() <= new Date(this.form.reportStartTime).getTime()
             );
           }
-        }
+        },
       },
       // 头部搜索
       form: {
-        estatenum: '',
-        reportStartTime: '',
-        reportEndTime: '',
-        ywmc: '',
-        state: '',
-        pcode: ''
+        estatenum: "",
+        reportStartTime: "",
+        reportEndTime: "",
+        ywmc: "",
+        state: "",
+        pcode: "",
       },
       // table数据
       tableData: {
         // 表头数据
-        columns: data.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(data.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,
         data: [{}],
       },
       // 行政区
       xzqOptions: [
         {
-          value: '632321',
-          label: '同仁县'
+          value: "632321",
+          label: "同仁县",
         },
         {
-          value: '632322',
-          label: '尖扎县'
+          value: "632322",
+          label: "尖扎县",
         },
         {
-          value: '632323',
-          label: '泽库县'
+          value: "632323",
+          label: "泽库县",
         },
         {
-          value: '632324',
-          label: '河南县'
-        }
-      ]
-    }
+          value: "632324",
+          label: "河南县",
+        },
+      ],
+    };
   },
   methods: {
     // 重置表单
-    resetForm () {
+    resetForm() {
       this.$refs.ruleForm.resetFields();
     },
     // 初始化数据
-    queryClick () {
-      getDataReportPage({ ...this.form, ...this.pageData }).then(res => {
+    queryClick() {
+      getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
-          let { total, records } = res.result
+          let { total, records } = res.result;
           this.tableData.total = total;
-          this.tableData.data = records ? records : []
+          this.tableData.data = records ? records : [];
         }
-      })
+      });
     },
     // 多选
-    handleSelectionChange (val) {
-    },
+    handleSelectionChange(val) {},
     // 上报
-    handleEscalation () { },
+    handleEscalation() {},
     // 详情
-    handleDetail (row) {
-      this.$refs.editLog.isShow(row)
-    }
-  }
-}
+    handleDetail(row) {
+      this.$refs.editLog.isShow(row);
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 // 引入页面公共样式