Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
394d00d3 by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents fe2d18f6 e49c2e10
Inline Side-by-side
Showing 3 changed files with 71 additions and 61 deletions
......@@ -44,7 +44,8 @@ const store = new Vuex.Store({
zjlxList: [],
gyfsList: [],
hbsm:'',
contentWidth:'' //内容区域宽度
contentWidth:'', //内容区域宽度
zrzh:'' //自然幢号
},
modules: {
user,
......
......@@ -25,8 +25,7 @@
<el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
<el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
<el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
<el-button class="radioBtn" label="7" border>批量单元号</el-button>
<el-button class="radioBtn" label="7" border @click="hcxlzVisible=true">户重新落宗</el-button>
<el-button class="radioBtn" label="7" border @click="addBdcdyh">批量单元号</el-button>
</div>
</el-col>
</el-row>
......@@ -136,8 +135,7 @@
<el-button type="primary" @click="saveInfo">保存</el-button>
<el-button type="primary" @click="resetInfo">重置</el-button>
<el-button type="primary" @click="dialogVisible = false"
>取消
</el-button
>取消</el-button
>
</div>
</el-dialog>
......@@ -377,17 +375,17 @@
console.log(this.bsms);
},
//不动产单元号输入框事件
inputFocus() {
inputFocus(){
this.inputWidth = 200
},
inputBlur() {
inputBlur(){
this.inputWidth = 74
},
inputChange() {
if (this.bdcdyh != '') {
console.log('查询' + this.bdcdyh);
inputChange(){
if (this.bdcdyh!='') {
console.log('查询'+this.bdcdyh);
this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
} else {
}else{
this.$message({
message: "请输入内容后查询",
type: "warning",
......@@ -395,40 +393,46 @@
}
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
hbjSaveInfo(){
this.$refs.hbj.onSave(this.bsms[this.bsms.length-1],this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
hbjResetInfo(){
this.$refs.hbj.onReset();
},
//调用楼盘表信息查询接口
getlpbData() {
getlpbData(){
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
//改变楼盘表子组件的key值，重新渲染
this.time = new Date().getTime();
},
//实预测装换
plScYcChange() {
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: "0"
plScYcChange(){
let data={
zrzbsm:this.$store.state.zrzbsm,
scyclx:"0"
}
batchScYcChange(data).then((res) => {
if (res.code === 200) {
batchScYcChange(data).then((res)=>{
if(res.code===200){
this.$message.success("实预测转换成功")
}
})
},
//选中房屋状态
handleChoosedH() {
handleChoosedH(){
//清除选中户
this.$refs.lpbContent.clearChoosedH()
//给hBsmList传值
// this.$refs.lpbContent.choosedList=["0a66bc775dcec26385f9124cc0fd8656", "58cafdbee129bb412527f674ef9267ae", "4bbca678fa56d5ab97b8a62c7cb54898", "ecfd72e9a31a03ba0ab4e46faba2b51b", "049033ea9d244b4b5ea75521b6862239", "013352d8a001a1d5f790296b6843627b", "ed8e3f0e2b2682cf76b4d58b9a74e49c", "37cc53acaf2c3bb92be4b9adf06d94c9", "f5a5e14ce08c26056aca5861f56e5cf6", "11eeaaa5c9f5f1231c69d3b958d05568", "421978023a36d4920dbb86300cc52dc9", "e97f2af2588cc0e41ffb6b203df617c9", "7210987d94350472dca10d4ad71fffc5", "6eb1b50edce538a4c63574e9e28fedce", "43c5fecd7623ceabc37844e8a4722603", "c361ccfcd3da9f7288110c6fa202cb96", "2321512f6f8d0ec9f570c6eec9a892fe", "ea08fb234cd908c89a0d21c085dadb2f", "be71f7f0ec926e1850d3baec8817cdbd", "6f695d6b7ecb97f7ff17f22dbe86b93c", "4ee1604b2629e6797d3096c20229223b"]
},
//批量添加不动产单元号
addBdcdyh(){
// this.pd[0].bsm //自然幢标识码
console.log(this.$store.state.zrzh,'this.$store.state.zrzh');
}
},
computed: {},
computed: {
},
destroyed() {
window.removeEventListener("resize", this.getHeight);
},
......@@ -449,10 +453,10 @@
}
},
},
};
};
</script>
<style scoped lang="less">
.edit {
.edit {
height: 100%;
background-color: #eaedf5;
.tab-header {
......@@ -465,17 +469,17 @@
.searchContent {
box-sizing: border-box;
padding: 0 20px;
/deep/ .el-radio-button__inner {
/deep/.el-radio-button__inner {
border: 1px solid #00CACD;
color: #00CACD;
}
/deep/ .el-radio-button__inner:hover {
/deep/.el-radio-button__inner:hover{
color: #00CACD;
}
/deep/ .is-active .el-radio-button__inner {
/deep/.is-active .el-radio-button__inner{
color: #fff;
}
/deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
/deep/.el-radio-button__orig-radio:checked+.el-radio-button__inner{
background-color: #00CACD;
border-color: #00CACD;
}
......@@ -487,7 +491,7 @@
}
.radioBtn {
margin-left: 20px;
/deep/ .el-radio-button__inner {
/deep/.el-radio-button__inner {
border: 1px solid #dcdfe6;
border-radius: 4px;
box-shadow: 0 0 0 0 #409eff !important;
......@@ -559,7 +563,7 @@
letter-spacing: 2px;
}
}
.selectedZt {
.selectedZt{
background-color: #0091FF;
color: #fff;
}
......@@ -595,12 +599,12 @@
}
}
}
.tab-content::-webkit-scrollbar {
.tab-content::-webkit-scrollbar{
width: 1px;
}
.btnGroup {
margin: 20px auto 0;
width: 230px;
}
}
}
</style>
......
......@@ -10,25 +10,25 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<el-input v-model="form.zddm" disabled></el-input>
<el-input v-show="false" v-model="form.zdbsm"></el-input>
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" align="center" >自然幢号</td>
<td colspan="4" >
<el-input v-model="form.zrzh" style="width: 70%"></el-input>
<input class="formInput" v-model="form.zrzh" style="width: 70%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<td colspan="4" >
<el-input v-model="form.xmmc"></el-input>
<input class="formInput" v-model="form.xmmc">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-input v-show="false" v-model="form.dyhbsm" style="width: 70%"></el-input>
<input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%">
<input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%">
<el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
......@@ -36,18 +36,18 @@
<tr height="30">
<td colspan="2" align="center" >建筑物名称</td>
<td colspan="4" >
<el-input v-model="form.jzwmc"></el-input>
<input class="formInput" v-model="form.jzwmc">
</td>
<td colspan="2" align="center" >建筑物基本用途</td>
<td colspan="4" >
<el-input v-model="form.jzwjbyt"></el-input>
<input class="formInput" v-model="form.jzwjbyt">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋性质</td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -69,62 +69,62 @@
<tr height="30">
<td colspan="2" align="center" >建筑物高度(m)</td>
<td colspan="4" >
<el-input v-model="form.jzwgd"></el-input>
<input class="formInput" v-model="form.jzwgd">
</td>
<td colspan="2" align="center" >总套数</td>
<td colspan="4" >
<el-input v-model="form.zts"></el-input>
<input class="formInput" v-model="form.zts">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >幢用地面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.zydmj"></el-input>
<input class="formInput" v-model="form.zydmj">
</td>
<td colspan="2" align="center" >幢占用地面积（㎡）</td>
<td colspan="4" >
<el-input v-model="form.zzdmj"></el-input>
<input class="formInput" v-model="form.zzdmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >预测建筑面积（㎡）</td>
<td colspan="4" >
<el-input v-model="form.ycjzmj"></el-input>
<input class="formInput" v-model="form.ycjzmj">
</td>
<td colspan="2" align="center" >实测建筑面积（㎡）</td>
<td colspan="4" >
<el-input v-model="form.scjzmj"></el-input>
<input class="formInput" v-model="form.scjzmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下层数</td>
<td colspan="4" >
<el-input v-model="form.dxcs"></el-input>
<input class="formInput" v-model="form.dxcs">
</td>
<td colspan="2" align="center" >地上层数</td>
<td colspan="4" >
<el-input v-model="form.dscs"></el-input>
<input class="formInput" v-model="form.dscs">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >总层数</td>
<td colspan="4" >
<el-input v-model="form.zcs"></el-input>
<input class="formInput" v-model="form.zcs">
</td>
<td colspan="2" align="center" >地下深度（m）</td>
<td colspan="4" >
<el-input v-model="form.dxsd"></el-input>
<input class="formInput" v-model="form.dxsd">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-select class="formInput" v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -135,7 +135,7 @@
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select class="formInput" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -157,7 +157,7 @@
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -172,7 +172,7 @@
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -196,7 +196,7 @@
<span @click="deleteFwjgInfo(index)">删除</span>
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select class="persent78" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
......@@ -221,7 +221,7 @@
<span>坐落</span>
</td>
<td colspan="10" >
<el-input v-model="form.zl"></el-input>
<input class="formInput" v-model="form.zl">
</td>
</tr>
......@@ -230,7 +230,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<el-input v-model="form.bz" type="textarea"></el-input>
<input class="formInput" v-model="form.bz" type="textarea">
</td>
</tr>
<tr height="30">
......@@ -241,7 +241,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<el-input v-model="form.dcyj"></el-input>
<input class="formInput" v-model="form.dcyj">
</td>
</tr>
......@@ -250,7 +250,7 @@
<span>审查员</span>
</td>
<td colspan="2" >
<el-input v-model="form.scy"></el-input>
<input class="formInput" v-model="form.scy">
</td>
<td colspan="2" align="right" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
......@@ -473,6 +473,7 @@
getZrzDetailByBsm(data).then((res)=>{
if(res.code===200){
this.form=res.result;
this.$store.state.zrzh = res.result.zrzh;
if(this.form.fwjgList.length===0){
this.form.fwjgList.push({
fwjgzdbsm:'', //房屋结构字典标识码
......@@ -589,6 +590,10 @@
.zrzTable{
margin-top: 10px;
td{
text-align: center;
height: 36px;
}
}
}
</style>
\ No newline at end of file
......