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 @@
<span>业务报文ID：</span>
<p>{{ dataReport.BizMsgId }}</p>
</el-col>
<el-col :span="7">
<el-col :span="6">
<span>接入报文ID：</span>
<p>{{ dataReport.ASID }}</p>
</el-col>
<el-col :span="5">
<el-col :span="6">
<span>行政区划编码：</span>
<p>{{ dataReport.AreaCode }}</p>
</el-col>
......@@ -35,13 +35,13 @@
<span>业务编码：</span>
<p>{{ dataReport.RecType }}</p>
</el-col>
<el-col :span="7">
<el-col :span="6">
<span>权利类型：</span>
<p>{{ dataReport.RightType }}</p>
<p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p>
</el-col>
<el-col :span="5">
<el-col :span="6">
<span>登记类型：</span>
<p>{{ dataReport.RegType }}</p>
<p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p>
</el-col>
<el-col :span="7">
<span>不动产权证书数量：</span>
......@@ -53,13 +53,13 @@
<span>创建时间：</span>
<p>{{ dataReport.createDate }}</p>
</el-col>
<el-col :span="7">
<el-col :span="6">
<span>业务流水号：</span>
<p>{{ dataReport.RecFlowID }}</p>
</el-col>
<el-col :span="5">
<span>登记机构：</span>
<p>{{ dataReport.RegOrgID }}</p>
<el-col :span="6">
<span>宗地/宗海代码：</span>
<p>{{ dataReport.ParcelID }}</p>
</el-col>
<el-col :span="7">
<span>证明数量：</span>
......@@ -67,15 +67,15 @@
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<span>宗地/宗海代码：</span>
<p>{{ dataReport.ParcelID }}</p>
</el-col>
<el-col :span="7">
<el-col :span="6">
<span>不动产单元号：</span>
<p>{{ dataReport.EstateNum }}</p>
</el-col>
<el-col :span="12">
<el-col :span="8">
<span>登记机构：</span>
<p>{{ dataReport.RegOrgID }}</p>
</el-col>
<el-col :span="11">
<span>上次不动产权证号/不动产登记证明：</span>
<p>{{ dataReport.PreCertID }}</p>
</el-col>
......@@ -127,6 +127,7 @@ export default {
default: false
}
},
computed: {
...mapGetters(["dicData"]),
},
......@@ -168,6 +169,18 @@ export default {
};
},
methods: {
dicStatus (val, code) {
let data = this.dicData[code],
name = ''
if (data) {
data.map((item) => {
if (item.DCODE == val) {
name = item.DNAME
}
})
return name
}
},
handleTitleTab (val) {
console.log(val);
},
......
......@@ -39,7 +39,7 @@
<br>
<el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
:page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange"
layout="total, prev, pager, next" @current-change="paginationCurrentChange"
:style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
</el-pagination>
</div>
......
......@@ -348,6 +348,11 @@ aside {
position: relative;
}
.fail {
color: #F56C6C;
position: relative;
}
.adopt::before {
position: absolute;
......
......@@ -3,8 +3,8 @@
<div class="card1 cardCon d-center">
<div class="cardhead">新建国有房屋信息</div>
<div class="cardcontent" style="margin-top: .3646rem">
<dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
<div v-else="config.data.length==0" class="nodata">暂无数据</div>
<dv-scroll-board v-if="config.data.length > 0" :config="config" class="board" />
<div v-else="config.data.length==0" class="nodata">暂无数据</div>
</div>
</div>
<div class="card2 cardCon mt-10">
......@@ -31,7 +31,7 @@ export default {
evenRowBGC: '#154295',
header: ['序号', '用途', '性质', '面积'],
data: [],
key:0
key: 0
}
}
},
......@@ -40,22 +40,20 @@ export default {
this.addhousetotal();
// scroll(tableref.value.$refs.bodyWrapper);//设置滚动
},
methods: {
methods: {
async addhousetotal () {
try {
let {result:res}= await work.addhousetotal();
console.log("resultssssssssssss",res);
res.map((item,index) => {
console.log("item",item);
console.log("index",index);
let { result: res } = await work.addhousetotal();
res.map((item, index) => {
console.log("item", item);
console.log("index", index);
return (
this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
this.config.data.push([index, item.fwyt, item.fwxz, item.mj])
)
});
console.log("this.config.data",this.config.data);
} catch (error) {
console.log("error",error);
console.log("error", error);
}
}
}
......@@ -89,12 +87,13 @@ export default {
height: 100%;
display: -webkit-box;
overflow: hidden;
.nodata{
font-size: .1042rem;
color: #02D9FD;
font-weight: bold;
margin:auto;
margin-top: 120px;
.nodata {
font-size: .1042rem;
color: #02D9FD;
font-weight: bold;
margin: auto;
margin-top: 120px;
}
}
......@@ -106,7 +105,7 @@ export default {
}
.card1 {
height: 33%;
height: 33%;
background: url("~@/image/xjgyfwxx.png") no-repeat;
background-size: 100% 100%;
......@@ -131,6 +130,7 @@ export default {
background: url("~@/image/djlxzl.png") no-repeat;
background-size: 100% 100%;
padding-bottom: 0;
.cardhead {
top: .0417rem;
}
......
......@@ -11,13 +11,13 @@ class data extends filter {
return [
{
label: '汇交状态',
width: '110',
width: '130',
render: (h, scope) => {
return (
<div>
<span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
<span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
<span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span>
<span v-show={scope.row.exchangeState == 2} class='fail'>上报响应失败</span>
<span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span>
</div>
)
......
......@@ -12,4 +12,7 @@
.zhi {
color: #FFFFFF;
text-align: center;
}
.hjsj {
}
\ No newline at end of file
......
......@@ -18,7 +18,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="汇交时间" prop="exchangeStartTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" clearable
<el-date-picker type="date" class="width100 hjsj" placeholder="开始日期" clearable
:picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
......