Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
434393fe by 任超
Options

Merge branch 'master' into dev

2 parents 4753bcda c7fbdbbf
Inline Side-by-side
Showing 7 changed files with 60 additions and 39 deletions
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
17 <span>业务报文ID：</span> 17 <span>业务报文ID：</span>
18 <p>{{ dataReport.BizMsgId }}</p> 18 <p>{{ dataReport.BizMsgId }}</p>
19 </el-col> 19 </el-col>
20 <el-col :span="7"> 20 <el-col :span="6">
21 <span>接入报文ID：</span> 21 <span>接入报文ID：</span>
22 <p>{{ dataReport.ASID }}</p> 22 <p>{{ dataReport.ASID }}</p>
23 </el-col> 23 </el-col>
24 <el-col :span="5"> 24 <el-col :span="6">
25 <span>行政区划编码：</span> 25 <span>行政区划编码：</span>
26 <p>{{ dataReport.AreaCode }}</p> 26 <p>{{ dataReport.AreaCode }}</p>
27 </el-col> 27 </el-col>
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
35 <span>业务编码：</span> 35 <span>业务编码：</span>
36 <p>{{ dataReport.RecType }}</p> 36 <p>{{ dataReport.RecType }}</p>
37 </el-col> 37 </el-col>
38 <el-col :span="7"> 38 <el-col :span="6">
39 <span>权利类型：</span> 39 <span>权利类型：</span>
40 <p>{{ dataReport.RightType }}</p> 40 <p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p>
41 </el-col> 41 </el-col>
42 <el-col :span="5"> 42 <el-col :span="6">
43 <span>登记类型：</span> 43 <span>登记类型：</span>
44 <p>{{ dataReport.RegType }}</p> 44 <p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p>
45 </el-col> 45 </el-col>
46 <el-col :span="7"> 46 <el-col :span="7">
47 <span>不动产权证书数量：</span> 47 <span>不动产权证书数量：</span>
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
53 <span>创建时间：</span> 53 <span>创建时间：</span>
54 <p>{{ dataReport.createDate }}</p> 54 <p>{{ dataReport.createDate }}</p>
55 </el-col> 55 </el-col>
56 <el-col :span="7"> 56 <el-col :span="6">
57 <span>业务流水号：</span> 57 <span>业务流水号：</span>
58 <p>{{ dataReport.RecFlowID }}</p> 58 <p>{{ dataReport.RecFlowID }}</p>
59 </el-col> 59 </el-col>
60 <el-col :span="5"> 60 <el-col :span="6">
61 <span>登记机构：</span> 61 <span>宗地/宗海代码：</span>
62 <p>{{ dataReport.RegOrgID }}</p> 62 <p>{{ dataReport.ParcelID }}</p>
63 </el-col> 63 </el-col>
64 <el-col :span="7"> 64 <el-col :span="7">
65 <span>证明数量：</span> 65 <span>证明数量：</span>
...@@ -67,15 +67,15 @@ ...@@ -67,15 +67,15 @@
67 </el-col> 67 </el-col>
68 </el-row> 68 </el-row>
69 <el-row> 69 <el-row>
70 <el-col :span="5"> 70 <el-col :span="6">
71 <span>宗地/宗海代码：</span>
72 <p>{{ dataReport.ParcelID }}</p>
73 </el-col>
74 <el-col :span="7">
75 <span>不动产单元号：</span> 71 <span>不动产单元号：</span>
76 <p>{{ dataReport.EstateNum }}</p> 72 <p>{{ dataReport.EstateNum }}</p>
77 </el-col> 73 </el-col>
78 <el-col :span="12"> 74 <el-col :span="8">
75 <span>登记机构：</span>
76 <p>{{ dataReport.RegOrgID }}</p>
77 </el-col>
78 <el-col :span="11">
79 <span>上次不动产权证号/不动产登记证明：</span> 79 <span>上次不动产权证号/不动产登记证明：</span>
80 <p>{{ dataReport.PreCertID }}</p> 80 <p>{{ dataReport.PreCertID }}</p>
81 </el-col> 81 </el-col>
...@@ -127,6 +127,7 @@ export default { ...@@ -127,6 +127,7 @@ export default {
127 default: false 127 default: false
128 } 128 }
129 }, 129 },
130
130 computed: { 131 computed: {
131 ...mapGetters(["dicData"]), 132 ...mapGetters(["dicData"]),
132 }, 133 },
...@@ -168,6 +169,18 @@ export default { ...@@ -168,6 +169,18 @@ export default {
168 }; 169 };
169 }, 170 },
170 methods: { 171 methods: {
172 dicStatus (val, code) {
173 let data = this.dicData[code],
174 name = ''
175 if (data) {
176 data.map((item) => {
177 if (item.DCODE == val) {
178 name = item.DNAME
179 }
180 })
181 return name
182 }
183 },
171 handleTitleTab (val) { 184 handleTitleTab (val) {
172 console.log(val); 185 console.log(val);
173 }, 186 },
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 39
40 <br> 40 <br>
41 <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background 41 <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
42 :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange" 42 layout="total, prev, pager, next" @current-change="paginationCurrentChange"
43 :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }"> 43 :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
44 </el-pagination> 44 </el-pagination>
45 </div> 45 </div>
......
...@@ -348,6 +348,11 @@ aside { ...@@ -348,6 +348,11 @@ aside {
348 position: relative; 348 position: relative;
349 } 349 }
350 350
351 .fail {
352 color: #F56C6C;
353 position: relative;
354 }
355
351 356
352 .adopt::before { 357 .adopt::before {
353 position: absolute; 358 position: absolute;
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 <div class="card1 cardCon d-center"> 3 <div class="card1 cardCon d-center">
4 <div class="cardhead">新建国有房屋信息</div> 4 <div class="cardhead">新建国有房屋信息</div>
5 <div class="cardcontent" style="margin-top: .3646rem"> 5 <div class="cardcontent" style="margin-top: .3646rem">
6 <dv-scroll-board v-if="config.data.length>0" :config="config" class="board" /> 6 <dv-scroll-board v-if="config.data.length > 0" :config="config" class="board" />
7 <div v-else="config.data.length==0" class="nodata">暂无数据</div> 7 <div v-else="config.data.length==0" class="nodata">暂无数据</div>
8 </div> 8 </div>
9 </div> 9 </div>
10 <div class="card2 cardCon mt-10"> 10 <div class="card2 cardCon mt-10">
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
31 evenRowBGC: '#154295', 31 evenRowBGC: '#154295',
32 header: ['序号', '用途', '性质', '面积'], 32 header: ['序号', '用途', '性质', '面积'],
33 data: [], 33 data: [],
34 key:0 34 key: 0
35 } 35 }
36 } 36 }
37 }, 37 },
...@@ -40,22 +40,20 @@ export default { ...@@ -40,22 +40,20 @@ export default {
40 this.addhousetotal(); 40 this.addhousetotal();
41 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动 41 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
42 }, 42 },
43 methods: { 43 methods: {
44 async addhousetotal () { 44 async addhousetotal () {
45 try { 45 try {
46 let {result:res}= await work.addhousetotal(); 46 let { result: res } = await work.addhousetotal();
47 console.log("resultssssssssssss",res); 47 res.map((item, index) => {
48 res.map((item,index) => { 48 console.log("item", item);
49 console.log("item",item); 49 console.log("index", index);
50 console.log("index",index);
51 return ( 50 return (
52 this.config.data.push([index,item.fwyt,item.fwxz,item.mj]) 51 this.config.data.push([index, item.fwyt, item.fwxz, item.mj])
53 ) 52 )
54 53
55 }); 54 });
56 console.log("this.config.data",this.config.data);
57 } catch (error) { 55 } catch (error) {
58 console.log("error",error); 56 console.log("error", error);
59 } 57 }
60 } 58 }
61 } 59 }
...@@ -89,12 +87,13 @@ export default { ...@@ -89,12 +87,13 @@ export default {
89 height: 100%; 87 height: 100%;
90 display: -webkit-box; 88 display: -webkit-box;
91 overflow: hidden; 89 overflow: hidden;
92 .nodata{ 90
93 font-size: .1042rem; 91 .nodata {
94 color: #02D9FD; 92 font-size: .1042rem;
95 font-weight: bold; 93 color: #02D9FD;
96 margin:auto; 94 font-weight: bold;
97 margin-top: 120px; 95 margin: auto;
96 margin-top: 120px;
98 } 97 }
99 } 98 }
100 99
...@@ -106,7 +105,7 @@ export default { ...@@ -106,7 +105,7 @@ export default {
106 } 105 }
107 106
108 .card1 { 107 .card1 {
109 height: 33%; 108 height: 33%;
110 background: url("~@/image/xjgyfwxx.png") no-repeat; 109 background: url("~@/image/xjgyfwxx.png") no-repeat;
111 background-size: 100% 100%; 110 background-size: 100% 100%;
112 111
...@@ -131,6 +130,7 @@ export default { ...@@ -131,6 +130,7 @@ export default {
131 background: url("~@/image/djlxzl.png") no-repeat; 130 background: url("~@/image/djlxzl.png") no-repeat;
132 background-size: 100% 100%; 131 background-size: 100% 100%;
133 padding-bottom: 0; 132 padding-bottom: 0;
133
134 .cardhead { 134 .cardhead {
135 top: .0417rem; 135 top: .0417rem;
136 } 136 }
......
...@@ -11,13 +11,13 @@ class data extends filter { ...@@ -11,13 +11,13 @@ class data extends filter {
11 return [ 11 return [
12 { 12 {
13 label: '汇交状态', 13 label: '汇交状态',
14 width: '110', 14 width: '130',
15 render: (h, scope) => { 15 render: (h, scope) => {
16 return ( 16 return (
17 <div> 17 <div>
18 <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span> 18 <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
19 <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span> 19 <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
20 <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span> 20 <span v-show={scope.row.exchangeState == 2} class='fail'>上报响应失败</span>
21 <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span> 21 <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span>
22 </div> 22 </div>
23 ) 23 )
......
...@@ -12,4 +12,7 @@ ...@@ -12,4 +12,7 @@
12 .zhi { 12 .zhi {
13 color: #FFFFFF; 13 color: #FFFFFF;
14 text-align: center; 14 text-align: center;
15 }
16 .hjsj {
17
15 } 18 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </el-col> 18 </el-col>
19 <el-col :span="6"> 19 <el-col :span="6">
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 hjsj" placeholder="开始日期" clearable
22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime" 22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
......