Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
73b5e427 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 1e6a684d a43dbd9f
Inline Side-by-side
Showing 11 changed files with 321 additions and 106 deletions
......@@ -15,6 +15,8 @@
"axios": "^0.19.0",
"core-js": "^2.6.5",
"e-icon-picker": "^1.0.7",
"el-select-tree": "^1.0.26",
"el-tree-select": "^3.1.10",
"element-ui": "^2.13.2",
"file-saver": "^2.0.2",
"form-making": "^1.2.9",
......
......@@ -19,6 +19,9 @@
.db{
display: block;
}
.dn{
display: none;
}
.fl{
float: left;
}
......@@ -32,15 +35,20 @@ table,td,tr,.el-col,.title{
border-color: #E6E6E6 !important;
}
.formInput {
height: 20px;
width: 96%;
height: 100%;
width: 100%;
line-height: 20px;
outline: none;
border: none;
color: #606764;
overflow: visible;
cursor: text;
text-align: center;
text-align: left;
text-indent: 20px;
padding: 0;
}
.formInput:focus{
border: 1px solid #A0C5F6!important;
}
.psr{
position: relative;
......
......@@ -53,26 +53,34 @@
<el-col :span="4" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>
<el-select class="formSelect percent30" v-model="childItem.pzytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
<el-select-tree
class="formSelect percent30"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.pzytdm"
></el-select-tree>
</li>
<li>
<el-select class="formSelect percent30" v-model="childItem.sjytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
<el-select-tree
class="formSelect percent30"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.sjytdm"
></el-select-tree>
</li>
<li>
<el-date-picker
......@@ -150,15 +158,18 @@
</template>
<div class="title">
<el-select class="formSelect" v-model="items.qlxzdm">
<el-option
v-for="item in $store.state.qlxzList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.qlxzList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="items.qlxzdm"
></el-select-tree>
</div>
</el-row>
</div>
......@@ -175,6 +186,20 @@ export default {
},
data() {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: false,
treeProps: {
value: 'dm',
children: 'children',
label: 'mc'
},
countList: [
{
id: Math.random(),
......
......@@ -53,26 +53,32 @@
<el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>
<el-select class="formSelect percent30" v-model="childItem.pzytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.pzytdm"
></el-select-tree>
</li>
<li>
<el-select class="formSelect percent30" v-model="childItem.sjytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.sjytdm"
></el-select-tree>
</li>
<li>
<el-date-picker
......@@ -139,6 +145,20 @@ export default {
},
data() {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: false,
treeProps: {
value: 'dm',
children: 'children',
label: 'mc'
},
countList: [
{
id: Math.random(),
......
......@@ -135,25 +135,33 @@
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwsjytbsm"
></el-select-tree>
</td>
</tr>
......@@ -228,6 +236,21 @@
},
data() {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: false,
treeProps: {
value: 'bsm',
children: 'children',
label: 'mc'
},
form:{
jzmj:'',
tnjzmj:'',
......
......@@ -110,17 +110,18 @@ export default {
};
},
created() {
},
mounted() {
let self = this;
document.onkeydown = function(e) {
//按下回车提交
let key = window.event.keyCode;
//事件中keycode=13为回车事件
if (key == 13) {
self.onSubmit();
// self.onSubmit();
}
};
},
mounted() {},
methods: {
//重置
reset() {
......
......@@ -5,6 +5,9 @@ import store from '@store'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import '../mock/index.js'
import ElTreeSelect from 'el-select-tree'
//树型选择器
Vue.use(ElTreeSelect);
//引入富文本编辑器
import VueQuillEditor from 'vue-quill-editor'
// 导入富文本编辑器的样式
......
......@@ -224,25 +224,33 @@
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwsjytbsm"
></el-select-tree>
</td>
</tr>
......@@ -389,6 +397,21 @@
},
data () {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: false,
treeProps: {
value: 'bsm',
children: 'children',
label: 'mc'
},
form:{
bsm:'',//户标识码
zrzbsm:'', //自然幢标识码
......@@ -651,7 +674,67 @@
})
},
onReset(){
this.form.bdcdyh='', //不动产单元号
this.form.mjdwbsm='', //面积单位编号
this.form.hxbsm='', //户型标识码
this.form.hxjgbsm='', //户型结构标识码
this.form.dltdmj='', //独立使用土地面积
this.form.fttdmj='', //分摊土地使用面积
this.form.gytdmj='', //共有土地面积
this.form.fwlxbsm='', //房屋类型标识码
this.form.fwxzbsm='', //房屋性质标识码
this.form.sjc='', //实际层
this.form.dqtgs='', //东墙体归属
this.form.nqtgs='', //南墙体归属
this.form.xqtgs='', //西墙体归属
this.form.bqtgs='', //北墙体归属
this.form.fwbh='', //房屋编号
this.form.fjsm='', //附加说明
this.form.fwcbbsm='', //房屋产别标识码
this.form.sjhs='', //实际户数
this.form.shbw='', //室号部位
this.form.fwcqlybsm='', //房屋产权来源标识码
//预测数据
this.form.ycjzmj='', //建筑面积
this.form.yctnjzmj='', //套内建筑面积
this.form.ycftjzmj='', //分摊建筑面积
this.form.ycdxbfjzmj='', //地下部分建筑面积
this.form.ycqtjzmj='', //其它建筑面积
this.form.ycftxs='', //分摊系数
//实测数据
this.form.scjzmj='', //建筑面积
this.form.sctnjzmj='', //套内建筑面积
this.form.scftjzmj='', //分摊建筑面积
this.form.scdxbfjzmj='', //地下部分建筑面积
this.form.scqtjzmj='', //其它建筑面积
this.form.scftxs='', //分摊系数
this.form.scyclx='0', //实预测类型(0:预测，1:实测;),区别户是实测还是预测数据
this.form.scycglbsm='', //实测预测关联标识码
this.form.bz='', //备注
this.form.name='',
this.form.date='',
this.form.fwytList=[{
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
fwsjytbsm:'', //房屋实际用途字典标识码
}],
this.form.fwjgList=[{
fwjgzdbsm:'', //房屋结构字典标识码
glbsm:'', //关联标识码
sx:'', //顺序
}],
this.form.qlxzList=[{
qlxzdm:'', //权利性质代码
glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzzdbsm:'', //权利性质字典表标识码
qlxzmc:'', //权利名称名称
zhqlxzlx:'', //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
addQjTdytRequestList:[{
}], //土地用途新增实体列表
}]
console.log("----------------------------------")
console.log(this.form)
},
generatorCode(){
getBdcdyh(this.form.zrzh,"h")
......
......@@ -346,6 +346,12 @@ export default {
inputChange(){
if (this.bdcdyh!='') {
console.log('查询'+this.bdcdyh);
this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
}else{
this.$message({
message: "请输入内容后查询",
type: "warning",
})
}
},
//户保存
......
......@@ -14,7 +14,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
<!-- </div> -->
......@@ -30,7 +30,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -55,7 +55,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -67,7 +67,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -107,6 +107,7 @@ export default {
loading:true,
hbsmList:[],
time:null, //区分单双击事件的定时器
searchNum:Math.random()
};
},
created() {
......@@ -140,6 +141,11 @@ export default {
}
}))
},
//按照bdcdyh或shbw筛选户
lpbDataMap(sh){
// console.log('查询'+sh);
this.searchNum = sh;
},
//自然幢下元素高度宽度计算
dataChange(){
//计算逻辑幢宽度 20为marginRight值
......@@ -207,17 +213,16 @@ export default {
self.time = setTimeout(() => {
//判断点击的户是否选中
if(e.target.className.indexOf('tdSelect') == -1){
//未选中
//未选中→选中
e.target.className = 'tdSelect'; //加边框
this.hbsmList.push(bsm) // 将户bsm放进hbsmList
}else{
//选中
//选中→未选中
e.target.className = '';
this.deleteArrOption(this.hbsmList,bsm);
}
this.$parent.getHbsm(this.hbsmList,false);
}, 200);
},
//户双击事件
dbclick(bsm){
......@@ -253,6 +258,22 @@ export default {
this.lpbContentWidth = this.$refs.lpbContent.offsetWidth -6;
}, 501);
},
//监听有无通过输入框查询选择到的户,如果有，将其bsm放入hbsmList
searchNum(n){
console.log(this.$refs.hBsm,'this.$refs.hBsm');
this.$nextTick(()=>{
this.$refs.hBsm.forEach(item=>{
console.log(item.dataset,'item');
if(item.dataset.bsm != ''){
console.log(item.dataset.bsm,'item.dataset.bsm');
// 判断hbsmList中是否已经存在
if(this.hbsmList.indexOf(item.dataset.bsm) == -1){
this.hbsmList.push(item.dataset.bsm) // 将户bsm放进hbsmList
}
}
})
})
}
},
};
</script>
......
......@@ -157,25 +157,33 @@
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.tdytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.tdytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
</tr>
......@@ -282,6 +290,21 @@
inject:['reload'],
data () {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: false,
treeProps: {
value: 'bsm',
children: 'children',
label: 'mc'
},
lx:"zrz",
bsm:'',
form:{
......