7f5fbad9 by weimo934

feat(Home):左侧行政区

1 parent c579ca83
......@@ -52,7 +52,7 @@ export function getDdicByMC(mc) {
/**
* 根据宗地BSM获取左侧目录树
*/
export function getTree(bsm) {
export function getTree(zdbsm) {
return request({
url: 'system/xzq/getMenuTreeByZdbsm',
method: 'get',
......
......@@ -39,7 +39,7 @@
active_color: item.expand,
}"
>
{{ item.label }}
{{ item.mc }}
</div>
</div>
<line-item
......
......@@ -28,7 +28,7 @@
reTree_expand_icon: !item.expand && item.children.length > 0,
}"
></div>
<div class="layer_text nowrap">{{ item.label }}</div>
<div class="layer_text nowrap">{{ item.mc }}</div>
</div>
<lineItem
......
......@@ -44,19 +44,21 @@
</el-dialog>
</el-header>
<el-main>
<router-view />
<router-view/>
</el-main>
</el-container>
</el-container>
</div>
</template>
<script>
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import { setTimeout } from "timers";
export default {
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import {setTimeout} from "timers";
import {getTree} from "../api/common"
export default {
components: {
Navigation,
LineTree,
......@@ -125,28 +127,28 @@ export default {
},
pd: [
{
label: "行政区(1)",
mc: "行政区(1)",
children: [],
},
{
label: "行政区(2)",
mc: "行政区(2)",
children: [
{
label: "地籍区1",
mc: "地籍区1",
children: [],
},
{
label: "地籍区2",
mc: "地籍区2",
children: [
{
label: "国有",
mc: "国有",
children: [
{
label: "宗地代码1933",
mc: "宗地代码1933",
isZD: true,
},
{
label: "自然幢2100",
mc: "自然幢2100",
isZD: false,
},
],
......@@ -164,15 +166,15 @@ export default {
],
},
{
label: "行政区(3)",
mc: "行政区(3)",
children: [],
},
{
label: "行政区(4)",
mc: "行政区(4)",
children: [],
},
{
label: "行政区(5)",
mc: "行政区(5)",
children: [],
},
],
......@@ -185,7 +187,7 @@ export default {
},
},
watch: {
"$route.path": function(newPath) {
"$route.path": function (newPath) {
//监测路由变化,高亮顶部导航
this.headTop.forEach((item, index) => {
item.select = false;
......@@ -194,6 +196,9 @@ export default {
}
});
},
"$store.state.zdbsm": function (bsm) {
this.getRightTree(bsm)
}
},
created() {
if (this.$route.meta) {
......@@ -215,7 +220,7 @@ export default {
icon: "fa fa-address-card-o",
path: "/add",
},
{ name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
{name: "更正", icon: "fa fa-address-card-o", path: "/modify"},
{
name: "变更",
icon: "fa fa-address-card-o",
......@@ -237,6 +242,15 @@ export default {
// }
},
methods: {
getRightTree(bsm) {
getTree(bsm).then(res => {
console.log("=========================================")
console.log(res)
if (res.success) {
this.pd=res.result
}
})
},
sortNavigation(data, selectId) {
let headTop = this.headTop;
data.forEach((item, index) => {
......@@ -292,14 +306,14 @@ export default {
console.log(data);
},
//关闭新建子组件弹框
closeDialog(){
closeDialog() {
this.dialogVisible = false;
}
},
};
};
</script>
<style lang="less" scoped>
.home-box {
.home-box {
width: 100%;
height: 100vh;
.el-container {
......@@ -404,5 +418,5 @@ export default {
// line-height: 160px;
padding: 0;
}
}
}
</style>
......
......@@ -234,7 +234,6 @@ export default {
console.log(data);
insertZrzjbxx(data)
.then((res) => {
console.log(res.result);
if (res.code == "200") {
this.$message({
message: "创建成功!",
......@@ -244,6 +243,9 @@ export default {
this.close();
this.$store.zdbsm=res.result.zdbsm;
this.$store.zrzbsm=res.result.bsm;
debugger
console.log("=================================================")
console.log(this.$store.zdbsm)
this.$store.xmmc=res.result.xmmc;
this.$router.push({
path: '/zrz', query:{data: res.result}
......
......@@ -162,10 +162,6 @@
},
mounted() {
// 该标识码继承过来
let bsm = '401044005bad0557d5e3787239d8e18e';
this.bsm=bsm;
this.getData(this.bsm)
},
methods: {
getData(bsm) {
......@@ -260,7 +256,11 @@
}
},
computed: {},
watch: {},
watch: {
"$store.state.zdbsm": function (bsm) {
this.getData(bsm)
}
},
}
</script>
<style scoped lang="less">
......
......@@ -228,10 +228,7 @@
},
mounted() {
// 该标识码继承过来
let bsm = '044dc12648a1f41374679281da63e93b';
this.bsm=bsm;
this.getData(this.bsm)
},
methods: {
getData(bsm) {
......@@ -325,7 +322,11 @@
}
},
computed: {},
watch: {},
watch: {
"$store.state.zdbsm": function (bsm) {
this.getData(bsm)
}
},
}
</script>
<style scoped lang="less">
......
......@@ -52,6 +52,7 @@
<script>
import {savemjft} from '../../../api/zd'
import {Message} from 'element-ui'
export default {
name: "index",
data() {
......@@ -81,7 +82,7 @@
methods: {
save() {
console.log(this.mjftData);
for (let val of this.mjftData.addQjZdftdzwRequestList){
for (let val of this.mjftData.addQjZdftdzwRequestList) {
if (val.dzwdm == '') {
Message.error("定着物代码不能为空")
return
......@@ -90,9 +91,9 @@
savemjft(this.mjftData).then(res => {
console.log(res)
if (res.success){
if (res.success) {
Message.success("保存成功")
}else {
} else {
Message.error(res.message)
}
}).catch(error => {
......@@ -169,13 +170,21 @@
console.log("create init...")
},
mounted() {
// 暂时随机生成 后续从调查表继承过来
this.mjftData.zdbsm = 'ZDDM' + parseInt(Math.random() * 100)
this.mjftData.zdmj = (Math.random() * 1000).toFixed(3)
let zl = ['西安', '咸阳', '雁塔区', '高新区', '未央区', '莲湖区', '临潼区']
let i = parseInt(Math.random() * 7, 10);
this.mjftData.tdzl = zl[i]
console.log("mounted init...")
},
watch: {
"$store.state.zdbsm": function (bsm) {
alert("面积分摊表 宗地标识码"+bsm)
this.mjftData.zdbsm = bsm
},
"$store.state.zdmj": function (zdmj) {
alert("面积分摊表 宗地面积"+zdmj)
this.mjftData.zdmj = zdmj
},
"$store.state.zdzl": function (tdzl) {
alert("面积分摊表 土地坐落"+tdzl)
this.mjftData.tdzl = tdzl
},
}
}
</script>
......
......@@ -112,14 +112,15 @@
v-model="formData.zddm"
/>
<el-button type="primary" class="createBtn" @click="generatorCode"
>生成</el-button
>生成
</el-button
>
</td>
</tr>
<tr>
<td colspan="2">地籍号</td>
<td colspan="4">
<input type="text" class="formInput" v-model="formData.djh" />
<input type="text" class="formInput" v-model="formData.djh"/>
</td>
<td colspan="2">不动产单元号<i class="requisite">*</i></td>
......@@ -135,7 +136,7 @@
<tr>
<td colspan="2">坐落<i class="requisite">*</i></td>
<td colspan="4">
<input type="text" class="formInput" v-model="formData.zl" />
<input type="text" class="formInput" v-model="formData.zl"/>
</td>
<td colspan="2">土地权属来源证明材料</td>
<td colspan="4" class="psr">
......@@ -161,20 +162,20 @@
</td>
<td colspan="2">价格(元)</td>
<td colspan="4" class="psr">
<input type="text" class="formInput" v-model="formData.jg" />
<input type="text" class="formInput" v-model="formData.jg"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="2">所在图幅号</td>
<td colspan="2">比例尺</td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.blc" />
<input type="text" class="formInput" v-model="formData.blc"/>
</td>
</tr>
<tr>
<td colspan="2">图幅号</td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.tfh" />
<input type="text" class="formInput" v-model="formData.tfh"/>
</td>
</tr>
<tr>
......@@ -189,11 +190,11 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68" />
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">容积说明</td>
<td colspan="4" class="psr">
<input type="text" class="formInput" v-model="formData.rjsm" />
<input type="text" class="formInput" v-model="formData.rjsm"/>
</td>
</tr>
<tr>
......@@ -208,11 +209,11 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68" />
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">建筑密度说明</td>
<td colspan="4" class="psr">
<input type="text" class="formInput" v-model="formData.jzmdsm" />
<input type="text" class="formInput" v-model="formData.jzmdsm"/>
</td>
</tr>
<tr>
......@@ -227,36 +228,36 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68" />
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">建筑限高说明</td>
<td colspan="4" class="psr">
<input type="text" class="formInput" v-model="formData.jzxgsm" />
<input type="text" class="formInput" v-model="formData.jzxgsm"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="4">宗地四至</td>
<td colspan="2">北至<i class="requisite">*</i></td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.bz" />
<input type="text" class="formInput" v-model="formData.bz"/>
</td>
</tr>
<tr>
<td colspan="2">东至<i class="requisite">*</i></td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.dz" />
<input type="text" class="formInput" v-model="formData.dz"/>
</td>
</tr>
<tr>
<td colspan="2">南至<i class="requisite">*</i></td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.nz" />
<input type="text" class="formInput" v-model="formData.nz"/>
</td>
</tr>
<tr>
<td colspan="2">西至<i class="requisite">*</i></td>
<td colspan="8" class="psr">
<input type="text" class="formInput" v-model="formData.xz" />
<input type="text" class="formInput" v-model="formData.xz"/>
</td>
</tr>
<tr>
......@@ -267,33 +268,33 @@
<tr>
<td colspan="2" rowspan="2">批准面积(㎡)</td>
<td colspan="2" rowspan="2">
<input type="text" class="formInput" v-model="formData.pzmj" />
<input type="text" class="formInput" v-model="formData.pzmj"/>
</td>
<td colspan="2" rowspan="2">宗地面积(㎡)</td>
<td colspan="2" rowspan="2">
<input type="text" class="formInput" v-model="formData.zdmj" />
<input type="text" class="formInput" v-model="formData.zdmj"/>
</td>
<td colspan="2">建筑占地宗面积</td>
<td colspan="2">
<input type="text" class="formInput" v-model="formData.jzzdzmj" />
<input type="text" class="formInput" v-model="formData.jzzdzmj"/>
</td>
</tr>
<tr>
<td colspan="2">建筑面积(㎡)</td>
<td colspan="2">
<input type="text" class="formInput" v-model="formData.jzmj" />
<input type="text" class="formInput" v-model="formData.jzmj"/>
</td>
</tr>
<tr>
<td colspan="2">共有/共用权利人情况</td>
<td colspan="10">
<input type="text" class="formInput" v-model="formData.gyqlrqk" />
<input type="text" class="formInput" v-model="formData.gyqlrqk"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="2">说明</td>
<td colspan="10" rowspan="2">
<input type="text" class="formInput" v-model="formData.sm" />
<input type="text" class="formInput" v-model="formData.sm"/>
</td>
</tr>
</table>
......@@ -302,15 +303,16 @@
</template>
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import {
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import {
getDdicByMC,
getListByXzqbsm,
getListByPbsm,
} from "../../../api/common";
import { getBdcdyh, getQjZdjbxxDetailById } from "../../../api/zd";
export default {
} from "../../../api/common";
import {getBdcdyh, getQjZdjbxxDetailById} from "../../../api/zd";
export default {
name: "",
components: {
Qlr,
......@@ -327,9 +329,9 @@ export default {
djqList: this.$store.state.djqList,
djzqList: this.$store.state.djzqList,
compareList: [
{ label: "=", value: "=" },
{ label: "<=", value: "<=" },
{ label: ">=", value: ">=" },
{label: "=", value: "="},
{label: "<=", value: "<="},
{label: ">=", value: ">="},
],
formData: {
xzqbsm: "",
......@@ -370,7 +372,8 @@ export default {
this.getDicData();
this.getZdjbxxData();
},
mounted() {},
mounted() {
},
methods: {
//根据zdbsm查询基本信息
getZdjbxxData() {
......@@ -381,7 +384,8 @@ export default {
this.formData = res.result;
}
})
.catch((error) => {});
.catch((error) => {
});
},
//生成宗地代码
generatorCode() {
......@@ -392,7 +396,8 @@ export default {
this.formData.zddm = res.result.substring(0, 19);
this.formData.bdcdyh = res.result;
})
.catch((error) => {});
.catch((error) => {
});
},
getQlrxxData() {
......@@ -409,25 +414,29 @@ export default {
console.log(res.result);
this.qllxList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
getDdicByMC("宗地(宗海)特征码")
.then((res) => {
console.log(res.result);
this.zdtzmList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
getDdicByMC("权利设定方式")
.then((res) => {
console.log(res.result);
this.qlsdfsList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
getDdicByMC("国民经济行业分类代码")
.then((res) => {
console.log(res.result);
this.gmjjhyflList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
},
//行政区划选择
changeXzq(id) {
......@@ -438,7 +447,8 @@ export default {
this.djqList = res.result;
this.$store.state.djqList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
},
changeDjq(item) {
getListByPbsm(item)
......@@ -447,15 +457,32 @@ export default {
this.djzqList = res.result;
this.$store.state.djzqList = res.result;
})
.catch((error) => {});
.catch((error) => {
});
},
},
computed: {
zl() {
return this.formData.zl
},
zdmj() {
return this.formData.zdmj
}
},
watch: {
zl: function (val) {
alert("宗地坐落")
alert(val)
this.$store.state.zdzl = val
},
zdmj: function (val) {
this.$store.state.zdmj = val
}
},
computed: {},
watch: {},
};
};
</script>
<style lang="less" scoped>
.main {
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
......@@ -478,7 +505,7 @@ export default {
text-align: center;
height: 36px;
}
/deep/.el-input__inner {
/deep/ .el-input__inner {
margin: 0;
height: 36px;
outline: none;
......@@ -516,5 +543,5 @@ export default {
width: 100%;
}
}
}
}
</style>
......