Merge remote-tracking branch 'origin/master'
Showing
7 changed files
with
96 additions
and
129 deletions
| ... | @@ -5,31 +5,14 @@ | ... | @@ -5,31 +5,14 @@ |
| 5 | </template> | 5 | </template> |
| 6 | 6 | ||
| 7 | <script> | 7 | <script> |
| 8 | import { getDdicByMC } from "../src/api/common"; | ||
| 9 | export default { | 8 | export default { |
| 10 | mounted() { | 9 | mounted() { |
| 11 | this.getDic(); | ||
| 12 | window.addEventListener("unload", this.saveState); | 10 | window.addEventListener("unload", this.saveState); |
| 13 | }, | 11 | }, |
| 14 | methods: { | 12 | methods: { |
| 15 | saveState() { | 13 | saveState() { |
| 16 | sessionStorage.setItem("state", JSON.stringify(this.$store.state)); | 14 | sessionStorage.setItem("state", JSON.stringify(this.$store.state)); |
| 17 | }, | 15 | }, |
| 18 | //请求字典数据 | ||
| 19 | getDic() { | ||
| 20 | let s = this.$store.state; | ||
| 21 | s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList; | ||
| 22 | s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList; | ||
| 23 | s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList; | ||
| 24 | s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList; | ||
| 25 | s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList; | ||
| 26 | s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList; | ||
| 27 | }, | ||
| 28 | getDicData(name) { | ||
| 29 | getDdicByMC(name).then((res) => { | ||
| 30 | return res.result; | ||
| 31 | }); | ||
| 32 | }, | ||
| 33 | }, | 16 | }, |
| 34 | }; | 17 | }; |
| 35 | </script> | 18 | </script> | ... | ... |
| ... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
| 61 | <td colspan="3"> | 61 | <td colspan="3"> |
| 62 | <el-select class="formSelect" v-model="formData.qlrlxbsm"> | 62 | <el-select class="formSelect" v-model="formData.qlrlxbsm"> |
| 63 | <el-option | 63 | <el-option |
| 64 | v-for="item in qlrlxList" | 64 | v-for="item in $store.state.qlrlxList" |
| 65 | :key="item.bsm" | 65 | :key="item.bsm" |
| 66 | :label="item.mc" | 66 | :label="item.mc" |
| 67 | :value="item.bsm" | 67 | :value="item.bsm" |
| ... | @@ -75,7 +75,7 @@ | ... | @@ -75,7 +75,7 @@ |
| 75 | <td colspan="3"> | 75 | <td colspan="3"> |
| 76 | <el-select class="formSelect" v-model="formData.zjzlbsm"> | 76 | <el-select class="formSelect" v-model="formData.zjzlbsm"> |
| 77 | <el-option | 77 | <el-option |
| 78 | v-for="item in zlzlList" | 78 | v-for="item in $store.state.zjzlList" |
| 79 | :key="item.bsm" | 79 | :key="item.bsm" |
| 80 | :label="item.mc" | 80 | :label="item.mc" |
| 81 | :value="item.bsm" | 81 | :value="item.bsm" |
| ... | @@ -103,7 +103,7 @@ | ... | @@ -103,7 +103,7 @@ |
| 103 | <td colspan="3"> | 103 | <td colspan="3"> |
| 104 | <el-select class="formSelect" v-model="formData.gjbsm"> | 104 | <el-select class="formSelect" v-model="formData.gjbsm"> |
| 105 | <el-option | 105 | <el-option |
| 106 | v-for="item in gjList" | 106 | v-for="item in $store.state.gjList" |
| 107 | :key="item.bsm" | 107 | :key="item.bsm" |
| 108 | :label="item.mc" | 108 | :label="item.mc" |
| 109 | :value="item.bsm" | 109 | :value="item.bsm" |
| ... | @@ -115,7 +115,7 @@ | ... | @@ -115,7 +115,7 @@ |
| 115 | <td colspan="3"> | 115 | <td colspan="3"> |
| 116 | <el-select class="formSelect" v-model="formData.hjszssbsm"> | 116 | <el-select class="formSelect" v-model="formData.hjszssbsm"> |
| 117 | <el-option | 117 | <el-option |
| 118 | v-for="item in ssList" | 118 | v-for="item in $store.state.ssList" |
| 119 | :key="item.bsm" | 119 | :key="item.bsm" |
| 120 | :label="item.mc" | 120 | :label="item.mc" |
| 121 | :value="item.bsm" | 121 | :value="item.bsm" |
| ... | @@ -129,7 +129,7 @@ | ... | @@ -129,7 +129,7 @@ |
| 129 | <td colspan="3"> | 129 | <td colspan="3"> |
| 130 | <el-select class="formSelect" v-model="formData.xbbsm"> | 130 | <el-select class="formSelect" v-model="formData.xbbsm"> |
| 131 | <el-option | 131 | <el-option |
| 132 | v-for="item in xbList" | 132 | v-for="item in $store.state.xbList" |
| 133 | :key="item.bsm" | 133 | :key="item.bsm" |
| 134 | :label="item.mc" | 134 | :label="item.mc" |
| 135 | :value="item.bsm" | 135 | :value="item.bsm" |
| ... | @@ -147,7 +147,7 @@ | ... | @@ -147,7 +147,7 @@ |
| 147 | <td colspan="3"> | 147 | <td colspan="3"> |
| 148 | <el-select class="formSelect" v-model="formData.sshy"> | 148 | <el-select class="formSelect" v-model="formData.sshy"> |
| 149 | <el-option | 149 | <el-option |
| 150 | v-for="item in sshyList" | 150 | v-for="item in $store.state.sshyList" |
| 151 | :key="item.bsm" | 151 | :key="item.bsm" |
| 152 | :label="item.mc" | 152 | :label="item.mc" |
| 153 | :value="item.bsm" | 153 | :value="item.bsm" |
| ... | @@ -176,7 +176,7 @@ | ... | @@ -176,7 +176,7 @@ |
| 176 | <td colspan="3"> | 176 | <td colspan="3"> |
| 177 | <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> | 177 | <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> |
| 178 | <el-option | 178 | <el-option |
| 179 | v-for="item in zjzlList" | 179 | v-for="item in $store.state.zjzlList" |
| 180 | :key="item.bsm" | 180 | :key="item.bsm" |
| 181 | :label="item.mc" | 181 | :label="item.mc" |
| 182 | :value="item.bsm" | 182 | :value="item.bsm" |
| ... | @@ -222,7 +222,7 @@ | ... | @@ -222,7 +222,7 @@ |
| 222 | <td colspan="3"> | 222 | <td colspan="3"> |
| 223 | <el-select class="formSelect" v-model="item.zjzlbsm"> | 223 | <el-select class="formSelect" v-model="item.zjzlbsm"> |
| 224 | <el-option | 224 | <el-option |
| 225 | v-for="item in zjzlList" | 225 | v-for="item in $store.state.zjzlList" |
| 226 | :key="item.bsm" | 226 | :key="item.bsm" |
| 227 | :label="item.mc" | 227 | :label="item.mc" |
| 228 | :value="item.bsm" | 228 | :value="item.bsm" |
| ... | @@ -251,7 +251,7 @@ | ... | @@ -251,7 +251,7 @@ |
| 251 | <td colspan="3"> | 251 | <td colspan="3"> |
| 252 | <el-select class="formSelect" v-model="formData.gyfsbsm"> | 252 | <el-select class="formSelect" v-model="formData.gyfsbsm"> |
| 253 | <el-option | 253 | <el-option |
| 254 | v-for="item in qlrlxList" | 254 | v-for="item in $store.state.qlrlxList" |
| 255 | :key="item.bsm" | 255 | :key="item.bsm" |
| 256 | :label="item.mc" | 256 | :label="item.mc" |
| 257 | :value="item.bsm" | 257 | :value="item.bsm" |
| ... | @@ -356,12 +356,6 @@ export default { | ... | @@ -356,12 +356,6 @@ export default { |
| 356 | zjh: "", | 356 | zjh: "", |
| 357 | zjzlbsm: "", | 357 | zjzlbsm: "", |
| 358 | }, | 358 | }, |
| 359 | qlrlxList: this.$store.state.qlrlxList, | ||
| 360 | zjzlList: this.$store.state.zjzlList, | ||
| 361 | xbList: this.$store.state.xbList, | ||
| 362 | gjList: this.$store.state.gjList, | ||
| 363 | ssList: this.$store.state.ssList, | ||
| 364 | sshyList: this.$store.state.sshyList, | ||
| 365 | }; | 359 | }; |
| 366 | }, | 360 | }, |
| 367 | methods: { | 361 | methods: { | ... | ... |
| ... | @@ -211,14 +211,12 @@ export default { | ... | @@ -211,14 +211,12 @@ export default { |
| 211 | getDicData(){ | 211 | getDicData(){ |
| 212 | getDdicByMC("土地用途") | 212 | getDdicByMC("土地用途") |
| 213 | .then((res) => { | 213 | .then((res) => { |
| 214 | console.log(res.result); | ||
| 215 | this.pzytList = res.result; | 214 | this.pzytList = res.result; |
| 216 | this.sjytList = res.result; | 215 | this.sjytList = res.result; |
| 217 | }) | 216 | }) |
| 218 | .catch((error) => {}); | 217 | .catch((error) => {}); |
| 219 | getDdicByMC("土地等级") | 218 | getDdicByMC("土地等级") |
| 220 | .then((res) => { | 219 | .then((res) => { |
| 221 | console.log(res.result); | ||
| 222 | this.djList = res.result; | 220 | this.djList = res.result; |
| 223 | }) | 221 | }) |
| 224 | .catch((error) => {}); | 222 | .catch((error) => {}); | ... | ... |
| ... | @@ -5,20 +5,22 @@ import user from './modules/user' | ... | @@ -5,20 +5,22 @@ import user from './modules/user' |
| 5 | import permission_routes from './modules/permission_routes' | 5 | import permission_routes from './modules/permission_routes' |
| 6 | import setTabs from './modules/setTabs' | 6 | import setTabs from './modules/setTabs' |
| 7 | 7 | ||
| 8 | Vue.use(Vuex) | 8 | Vue.use(Vuex); |
| 9 | |||
| 10 | const store = new Vuex.Store({ | 9 | const store = new Vuex.Store({ |
| 11 | state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { | 10 | state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { |
| 12 | zdbsm: '', | 11 | zdbsm: '', |
| 13 | xzqList: [], | 12 | qllxList:[], |
| 14 | djqList: [], | 13 | zdtzmList:[], |
| 15 | djzqList: [], | 14 | qlsdfsList:[], |
| 16 | zjzlList:[], | 15 | zjzlList:[], |
| 17 | gjList:[], | 16 | gjList:[], |
| 18 | ssList:[], | 17 | ssList:[], |
| 19 | qlrlxList:[], | 18 | qlrlxList:[], |
| 20 | xbList:[], | 19 | xbList:[], |
| 21 | sshyList:[], | 20 | sshyList:[], |
| 21 | xzqList: [], | ||
| 22 | djqList: [], | ||
| 23 | djzqList: [], | ||
| 22 | //创建自然幢时需要用到的临时存储信息 | 24 | //创建自然幢时需要用到的临时存储信息 |
| 23 | zrzbsm: '', | 25 | zrzbsm: '', |
| 24 | xmmc: '', | 26 | xmmc: '', | ... | ... |
| ... | @@ -15,7 +15,7 @@ | ... | @@ -15,7 +15,7 @@ |
| 15 | </div> | 15 | </div> |
| 16 | </el-aside> | 16 | </el-aside> |
| 17 | <el-container> | 17 | <el-container> |
| 18 | <el-header height="100px"> | 18 | <el-header> |
| 19 | <div class="header-top"> | 19 | <div class="header-top"> |
| 20 | <div class="top-items" @click="toggleClick"> | 20 | <div class="top-items" @click="toggleClick"> |
| 21 | <i class="fa fa-outdent hamburger" v-show="!isActive"></i> | 21 | <i class="fa fa-outdent hamburger" v-show="!isActive"></i> |
| ... | @@ -32,35 +32,31 @@ | ... | @@ -32,35 +32,31 @@ |
| 32 | <span>{{ item.name }}</span> | 32 | <span>{{ item.name }}</span> |
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
| 35 | <div class="header-bottom"> | 35 | <!-- <div class="header-bottom"> |
| 36 | <Navigation ref="navigation"></Navigation> | 36 | <Navigation ref="navigation"></Navigation> |
| 37 | </div> | 37 | </div> --> |
| 38 | <el-dialog | 38 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> |
| 39 | title="新建" | ||
| 40 | :visible.sync="dialogVisible" | ||
| 41 | width="40%" | ||
| 42 | > | ||
| 43 | <Create @closeDialog="closeDialog"></Create> | 39 | <Create @closeDialog="closeDialog"></Create> |
| 44 | </el-dialog> | 40 | </el-dialog> |
| 45 | </el-header> | 41 | </el-header> |
| 46 | <el-main> | 42 | <el-main> |
| 47 | <router-view/> | 43 | <router-view /> |
| 48 | </el-main> | 44 | </el-main> |
| 49 | </el-container> | 45 | </el-container> |
| 50 | </el-container> | 46 | </el-container> |
| 51 | </div> | 47 | </div> |
| 52 | </template> | 48 | </template> |
| 53 | <script> | 49 | <script> |
| 54 | import util from "@/libs/util.js"; | 50 | import util from "@/libs/util.js"; |
| 55 | import Navigation from "../components/IvyElement/navigation"; | 51 | import Navigation from "../components/IvyElement/navigation"; |
| 56 | import Create from "./panel/create/index"; | 52 | import Create from "./panel/create/index"; |
| 57 | import LineTree from "../components/lineTree/lineTree"; | 53 | import LineTree from "../components/lineTree/lineTree"; |
| 58 | import {setTimeout} from "timers"; | 54 | import { setTimeout } from "timers"; |
| 59 | import {getTree} from "../api/common" | 55 | import { getTree,getDdicByMC } from "../api/common"; |
| 60 | 56 | ||
| 61 | export default { | 57 | export default { |
| 62 | components: { | 58 | components: { |
| 63 | Navigation, | 59 | // Navigation, |
| 64 | LineTree, | 60 | LineTree, |
| 65 | Create, | 61 | Create, |
| 66 | }, | 62 | }, |
| ... | @@ -187,7 +183,7 @@ | ... | @@ -187,7 +183,7 @@ |
| 187 | }, | 183 | }, |
| 188 | }, | 184 | }, |
| 189 | watch: { | 185 | watch: { |
| 190 | "$route.path": function (newPath) { | 186 | "$route.path": function(newPath) { |
| 191 | //监测路由变化,高亮顶部导航 | 187 | //监测路由变化,高亮顶部导航 |
| 192 | this.headTop.forEach((item, index) => { | 188 | this.headTop.forEach((item, index) => { |
| 193 | item.select = false; | 189 | item.select = false; |
| ... | @@ -195,13 +191,13 @@ | ... | @@ -195,13 +191,13 @@ |
| 195 | item.select = true; | 191 | item.select = true; |
| 196 | } | 192 | } |
| 197 | }); | 193 | }); |
| 198 | if(newPath == '/zd'){ | 194 | if (newPath == "/zd") { |
| 199 | this.getRightTree(this.$store.state.zdbsm) | 195 | this.getRightTree(this.$store.state.zdbsm); |
| 200 | } | 196 | } |
| 201 | }, | 197 | }, |
| 202 | "$store.state.zdbsm": function (bsm) { | 198 | "$store.state.zdbsm": function(bsm) { |
| 203 | this.getRightTree(bsm) | 199 | this.getRightTree(bsm); |
| 204 | } | 200 | }, |
| 205 | }, | 201 | }, |
| 206 | created() { | 202 | created() { |
| 207 | if (this.$route.meta) { | 203 | if (this.$route.meta) { |
| ... | @@ -223,7 +219,7 @@ | ... | @@ -223,7 +219,7 @@ |
| 223 | icon: "fa fa-address-card-o", | 219 | icon: "fa fa-address-card-o", |
| 224 | path: "/add", | 220 | path: "/add", |
| 225 | }, | 221 | }, |
| 226 | {name: "更正", icon: "fa fa-address-card-o", path: "/modify"}, | 222 | { name: "更正", icon: "fa fa-address-card-o", path: "/modify" }, |
| 227 | { | 223 | { |
| 228 | name: "变更", | 224 | name: "变更", |
| 229 | icon: "fa fa-address-card-o", | 225 | icon: "fa fa-address-card-o", |
| ... | @@ -243,14 +239,33 @@ | ... | @@ -243,14 +239,33 @@ |
| 243 | // this.navSelect(indId); | 239 | // this.navSelect(indId); |
| 244 | // this.sortNavigation(this.navigationList, indId); | 240 | // this.sortNavigation(this.navigationList, indId); |
| 245 | // } | 241 | // } |
| 242 | this.getDic(); | ||
| 246 | }, | 243 | }, |
| 247 | methods: { | 244 | methods: { |
| 245 | //请求字典数据 | ||
| 246 | async getDic() { | ||
| 247 | let s = this.$store.state; | ||
| 248 | s.zjzlList = s.zjzlList.length == 0 ?await this.getDicData("证件种类") : s.zjzlList; | ||
| 249 | s.gjList = s.gjList.length == 0 ?await this.getDicData("国家和地区") : s.gjList; | ||
| 250 | s.ssList = s.ssList.length == 0 ?await this.getDicData("省市") : s.ssList; | ||
| 251 | s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList; | ||
| 252 | s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList; | ||
| 253 | s.sshyList = s.sshyList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.sshyList; | ||
| 254 | s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList; | ||
| 255 | s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地(宗海)特征码") : s.sshyList; | ||
| 256 | s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList; | ||
| 257 | }, | ||
| 258 | async getDicData(name) { | ||
| 259 | return await getDdicByMC(name).then((res)=> { | ||
| 260 | return res.result | ||
| 261 | }); | ||
| 262 | }, | ||
| 248 | getRightTree(bsm) { | 263 | getRightTree(bsm) { |
| 249 | getTree(bsm).then(res => { | 264 | getTree(bsm).then((res) => { |
| 250 | if (res.success) { | 265 | if (res.success) { |
| 251 | this.pd=res.result | 266 | this.pd = res.result; |
| 252 | } | 267 | } |
| 253 | }) | 268 | }); |
| 254 | }, | 269 | }, |
| 255 | sortNavigation(data, selectId) { | 270 | sortNavigation(data, selectId) { |
| 256 | let headTop = this.headTop; | 271 | let headTop = this.headTop; |
| ... | @@ -309,12 +324,12 @@ | ... | @@ -309,12 +324,12 @@ |
| 309 | //关闭新建子组件弹框 | 324 | //关闭新建子组件弹框 |
| 310 | closeDialog() { | 325 | closeDialog() { |
| 311 | this.dialogVisible = false; | 326 | this.dialogVisible = false; |
| 312 | } | ||
| 313 | }, | 327 | }, |
| 314 | }; | 328 | }, |
| 329 | }; | ||
| 315 | </script> | 330 | </script> |
| 316 | <style lang="less" scoped> | 331 | <style lang="less" scoped> |
| 317 | .home-box { | 332 | .home-box { |
| 318 | width: 100%; | 333 | width: 100%; |
| 319 | height: 100vh; | 334 | height: 100vh; |
| 320 | .el-container { | 335 | .el-container { |
| ... | @@ -419,5 +434,5 @@ | ... | @@ -419,5 +434,5 @@ |
| 419 | // line-height: 160px; | 434 | // line-height: 160px; |
| 420 | padding: 0; | 435 | padding: 0; |
| 421 | } | 436 | } |
| 422 | } | 437 | } |
| 423 | </style> | 438 | </style> | ... | ... |
| ... | @@ -83,8 +83,9 @@ | ... | @@ -83,8 +83,9 @@ |
| 83 | </el-form-item> | 83 | </el-form-item> |
| 84 | <el-form-item label="特征码"> | 84 | <el-form-item label="特征码"> |
| 85 | <el-select | 85 | <el-select |
| 86 | v-model="tzmCode" | 86 | v-model="zdtzm.value" |
| 87 | placeholder="地籍子区" | 87 | placeholder="宗地特征码" |
| 88 | @change="changeZdtzm(zdtzm.value)" | ||
| 88 | style="width:200px;" | 89 | style="width:200px;" |
| 89 | > | 90 | > |
| 90 | <el-option | 91 | <el-option |
| ... | @@ -203,8 +204,8 @@ export default { | ... | @@ -203,8 +204,8 @@ export default { |
| 203 | djzqbsm: this.djzqValue, | 204 | djzqbsm: this.djzqValue, |
| 204 | syqlxbsm: this.syqlxCode, | 205 | syqlxbsm: this.syqlxCode, |
| 205 | xmmc: this.zdProjectName, | 206 | xmmc: this.zdProjectName, |
| 206 | // zdtzmbsm: this.tzmCode, | 207 | zdtzmbsm: this.tzmCode, |
| 207 | zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010", | 208 | //zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010", |
| 208 | }; | 209 | }; |
| 209 | insertQjZdjbxx(data) | 210 | insertQjZdjbxx(data) |
| 210 | .then((res) => { | 211 | .then((res) => { |
| ... | @@ -310,6 +311,12 @@ export default { | ... | @@ -310,6 +311,12 @@ export default { |
| 310 | this.syqlxCode = id; | 311 | this.syqlxCode = id; |
| 311 | console.log(this.syqlxCode); | 312 | console.log(this.syqlxCode); |
| 312 | }, | 313 | }, |
| 314 | changeZdtzm(id){ | ||
| 315 | |||
| 316 | this.tzmCode=id; | ||
| 317 | console.log(this.tzmCode); | ||
| 318 | |||
| 319 | }, | ||
| 313 | close() { | 320 | close() { |
| 314 | this.$emit("closeDialog"); | 321 | this.$emit("closeDialog"); |
| 315 | }, | 322 | }, | ... | ... |
| ... | @@ -2,7 +2,6 @@ | ... | @@ -2,7 +2,6 @@ |
| 2 | <div class="main"> | 2 | <div class="main"> |
| 3 | <div class="formMenu"> | 3 | <div class="formMenu"> |
| 4 | <Qlr ref="qlrxxModule"></Qlr> | 4 | <Qlr ref="qlrxxModule"></Qlr> |
| 5 | |||
| 6 | <!-- <el-button | 5 | <!-- <el-button |
| 7 | type="primary" | 6 | type="primary" |
| 8 | class="changeBtn" | 7 | class="changeBtn" |
| ... | @@ -28,7 +27,7 @@ | ... | @@ -28,7 +27,7 @@ |
| 28 | @change="changeXzq(formData.xzqbsm)" | 27 | @change="changeXzq(formData.xzqbsm)" |
| 29 | > | 28 | > |
| 30 | <el-option | 29 | <el-option |
| 31 | v-for="item in xzqList" | 30 | v-for="item in $store.state.xzqList" |
| 32 | :key="item.xzqbsm" | 31 | :key="item.xzqbsm" |
| 33 | :label="item.xzqmc" | 32 | :label="item.xzqmc" |
| 34 | :value="item.xzqbsm" | 33 | :value="item.xzqbsm" |
| ... | @@ -44,7 +43,7 @@ | ... | @@ -44,7 +43,7 @@ |
| 44 | @change="changeDjq(formData.djqbsm)" | 43 | @change="changeDjq(formData.djqbsm)" |
| 45 | > | 44 | > |
| 46 | <el-option | 45 | <el-option |
| 47 | v-for="item in djqList" | 46 | v-for="item in $store.state.djqList" |
| 48 | :key="item.bsm" | 47 | :key="item.bsm" |
| 49 | :label="item.mc" | 48 | :label="item.mc" |
| 50 | :value="item.bsm" | 49 | :value="item.bsm" |
| ... | @@ -56,7 +55,7 @@ | ... | @@ -56,7 +55,7 @@ |
| 56 | <td colspan="2"> | 55 | <td colspan="2"> |
| 57 | <el-select class="formSelect" v-model="formData.djzqbsm"> | 56 | <el-select class="formSelect" v-model="formData.djzqbsm"> |
| 58 | <el-option | 57 | <el-option |
| 59 | v-for="item in djzqList" | 58 | v-for="item in $store.state.djzqList" |
| 60 | :key="item.bsm" | 59 | :key="item.bsm" |
| 61 | :label="item.mc" | 60 | :label="item.mc" |
| 62 | :value="item.bsm" | 61 | :value="item.bsm" |
| ... | @@ -70,7 +69,7 @@ | ... | @@ -70,7 +69,7 @@ |
| 70 | <td colspan="4"> | 69 | <td colspan="4"> |
| 71 | <el-select class="formSelect" v-model="formData.qllxbsm"> | 70 | <el-select class="formSelect" v-model="formData.qllxbsm"> |
| 72 | <el-option | 71 | <el-option |
| 73 | v-for="item in qllxList" | 72 | v-for="item in $store.state.qllxList" |
| 74 | :key="item.bsm" | 73 | :key="item.bsm" |
| 75 | :label="item.mc" | 74 | :label="item.mc" |
| 76 | :value="item.bsm" | 75 | :value="item.bsm" |
| ... | @@ -82,7 +81,7 @@ | ... | @@ -82,7 +81,7 @@ |
| 82 | <td colspan="4"> | 81 | <td colspan="4"> |
| 83 | <el-select class="formSelect" v-model="formData.zdtzmbsm"> | 82 | <el-select class="formSelect" v-model="formData.zdtzmbsm"> |
| 84 | <el-option | 83 | <el-option |
| 85 | v-for="item in zdtzmList" | 84 | v-for="item in $store.state.zdtzmList" |
| 86 | :key="item.bsm" | 85 | :key="item.bsm" |
| 87 | :label="item.mc" | 86 | :label="item.mc" |
| 88 | :value="item.bsm" | 87 | :value="item.bsm" |
| ... | @@ -96,7 +95,7 @@ | ... | @@ -96,7 +95,7 @@ |
| 96 | <td colspan="4"> | 95 | <td colspan="4"> |
| 97 | <el-select class="formSelect" v-model="formData.qlsdfs"> | 96 | <el-select class="formSelect" v-model="formData.qlsdfs"> |
| 98 | <el-option | 97 | <el-option |
| 99 | v-for="item in qlsdfsList" | 98 | v-for="item in $store.state.qlsdfsList" |
| 100 | :key="item.bsm" | 99 | :key="item.bsm" |
| 101 | :label="item.mc" | 100 | :label="item.mc" |
| 102 | :value="item.bsm" | 101 | :value="item.bsm" |
| ... | @@ -152,7 +151,7 @@ | ... | @@ -152,7 +151,7 @@ |
| 152 | <td colspan="4"> | 151 | <td colspan="4"> |
| 153 | <el-select class="formSelect" v-model="formData.gmjjhyfl"> | 152 | <el-select class="formSelect" v-model="formData.gmjjhyfl"> |
| 154 | <el-option | 153 | <el-option |
| 155 | v-for="item in gmjjhyflList" | 154 | v-for="item in $store.state.sshyList" |
| 156 | :key="item.value" | 155 | :key="item.value" |
| 157 | :label="item.label" | 156 | :label="item.label" |
| 158 | :value="item.value" | 157 | :value="item.value" |
| ... | @@ -180,8 +179,8 @@ | ... | @@ -180,8 +179,8 @@ |
| 180 | </tr> | 179 | </tr> |
| 181 | <tr> | 180 | <tr> |
| 182 | <td colspan="2">容积率</td> | 181 | <td colspan="2">容积率</td> |
| 183 | <td colspan="4"> | 182 | <td colspan="2"> |
| 184 | <el-select class="formSelect percent30" v-model="formData.rjl"> | 183 | <el-select class="formSelect" v-model="formData.rjl"> |
| 185 | <el-option | 184 | <el-option |
| 186 | v-for="item in compareList" | 185 | v-for="item in compareList" |
| 187 | :key="item.value" | 186 | :key="item.value" |
| ... | @@ -190,7 +189,9 @@ | ... | @@ -190,7 +189,9 @@ |
| 190 | > | 189 | > |
| 191 | </el-option> | 190 | </el-option> |
| 192 | </el-select> | 191 | </el-select> |
| 193 | <input type="text" class="formInput percent68"/> | 192 | </td> |
| 193 | <td colspan="2"> | ||
| 194 | <input type="text" class="formInput"/> | ||
| 194 | </td> | 195 | </td> |
| 195 | <td colspan="2">容积说明</td> | 196 | <td colspan="2">容积说明</td> |
| 196 | <td colspan="4" class="psr"> | 197 | <td colspan="4" class="psr"> |
| ... | @@ -199,8 +200,8 @@ | ... | @@ -199,8 +200,8 @@ |
| 199 | </tr> | 200 | </tr> |
| 200 | <tr> | 201 | <tr> |
| 201 | <td colspan="2">建筑密度</td> | 202 | <td colspan="2">建筑密度</td> |
| 202 | <td colspan="4"> | 203 | <td colspan="2"> |
| 203 | <el-select class="formSelect percent30" v-model="formData.jzmd"> | 204 | <el-select class="formSelect" v-model="formData.jzmd"> |
| 204 | <el-option | 205 | <el-option |
| 205 | v-for="item in compareList" | 206 | v-for="item in compareList" |
| 206 | :key="item.value" | 207 | :key="item.value" |
| ... | @@ -209,7 +210,9 @@ | ... | @@ -209,7 +210,9 @@ |
| 209 | > | 210 | > |
| 210 | </el-option> | 211 | </el-option> |
| 211 | </el-select> | 212 | </el-select> |
| 212 | <input type="text" class="formInput percent68"/> | 213 | </td> |
| 214 | <td colspan="2"> | ||
| 215 | <input type="text" class="formInput"/> | ||
| 213 | </td> | 216 | </td> |
| 214 | <td colspan="2">建筑密度说明</td> | 217 | <td colspan="2">建筑密度说明</td> |
| 215 | <td colspan="4" class="psr"> | 218 | <td colspan="4" class="psr"> |
| ... | @@ -218,8 +221,8 @@ | ... | @@ -218,8 +221,8 @@ |
| 218 | </tr> | 221 | </tr> |
| 219 | <tr> | 222 | <tr> |
| 220 | <td colspan="2">建筑限高</td> | 223 | <td colspan="2">建筑限高</td> |
| 221 | <td colspan="4"> | 224 | <td colspan="2"> |
| 222 | <el-select class="formSelect percent30" v-model="formData.jzxg"> | 225 | <el-select class="formSelect" v-model="formData.jzxg"> |
| 223 | <el-option | 226 | <el-option |
| 224 | v-for="item in compareList" | 227 | v-for="item in compareList" |
| 225 | :key="item.value" | 228 | :key="item.value" |
| ... | @@ -228,6 +231,8 @@ | ... | @@ -228,6 +231,8 @@ |
| 228 | > | 231 | > |
| 229 | </el-option> | 232 | </el-option> |
| 230 | </el-select> | 233 | </el-select> |
| 234 | </td> | ||
| 235 | <td colspan="2"> | ||
| 231 | <input type="text" class="formInput percent68"/> | 236 | <input type="text" class="formInput percent68"/> |
| 232 | </td> | 237 | </td> |
| 233 | <td colspan="2">建筑限高说明</td> | 238 | <td colspan="2">建筑限高说明</td> |
| ... | @@ -321,14 +326,9 @@ | ... | @@ -321,14 +326,9 @@ |
| 321 | props: {}, | 326 | props: {}, |
| 322 | data() { | 327 | data() { |
| 323 | return { | 328 | return { |
| 324 | qllxList: [], | ||
| 325 | zdtzmList: [], | ||
| 326 | qlsdfsList: [], | ||
| 327 | gmjjhyflList: [], | ||
| 328 | xzqList: this.$store.state.xzqList, | ||
| 329 | djqList: this.$store.state.djqList, | ||
| 330 | djzqList: this.$store.state.djzqList, | ||
| 331 | compareList: [ | 329 | compareList: [ |
| 330 | {label: "<", value: "<"}, | ||
| 331 | {label: ">", value: ">"}, | ||
| 332 | {label: "=", value: "="}, | 332 | {label: "=", value: "="}, |
| 333 | {label: "<=", value: "<="}, | 333 | {label: "<=", value: "<="}, |
| 334 | {label: ">=", value: ">="}, | 334 | {label: ">=", value: ">="}, |
| ... | @@ -369,7 +369,6 @@ | ... | @@ -369,7 +369,6 @@ |
| 369 | }; | 369 | }; |
| 370 | }, | 370 | }, |
| 371 | created() { | 371 | created() { |
| 372 | this.getDicData(); | ||
| 373 | this.getZdjbxxData(); | 372 | this.getZdjbxxData(); |
| 374 | }, | 373 | }, |
| 375 | mounted() { | 374 | mounted() { |
| ... | @@ -407,37 +406,6 @@ | ... | @@ -407,37 +406,6 @@ |
| 407 | getQlxzData() { | 406 | getQlxzData() { |
| 408 | console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 | 407 | console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 |
| 409 | }, | 408 | }, |
| 410 | //获取字典数据信息 | ||
| 411 | getDicData() { | ||
| 412 | getDdicByMC("权利类型") | ||
| 413 | .then((res) => { | ||
| 414 | console.log(res.result); | ||
| 415 | this.qllxList = res.result; | ||
| 416 | }) | ||
| 417 | .catch((error) => { | ||
| 418 | }); | ||
| 419 | getDdicByMC("宗地(宗海)特征码") | ||
| 420 | .then((res) => { | ||
| 421 | console.log(res.result); | ||
| 422 | this.zdtzmList = res.result; | ||
| 423 | }) | ||
| 424 | .catch((error) => { | ||
| 425 | }); | ||
| 426 | getDdicByMC("权利设定方式") | ||
| 427 | .then((res) => { | ||
| 428 | console.log(res.result); | ||
| 429 | this.qlsdfsList = res.result; | ||
| 430 | }) | ||
| 431 | .catch((error) => { | ||
| 432 | }); | ||
| 433 | getDdicByMC("国民经济行业分类代码") | ||
| 434 | .then((res) => { | ||
| 435 | console.log(res.result); | ||
| 436 | this.gmjjhyflList = res.result; | ||
| 437 | }) | ||
| 438 | .catch((error) => { | ||
| 439 | }); | ||
| 440 | }, | ||
| 441 | //行政区划选择 | 409 | //行政区划选择 |
| 442 | changeXzq(id) { | 410 | changeXzq(id) { |
| 443 | getListByXzqbsm(id) | 411 | getListByXzqbsm(id) | ... | ... |
-
Please register or sign in to post a comment