Skip to content

任超 / js.CadastralSystem

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

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

2 parents b6ea0d93 b40efab6
Inline Side-by-side
Showing 5 changed files with 95 additions and 18 deletions
......@@ -126,3 +126,13 @@ export function cxlzZrzList(data) {
})
}
/**
* 查询权籍_建筑物区分所有权业主共有部分调查表
*/
export function getHCountByZrzbsm(id) {
return request({
url: '/fw/qjZrz/getHCountByZrzbsm',
method: 'get',
params: {id}
})
}
......
......@@ -156,7 +156,7 @@ ol, ul { list-style:none; }
}
.el-dialog__header{
border-bottom: 1px solid #F1F1F1;
background: #3FA2E1;
background: #0091FF;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
color: #fff;
......@@ -308,16 +308,16 @@ ol, ul { list-style:none; }
}
//实预测转换按钮样式
/deep/.el-radio-button__inner {
border: 1px solid #3fa2e1!important;
color: #3fa2e1;
border: 1px solid #00cacd!important;
color: #00cacd;
}
/deep/.el-radio-button__inner:hover {
color: #3fa2e1;
color: #00cacd;
}
/deep/.is-active .el-radio-button__inner {
color: #fff;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #3fa2e1;
border-color: #3fa2e1;
background-color: #00cacd;
border-color: #00cacd;
}
\ No newline at end of file
......
......@@ -64,7 +64,7 @@
<br/>
样例3：11<span>(1层01室)</span>([层号])
<br/>
样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
<br/>
样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
<br/>
......
......@@ -9,21 +9,26 @@ const errorPage = [
{ path: "*", redirect: "/404", hidden: true },
];
const frameOut = [
/*const frameOut = [
{
path: "/",
name: "login",
component: login,
},
];
];*/
const constantRoutes = [
{
path: "/panel",
code: "panel",
path: "/",
component: () => import("@/views/Home"),
redirect: "/panel",
redirect: "/",
children: [
{
path: "/",
name: "首页",
code: "0-1",
component: () => import("@/views/panel/index"),
},
{
path: "/panel",
name: "首页",
code: "0-1",
......@@ -105,4 +110,4 @@ const constantRoutes = [
];
// 在这里面动态引入路由文件 达成权限处理得问题
// 重新组织后导出
export default [...errorPage, ...frameOut, ...constantRoutes];
export default [...errorPage, ...constantRoutes];
......
......@@ -14,7 +14,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<input class="formInput percent80" ref="zrzh" @blur="inputBlurZrzh($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
......@@ -25,7 +25,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" disabled maxlength="28" v-model="form.bdcdyh">
</td>
</tr>
......@@ -285,7 +285,7 @@
<script>
import Qlr from "@components/formMenu/qlr";
import Qlxz from "@components/formMenu/qlxz";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "@api/zrz"
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz"
import {getQjZdjbxxDetailById} from "@api/zd"
import {submit,registerCall} from "@api/common"
import geoUtils from "@components/lineTree/tx/js/geoUtils";
......@@ -315,6 +315,12 @@
lx:"zrz",
bsm:'',
initZrzh:'',
finishZrzh:'',
hcount:0,
booleanUpdateH:false,
form:{
zrzbsm:'', //自然幢标识码
zdbsm:'', //宗地标识码
......@@ -360,6 +366,7 @@
glbsm:'', //关联标识码
sx:'', //顺序
}],
booleanUpdateH:false,
},
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
......@@ -467,6 +474,10 @@
}
},
onSave(){
//保存之前的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.finishZrzh = this.form.zrzh;
this.form.booleanUpdateH =this.booleanUpdateH;
//判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
console.log(this.form,'this.form');
//给校验项赋值
......@@ -614,6 +625,7 @@
})
},
open() {
const self = this;
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -623,6 +635,16 @@
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
});
this.$message({
type: 'success',
......@@ -636,6 +658,7 @@
});
},
generatorCode(){
const self = this;
console.log(this.form,'this.form');
if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
this.open();
......@@ -643,8 +666,18 @@
}
getBdcdyh(this.form.zddm,"zrz")
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
self.form.zrzh=res.result.substring(0,24);
self.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
})
},
......@@ -681,6 +714,8 @@
}else {
this.disabled = true
}
//初始化的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.initZrzh = res.result.zrzh;
this.$store.state.zrzh = res.result.zrzh;
if(this.form.fwjgList.length===0){
this.form.fwjgList.push({
......@@ -734,6 +769,27 @@
e.target.style.boxSizing = 'border-box';
}
},
inputBlurZrzh(e){
if(this.initZrzh != null && this.initZrzh !== ''&& e.target.value !==''&& this.hcount>0){
if(this.initZrzh !== e.target.value){
this.booleanUpdateH =true;
this.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}else {
this.booleanUpdateH =false;
}
}
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
}
},
created(){
//todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
......@@ -753,6 +809,11 @@
}
},
mounted() {
getHCountByZrzbsm(this.$route.query.bsm).then((res)=>{
if(res.code === 200){
this.hcount = res.result;
}
});
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
......@@ -775,6 +836,7 @@
"form.zrzh":function (val) {
if (val != '') {
this.$refs.zrzh.style.border = '';
this.form.bdcdyh = val+"0000";
}
},
"form.fwxzbsm":{
......