Merge remote-tracking branch 'origin/master'
# Conflicts: # src/api/zrz.js
Showing
8 changed files
with
225 additions
and
11 deletions
| 1 | import request from '@/plugin/axios' | 1 | import request from '@/plugin/axios' |
| 2 | |||
| 3 | /** | 2 | /** |
| 4 | * 新增自然幢基本信息 | 3 | * 新增自然幢基本信息 |
| 5 | */ | 4 | */ |
| 6 | export function insertZrzjbxx(data) { | 5 | export function insertZrzjbxx (data) { |
| 7 | return request({ | 6 | return request({ |
| 8 | url: 'fw/qjZrz/insert', | 7 | url: 'fw/qjZrz/insert', |
| 9 | method: 'post', | 8 | method: 'post', |
| ... | @@ -14,13 +13,13 @@ export function insertZrzjbxx(data) { | ... | @@ -14,13 +13,13 @@ export function insertZrzjbxx(data) { |
| 14 | /** | 13 | /** |
| 15 | * 生成不动产单元号 | 14 | * 生成不动产单元号 |
| 16 | */ | 15 | */ |
| 17 | export function getBdcdyh(dpdm, dptype) { | 16 | export function getBdcdyh (dpdm,dptype) { |
| 18 | return request({ | 17 | return request({ |
| 19 | url: '/system/generator/getBdcdyh', | 18 | url: '/system/generator/getBdcdyh', |
| 20 | method: 'get', | 19 | method: 'get', |
| 21 | params: { | 20 | params:{ |
| 22 | dpdm: dpdm, | 21 | dpdm:dpdm, |
| 23 | dptype: dptype | 22 | dptype:dptype |
| 24 | } | 23 | } |
| 25 | }) | 24 | }) |
| 26 | } | 25 | } |
| ... | @@ -28,23 +27,23 @@ export function getBdcdyh(dpdm, dptype) { | ... | @@ -28,23 +27,23 @@ export function getBdcdyh(dpdm, dptype) { |
| 28 | /** | 27 | /** |
| 29 | * 保存自然幢信息 | 28 | * 保存自然幢信息 |
| 30 | */ | 29 | */ |
| 31 | export function saveZrzInfo(data) { | 30 | export function saveZrzInfo (data) { |
| 32 | return request({ | 31 | return request({ |
| 33 | url: '/fw/qjZrz/updateQjZrz', | 32 | url: '/fw/qjZrz/updateQjZrz', |
| 34 | method: 'put', | 33 | method: 'put', |
| 35 | data: data | 34 | data:data |
| 36 | }) | 35 | }) |
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | /** | 38 | /** |
| 40 | * 保存自然幢信息 | 39 | * 保存自然幢信息 |
| 41 | */ | 40 | */ |
| 42 | export function getZrzDetailByBsm(data) { | 41 | export function getZrzDetailByBsm (data) { |
| 43 | return request({ | 42 | return request({ |
| 44 | url: '/fw/qjZrz/getQjZrzDetailById', | 43 | url: '/fw/qjZrz/getQjZrzDetailById', |
| 45 | method: 'get', | 44 | method: 'get', |
| 46 | params: { | 45 | params:{ |
| 47 | id: data | 46 | id:data |
| 48 | } | 47 | } |
| 49 | }) | 48 | }) |
| 50 | } | 49 | } |
| ... | @@ -70,4 +69,25 @@ export function queryYzgy(id) { | ... | @@ -70,4 +69,25 @@ export function queryYzgy(id) { |
| 70 | params: {id} | 69 | params: {id} |
| 71 | }) | 70 | }) |
| 72 | } | 71 | } |
| 72 | /** | ||
| 73 | * 新增逻辑幢信息接口 | ||
| 74 | */ | ||
| 75 | export function insertLjzInfo (data) { | ||
| 76 | return request({ | ||
| 77 | url: '/system/qjLjz/insertQjLjz', | ||
| 78 | method: 'post', | ||
| 79 | data:data | ||
| 80 | }) | ||
| 81 | } | ||
| 82 | |||
| 83 | /** | ||
| 84 | * 新增逻辑幢信息接口 | ||
| 85 | */ | ||
| 86 | export function insertCInfo (data) { | ||
| 87 | return request({ | ||
| 88 | url: '/system/qjC/insertQjC', | ||
| 89 | method: 'post', | ||
| 90 | data:data | ||
| 91 | }) | ||
| 92 | } | ||
| 73 | 93 | ... | ... |
| ... | @@ -123,7 +123,9 @@ export default { | ... | @@ -123,7 +123,9 @@ export default { |
| 123 | }, | 123 | }, |
| 124 | //添加定着物 | 124 | //添加定着物 |
| 125 | openCreateDialog(){ | 125 | openCreateDialog(){ |
| 126 | debugger | ||
| 126 | this.dialogVisible = true | 127 | this.dialogVisible = true |
| 128 | this.$store.state.rightClickZdbsm = this.zdData.zdbsm; | ||
| 127 | }, | 129 | }, |
| 128 | //关闭添加定着物弹框 | 130 | //关闭添加定着物弹框 |
| 129 | closeDialog() { | 131 | closeDialog() { | ... | ... |
| ... | @@ -83,6 +83,18 @@ const constantRoutes = [ | ... | @@ -83,6 +83,18 @@ const constantRoutes = [ |
| 83 | code: "1-5", | 83 | code: "1-5", |
| 84 | component: () => import("@/views/systemZD/index"), | 84 | component: () => import("@/views/systemZD/index"), |
| 85 | }, | 85 | }, |
| 86 | { | ||
| 87 | path: "/ljz", | ||
| 88 | name: "逻辑幢", | ||
| 89 | code: "1-6", | ||
| 90 | component: () => import("@/views/systemZRZ/ljz/index"), | ||
| 91 | }, | ||
| 92 | { | ||
| 93 | path: "/c", | ||
| 94 | name: "层", | ||
| 95 | code: "1-7", | ||
| 96 | component: () => import("@/views/systemZRZ/c/index"), | ||
| 97 | }, | ||
| 86 | ], | 98 | ], |
| 87 | }, | 99 | }, |
| 88 | ]; | 100 | ]; | ... | ... |
| ... | @@ -13,6 +13,7 @@ const store = new Vuex.Store({ | ... | @@ -13,6 +13,7 @@ const store = new Vuex.Store({ |
| 13 | xmmc: '', // 项目名称 | 13 | xmmc: '', // 项目名称 |
| 14 | zdmj: '', // 宗地面积 | 14 | zdmj: '', // 宗地面积 |
| 15 | zdzl: '', // 宗地坐落 | 15 | zdzl: '', // 宗地坐落 |
| 16 | rightClickZdbsm:'', //右键菜单传入的zdbsm | ||
| 16 | tdytList:[], | 17 | tdytList:[], |
| 17 | tddjList:[], | 18 | tddjList:[], |
| 18 | qlxzList:[], | 19 | qlxzList:[], |
| ... | @@ -33,6 +34,7 @@ const store = new Vuex.Store({ | ... | @@ -33,6 +34,7 @@ const store = new Vuex.Store({ |
| 33 | cqlyOptions:[], | 34 | cqlyOptions:[], |
| 34 | jgOptions:[], | 35 | jgOptions:[], |
| 35 | gmjjhyflbsmList:[], | 36 | gmjjhyflbsmList:[], |
| 37 | fwytList:[], | ||
| 36 | //创建自然幢时需要用到的临时存储信息 | 38 | //创建自然幢时需要用到的临时存储信息 |
| 37 | zrzbsm: '', | 39 | zrzbsm: '', |
| 38 | zjlxList: [], | 40 | zjlxList: [], | ... | ... |
| ... | @@ -210,6 +210,7 @@ export default { | ... | @@ -210,6 +210,7 @@ export default { |
| 210 | s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList; | 210 | s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList; |
| 211 | s.qlxzList = s.qlxzList.length == 0 ?await this.getDicData("权利性质") : s.qlxzList; | 211 | s.qlxzList = s.qlxzList.length == 0 ?await this.getDicData("权利性质") : s.qlxzList; |
| 212 | s.tdytList = s.tdytList.length == 0 ?await this.getDicData("土地用途") : s.tdytList; | 212 | s.tdytList = s.tdytList.length == 0 ?await this.getDicData("土地用途") : s.tdytList; |
| 213 | s.fwytList = s.fwytList.length == 0 ?await this.getDicData("房屋用途") : s.fwytList; | ||
| 213 | s.tddjList = s.tddjList.length == 0 ?await this.getDicData("土地等级") : s.tddjList; | 214 | s.tddjList = s.tddjList.length == 0 ?await this.getDicData("土地等级") : s.tddjList; |
| 214 | 215 | ||
| 215 | s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions; | 216 | s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions; | ... | ... |
| ... | @@ -250,6 +250,7 @@ export default { | ... | @@ -250,6 +250,7 @@ export default { |
| 250 | //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm | 250 | //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm |
| 251 | this.$refs['ruleForm1'].validate((valid) => { | 251 | this.$refs['ruleForm1'].validate((valid) => { |
| 252 | if (valid) { | 252 | if (valid) { |
| 253 | this.ruleForm1.zdbsm = this.$store.state.rightClickZdbsm != '' ? this.$store.state.rightClickZdbsm : ''; | ||
| 253 | insertZrzjbxx(this.ruleForm1) | 254 | insertZrzjbxx(this.ruleForm1) |
| 254 | .then((res) => { | 255 | .then((res) => { |
| 255 | if (res.code == "200") { | 256 | if (res.code == "200") { | ... | ... |
src/views/systemZRZ/c/index.vue
0 → 100644
| 1 | <template> | ||
| 2 | <div class="h content-form"> | ||
| 3 | <el-form ref="form" :model="form" label-width="160px"> | ||
| 4 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> | ||
| 5 | <tbody> | ||
| 6 | <tr height="30"> | ||
| 7 | <td colspan="12" align="center" ><font size="4">逻辑幢基本信息</font></td> | ||
| 8 | </tr> | ||
| 9 | <tr height="30"> | ||
| 10 | <td colspan="2" align="center" >层号</td> | ||
| 11 | <td colspan="4" > | ||
| 12 | <el-input v-model="form.ch"></el-input> | ||
| 13 | </td> | ||
| 14 | <td colspan="2" align="center" >自然幢号</td> | ||
| 15 | <td colspan="4" > | ||
| 16 | <el-input v-model="form.zrzh"></el-input> | ||
| 17 | </td> | ||
| 18 | </tr> | ||
| 19 | <tr height="30"> | ||
| 20 | <td colspan="2" align="center" >实际层</td> | ||
| 21 | <td colspan="4" > | ||
| 22 | <el-input v-model="form.sjc"></el-input> | ||
| 23 | </td> | ||
| 24 | <td colspan="2" align="center" >名义层</td> | ||
| 25 | <td colspan="4" > | ||
| 26 | <el-input v-model="form.myc"></el-input> | ||
| 27 | </td> | ||
| 28 | </tr> | ||
| 29 | |||
| 30 | |||
| 31 | <tr height="30"> | ||
| 32 | <td colspan="2" align="center" >层建筑面积(㎡)</td> | ||
| 33 | <td colspan="4" > | ||
| 34 | <el-input v-model="form.cjzmj"></el-input> | ||
| 35 | </td> | ||
| 36 | <td colspan="2" align="center" >层套内建筑面积(㎡)</td> | ||
| 37 | <td colspan="4" > | ||
| 38 | <el-input v-model="form.ctnjzmj"></el-input> | ||
| 39 | </td> | ||
| 40 | </tr> | ||
| 41 | |||
| 42 | <tr height="30"> | ||
| 43 | <td colspan="2" align="center" >层阳台面积(㎡)</td> | ||
| 44 | <td colspan="4" > | ||
| 45 | <el-input v-model="form.cytmj"></el-input> | ||
| 46 | </td> | ||
| 47 | <td colspan="2" align="center" >层半墙面积(㎡)</td> | ||
| 48 | <td colspan="4" > | ||
| 49 | <el-input v-model="form.cbqmj"></el-input> | ||
| 50 | </td> | ||
| 51 | </tr> | ||
| 52 | |||
| 53 | <tr height="30"> | ||
| 54 | <td colspan="2" align="center" >层共有建筑面积(㎡)</td> | ||
| 55 | <td colspan="4" > | ||
| 56 | <el-input v-model="form.cgyjzmj"></el-input> | ||
| 57 | </td> | ||
| 58 | <td colspan="2" align="center" >层分摊建筑面积(㎡)</td> | ||
| 59 | <td colspan="4" > | ||
| 60 | <el-input v-model="form.cftjzmj"></el-input> | ||
| 61 | </td> | ||
| 62 | </tr> | ||
| 63 | |||
| 64 | <tr height="30"> | ||
| 65 | <td colspan="2" align="center" >层高</td> | ||
| 66 | <td colspan="4" > | ||
| 67 | <el-input v-model="form.cg"></el-input> | ||
| 68 | </td> | ||
| 69 | <td colspan="2" align="center" >水平投影面积</td> | ||
| 70 | <td colspan="4" > | ||
| 71 | <el-input v-model="form.sptymj"></el-input> | ||
| 72 | </td> | ||
| 73 | </tr> | ||
| 74 | <tr height="30"> | ||
| 75 | </tr> | ||
| 76 | |||
| 77 | </tbody> | ||
| 78 | </table> | ||
| 79 | </el-form> | ||
| 80 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> | ||
| 81 | <el-button type="success" @click="onSave">保存</el-button> | ||
| 82 | <el-button type="primary" @click="onSubmit">提交</el-button> | ||
| 83 | </div> | ||
| 84 | </div> | ||
| 85 | |||
| 86 | </template> | ||
| 87 | |||
| 88 | <script> | ||
| 89 | import {insertCInfo} from "../../../api/zrz"; | ||
| 90 | export default { | ||
| 91 | name:'c', | ||
| 92 | components:{}, | ||
| 93 | data () { | ||
| 94 | return { | ||
| 95 | form:{ | ||
| 96 | zrzbsm:'', | ||
| 97 | ch:'', //层号 | ||
| 98 | zrzh:'', //自然幢号 | ||
| 99 | sjc:'', //实际层 | ||
| 100 | myc:'', //名义层 | ||
| 101 | cjzmj:'', //层建筑面积 | ||
| 102 | ctnjzmj:'', //层套内建筑面积 | ||
| 103 | cytmj:'', //层阳台面积 | ||
| 104 | cbqmj:'', //层半墙面积 | ||
| 105 | cgyjzmj:'', //层共有建筑面积 | ||
| 106 | cftjzmj:'', //层分摊建筑面积 | ||
| 107 | cg:'', //层高 | ||
| 108 | sptymj:'', //水平投影面积 | ||
| 109 | }, | ||
| 110 | value: '', | ||
| 111 | } | ||
| 112 | }, | ||
| 113 | methods: { | ||
| 114 | onSave(){ | ||
| 115 | this.form.zrzbsm=this.$router.query.bsm; | ||
| 116 | insertCInfo(this.form).then((res)=>{ | ||
| 117 | if(res.code===200){ | ||
| 118 | this.$message.success("保存成功") | ||
| 119 | } | ||
| 120 | }) | ||
| 121 | console.log(this.form) | ||
| 122 | }, | ||
| 123 | onSubmit(){ | ||
| 124 | console.log(this.form) | ||
| 125 | } | ||
| 126 | } | ||
| 127 | } | ||
| 128 | </script> | ||
| 129 | <style rel="stylesheet/less" lang="less" scoped> | ||
| 130 | .h { | ||
| 131 | min-height: 200px; | ||
| 132 | width: 80%; | ||
| 133 | margin-top: 10px; | ||
| 134 | margin-left: 10%; | ||
| 135 | float: left; | ||
| 136 | |||
| 137 | /deep/.el-input__inner{ | ||
| 138 | width: 100%; | ||
| 139 | border: 0; | ||
| 140 | } | ||
| 141 | |||
| 142 | /deep/textarea{ | ||
| 143 | width: 100%; | ||
| 144 | border: 0; | ||
| 145 | } | ||
| 146 | |||
| 147 | |||
| 148 | .el-form-item{ | ||
| 149 | font-weight: bold; | ||
| 150 | font-size: xx-large | ||
| 151 | } | ||
| 152 | |||
| 153 | table{ | ||
| 154 | background: #fff; | ||
| 155 | table-layout: fixed; | ||
| 156 | } | ||
| 157 | |||
| 158 | td{ | ||
| 159 | //bgcolor:#F1F4FC; | ||
| 160 | bgcolor:#fff; | ||
| 161 | width:8.33% | ||
| 162 | } | ||
| 163 | |||
| 164 | .el-select{ | ||
| 165 | display:block; | ||
| 166 | } | ||
| 167 | } | ||
| 168 | |||
| 169 | table{ | ||
| 170 | font-size: 14px; | ||
| 171 | } | ||
| 172 | |||
| 173 | .hTable{ | ||
| 174 | margin-top: 10px; | ||
| 175 | } | ||
| 176 | </style> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
src/views/systemZRZ/ljz/index.vue
0 → 100644
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment