9fd885ad by 田浩浩

联调测试系统功能

1 parent 539f1163
...@@ -47,11 +47,12 @@ class data extends filter { ...@@ -47,11 +47,12 @@ class data extends filter {
47 { 47 {
48 prop: 'jcjg', 48 prop: 'jcjg',
49 label: '检查结果', 49 label: '检查结果',
50 width: 100,
50 render: (h, scope) => { 51 render: (h, scope) => {
51 return ( 52 return (
52 <div> 53 <div>
53 { 54 {
54 scope.row.jcjg 55 scope.row.receiveState
55 ? <span class='adopt'>通过</span> 56 ? <span class='adopt'>通过</span>
56 : <span>通过1</span> 57 : <span>通过1</span>
57 } 58 }
...@@ -62,11 +63,12 @@ class data extends filter { ...@@ -62,11 +63,12 @@ class data extends filter {
62 { 63 {
63 prop: 'rkjg', 64 prop: 'rkjg',
64 label: '入库结果', 65 label: '入库结果',
66 width: 100,
65 render: (h, scope) => { 67 render: (h, scope) => {
66 return ( 68 return (
67 <div> 69 <div>
68 { 70 {
69 scope.row.jcjg 71 scope.row.storageState
70 ? <span class='warehousing'>入库</span> 72 ? <span class='warehousing'>入库</span>
71 : <span>入库1</span> 73 : <span>入库1</span>
72 } 74 }
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </div> 69 </div>
70 <!-- 列表区域 --> 70 <!-- 列表区域 -->
71 <div class="from-clues-content"> 71 <div class="from-clues-content">
72 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total" 72 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
73 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 73 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
74 :data="tableData.data"> 74 :data="tableData.data">
75 </lb-table> 75 </lb-table>
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
141 type: "index", 141 type: "index",
142 width: "50", 142 width: "50",
143 index: this.indexMethod, 143 index: this.indexMethod,
144 }, 144 },
145 ] 145 ]
146 .concat(data.columns()) 146 .concat(data.columns())
147 .concat([ 147 .concat([
...@@ -166,7 +166,8 @@ export default { ...@@ -166,7 +166,8 @@ export default {
166 }, 166 },
167 ]), 167 ]),
168 // 表格列表数据 168 // 表格列表数据
169 data: [{ jcjg: 1 }], 169 total: 0,
170 data: [{}],
170 }, 171 },
171 // 分页 172 // 分页
172 pageData: { 173 pageData: {
......
...@@ -4,38 +4,53 @@ class data extends filter { ...@@ -4,38 +4,53 @@ class data extends filter {
4 super() 4 super()
5 } 5 }
6 columns () { 6 columns () {
7 return [ 7 return [
8 { 8 {
9 type: 'selection' 9 prop: "areacode",
10 label: "行政区代码",
11 width: 100,
10 }, 12 },
11 { 13 {
12 prop: "pcode", 14 prop: "areaName",
13 label: "行政区代码", 15 label: "行政区名称",
16 width: 100,
14 }, 17 },
15 { 18 {
16 prop: "estatenum", 19 prop: "bizMsgid",
17 label: "不动产单元号", 20 label: "业务报文ID",
18 }, 21 },
19 { 22 {
20 prop: "pcode", 23 prop: "createdate",
21 label: "行政区名称", 24 label: "创建时间",
25 },
26 {
27 prop: "recflowid",
28 label: "业务流水号",
29 },
30 {
31 prop: "estatenum",
32 label: "不动产单元号",
33 width: 240,
22 }, 34 },
23 { 35 {
24 prop: "rectype", 36 prop: "rectype",
25 label: "业务编码", 37 label: "业务编码",
26 }, 38 },
27 { 39 {
40 prop: "rectypeName",
41 label: "业务名称",
42 },
43 {
28 prop: "uploadtime", 44 prop: "uploadtime",
29 label: "上报时间", 45 label: "汇交时间",
30 }, 46 },
31 { 47 {
32 prop: 'sbjg', 48 label: '汇交状态',
33 label: '上报结果',
34 render: (h, scope) => { 49 render: (h, scope) => {
35 return ( 50 return (
36 <div> 51 <div>
37 { 52 {
38 !scope.row.successflag ? '' : scope.row.successflag == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span> 53 scope.row.exchangeState == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span>
39 } 54 }
40 </div> 55 </div>
41 ) 56 )
......
...@@ -6,25 +6,24 @@ ...@@ -6,25 +6,24 @@
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-row class="marginbtm5"> 7 <el-row class="marginbtm5">
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="不动产单元号" prop="estatenum"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-input v-model="form.estatenum" class="width100" placeholder="不动产单元号"></el-input> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
11 <el-option v-for="item in xzqOptions" :key="item.value" :label="item.label" :value="item.value">
12 </el-option>
13 </el-select>
11 </el-form-item> 14 </el-form-item>
12 </el-col> 15 </el-col>
13 <el-col :span="6"> 16 <el-col :span="6">
14 <el-form-item label="开始日期" prop="reportStartTime"> 17 <el-form-item label="汇交时间" prop="reportStartTime">
15 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 18 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
16 clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker> 19 clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
17 </el-form-item>
18 </el-col>
19 <el-col :span="6">
20 <el-form-item label="结束日期" prop="reportEndTime">
21 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 20 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
22 clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker> 21 clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
23 </el-form-item> 22 </el-form-item>
24 </el-col> 23 </el-col>
25 <el-col :span="6"> 24 <el-col :span="6">
26 <el-form-item label="业务名称" prop="ywmc"> 25 <el-form-item label="汇交状态" prop="state">
27 <el-select v-model="form.ywmc" class="width100" clearable placeholder="业务名称"> 26 <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
28 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value"> 27 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
29 </el-option> 28 </el-option>
30 </el-select> 29 </el-select>
...@@ -32,27 +31,10 @@ ...@@ -32,27 +31,10 @@
32 </el-col> 31 </el-col>
33 </el-row> 32 </el-row>
34 <el-row class="mt-10"> 33 <el-row class="mt-10">
35 <el-col :span="6">
36 <el-form-item label="响应结果" prop="state">
37 <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
38 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
39 </el-option>
40 </el-select>
41 </el-form-item>
42 </el-col>
43 <el-col :span="6">
44 <el-form-item label="行政区" prop="pcode">
45 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
46 <el-option v-for="item in xzqOptions" :key="item.value" :label="item.label" :value="item.value">
47 </el-option>
48 </el-select>
49 </el-form-item>
50 </el-col>
51 <!-- 操作按钮 --> 34 <!-- 操作按钮 -->
52 <el-col :span="12" class="btnColRight"> 35 <el-col :span="12" class="btnColRight">
53 <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn> 36 <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn>
54 <btn nativeType="cx" @click="queryClick">查询</btn> 37 <btn nativeType="cx" @click="queryClick">查询</btn>
55 <btn nativeType="sb" @click="handleEscalation">上报</btn>
56 </el-col> 38 </el-col>
57 </el-row> 39 </el-row>
58 </el-form> 40 </el-form>
...@@ -72,11 +54,11 @@ ...@@ -72,11 +54,11 @@
72 <script> 54 <script>
73 // 上报报文查询 55 // 上报报文查询
74 // 引入表头数据 56 // 引入表头数据
75 import data from "./data" 57 import data from "./data";
76 // 引入表格混入方法 58 // 引入表格混入方法
77 import table from "@/utils/mixin/table" 59 import table from "@/utils/mixin/table";
78 // 引入详情弹框 60 // 引入详情弹框
79 import dataDetails from '@/components/dataDetails/edit-dialog' 61 import dataDetails from "@/components/dataDetails/edit-dialog";
80 import { getDataReportPage } from "@/api/sbbwcx.js"; 62 import { getDataReportPage } from "@/api/sbbwcx.js";
81 63
82 export default { 64 export default {
...@@ -84,9 +66,9 @@ export default { ...@@ -84,9 +66,9 @@ export default {
84 mixins: [table], 66 mixins: [table],
85 // 注册组件 67 // 注册组件
86 components: { 68 components: {
87 dataDetails 69 dataDetails,
88 }, 70 },
89 data () { 71 data() {
90 return { 72 return {
91 isShow: false, 73 isShow: false,
92 // 开始结束日期限制 74 // 开始结束日期限制
...@@ -97,7 +79,7 @@ export default { ...@@ -97,7 +79,7 @@ export default {
97 time.getTime() >= new Date(this.form.reportEndTime).getTime() 79 time.getTime() >= new Date(this.form.reportEndTime).getTime()
98 ); 80 );
99 } 81 }
100 } 82 },
101 }, 83 },
102 // 结束日期限制 84 // 结束日期限制
103 pickerOptionsEnd: { 85 pickerOptionsEnd: {
...@@ -107,89 +89,99 @@ export default { ...@@ -107,89 +89,99 @@ export default {
107 time.getTime() <= new Date(this.form.reportStartTime).getTime() 89 time.getTime() <= new Date(this.form.reportStartTime).getTime()
108 ); 90 );
109 } 91 }
110 } 92 },
111 }, 93 },
112 // 头部搜索 94 // 头部搜索
113 form: { 95 form: {
114 estatenum: '', 96 estatenum: "",
115 reportStartTime: '', 97 reportStartTime: "",
116 reportEndTime: '', 98 reportEndTime: "",
117 ywmc: '', 99 ywmc: "",
118 state: '', 100 state: "",
119 pcode: '' 101 pcode: "",
120 }, 102 },
121 // table数据 103 // table数据
122 tableData: { 104 tableData: {
123 // 表头数据 105 // 表头数据
124 columns: data.columns().concat([ 106 columns: [
125 { 107 {
126 label: "操作", 108 label: "序号",
127 width: '80', 109 type: "index",
128 render: (h, scope) => { 110 width: "50",
129 return ( 111 index: this.indexMethod,
130 <div> 112 },
131 <el-button 113 ]
132 size="mini" 114 .concat(data.columns())
133 type="primary" 115 .concat([
134 onClick={() => { this.handleDetail(scope.row) }} 116 {
135 > 117 label: "操作",
136 详情 118 width: "80",
137 </el-button> 119 render: (h, scope) => {
138 </div> 120 return (
139 ) 121 <div>
140 } 122 <el-button
141 } 123 size="mini"
142 ]), 124 type="primary"
125 onClick={() => {
126 this.handleDetail(scope.row);
127 }}
128 >
129 详情
130 </el-button>
131 </div>
132 );
133 },
134 },
135 ]),
143 total: 0, 136 total: 0,
144 data: [{}], 137 data: [{}],
145 }, 138 },
146 // 行政区 139 // 行政区
147 xzqOptions: [ 140 xzqOptions: [
148 { 141 {
149 value: '632321', 142 value: "632321",
150 label: '同仁县' 143 label: "同仁县",
151 }, 144 },
152 { 145 {
153 value: '632322', 146 value: "632322",
154 label: '尖扎县' 147 label: "尖扎县",
155 }, 148 },
156 { 149 {
157 value: '632323', 150 value: "632323",
158 label: '泽库县' 151 label: "泽库县",
159 }, 152 },
160 { 153 {
161 value: '632324', 154 value: "632324",
162 label: '河南县' 155 label: "河南县",
163 } 156 },
164 ] 157 ],
165 } 158 };
166 }, 159 },
167 methods: { 160 methods: {
168 // 重置表单 161 // 重置表单
169 resetForm () { 162 resetForm() {
170 this.$refs.ruleForm.resetFields(); 163 this.$refs.ruleForm.resetFields();
171 }, 164 },
172 // 初始化数据 165 // 初始化数据
173 queryClick () { 166 queryClick() {
174 getDataReportPage({ ...this.form, ...this.pageData }).then(res => { 167 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
175 if (res.code === 200) { 168 if (res.code === 200) {
176 let { total, records } = res.result 169 let { total, records } = res.result;
177 this.tableData.total = total; 170 this.tableData.total = total;
178 this.tableData.data = records ? records : [] 171 this.tableData.data = records ? records : [];
179 } 172 }
180 }) 173 });
181 }, 174 },
182 // 多选 175 // 多选
183 handleSelectionChange (val) { 176 handleSelectionChange(val) {},
184 },
185 // 上报 177 // 上报
186 handleEscalation () { }, 178 handleEscalation() {},
187 // 详情 179 // 详情
188 handleDetail (row) { 180 handleDetail(row) {
189 this.$refs.editLog.isShow(row) 181 this.$refs.editLog.isShow(row);
190 } 182 },
191 } 183 },
192 } 184 };
193 </script> 185 </script>
194 <style scoped lang="scss"> 186 <style scoped lang="scss">
195 // 引入页面公共样式 187 // 引入页面公共样式
......