Skip to content

任超 / js.CadastralSystem

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

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

2 parents 34bc06c4 67b4d21a
Inline Side-by-side
Showing 6 changed files with 68 additions and 43 deletions
......@@ -17,7 +17,7 @@
<el-button style="border:0;padding:0 10px" @click="newAddDz">
<i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢
</el-button>
<el-button style="border:0;padding:0 10px" @click="newAddDz">
<el-button style="border:0;padding:0 10px" @click="newAddZrz">
<i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢
</el-button>
</template>
......@@ -245,7 +245,7 @@
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.qlrmc}}</td>
<td>{{item.zl}}</td>
<td>{{item.zrzCount}}</td>
</tr>
......@@ -328,7 +328,7 @@
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="Data.length==0">
<tr v-if="Data.length===0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
......@@ -342,7 +342,7 @@
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.qlrmc}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
......@@ -424,25 +424,26 @@
methods: {
getZdData(id) {
getQjZdjbxxDetailById(id).then(res => {
this.dzhbhData.xzqbsm = res.result.xzqbsm
this.changeXzq(this.dzhbhData.xzqbsm)
this.dzhbhData.djqbsm = res.result.djqbsm
this.changeDjq(this.dzhbhData.djqbsm)
this.dzhbhData.djzqbsm = res.result.djzqbsm
this.dzhbhData.syqlxbsm = res.result.syqlxbsm
this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm
this.dzhbhData.xzqbsm = res.result.xzqbsm;
this.changeXzq(this.dzhbhData.xzqbsm);
this.dzhbhData.djqbsm = res.result.djqbsm;
this.changeDjq(this.dzhbhData.djqbsm);
this.dzhbhData.djzqbsm = res.result.djzqbsm;
this.dzhbhData.syqlxbsm = res.result.syqlxbsm;
this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm;
})
},
newAddDz() {
this.dzIsVisible = true;
this.reset();
this.geDztData(this.queryData)
},
newAddZrz() {
this.zrzIsVisible = true;
this.reset();
this.geZrztData(this.queryData)
},
deleteData(index) {
console.log(JSON.stringify(index)+":row")
let data = this.dzhbqData[index];
// 多幢
if (data.zrzCount) {
......@@ -453,17 +454,17 @@
let zrzIndex = this.zrzList.indexOf(data);
this.zrzList.splice(zrzIndex, 1)
}
this.dzhbqData.splice(index, 1)
this.dzhbqData.splice(index, 1);
if (this.dzhbqData.length === 0) {
this.dzhbhData.xzqbsm = ""
this.dzhbhData.djqbsm = ""
this.dzhbhData.djzqbsm = ""
this.dzhbhData.syqlxbsm = ""
this.dzhbhData.xzqbsm = "";
this.dzhbhData.djqbsm = "";
this.dzhbhData.djzqbsm = "";
this.dzhbhData.syqlxbsm = "";
this.dzhbhData.zdtzmbsm = ""
}
},
save() {
},
dzClose() {
this.dzIsVisible = false;
......@@ -473,22 +474,30 @@
},
currentChange(val) {
this.queryData.pageNo = val;
this.geDztData(this.queryData);
if (this.dzIsVisible) {
this.geDztData(this.queryData);
}else {
this.geZrztData(this.queryData)
}
},
geDztData(data) {
dzList(data).then(res => {
this.Data = res.result.records
this.Data = res.result.records;
this.total = res.result.total;
})
},
geZrztData(data) {
zrzList(data).then(res => {
this.Data = res.result.records
this.Data = res.result.records;
this.total = res.result.total;
})
},
search() {
this.geDztData(this.queryData)
if (this.dzIsVisible) {
this.geDztData(this.queryData);
}else {
this.geZrztData(this.queryData)
}
},
addData(data) {
if (this.dzhbqData.length === 0) {
......@@ -502,7 +511,7 @@
let arr = [];
arr = this.dzhbqData.filter(i => i.bsm === data.bsm);
if (arr.length > 0) {
this.$message.info("当前多幢已选择,请重新选择")
this.$message.info("当前多幢已选择,请重新选择");
return
}
arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm);
......@@ -610,19 +619,23 @@
pageNo: 1,
pageSize: 10
};
this.geDztData(this.queryData)
if (this.dzIsVisible) {
this.geDztData(this.queryData);
}else {
this.geZrztData(this.queryData)
}
},
},
watch: {
zdbsm: function (bsm) {
this.getZdData(bsm)
}
},
}
}
</script>
<style scoped lang="less">
.psn {
position: unset !important;
}
......
......@@ -79,7 +79,7 @@
</td>
<td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.qlrlxbsm" ref="qlrlxbsm" @blur="inputBlur($event)">
<el-select class="formSelect" v-model="formData.qlrlxbsm" ref="qlrlxbsm">
<el-option
v-for="item in $store.state.qlrlxList"
:key="item.bsm"
......@@ -93,7 +93,7 @@
<tr>
<td colspan="4" class="tdright"><i class="requisite">*</i>证件类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.zjzlbsm" ref="zjzlbsm" @blur="inputBlur($event)">
<el-select class="formSelect" v-model="formData.zjzlbsm" ref="zjzlbsm">
<el-option
v-for="item in $store.state.zjzlList"
:key="item.bsm"
......
......@@ -66,7 +66,7 @@
<tr height="30">
<td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwlxbsm">
<el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag" ref="fwlxbsm">
<el-option
v-for="item in $store.state.fwlxList"
:key="item.bsm"
......@@ -77,7 +77,7 @@
</td>
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwxzbsm">
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -127,7 +127,7 @@
<tr height="30">
<td colspan="2" align="center" >产别<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwcbbsm">
<el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag" ref="fwcbbsm">
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -138,7 +138,7 @@
</td>
<td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwcqlybsm">
<el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag" ref="fwcqlybsm">
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -204,11 +204,11 @@
<tr height="30">
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycftxs" type="number" :disabled="form.scyclx==='1'||disableFlag" @blur="inputFtxsBlur($event)" ref="ycftxs"></el-input>
<input class="formInput" v-model="form.ycftxs" type="number" :disabled="form.scyclx==='1'||disableFlag" @blur="inputFtxsBlur($event)" ref="ycftxs" />
</td>
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" >
<el-input v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs"></el-input>
<input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" />
</td>
</tr>
......@@ -327,7 +327,7 @@
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
<el-input v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag"></el-input>
<input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
</td>
</tr>
......@@ -840,7 +840,9 @@
let ftxsflag = true;
this.ftxsrules.forEach(item=>{
if(item.data !==""){
console.log(item.data+":item.data")
console.log(item.data !=="" +":item.data !==")
if(item.data !=="" && item.data !==null){
if(!item.rule.test(+item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
......@@ -1025,6 +1027,15 @@
immediate:false
},
"form.fwxzbsm":{
handler:function (val) {
if (val != '') {
this.$refs.fwxzbsm.$el.style.border = '';
}
},
immediate:false
},
"form.fwcqlybsm":{
handler:function (val) {
if (val != '') {
......
......@@ -666,6 +666,8 @@ export default {
let hasGenerateCount = res.result.hasGenerateCount;
let unGenerateCount = res.result.unGenerateCount;
this.open(hasGenerateCount,unGenerateCount);
}else {
this.$message.warning(res.message)
}
}
);
......
......@@ -43,22 +43,22 @@
>
</td>
<td>
<el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input>
<el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号" maxlength="10"></el-input>
</td>
<td>
<el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,10}/g)) || null"
<el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,9}/g)) || null"
placeholder="请输入建(构)筑物数量"></el-input>
</td>
<td>
<el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,10}(\.?\d{0,3})/g)[0]) || null"
<el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
placeholder="请输入建(构)筑物面积(㎡)"></el-input>
</td>
<td>
<el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,10}(\.?\d{0,3})/g)[0]) || null"
<el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
placeholder="请输入占地面积(㎡)"></el-input>
</td>
<td>
<el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,10}(\.?\d{0,3})/g)[0]) || null"
<el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"
placeholder="请输入分摊土地面积(㎡)"></el-input>
</td>
<td>
......@@ -102,7 +102,6 @@
methods: {
getData(id) {
queryYzgy(id).then(res => {
console.log(res)
if (res.result != null) {
this.Data = res.result
}
......@@ -115,7 +114,6 @@
return
}
saveYzgy(this.Data).then(res => {
console.log(res)
if (res.success) {
Message.success("新增成功")
this.getData(this.$store.state.zrzbsm)
......
......@@ -553,6 +553,7 @@
saveZrzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成！")
this.getZrzDetailByBsm(this.$route.query.bsm)
}else {
this.$message({
message: res.message,
......