ff9e4c33 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents a807b47f 11f3c79f
......@@ -46,11 +46,12 @@
<el-dialog
title="权利人信息"
:visible.sync="dialogVisible"
custom-class="insetDialog"
append-to-body
width="50%"
center
>
<el-form :model="formData">
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2">权利人名称<i class="requisite">*</i></td>
......@@ -232,7 +233,7 @@
</td>
</tr>
<!-- <tr :key="item.dh">-->
<tr :key="'dh'+item.index">
<tr :key="'dh'+index">
<td>证件号码</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.zjh" />
......@@ -283,12 +284,12 @@
</tr>
</table>
</el-form>
<span slot="footer" class="dialog-footer">
<div class="dialog-footer">
<el-button type="primary" @click="addNewQlrInfo"
>确 定</el-button
>
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
</div>
</el-dialog>
</div>
</template>
......@@ -494,8 +495,8 @@
});
} else {
this.formData.dlrList.forEach((item, index) => {
if (index == ind && this.formData.dlr.length > 1) {
this.formData.dlr.splice(ind, 1);
if (index == ind && this.formData.dlrList.length > 1) {
this.formData.dlrList.splice(ind, 1);
}
});
}
......@@ -525,7 +526,7 @@
},
};
</script>
<style lang="less">
<style lang="less">
.temp {
width: 100%;
table {
......@@ -594,79 +595,89 @@
text-align: center;
}
}
.zdjbxxTable {
margin: 10px 0;
background-color: #fff;
font-size: 14px;
width: 100%;
border-bottom: 1px solid #000;
}
.insetDialog{
.qlrForm{
height: 500px;
overflow-y: scroll;
}
.zdjbxxTable {
margin: 10px 0;
background-color: #fff;
font-size: 14px;
width: 100%;
border-bottom: 1px solid #000;
.btnCol {
position: relative;
width: 60px;
.changeBtn {
width: 30px;
height: 30px;
font-size: 25px;
padding: 0px 0px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -32px;
margin-left: -15px;
}
.el-button + .el-button {
margin-left: -15px;
margin-top: 2px;
}
}
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td {
text-align: center;
height: 36px;
padding: 0;
}
/deep/.el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
position: relative;
top: 7px;
}
.percent30 {
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
.el-select {
width: 100%;
}
.btnCol {
position: relative;
width: 60px;
.changeBtn {
width: 30px;
height: 30px;
font-size: 25px;
padding: 0px 0px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -32px;
margin-left: -15px;
}
.el-button + .el-button {
margin-left: -15px;
margin-top: 2px;
}
}
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td {
text-align: center;
height: 36px;
padding: 0;
}
/deep/.el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
position: relative;
top: 7px;
}
.percent30 {
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
.el-select {
width: 100%;
}
}
.dialog-footer{
width: 160px;
margin: 20px auto 0;
}
}
</style>
......
......@@ -375,7 +375,7 @@
<script>
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
export default {
name:'zrz',
components:{
......
......@@ -324,9 +324,9 @@ export default {
// 双击
this.hbsm = this.bsms[this.bsms.length-1];
this.hbjVisible = true;
setTimeout(() => {
this.$refs.hbj.getHInfo(this.hbsm);
}, 0);
this.$nextTick(function () {
this.$refs.hbj.getHInfo(this.hbsm);
})
}else{
//单击 TO DO
......