Skip to content

任超 / js.CadastralSystem

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

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

2 parents 4910876d 235b39d4
Inline Side-by-side
Showing 8 changed files with 75 additions and 43 deletions
......@@ -56,17 +56,18 @@
<div class="table-bode">
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<th>序号</th>
<th>操作</th>
<th>宗地代码</th>
<th>不动产单元号</th>
<th>项目名称</th>
<th>不动产权证号</th>
<th>权利人</th>
<th>坐落</th>
<th>自然幢数量</th>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
<tr v-if="Data.length===0">
<td colspan="9">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -79,8 +80,9 @@
<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>
</table>
</div>
......@@ -208,7 +210,9 @@
background-color: #F5F7FA;
}
}
th{
height: 36px;
}
td {
text-align: center;
height: 36px;
......
......@@ -8,11 +8,11 @@
<el-row>
<el-col :span="14" class="fl" style="line-height:32px">
<el-radio-group v-model="gyfs">
<el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in 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="10" class="fr">
<div v-show="qszt=='0'" class="fr" style="margin-right:20px">
<!-- <div v-show="qszt=='0'" class="fr" style="margin-right:20px">
<el-button class="qlrBtn" size="mini" @click="addRow">
<i class="iconfont iconxinzeng"></i> 新增
</el-button>
......@@ -22,15 +22,15 @@
<el-button class="qlrBtn" size="mini" @click="delRow">
<i class="iconfont iconshanchu"></i> 删除
</el-button>
</div>
<div v-show="qszt!='0'" class="fr" style="margin-right:20px">
<el-button class="qlrBtn" size="mini" disabled>
<i class="iconfont iconxinzeng"></i> 新增
</div>-->
<div v-show="+qszt === 0" class="fr" style="margin-right:20px">
<el-button class="qlrBtn" size="mini" :disabled="+qszt!==0 || (tableData.length>0 && gyfs ==='PSHGSBDCQJDC000000000000DC340010') " @click="addRow">
<i class="iconfont iconxinzeng" :disabled="+qszt!==0"></i> 新增
</el-button>
<el-button class="qlrBtn" size="mini" disabled>
<el-button class="qlrBtn" size="mini" :disabled="+qszt!==0" @click="changeRow">
<i class="iconfont iconbianji"></i> 编辑
</el-button>
<el-button class="qlrBtn" size="mini" disabled>
<el-button class="qlrBtn" size="mini" :disabled="+qszt!==0" @click="delRow">
<i class="iconfont iconshanchu"></i> 删除
</el-button>
</div>
......@@ -403,6 +403,9 @@
//新增行数据
addRow() {
console.log(this.gyfs,'共有方式')
this.update=false;
let flag=false;
for(let i = 0;i<this.$store.state.gyfsList.length;i++){
......@@ -641,6 +644,19 @@
}
},
watch:{
tableData:{
handler:function (v) {
console.log(v,'权利人')
this.gyfsList[0].disabled = v.length() > 1;
} ,
deep:true
},
gyfsList:{
handler:function(v){
console.log(v,"共有方式")
},
deep:true
},
dialogVisible(n){
if(n == false){
this.formData = {
......
......@@ -56,14 +56,15 @@
<div class="table-bode">
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<th>序号</th>
<th>操作</th>
<th>宗地代码</th>
<th>不动产单元号</th>
<th>项目名称</th>
<th>不动产权证号</th>
<th>权利人</th>
<th>坐落</th>
<th>自然幢数量</th>
</tr>
<tr v-if="Data.length===0">
<td colspan="8">
......@@ -81,6 +82,7 @@
<td>{{item.bdcqzh}}</td>
<td>{{item.qlrmc}}</td>
<td>{{item.zl}}</td>
<td>{{item.zrzCount}}</td>
</tr>
</table>
</div>
......@@ -167,7 +169,11 @@
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData",val)
if (val.zrzCount < 1) {
this.$message.warning("当前宗地下没有自然幢,请重新选择")
return
}
this.$emit("getData",val);
},
isClose(flag){
......@@ -208,7 +214,9 @@
background-color: #F5F7FA;
}
}
th{
height: 36px;
}
td {
text-align: center;
height: 36px;
......
......@@ -50,7 +50,7 @@
<tr>
<th class="cz">
<i class="iconfont iconicon-test2 " style="color:#66b1ff;font-size:30px" @click="addRow"></i>
</th>
<th class="xh">序号</th>
<th class="xzq">行政区</th>
......
......@@ -157,8 +157,10 @@
watch:{
cbsm: {
handler: function (item) {
console.log(item,"item")
console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType")
if(item!='' && this.$parent.$parent.menuType == 'c'){
this.getLjzInfo(this.item)
this.getCinfo(item)
}
},
immediate: true
......
......@@ -21,7 +21,7 @@
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh" @blur="inputBlur($event)"></el-input>
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
......@@ -1014,7 +1014,7 @@
"form.bdcdyh":function (val) {
if (val != '') {
this.$refs.bdcdyh.style.border = '';
this.$refs.bdcdyh.$el.style.border = '';
}
},
......
......@@ -412,9 +412,11 @@ export default {
Message.warning("已提交的户无法继续操作")
}else{
batchCommit(this.bsms).then(res=>{
if (res.success) {
if(res.code === 200){
Message.success("提交成功");
this.getlpbData();
}else {
this.$message.error(res.message);
}
})
}
......
......@@ -55,33 +55,33 @@
<tr height="30">
<td colspan="2" align="center">预测建筑面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.ycjzmj"></el-input>
<el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
<td colspan="2" align="center">实测建筑面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.scjzmj"></el-input>
<el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center">预测地下面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.ycdxmj"></el-input>
<el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
<td colspan="2" align="center">实测地下面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.scdxmj"></el-input>
<el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center">预测其他面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.ycqtmj"></el-input>
<el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
<td colspan="2" align="center">实测其他面积(㎡)</td>
<td colspan="4">
<el-input v-model="form.scqymj"></el-input>
<el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
......@@ -346,7 +346,7 @@ export default {
}
});
}else{
//逻辑幢更新接口调用 TODO
//逻辑幢更新接口调用 TODO
console.log('保存');
updateQjLjz(this.form).then((res)=>{
if(res.code === 200){
......@@ -414,7 +414,7 @@ export default {
ljzbsm: {
handler: function (item) {
console.log(item,'item');
if(item!='' && this.$parent.$parent.menuType == 'ljz'){
if(item!='' && this.$parent.menuType == 'ljz'){
this.getLjzInfo(this.ljzbsm)
}
},
......