Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
ec4ff21e by xiaomiao
Options

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

2 parents 5b13f141 3fd36313
Inline Side-by-side
Showing 31 changed files with 249 additions and 204 deletions
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
5 <template> 5 <template>
6 <div class='result'> 6 <div class='result'>
7 <p>响应xml</p> 7 <p>响应xml</p>
8 <el-input type="textarea" :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML"> 8 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
9 </el-input> 9 </el-input>
10 <p>错误信息</p> 10 <p>错误信息</p>
11 <el-input type="textarea" :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO"> 11 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
12 </el-input> 12 </el-input>
13 </div> 13 </div>
14 </template> 14 </template>
...@@ -57,5 +57,4 @@ export default { ...@@ -57,5 +57,4 @@ export default {
57 } 57 }
58 58
59 } 59 }
60
61 </style> 60 </style>
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 <span>不动产单元号：</span> 75 <span>不动产单元号：</span>
76 <p>{{ dataReport.EstateNum }}</p> 76 <p>{{ dataReport.EstateNum }}</p>
77 </el-col> 77 </el-col>
78 <el-col :span="11"> 78 <el-col :span="12">
79 <span>上次不动产权证号/不动产登记证明：</span> 79 <span>上次不动产权证号/不动产登记证明：</span>
80 <p>{{ dataReport.PreCertID }}</p> 80 <p>{{ dataReport.PreCertID }}</p>
81 </el-col> 81 </el-col>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 <div v-if="titleName == 'xyjg'"> 100 <div v-if="titleName == 'xyjg'">
101 <Xyjg :form-data='dataReport'></Xyjg> 101 <Xyjg :form-data='dataReport'></Xyjg>
102 </div> 102 </div>
103 <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" /> 103 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" />
104 </div> 104 </div>
105 </el-dialog> 105 </el-dialog>
106 </template> 106 </template>
...@@ -416,7 +416,6 @@ export default { ...@@ -416,7 +416,6 @@ export default {
416 padding: 3px; 416 padding: 3px;
417 border-radius: 3px; 417 border-radius: 3px;
418 overflow: hidden; 418 overflow: hidden;
419 width: 100px;
420 white-space: nowrap; 419 white-space: nowrap;
421 text-align: left; 420 text-align: left;
422 color: #02D9FD; 421 color: #02D9FD;
...@@ -429,6 +428,7 @@ export default { ...@@ -429,6 +428,7 @@ export default {
429 line-height: 20px; 428 line-height: 20px;
430 color: #c0c4cc; 429 color: #c0c4cc;
431 cursor: not-allowed; 430 cursor: not-allowed;
431 white-space: nowrap;
432 margin-right: 5px; 432 margin-right: 5px;
433 text-align: right; 433 text-align: right;
434 } 434 }
......
1 <template> 1 <template>
2 <el-input type="textarea" :rows="6" placeholder="配置参数" v-model="resultInfo"> 2 <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
3 </el-input> 3 </el-input>
4 </template> 4 </template>
5 <script> 5 <script>
......
...@@ -59,7 +59,7 @@ let mixin = { ...@@ -59,7 +59,7 @@ let mixin = {
59 } 59 }
60 this.$refs.editLog.isShow(row); 60 this.$refs.editLog.isShow(row);
61 }, 61 },
62 // // 重置表单 62 // 重置表单
63 resetForm () { 63 resetForm () {
64 if (!this.form) return 64 if (!this.form) return
65 Object.keys(this.form).forEach((key) => { 65 Object.keys(this.form).forEach((key) => {
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
10 } 10 }
11 11
12 .el-table__row .cell { 12 .el-table__row .cell {
13 color: #CEF8FF !important; 13 color: #8DEAF9 !important;
14 font-weight: 100 !important;
14 } 15 }
15 16
16 .el-table__row { 17 .el-table__row {
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
62 /deep/.el-input__inner { 63 /deep/.el-input__inner {
63 background: #07388B; 64 background: #07388B;
64 border-radius: 2px; 65 border-radius: 2px;
66 color: #CEF8FF;
65 border: 1px solid #6BC1FC; 67 border: 1px solid #6BC1FC;
66 } 68 }
67 } 69 }
......
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
23 this.queryClick() 23 this.queryClick()
24 }, 24 },
25 handleCurrentChange (val) { 25 handleCurrentChange (val) {
26 console.log(val, '222222222');
27 this.pageData.currentPage = val 26 this.pageData.currentPage = val
28 if (this.queryClick) { 27 if (this.queryClick) {
29 this.queryClick() 28 this.queryClick()
...@@ -33,6 +32,16 @@ export default { ...@@ -33,6 +32,16 @@ export default {
33 let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize) 32 let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)
34 let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage 33 let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage
35 this.pageData.currentPage = currentPage < 1 ? 1 : currentPage 34 this.pageData.currentPage = currentPage < 1 ? 1 : currentPage
35 },
36 // 重置表单
37 resetForm () {
38 if (!this.form) return
39 Object.keys(this.form).forEach((key) => {
40 if (key !== 'currentPage') this.form[key] = '';
41 })
42 this.form.currentPage = 1
43 this.tableData.data = []
44 this.queryClick()
36 } 45 }
37 } 46 }
38 } 47 }
......
1 import { Message } from "element-ui"; 1 import { Message } from "element-ui";
2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') { 2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
3
3 if (!treeList || !treeList.length) { 4 if (!treeList || !treeList.length) {
4 return 5 return
5 } 6 }
...@@ -117,11 +118,13 @@ export function timeFormat (date, end) { ...@@ -117,11 +118,13 @@ export function timeFormat (date, end) {
117 } 118 }
118 var y = date.getFullYear(); //年 119 var y = date.getFullYear(); //年
119 var m = date.getMonth() + 1; //月 120 var m = date.getMonth() + 1; //月
121 m < 10 && (m = '0' + m)
120 var d = date.getDate(); //日 122 var d = date.getDate(); //日
123 d < 10 && (d = '0' + d)
121 if (end) { 124 if (end) {
122 return y + "/" + m + "/" + d + ' 23:59:59'; 125 return y + "-" + m + "-" + d + ' 23:59:59';
123 } else { 126 } else {
124 return y + "/" + m + "/" + d + ' 00:00:00'; 127 return y + "-" + m + "-" + d + ' 00:00:00';
125 } 128 }
126 } 129 }
127 export function getFirstDayOfSeason (d) { 130 export function getFirstDayOfSeason (d) {
......
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
34 </el-col> --> 34 </el-col> -->
35 <el-col :span="5"> 35 <el-col :span="5">
36 <el-form-item label="权利人" label-width="80px"> 36 <el-form-item label="权利人" label-width="80px">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="5"> 40 <el-col :span="5">
41 <el-form-item label="不动产单元号"> 41 <el-form-item label="不动产单元号">
42 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 42 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 45
...@@ -47,22 +47,22 @@ ...@@ -47,22 +47,22 @@
47 <el-row class="mt-10"> 47 <el-row class="mt-10">
48 <el-col :span="5"> 48 <el-col :span="5">
49 <el-form-item label="查封机关" label-width="80px"> 49 <el-form-item label="查封机关" label-width="80px">
50 <el-input v-model="form.CFJG" placeholder="查封机关"></el-input> 50 <el-input v-model="form.CFJG" clearable placeholder="查封机关"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="5"> 53 <el-col :span="5">
54 <el-form-item label="查封文号"> 54 <el-form-item label="查封文号">
55 <el-input v-model="form.CFWH" placeholder="查封文号"></el-input> 55 <el-input v-model="form.CFWH" clearable placeholder="查封文号"></el-input>
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 <el-col :span="5"> 58 <el-col :span="5">
59 <el-form-item label="解封机关" label-width="80px"> 59 <el-form-item label="解封机关" label-width="80px">
60 <el-input v-model="form.JFJG" placeholder="解封机关"></el-input> 60 <el-input v-model="form.JFJG" clearable placeholder="解封机关"></el-input>
61 </el-form-item> 61 </el-form-item>
62 </el-col> 62 </el-col>
63 <el-col :span="5"> 63 <el-col :span="5">
64 <el-form-item label="解封文号"> 64 <el-form-item label="解封文号">
65 <el-input v-model="form.JFWH" placeholder="解封文号"></el-input> 65 <el-input v-model="form.JFWH" clearable placeholder="解封文号"></el-input>
66 </el-form-item> 66 </el-form-item>
67 </el-col> 67 </el-col>
68 68
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
9 <el-col :span="5"> 9 <el-col :span="6">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </el-select> 14 </el-select>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="5"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> 19 <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -22,29 +22,24 @@ ...@@ -22,29 +22,24 @@
22 </el-select> 22 </el-select>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <!-- <el-col :span="5"> 25 <el-col :span="6">
26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input>
28 </el-form-item>
29 </el-col> -->
30 <el-col :span="5">
31 <el-form-item label="不动产权证号"> 26 <el-form-item label="不动产权证号">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 27 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 28 </el-form-item>
34 </el-col> 29 </el-col>
35 <el-col :span="5"> 30 <el-col :span="6">
36 <el-form-item label="抵押人" label-width="80px"> 31 <el-form-item label="抵押人" label-width="80px">
37 <el-input v-model="form.dyr" placeholder="抵押人"></el-input> 32 <el-input v-model="form.dyr" clearable placeholder="抵押人"></el-input>
38 </el-form-item> 33 </el-form-item>
39 </el-col> 34 </el-col>
40 </el-row> 35 </el-row>
41 <el-row class="mt-10"> 36 <el-row class="mt-10">
42 <el-col :span="5"> 37 <el-col :span="6">
43 <el-form-item label="不动产单元号"> 38 <el-form-item label="不动产单元号">
44 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 39 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
45 </el-form-item> 40 </el-form-item>
46 </el-col> 41 </el-col>
47 <el-col :span="5"> 42 <el-col :span="6">
48 <el-form-item label="抵押不动产类型"> 43 <el-form-item label="抵押不动产类型">
49 <el-select v-model="form.dybdclx" class="width100" clearable placeholder="抵押不动产类型"> 44 <el-select v-model="form.dybdclx" class="width100" clearable placeholder="抵押不动产类型">
50 <el-option v-for="item in dicData['A27']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 45 <el-option v-for="item in dicData['A27']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -52,7 +47,7 @@ ...@@ -52,7 +47,7 @@
52 </el-select> 47 </el-select>
53 </el-form-item> 48 </el-form-item>
54 </el-col> 49 </el-col>
55 <el-col :span="5"> 50 <el-col :span="6">
56 <el-form-item label="登记类型"> 51 <el-form-item label="登记类型">
57 <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型"> 52 <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型">
58 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 53 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -61,7 +56,7 @@ ...@@ -61,7 +56,7 @@
61 </el-form-item> 56 </el-form-item>
62 </el-col> 57 </el-col>
63 58
64 <el-col :span="9" class="btnColRight"> 59 <el-col :span="6" class="btnColRight">
65 <btn nativeType="cz" @click="resetForm">重置</btn> 60 <btn nativeType="cz" @click="resetForm">重置</btn>
66 <btn nativeType="cx" @click="handleSubmit">查询</btn> 61 <btn nativeType="cx" @click="handleSubmit">查询</btn>
67 </el-col> 62 </el-col>
......
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
26 26
27 <el-col :span="5"> 27 <el-col :span="5">
28 <el-form-item label="坐落"> 28 <el-form-item label="坐落">
29 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 29 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 <el-col :span="5"> 32 <el-col :span="5">
33 <el-form-item label="不动产权证号"> 33 <el-form-item label="不动产权证号">
34 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 34 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
35 </el-form-item> 35 </el-form-item>
36 </el-col> 36 </el-col>
37 37
...@@ -39,24 +39,24 @@ ...@@ -39,24 +39,24 @@
39 <el-row class="mt-10"> 39 <el-row class="mt-10">
40 <el-col :span="5"> 40 <el-col :span="5">
41 <el-form-item label="权利人" label-width="80px"> 41 <el-form-item label="权利人" label-width="80px">
42 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 42 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 <el-col :span="5"> 45 <el-col :span="5">
46 <el-form-item label="不动产单元号"> 46 <el-form-item label="不动产单元号">
47 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 47 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 50
51 <el-col :span="5"> 51 <el-col :span="5">
52 <el-form-item label="供役地不动产单元号"> 52 <el-form-item label="供役地不动产单元号">
53 <el-input v-model="form.GYDBDCDYH" placeholder="供役地不动产单元号"></el-input> 53 <el-input v-model="form.GYDBDCDYH" clearable placeholder="供役地不动产单元号"></el-input>
54 </el-form-item> 54 </el-form-item>
55 </el-col> 55 </el-col>
56 56
57 <el-col :span="5"> 57 <el-col :span="5">
58 <el-form-item label="需役地不动产单元号"> 58 <el-form-item label="需役地不动产单元号">
59 <el-input v-model="form.XYDBDCDYH" placeholder="需役地不动产单元号"></el-input> 59 <el-input v-model="form.XYDBDCDYH" clearable placeholder="需役地不动产单元号"></el-input>
60 </el-form-item> 60 </el-form-item>
61 </el-col> 61 </el-col>
62 62
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-col> 16 </el-col>
17 <el-col :span="6"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> 19 <el-select class="width100" v-model="form.QSZT" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="权利人" label-width="80px"> 31 <el-form-item label="权利人" label-width="80px">
32 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 32 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
45 </el-col> 45 </el-col>
46 <el-col :span="6"> 46 <el-col :span="6">
47 <el-form-item label="不动产单元号" label-width="120px"> 47 <el-form-item label="不动产单元号" label-width="120px">
48 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 48 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
49 </el-form-item> 49 </el-form-item>
50 </el-col> 50 </el-col>
51 <el-col :span="6"> 51 <el-col :span="6">
52 <el-form-item label="不动产权证号" label-width="120px"> 52 <el-form-item label="不动产权证号" label-width="120px">
53 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 53 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
54 </el-form-item> 54 </el-form-item>
55 </el-col> 55 </el-col>
56 <el-col :span="6" class="btnColRight"> 56 <el-col :span="6" class="btnColRight">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="5"> 9 <el-col :span="5">
10 <el-form-item label="业务号"> 10 <el-form-item label="业务号">
11 <el-input v-model="form.YWH" placeholder="业务号"></el-input> 11 <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input>
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="5"> 14 <el-col :span="5">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-col> 22 </el-col>
23 <el-col :span="5"> 23 <el-col :span="5">
24 <el-form-item label="不动产单元号" label-width="105px"> 24 <el-form-item label="不动产单元号" label-width="105px">
25 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 25 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
26 </el-form-item> 26 </el-form-item>
27 </el-col> 27 </el-col>
28 <el-col :span="9" class="btnColRight"> 28 <el-col :span="9" class="btnColRight">
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-col> 16 </el-col>
17 <el-col :span="6"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> 19 <el-select class="width100" v-model="form.QSZT" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="权利人" label-width="80px"> 31 <el-form-item label="权利人" label-width="80px">
32 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 32 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
45 </el-col> 45 </el-col>
46 <el-col :span="6"> 46 <el-col :span="6">
47 <el-form-item label="不动产单元号" label-width="120px"> 47 <el-form-item label="不动产单元号" label-width="120px">
48 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 48 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
49 </el-form-item> 49 </el-form-item>
50 </el-col> 50 </el-col>
51 <el-col :span="6"> 51 <el-col :span="6">
52 <el-form-item label="不动产权证号" label-width="120px"> 52 <el-form-item label="不动产权证号" label-width="120px">
53 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 53 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
54 </el-form-item> 54 </el-form-item>
55 </el-col> 55 </el-col>
56 <el-col :span="6" class="btnColRight"> 56 <el-col :span="6" class="btnColRight">
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="不动产权证号" label-width="105px"> 31 <el-form-item label="不动产权证号" label-width="105px">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6" class="mt-10">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6" class="mt-10">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-col> 47 </el-col>
48 <el-col :span="6" class="mt-10"> 48 <el-col :span="6" class="mt-10">
49 <el-form-item label="建筑名称"> 49 <el-form-item label="建筑名称">
50 <el-input v-model="form.JZWMC" placeholder="建筑名称"></el-input> 50 <el-input v-model="form.JZWMC" clearable placeholder="建筑名称"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6" class="btnColRight mt-10"> 53 <el-col :span="6" class="btnColRight mt-10">
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="不动产权证号" label-width="105px"> 31 <el-form-item label="不动产权证号" label-width="105px">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6" class="mt-10">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6" class="mt-10">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-col> 47 </el-col>
48 <el-col :span="6" class="mt-10"> 48 <el-col :span="6" class="mt-10">
49 <el-form-item label="海岛名称"> 49 <el-form-item label="海岛名称">
50 <el-input v-model="form.HDMC" placeholder="海岛名称"></el-input> 50 <el-input v-model="form.HDMC" clearable placeholder="海岛名称"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6" class="btnColRight mt-10"> 53 <el-col :span="6" class="btnColRight mt-10">
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-col> 16 </el-col>
17 <el-col :span="6"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> 19 <el-select class="width100" v-model="form.QSZT" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="权利人" label-width="80px"> 31 <el-form-item label="权利人" label-width="80px">
32 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 32 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 </el-col> 45 </el-col>
46 <el-col :span="6"> 46 <el-col :span="6">
47 <el-form-item label="不动产权证号" label-width="120px"> 47 <el-form-item label="不动产权证号" label-width="120px">
48 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 48 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
49 </el-form-item> 49 </el-form-item>
50 </el-col> 50 </el-col>
51 <el-col :span="12" class="btnColRight"> 51 <el-col :span="12" class="btnColRight">
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="不动产权证号" label-width="105px"> 31 <el-form-item label="不动产权证号" label-width="105px">
32 <el-input v-model="form.BDCDYH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCDYH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6" class="mt-10">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6" class="mt-10">
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="不动产权证号" label-width="105px"> 31 <el-form-item label="不动产权证号" label-width="105px">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6" class="mt-10">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6" class="mt-10">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-col> 47 </el-col>
48 <el-col :span="6" class="mt-10"> 48 <el-col :span="6" class="mt-10">
49 <el-form-item label="地籍号"> 49 <el-form-item label="地籍号">
50 <el-input v-model="form.xxx" placeholder="地籍号"></el-input> 50 <el-input v-model="form.xxx" clearable placeholder="地籍号"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6" class="btnColRight mt-10"> 53 <el-col :span="6" class="btnColRight mt-10">
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-col> 16 </el-col>
17 <el-col :span="6"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> 19 <el-select class="width100" v-model="form.QSZT" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落"> 26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 27 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="权利人" label-width="80px"> 31 <el-form-item label="权利人" label-width="80px">
32 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 32 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </el-col> 44 </el-col>
45 <el-col :span="6"> 45 <el-col :span="6">
46 <el-form-item label="不动产权证号" label-width="120px"> 46 <el-form-item label="不动产权证号" label-width="120px">
47 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 47 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 <el-col :span="12" class="btnColRight"> 50 <el-col :span="12" class="btnColRight">
......
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 </el-col> --> 24 </el-col> -->
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="不动产权证号"> 26 <el-form-item label="不动产权证号">
27 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 27 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="业务号"> 31 <el-form-item label="业务号">
32 <el-input v-model="form.YWH" placeholder="业务号"></el-input> 32 <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </el-col> 53 </el-col>
54 <el-col :span="6"> 54 <el-col :span="6">
55 <el-form-item label="不动产单元号" label-width="105px"> 55 <el-form-item label="不动产单元号" label-width="105px">
56 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 56 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 <el-col :span="6" class="btnColRight"> 59 <el-col :span="6" class="btnColRight">
......
...@@ -26,24 +26,24 @@ ...@@ -26,24 +26,24 @@
26 26
27 <el-col :span="5"> 27 <el-col :span="5">
28 <el-form-item label="坐落" label-width="60px"> 28 <el-form-item label="坐落" label-width="60px">
29 <el-input v-model="form.ZL" placeholder="坐落"></el-input> 29 <el-input v-model="form.ZL" clearable placeholder="坐落"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 <el-col :span="5"> 32 <el-col :span="5">
33 <el-form-item label="不动产权证号"> 33 <el-form-item label="不动产权证号">
34 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 34 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
35 </el-form-item> 35 </el-form-item>
36 </el-col> 36 </el-col>
37 <el-col :span="4"> 37 <el-col :span="4">
38 <el-form-item label="不动产单元号"> 38 <el-form-item label="不动产单元号">
39 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 39 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
40 </el-form-item> 40 </el-form-item>
41 </el-col> 41 </el-col>
42 </el-row> 42 </el-row>
43 <el-row class="mt-10"> 43 <el-row class="mt-10">
44 <el-col :span="5"> 44 <el-col :span="5">
45 <el-form-item label="权利人" label-width="80px"> 45 <el-form-item label="权利人" label-width="80px">
46 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 46 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="19" class="btnColRight"> 49 <el-col :span="19" class="btnColRight">
......
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
29 </el-col> --> 29 </el-col> -->
30 <el-col :span="6"> 30 <el-col :span="6">
31 <el-form-item label="不动产权证号" label-width="105px"> 31 <el-form-item label="不动产权证号" label-width="105px">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6">
41 <el-form-item label="权利类型" label-width="105px"> 41 <el-form-item label="权利类型" label-width="105px">
42 <el-select v-model="form.QLLX" class="width100" clearable placeholder="权利类型"> 42 <el-select v-model="form.QLLX" class="width100" clearable placeholder="权利类型">
43 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 43 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </el-col> 47 </el-col>
48 <el-col :span="6" class="mt-10"> 48 <el-col :span="6" class="mt-10">
49 <el-form-item label="不动产单元号" label-width="105px"> 49 <el-form-item label="不动产单元号" label-width="105px">
50 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 50 <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6" class="btnColRight mt-10"> 53 <el-col :span="18" class="btnColRight mt-10">
54 <btn nativeType="cz" @click="resetForm">重置</btn> 54 <btn nativeType="cz" @click="resetForm">重置</btn>
55 <btn nativeType="cx" @click="handleSubmit">查询</btn> 55 <btn nativeType="cx" @click="handleSubmit">查询</btn>
56 </el-col> 56 </el-col>
......
...@@ -11,12 +11,13 @@ ...@@ -11,12 +11,13 @@
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="开始日期" prop="startTime"> 12 <el-form-item label="开始日期" prop="startTime">
13 <el-date-picker 13 <el-date-picker
14 type="datetime" 14 type="date"
15 :clearable="false"
15 class="width100" 16 class="width100"
16 placeholder="开始日期" 17 placeholder="开始日期"
17 :picker-options="pickerOptionsStart" 18 :picker-options="pickerOptionsStart"
18 v-model="form.startTime" 19 v-model="form.startTime"
19 value-format="yyyy/MM/dd HH:mm:ss" 20 value-format="yyyy-MM-dd HH:mm:ss"
20 ></el-date-picker> 21 ></el-date-picker>
21 </el-form-item> 22 </el-form-item>
22 </el-col> 23 </el-col>
...@@ -24,16 +25,18 @@ ...@@ -24,16 +25,18 @@
24 <el-form-item label="结束日期" prop="endTime"> 25 <el-form-item label="结束日期" prop="endTime">
25 <el-date-picker 26 <el-date-picker
26 class="width100" 27 class="width100"
27 type="datetime" 28 :clearable="false"
29 type="date"
28 placeholder="结束日期" 30 placeholder="结束日期"
29 :picker-options="pickerOptionsEnd" 31 :picker-options="pickerOptionsEnd"
30 v-model="form.endTime" 32 v-model="form.endTime"
31 value-format="yyyy/MM/dd HH:mm:ss" 33 value-format="yyyy-MM-dd HH:mm:ss"
34 @change="endTimeChange"
32 ></el-date-picker> 35 ></el-date-picker>
33 </el-form-item> 36 </el-form-item>
34 </el-col> 37 </el-col>
35 <!-- 操作按钮 --> 38 <!-- 操作按钮 -->
36 <el-col :span="4" class="btnColRight"> 39 <el-col :span="16" class="btnColRight">
37 <btn nativeType="cz" @click="resetForm">重置</btn> 40 <btn nativeType="cz" @click="resetForm">重置</btn>
38 <btn nativeType="cx" @click="getProcessCounts">查询</btn> 41 <btn nativeType="cx" @click="getProcessCounts">查询</btn>
39 </el-col> 42 </el-col>
...@@ -60,7 +63,7 @@ export default { ...@@ -60,7 +63,7 @@ export default {
60 pickerOptionsStart: { 63 pickerOptionsStart: {
61 disabledDate: (time) => { 64 disabledDate: (time) => {
62 if (this.form.endTime) { 65 if (this.form.endTime) {
63 return time.getTime() >= new Date(this.form.endTime).getTime(); 66 return time.getTime() > new Date(this.form.endTime).getTime();
64 } 67 }
65 }, 68 },
66 }, 69 },
...@@ -68,7 +71,7 @@ export default { ...@@ -68,7 +71,7 @@ export default {
68 pickerOptionsEnd: { 71 pickerOptionsEnd: {
69 disabledDate: (time) => { 72 disabledDate: (time) => {
70 if (this.form.startTime) { 73 if (this.form.startTime) {
71 return time.getTime() <= new Date(this.form.startTime).getTime(); 74 return time.getTime() < new Date(this.form.startTime).getTime();
72 } 75 }
73 }, 76 },
74 }, 77 },
...@@ -88,6 +91,9 @@ export default { ...@@ -88,6 +91,9 @@ export default {
88 ...mapGetters(["dicData"]), 91 ...mapGetters(["dicData"]),
89 }, 92 },
90 methods: { 93 methods: {
94 endTimeChange(val){
95 this.form.endTime = timeFormat(new Date(val),true)
96 },
91 //查询各区县办件数量 97 //查询各区县办件数量
92 async getProcessCounts () { 98 async getProcessCounts () {
93 this.pieChartsData = []; 99 this.pieChartsData = [];
......
...@@ -29,29 +29,32 @@ ...@@ -29,29 +29,32 @@
29 <el-col :span="4"> 29 <el-col :span="4">
30 <el-form-item label="开始日期" prop="startTime"> 30 <el-form-item label="开始日期" prop="startTime">
31 <el-date-picker 31 <el-date-picker
32 type="datetime" 32 type="date"
33 :clearable="false"
33 class="width100" 34 class="width100"
34 placeholder="开始日期" 35 placeholder="开始日期"
35 :picker-options="pickerOptionsStart" 36 :picker-options="pickerOptionsStart"
36 v-model="form.startTime" 37 v-model="form.startTime"
37 value-format="yyyy/MM/dd HH:mm:ss" 38 value-format="yyyy-MM-dd HH:mm:ss"
38 ></el-date-picker> 39 ></el-date-picker>
39 </el-form-item> 40 </el-form-item>
40 </el-col> 41 </el-col>
41 <el-col :span="4"> 42 <el-col :span="4">
42 <el-form-item label="结束日期" prop="endTime"> 43 <el-form-item label="结束日期" prop="endTime">
43 <el-date-picker 44 <el-date-picker
44 type="datetime" 45 type="date"
46 :clearable="false"
45 class="width100" 47 class="width100"
46 placeholder="结束日期" 48 placeholder="结束日期"
47 :picker-options="pickerOptionsEnd" 49 :picker-options="pickerOptionsEnd"
48 v-model="form.endTime" 50 v-model="form.endTime"
49 value-format="yyyy/MM/dd HH:mm:ss" 51 value-format="yyyy-MM-dd HH:mm:ss"
52 @change="endTimeChange"
50 ></el-date-picker> 53 ></el-date-picker>
51 </el-form-item> 54 </el-form-item>
52 </el-col> 55 </el-col>
53 <!-- 操作按钮 --> 56 <!-- 操作按钮 -->
54 <el-col :span="4" class="btnColRight"> 57 <el-col :span="12" class="btnColRight">
55 <btn nativeType="cz" @click="resetForm">重置</btn> 58 <btn nativeType="cz" @click="resetForm">重置</btn>
56 <btn nativeType="cx" @click="getSuucessRate">查询</btn> 59 <btn nativeType="cx" @click="getSuucessRate">查询</btn>
57 </el-col> 60 </el-col>
...@@ -78,7 +81,7 @@ export default { ...@@ -78,7 +81,7 @@ export default {
78 pickerOptionsStart: { 81 pickerOptionsStart: {
79 disabledDate: (time) => { 82 disabledDate: (time) => {
80 if (this.form.endTime) { 83 if (this.form.endTime) {
81 return time.getTime() >= new Date(this.form.endTime).getTime(); 84 return time.getTime() > new Date(this.form.endTime).getTime();
82 } 85 }
83 }, 86 },
84 }, 87 },
...@@ -86,7 +89,7 @@ export default { ...@@ -86,7 +89,7 @@ export default {
86 pickerOptionsEnd: { 89 pickerOptionsEnd: {
87 disabledDate: (time) => { 90 disabledDate: (time) => {
88 if (this.form.startTime) { 91 if (this.form.startTime) {
89 return time.getTime() <= new Date(this.form.startTime).getTime(); 92 return time.getTime() < new Date(this.form.startTime).getTime();
90 } 93 }
91 }, 94 },
92 }, 95 },
...@@ -108,6 +111,9 @@ export default { ...@@ -108,6 +111,9 @@ export default {
108 ...mapGetters(["dicData"]), 111 ...mapGetters(["dicData"]),
109 }, 112 },
110 methods: { 113 methods: {
114 endTimeChange(val){
115 this.form.endTime = timeFormat(new Date(val),true)
116 },
111 async getSuucessRate () { 117 async getSuucessRate () {
112 this.recTypeArr = []; 118 this.recTypeArr = [];
113 this.chartData = []; 119 this.chartData = [];
......
...@@ -30,11 +30,12 @@ ...@@ -30,11 +30,12 @@
30 <el-form-item label="开始日期"> 30 <el-form-item label="开始日期">
31 <el-date-picker 31 <el-date-picker
32 class="width100" 32 class="width100"
33 type="datetime" 33 :clearable="false"
34 type="date"
34 placeholder="开始日期" 35 placeholder="开始日期"
35 :picker-options="pickerOptionsStart" 36 :picker-options="pickerOptionsStart"
36 v-model="form.startTime" 37 v-model="form.startTime"
37 value-format="yyyy/MM/dd HH:mm:ss" 38 value-format="yyyy-MM-dd HH:mm:ss"
38 ></el-date-picker> 39 ></el-date-picker>
39 </el-form-item> 40 </el-form-item>
40 </el-col> 41 </el-col>
...@@ -42,16 +43,18 @@ ...@@ -42,16 +43,18 @@
42 <el-form-item label="结束日期"> 43 <el-form-item label="结束日期">
43 <el-date-picker 44 <el-date-picker
44 class="width100" 45 class="width100"
45 type="datetime" 46 :clearable="false"
47 type="date"
46 placeholder="结束日期" 48 placeholder="结束日期"
47 :picker-options="pickerOptionsEnd" 49 :picker-options="pickerOptionsEnd"
48 v-model="form.endTime" 50 v-model="form.endTime"
49 value-format="yyyy/MM/dd HH:mm:ss" 51 value-format="yyyy-MM-dd HH:mm:ss"
52 @change="endTimeChange"
50 ></el-date-picker> 53 ></el-date-picker>
51 </el-form-item> 54 </el-form-item>
52 </el-col> 55 </el-col>
53 <!-- 操作按钮 --> 56 <!-- 操作按钮 -->
54 <el-col :span="4" class="btnColRight"> 57 <el-col :span="12" class="btnColRight">
55 <btn nativeType="cz" @click="resetForm">重置</btn> 58 <btn nativeType="cz" @click="resetForm">重置</btn>
56 <btn nativeType="cx" @click="getProcessCounts">查询</btn> 59 <btn nativeType="cx" @click="getProcessCounts">查询</btn>
57 </el-col> 60 </el-col>
...@@ -78,7 +81,7 @@ export default { ...@@ -78,7 +81,7 @@ export default {
78 pickerOptionsStart: { 81 pickerOptionsStart: {
79 disabledDate: (time) => { 82 disabledDate: (time) => {
80 if (this.form.endTime) { 83 if (this.form.endTime) {
81 return time.getTime() >= new Date(this.form.endTime).getTime(); 84 return time.getTime() > new Date(this.form.endTime).getTime();
82 } 85 }
83 }, 86 },
84 }, 87 },
...@@ -86,7 +89,7 @@ export default { ...@@ -86,7 +89,7 @@ export default {
86 pickerOptionsEnd: { 89 pickerOptionsEnd: {
87 disabledDate: (time) => { 90 disabledDate: (time) => {
88 if (this.form.startTime) { 91 if (this.form.startTime) {
89 return time.getTime() <= new Date(this.form.startTime).getTime(); 92 return time.getTime() < new Date(this.form.startTime).getTime();
90 } 93 }
91 }, 94 },
92 }, 95 },
...@@ -109,6 +112,9 @@ export default { ...@@ -109,6 +112,9 @@ export default {
109 ...mapGetters(["dicData"]), 112 ...mapGetters(["dicData"]),
110 }, 113 },
111 methods: { 114 methods: {
115 endTimeChange(val){
116 this.form.endTime = timeFormat(new Date(val),true)
117 },
112 async getProcessCounts(){ 118 async getProcessCounts(){
113 this.chartData = []; 119 this.chartData = [];
114 let { result: res } = await efficient.getProcessCounts( 120 let { result: res } = await efficient.getProcessCounts(
......
...@@ -19,25 +19,26 @@ ...@@ -19,25 +19,26 @@
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="接收日期" prop="receiveStartTime"> 20 <el-form-item label="接收日期" prop="receiveStartTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd"></el-date-picker> 22 clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="至" prop="receiveEndTime" label-width="35px"> 26 <el-form-item label="至" prop="receiveEndTime" label-width="35px">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
28 clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd"></el-date-picker> 28 clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd HH:mm:ss"
29 @change="endTimeChange"></el-date-picker>
29 </el-form-item> 30 </el-form-item>
30 </el-col> 31 </el-col>
31 <el-col :span="6"> 32 <el-col :span="6">
32 <el-form-item label="不动产单元号" prop="bdcdyh"> 33 <el-form-item label="不动产单元号" prop="bdcdyh">
33 <el-input v-model="form.bdcdyh" class="width100" placeholder="不动产单元号"></el-input> 34 <el-input v-model.trim="form.bdcdyh" clearable class="width100" placeholder="不动产单元号"></el-input>
34 </el-form-item> 35 </el-form-item>
35 </el-col> 36 </el-col>
36 </el-row> 37 </el-row>
37 <el-row class="mt-10"> 38 <el-row class="mt-10">
38 <el-col :span="6"> 39 <el-col :span="6">
39 <el-form-item label="业务号" prop="ywh"> 40 <el-form-item label="业务号流水号" prop="ywh">
40 <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input> 41 <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务号流水号"></el-input>
41 </el-form-item> 42 </el-form-item>
42 </el-col> 43 </el-col>
43 <el-col :span="3"> 44 <el-col :span="3">
...@@ -107,6 +108,8 @@ import tableMixin from "@/mixins/tableMixin.js"; ...@@ -107,6 +108,8 @@ import tableMixin from "@/mixins/tableMixin.js";
107 import { getReceiveDataReportPage } from "@/api/dataReport.js"; 108 import { getReceiveDataReportPage } from "@/api/dataReport.js";
108 // 引入详情弹框 109 // 引入详情弹框
109 import dataDetails from "@/components/EditDialog"; 110 import dataDetails from "@/components/EditDialog";
111 //引入日期处理方法
112 import { timeFormat } from "@/utils/operation";
110 export default { 113 export default {
111 name: "jsbwcx", 114 name: "jsbwcx",
112 mixins: [tableMixin], 115 mixins: [tableMixin],
...@@ -121,8 +124,8 @@ export default { ...@@ -121,8 +124,8 @@ export default {
121 let endDateVal = this.form.receiveEndTime; 124 let endDateVal = this.form.receiveEndTime;
122 if (endDateVal) { 125 if (endDateVal) {
123 return ( 126 return (
124 time.getTime() > 127 time.getTime() >=
125 new Date(endDateVal).getTime() - 1 * 24 * 60 * 60 * 1000 128 new Date(endDateVal).getTime()
126 ); 129 );
127 } 130 }
128 }, 131 },
...@@ -133,7 +136,7 @@ export default { ...@@ -133,7 +136,7 @@ export default {
133 if (beginDateVal) { 136 if (beginDateVal) {
134 return ( 137 return (
135 time.getTime() < 138 time.getTime() <
136 new Date(beginDateVal).getTime() + 1 * 24 * 60 * 60 * 1000 139 new Date(beginDateVal).getTime()
137 ); 140 );
138 } 141 }
139 }, 142 },
...@@ -176,7 +179,7 @@ export default { ...@@ -176,7 +179,7 @@ export default {
176 type: "index", 179 type: "index",
177 width: "50", 180 width: "50",
178 index: this.indexMethod, 181 index: this.indexMethod,
179 }, 182 }
180 ] 183 ]
181 .concat(data.columns()) 184 .concat(data.columns())
182 .concat([ 185 .concat([
...@@ -213,14 +216,19 @@ export default { ...@@ -213,14 +216,19 @@ export default {
213 }; 216 };
214 }, 217 },
215 methods: { 218 methods: {
219 //截止日期变化
220 endTimeChange (val) {
221 this.form.receiveEndTime = timeFormat(new Date(val), true)
222 },
216 // 初始化数据 223 // 初始化数据
217 queryClick () { 224 queryClick () {
218 getReceiveDataReportPage({ ...this.form, ...this.formData }).then( 225 getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
219 (res) => { 226 (res) => {
220 if (res.code === 200) { 227 if (res.code === 200) {
221 let { total, records } = res.result; 228 let { total, records, current } = res.result;
222 this.tableData.total = total; 229 this.tableData.total = total;
223 this.tableData.data = records ? records : []; 230 this.tableData.data = records ? records : [];
231 this.pageData.current = current
224 } 232 }
225 } 233 }
226 ) 234 )
...@@ -228,11 +236,10 @@ export default { ...@@ -228,11 +236,10 @@ export default {
228 // 重置 236 // 重置
229 resetForm () { 237 resetForm () {
230 this.$refs.ruleForm.resetFields(); 238 this.$refs.ruleForm.resetFields();
231 this.pageData.currentPage = 1 239 this.form.currentPage = 1
232 this.queryClick(); 240 this.queryClick();
233 }, 241 },
234 featchData () { 242 featchData () {
235 this.pageData.currentPage = 1
236 this.queryClick(); 243 this.queryClick();
237 }, 244 },
238 // 结果 245 // 结果
......
...@@ -6,18 +6,6 @@ class data { ...@@ -6,18 +6,6 @@ class data {
6 columns () { 6 columns () {
7 return [ 7 return [
8 { 8 {
9 label: '序号',
10 type: 'index',
11 width: '50',
12 render: (h, scope) => {
13 return (
14 <div>
15 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
16 </div>
17 )
18 }
19 },
20 {
21 prop: "AREANAME", 9 prop: "AREANAME",
22 label: "区域名称", 10 label: "区域名称",
23 }, 11 },
......
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="开始日期" prop="startTime"> 20 <el-form-item label="开始日期" prop="startTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker> 22 clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="结束日期" prop="endTime"> 26 <el-form-item label="结束日期" prop="endTime">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
28 clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker> 28 clearable v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
29 @change="endTimeChange"></el-date-picker>
29 </el-form-item> 30 </el-form-item>
30 </el-col> 31 </el-col>
31 <!-- 操作按钮 --> 32 <!-- 操作按钮 -->
...@@ -39,9 +40,9 @@ ...@@ -39,9 +40,9 @@
39 <!-- 列表区域 --> 40 <!-- 列表区域 -->
40 <div class="from-clues-content"> 41 <div class="from-clues-content">
41 <!-- table组件 --> 42 <!-- table组件 -->
42 <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current" 43 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
43 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 44 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
44 :column="tableData.columns" :data="tableData.data"> 45 :data="tableData.data">
45 </lb-table> 46 </lb-table>
46 </div> 47 </div>
47 </div> 48 </div>
...@@ -51,12 +52,14 @@ ...@@ -51,12 +52,14 @@
51 // 引入列表数据 52 // 引入列表数据
52 import { datas, sendThis } from "./data" 53 import { datas, sendThis } from "./data"
53 // 引入表格混入方法 54 // 引入表格混入方法
54 import table from "@/utils/mixin/table" 55 import tableMixin from "@/mixins/tableMixin.js";
55 import { getRecordLogPage } from "@/api/recordLog.js"; 56 import { getRecordLogPage } from "@/api/recordLog.js";
56 import { mapGetters } from 'vuex' 57 import { mapGetters } from 'vuex'
58 //引入日期处理方法
59 import { timeFormat } from "@/utils/operation";
57 export default { 60 export default {
58 name: "dbrzcx", 61 name: "dbrzcx",
59 mixins: [table], 62 mixins: [tableMixin],
60 computed: { 63 computed: {
61 ...mapGetters(['dicData']) 64 ...mapGetters(['dicData'])
62 }, 65 },
...@@ -66,9 +69,7 @@ export default { ...@@ -66,9 +69,7 @@ export default {
66 pickerOptionsStart: { 69 pickerOptionsStart: {
67 disabledDate: (time) => { 70 disabledDate: (time) => {
68 if (this.form.endTime) { 71 if (this.form.endTime) {
69 return ( 72 return time.getTime() >= new Date(this.form.endTime).getTime()
70 time.getTime() >= new Date(this.form.endTime).getTime()
71 );
72 } 73 }
73 } 74 }
74 }, 75 },
...@@ -76,9 +77,7 @@ export default { ...@@ -76,9 +77,7 @@ export default {
76 pickerOptionsEnd: { 77 pickerOptionsEnd: {
77 disabledDate: (time) => { 78 disabledDate: (time) => {
78 if (this.form.startTime) { 79 if (this.form.startTime) {
79 return ( 80 return time.getTime() < new Date(this.form.startTime).getTime()
80 time.getTime() <= new Date(this.form.startTime).getTime()
81 );
82 } 81 }
83 } 82 }
84 }, 83 },
...@@ -87,11 +86,26 @@ export default { ...@@ -87,11 +86,26 @@ export default {
87 areacode: '', 86 areacode: '',
88 startTime: '', 87 startTime: '',
89 endTime: '', 88 endTime: '',
89 currentPage: 1
90 },
91 // 分页
92 pageData: {
93 total: 0,
94 pageSize: 10,
95 current: 1
90 }, 96 },
91 // table数据 97 // table数据
92 tableData: { 98 tableData: {
93 // 表头 99 // 表头
94 columns: datas.columns(), 100 columns: [
101 {
102 label: "序号",
103 type: "index",
104 width: "50",
105 index: this.indexMethod,
106 }
107 ]
108 .concat(datas.columns()),
95 // 列表 109 // 列表
96 data: [], 110 data: [],
97 total: 0, 111 total: 0,
...@@ -102,19 +116,29 @@ export default { ...@@ -102,19 +116,29 @@ export default {
102 sendThis(this); 116 sendThis(this);
103 }, 117 },
104 methods: { 118 methods: {
105 // 重置表单 119 //截止日期变化
106 resetForm () { 120 endTimeChange (val) {
107 this.$refs.ruleForm.resetFields(); 121 this.form.endTime = timeFormat(new Date(val), true)
108 }, 122 },
109 queryClick () { 123 queryClick () {
110 getRecordLogPage({ ...this.form, ...this.pageData }).then(res => { 124 getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
111 if (res.code === 200) { 125 if (res.code === 200) {
112 let { records, total } = res.result 126 let { records, total, current } = res.result
113 this.tableData.data = records ? records : [] 127 this.tableData.data = records ? records : []
114 this.tableData.total = total ? total : 0 128 this.tableData.total = total ? total : 0
129 this.pageData.current = current
115 } 130 }
116 }) 131 })
117 } 132 },
133 // 重置
134 resetForm () {
135 this.$refs.ruleForm.resetFields();
136 this.form.currentPage = 1
137 this.queryClick();
138 },
139 featchData () {
140 this.queryClick();
141 },
118 } 142 }
119 } 143 }
120 </script> 144 </script>
......
...@@ -10,18 +10,6 @@ class data extends filter { ...@@ -10,18 +10,6 @@ class data extends filter {
10 columns () { 10 columns () {
11 return [ 11 return [
12 { 12 {
13 label: '序号',
14 type: 'index',
15 width: '50',
16 render: (h, scope) => {
17 return (
18 <div>
19 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
20 </div>
21 )
22 }
23 },
24 {
25 label: '汇交状态', 13 label: '汇交状态',
26 width: '110', 14 width: '110',
27 render: (h, scope) => { 15 render: (h, scope) => {
......
...@@ -20,18 +20,18 @@ ...@@ -20,18 +20,18 @@
20 <el-form-item label="汇交时间" prop="exchangeStartTime"> 20 <el-form-item label="汇交时间" prop="exchangeStartTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" clearable 21 <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime" 22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
23 value-format="yyyy-MM-dd"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px"> 27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable 28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" 29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" value-format="yyyy-MM-dd HH:mm:ss"
30 value-format="yyyy-MM-dd"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="6"> 33 <el-col :span="6">
34 <el-form-item label="汇交状态" prop="state"> 34 <el-form-item label="汇交状态" prop="hjjg">
35 <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态"> 35 <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
37 </el-option> 37 </el-option>
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 </el-row> 41 </el-row>
42 <el-row class="mt-10"> 42 <el-row class="mt-10">
43 <el-col :span="6"> 43 <el-col :span="6">
44 <el-form-item label="业务号" prop="ywh"> 44 <el-form-item label="业务号流水号" prop="ywh">
45 <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input> 45 <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务号流水号"></el-input>
46 </el-form-item> 46 </el-form-item>
47 </el-col> 47 </el-col>
48 <el-col :span="6"> 48 <el-col :span="6">
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
71 </div> 71 </div>
72 <!-- 列表 --> 72 <!-- 列表 -->
73 <div class="from-clues-content"> 73 <div class="from-clues-content">
74 <lb-table :page-size="pageData.pageSize" :current-page.sync="pageData.currentPage" :total="tableData.total" 74 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
75 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 75 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
76 :data="tableData.data"> 76 :data="tableData.data">
77 </lb-table> 77 </lb-table>
...@@ -86,14 +86,15 @@ ...@@ -86,14 +86,15 @@
86 // 引入表头数据 86 // 引入表头数据
87 import { datas, sendThis } from "./data"; 87 import { datas, sendThis } from "./data";
88 // 引入表格混入方法 88 // 引入表格混入方法
89 import table from "@/utils/mixin/table"; 89 import tableMixin from "@/mixins/tableMixin.js";
90 // 引入详情弹框 90 // 引入详情弹框
91 import dataDetails from "@/components/EditDialog"; 91 import dataDetails from "@/components/EditDialog";
92 import { getDataReportPage } from "@/api/dataReport.js"; 92 import { getDataReportPage } from "@/api/dataReport.js";
93 93 //引入日期处理方法
94 import { timeFormat } from "@/utils/operation";
94 export default { 95 export default {
95 name: "sbbwcx", 96 name: "sbbwcx",
96 mixins: [table], 97 mixins: [tableMixin],
97 // 注册组件 98 // 注册组件
98 components: { 99 components: {
99 dataDetails, 100 dataDetails,
...@@ -113,7 +114,7 @@ export default { ...@@ -113,7 +114,7 @@ export default {
113 pickerOptionsEnd: { 114 pickerOptionsEnd: {
114 disabledDate: (time) => { 115 disabledDate: (time) => {
115 if (this.form.exchangeStartTime) { 116 if (this.form.exchangeStartTime) {
116 return time.getTime() <= new Date(this.form.exchangeStartTime).getTime(); 117 return time.getTime() < new Date(this.form.exchangeStartTime).getTime();
117 } 118 }
118 }, 119 },
119 }, 120 },
...@@ -122,18 +123,33 @@ export default { ...@@ -122,18 +123,33 @@ export default {
122 qxdm: "", // 行政区 123 qxdm: "", // 行政区
123 exchangeStartTime: "", // 开始日期 124 exchangeStartTime: "", // 开始日期
124 exchangeEndTime: "", // 结束日期 125 exchangeEndTime: "", // 结束日期
126 hjjg: "", //汇交状态
125 bdcdyh: "", // 不动产单元号 127 bdcdyh: "", // 不动产单元号
126 ywh: "", // 业务号 128 ywh: "", // 业务号
127 qllx: "", // 权利类型 129 qllx: "", // 权利类型
128 djlx: "", // 登记类型 130 djlx: "", // 登记类型
129 jcjg: "", // 检查结果 131 jcjg: "", // 检查结果
130 rkjg: "", //入库结果 132 rkjg: "", //入库结果
131 currentPage: 1, 133 currentPage: 1
134 },
135 // 分页
136 pageData: {
137 total: 0,
138 pageSize: 10,
139 current: 1
132 }, 140 },
133 // table数据 141 // table数据
134 tableData: { 142 tableData: {
135 // 表头数据 143 // 表头数据
136 columns: datas.columns().concat([ 144 columns: [
145 {
146 label: "序号",
147 type: "index",
148 width: "50",
149 index: this.indexMethod,
150 }
151 ]
152 .concat(datas.columns().concat([
137 { 153 {
138 label: "操作", 154 label: "操作",
139 width: "80", 155 width: "80",
...@@ -152,10 +168,10 @@ export default { ...@@ -152,10 +168,10 @@ export default {
152 </div> 168 </div>
153 ); 169 );
154 }, 170 },
155 }, 171 }
156 ]), 172 ])),
157 total: 0, 173 total: 0,
158 data: [{}], 174 data: [],
159 }, 175 },
160 title: "", 176 title: "",
161 }; 177 };
...@@ -164,20 +180,24 @@ export default { ...@@ -164,20 +180,24 @@ export default {
164 sendThis(this); 180 sendThis(this);
165 }, 181 },
166 methods: { 182 methods: {
167 // 重置表单 183 //截止日期变化
168 resetForm () { 184 endTimeChange (val) {
169 this.$refs.ruleForm.resetFields(); 185 this.form.exchangeEndTime = timeFormat(new Date(val), true)
170 }, 186 },
171 // 初始化数据 187 // 初始化数据
172 queryClick () { 188 queryClick () {
173 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 189 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
174 if (res.code === 200) { 190 if (res.code === 200) {
175 let { total, records } = res.result; 191 let { total, records, current } = res.result;
176 this.tableData.total = total; 192 this.tableData.total = total;
177 this.tableData.data = records ? records : []; 193 this.tableData.data = records ? records : [];
194 this.pageData.current = current
178 } 195 }
179 }); 196 });
180 }, 197 },
198 featchData () {
199 this.queryClick();
200 },
181 // 多选 201 // 多选
182 handleSelectionChange (val) { }, 202 handleSelectionChange (val) { },
183 // 上报 203 // 上报
...@@ -187,6 +207,13 @@ export default { ...@@ -187,6 +207,13 @@ export default {
187 this.title = row.rectypeName; 207 this.title = row.rectypeName;
188 this.$refs.editLog.isShow(row); 208 this.$refs.editLog.isShow(row);
189 }, 209 },
210 // 重置
211 resetForm () {
212 this.$refs.ruleForm.resetFields();
213 this.form.exchangeEndTime = ""
214 this.form.currentPage = 1
215 this.queryClick();
216 },
190 }, 217 },
191 }; 218 };
192 </script> 219 </script>
......
...@@ -284,24 +284,8 @@ export default { ...@@ -284,24 +284,8 @@ export default {
284 }); 284 });
285 }, 285 },
286 handleMinus (index, row) { 286 handleMinus (index, row) {
287 this.$confirm("此操作将永久删除, 是否继续?", "提示", { 287 removeTreeListItem(this.tableData, row.dictid, 'dictid');
288 confirmButtonText: "确定", 288 this.tableData = judgeSort(this.tableData)
289 cancelButtonText: "取消",
290 type: "warning",
291 })
292 .then(() => {
293 removeTreeListItem(this.tableData, row.dictid);
294 this.$message({
295 type: "success",
296 message: "删除成功!",
297 });
298 })
299 .catch(() => {
300 this.$message({
301 type: "info",
302 message: "已取消删除",
303 });
304 });
305 }, 289 },
306 handleSubmit () { 290 handleSubmit () {
307 editDictNode({ 291 editDictNode({
...@@ -354,11 +338,12 @@ export default { ...@@ -354,11 +338,12 @@ export default {
354 typeid: this.ruleForm.typeid, 338 typeid: this.ruleForm.typeid,
355 }); 339 });
356 this.addIndexes(); 340 this.addIndexes();
341 this.tableData = judgeSort(this.tableData)
357 this.key++; 342 this.key++;
358 }, 343 },
359 // 上移下移 344 // 上移下移
360 moveUpward (index, row) { 345 moveUpward (index, row) {
361 console.log("row上移",row); 346 console.log("row上移", row);
362 347
363 realMove(row.dictid, "UP", this.tableData); 348 realMove(row.dictid, "UP", this.tableData);
364 let id = findParents(this.tableData, row.dictid); 349 let id = findParents(this.tableData, row.dictid);
...@@ -366,7 +351,7 @@ export default { ...@@ -366,7 +351,7 @@ export default {
366 this.key++; 351 this.key++;
367 }, 352 },
368 moveDown (index, row) { 353 moveDown (index, row) {
369 console.log("row下移",row); 354 console.log("row下移", row);
370 realMove(row.dictid, "DOWN", this.tableData); 355 realMove(row.dictid, "DOWN", this.tableData);
371 let id = findParents(this.tableData, row.dictid); 356 let id = findParents(this.tableData, row.dictid);
372 this.keyList = id; 357 this.keyList = id;
......