Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b9128c2b by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 7f039401 aaeee444
Inline Side-by-side
Showing 4 changed files with 81 additions and 13 deletions
......@@ -249,3 +249,13 @@ export function ZdHb(data) {
})
}
/**
* 多幢合并
*/
export function dzHb(data) {
return request({
url:"/bg/dzSplitMerge/dzHb",
method:'post',
data:data
})
}
......
......@@ -11,13 +11,16 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="zl">类型</td>
<td class="">
多幢:
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="newAddDz"
>+
</el-button>
自然幢:
<el-button
type="primary"
class="changeBtn outAdd addMinus"
......@@ -27,7 +30,7 @@
</td>
</tr>
<tr v-if="dzhbqData.length==0">
<td colspan="8">
<td colspan="9">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -39,6 +42,7 @@
<td class="bdcqzh">{{item.bdcqzh}}</td>
<td class="qlr">{{item.qlr}}</td>
<td class="zl">{{item.zl}}</td>
<td class="zl">{{item.type=='zrz'?'自然幢':'多幢'}}</td>
<td class="cz">
<el-button
type="primary"
......@@ -60,7 +64,8 @@
<li>
<span class="label">行政区:</span>
<span class="value">
<el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
<el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)"
disabled>
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -73,7 +78,8 @@
<li>
<span class="label">地籍区:</span>
<span class="value">
<el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
<el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"
disabled>
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -86,7 +92,7 @@
<li>
<span class="label">地籍子区:</span>
<span class="value">
<el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()">
<el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()" disabled>
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -99,7 +105,7 @@
<li>
<span class="label">所有权类型:</span>
<span class="value">
<el-select v-model="dzhbhData.syqlxbsm">
<el-select v-model="dzhbhData.syqlxbsm" disabled>
<el-option
v-for="i in syq"
:key="i.value"
......@@ -112,7 +118,7 @@
<li>
<span class="label">宗地特征码:</span>
<span class="value">
<el-select v-model="dzhbhData.zdtzmbsm">
<el-select v-model="dzhbhData.zdtzmbsm" disabled>
<el-option
v-for="i in $store.state.zdtzmList"
:key="i.bsm"
......@@ -360,7 +366,7 @@
getDdicByMC
} from "@api/common";
import {dzList, zrzList} from './../../api/search'
import {getQjZdjbxxDetailById} from './../../api/zd'
import {getQjZdjbxxDetailById, dzHb} from './../../api/zd'
export default {
name: "dzHb",
......@@ -448,6 +454,25 @@
}
},
save() {
let data = {
fwlist: this.dzhbqData,
newdzxmmc: this.dzhbhData.xmmc,
zdbsm: this.zdbsm
}
dzHb(data).then(res => {
if (res.success) {
console.log(res)
this.$message.success("多幢合并成功")
this.$router.push({
path: '/dz',
query: {
source: 1,
bsm: res.result
}
})
}
})
},
dzClose() {
this.dzIsVisible = false;
......@@ -494,6 +519,7 @@
this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
.then(_ => {
this.dzList.push(data)
data['type'] = 'dz'
this.addData(data)
return
})
......@@ -502,6 +528,7 @@
});
} else {
this.dzList.push(data);
data['type'] = 'dz'
this.addData(data)
}
},
......@@ -517,14 +544,16 @@
this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
.then(_ => {
this.zrzList.push(data)
data['type'] = 'zrz'
this.addData(data)
return
})
.catch(_ => {
return
});
}else {
} else {
this.zrzList.push(data)
data['type'] = 'zrz';
this.addData(data)
}
},
......
......@@ -8,7 +8,7 @@
<el-row>
<el-col :span="16" class="fl">
<el-radio-group v-model="gyfs">
<el-radio :label="item.bsm" :disabled="qszt!='0'" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio>
<el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
</el-radio-group>
</el-col>
<el-col :span="4" class="fr" v-show="qszt=='0'">
......@@ -245,7 +245,7 @@
</td>
<td colspan="2" class="tdright">电话</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.dh" />
<input type="text" class="formInput" v-model="item.dh" />
</td>
</tr>
</template>
......@@ -325,6 +325,7 @@
// bsm:'',
gyfs: '',
tableData: [],
gyfsList:[],
//表格选中项
multipleSelection: [],
dialogVisible: false,
......@@ -463,6 +464,16 @@
this.formData.fr=row.frList[0];
}
},
inputBlur(e){
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
//删除行数据
delRow() {
if (this.multipleSelection.length > 0) {
......@@ -531,12 +542,21 @@
})
}
},
created(){},
created(){
if(this.tableData.length>1){
this.gyfsList = this.$store.state.gyfsList.length;
for(let i = 0;i<this.gyfsList.length;i++){
let item = this.gyfsList[i];
this.gyfsList.disabled = item.mc === "单独所有" && item.bsm === this.gyfs;
}
}
},
mounted() {
this.getQlrInfo();
if(this.$store.state.gyfsList.length>0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}
},
watch:{
dialogVisible(n){
......@@ -584,7 +604,16 @@
zjzlbsm: "",
}
}
}
},
tableData(){
if(this.tableData.length>1){
this.gyfsList = this.$store.state.gyfsList;
for(let i = 0;i<this.gyfsList.length;i++){
let item = this.gyfsList[i];
this.gyfsList[i].disabled = item.mc === "单独所有";
}
}
},
}
};
</script>
......
......@@ -88,7 +88,7 @@
<tr>
<td colspan="2" class="tdright">建筑物高度(m)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwgd">
<input class="formInput" type="number" :disabled="form.qszt!='0'" v-model="form.jzwgd">
</td>
<td colspan="2" class="tdright">地下深度(m)</td>
<td colspan="4" >
......