Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
5 changed files
with
44 additions
and
37 deletions
... | @@ -52,29 +52,30 @@ | ... | @@ -52,29 +52,30 @@ |
52 | }" | 52 | }" |
53 | :ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''" | 53 | :ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''" |
54 | :data-zdbsm="item.zdbsm" | 54 | :data-zdbsm="item.zdbsm" |
55 | :title=item.mc | ||
55 | > | 56 | > |
56 | <span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; "> | 57 | <span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; "> |
57 | <span class="qsztFont">临</span> | 58 | <span class="qsztFont">临</span> |
58 | </span> | 59 | </span> |
59 | <span class="qsztImg" v-if="item.qszt=='1'" style="background:#00dd00; "> | 60 | <span class="qsztImg" v-if="item.qszt=='1'" style="background:#00dd00; "> |
60 | <span class="qsztFont">正</span> | 61 | <span class="qsztFont">正</span> |
61 | </span> | 62 | </span> |
62 | <span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; "> | 63 | <span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; "> |
63 | <span class="qsztFont">现</span> | 64 | <span class="qsztFont">现</span> |
64 | </span> | 65 | </span> |
65 | |||
66 | 66 | ||
67 | <!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> | 67 | <!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> |
68 | <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> | 68 | <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> |
69 | <img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/> --> | 69 | <img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/> --> |
70 | <span v-if="item.type=='zrz'" >(自然幢) | 70 | <span v-if="item.type=='zrz'" >(自然幢) |
71 | </span> | 71 | </span> |
72 | <span v-if="item.type=='dz'" >(多幢) | 72 | <span v-if="item.type=='dz'" >(多幢) |
73 | </span> | 73 | </span> |
74 | <span v-if="item.type=='gzw'" >(构筑物) | 74 | <span v-if="item.type=='gzw'" >(构筑物) |
75 | </span> | 75 | </span> |
76 | |||
76 | 77 | ||
77 | {{ item.mc }} | 78 | {{ item.mc }} |
78 | 79 | ||
79 | </div> | 80 | </div> |
80 | </div> | 81 | </div> | ... | ... |
... | @@ -30,7 +30,7 @@ | ... | @@ -30,7 +30,7 @@ |
30 | class="box" | 30 | class="box" |
31 | v-for="(item, index) in list" | 31 | v-for="(item, index) in list" |
32 | :key="index" | 32 | :key="index" |
33 | @click="handleSelect" | 33 | @click="handleSelect(item)" |
34 | > | 34 | > |
35 | <div class="psr"> | 35 | <div class="psr"> |
36 | <img :src="item.img" alt="" /> | 36 | <img :src="item.img" alt="" /> |
... | @@ -97,13 +97,14 @@ export default { | ... | @@ -97,13 +97,14 @@ export default { |
97 | { name: "退件箱", img: require("@assets/images/tjx.png"),count:0 }, | 97 | { name: "退件箱", img: require("@assets/images/tjx.png"),count:0 }, |
98 | ], | 98 | ], |
99 | list: [ | 99 | list: [ |
100 | { name: "宗地分割", img: require("@assets/images/zdfg.png") }, | 100 | { name: "宗地分割", img: require("@assets/images/zdfg.png"),path:'change',oLevel:'fg',tLevel:'zd'}, |
101 | { | 101 | { |
102 | name: "导入楼盘表模板", | 102 | name: "宗地合并", |
103 | img: require("@assets/images/drlpbmb.png"), | 103 | img: require("@assets/images/drlpbmb.png"), |
104 | path:'change',oLevel:'hb',tLevel:'zd' | ||
104 | }, | 105 | }, |
105 | { name: "新办房屋", img: require("@assets/images/xbfw.png") }, | 106 | { name: "范围属性变更", img: require("@assets/images/xbfw.png"),path:'change',oLevel:'fwsxbg',tLevel:'' }, |
106 | { name: "重新落宗", img: require("@assets/images/cxlz.png") }, | 107 | { name: "重新落宗", img: require("@assets/images/cxlz.png"),path:'change',oLevel:'cxlz',tLevel:''}, |
107 | { name: "添加", img: require("@assets/images/tj.png") }, | 108 | { name: "添加", img: require("@assets/images/tj.png") }, |
108 | ], | 109 | ], |
109 | tableData: [ | 110 | tableData: [ |
... | @@ -161,12 +162,16 @@ export default { | ... | @@ -161,12 +162,16 @@ export default { |
161 | //非编辑状态才可以点击 | 162 | //非编辑状态才可以点击 |
162 | if (!this.isEdit) { | 163 | if (!this.isEdit) { |
163 | if(item.path){ | 164 | if(item.path){ |
165 | let params = {}; | ||
166 | if(item.oLevel!==''){ | ||
167 | params.oLevel = item.oLevel; | ||
168 | } | ||
169 | if(item.tLevel!==''){ | ||
170 | params.tLevel = item.tLevel; | ||
171 | } | ||
164 | this.$router.push({ | 172 | this.$router.push({ |
165 | path:'/change', | 173 | path:item.path, |
166 | query:{ | 174 | query:params |
167 | oLevel:'fg', | ||
168 | tLevel:'h' | ||
169 | } | ||
170 | }) | 175 | }) |
171 | } | 176 | } |
172 | } | 177 | } | ... | ... |
... | @@ -43,22 +43,22 @@ | ... | @@ -43,22 +43,22 @@ |
43 | > | 43 | > |
44 | </td> | 44 | </td> |
45 | <td class="dzwdm"> | 45 | <td class="dzwdm"> |
46 | <el-input v-model="item.dzwdm" placeholder="请输入定着物代码" | 46 | <el-input v-model="item.dzwdm" |
47 | maxlength="9" | 47 | maxlength="9" |
48 | > | 48 | > |
49 | </el-input> | 49 | </el-input> |
50 | </td> | 50 | </td> |
51 | <td class="syqmj"> | 51 | <td class="syqmj"> |
52 | <el-input placeholder="请输入使用所有权面积" style="ime-mode:inactive" | 52 | <el-input style="ime-mode:inactive" |
53 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 53 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
54 | v-model="item.tdsyqsyqmj" | 54 | v-model="item.tdsyqsyqmj" |
55 | ></el-input> | 55 | ></el-input> |
56 | </td> | 56 | </td> |
57 | <td class="dytdmj"> | 57 | <td class="dytdmj"> |
58 | <el-input v-model="item.dydytdmj" style="ime-mode:inactive" placeholder="请输入独有独用土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> | 58 | <el-input v-model="item.dydytdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> |
59 | </td> | 59 | </td> |
60 | <td class="fttjmj"> | 60 | <td class="fttjmj"> |
61 | <el-input v-model="item.fttdmj" style="ime-mode:inactive" placeholder="请输入分摊土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> | 61 | <el-input v-model="item.fttdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> |
62 | </td> | 62 | </td> |
63 | </tr> | 63 | </tr> |
64 | <tr> | 64 | <tr> | ... | ... |
... | @@ -148,7 +148,7 @@ | ... | @@ -148,7 +148,7 @@ |
148 | <tr v-for="(item1,index) in form.fwytList" :key="index"> | 148 | <tr v-for="(item1,index) in form.fwytList" :key="index"> |
149 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle"> | 149 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle"> |
150 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> | 150 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
151 | <span> <i class="requisite">*</i>用途</span> | 151 | <span><i class="requisite">*</i>房屋用途</span> |
152 | </td> | 152 | </td> |
153 | 153 | ||
154 | <td colspan="1" style="min-width:120px" class="tdright"> | 154 | <td colspan="1" style="min-width:120px" class="tdright"> |
... | @@ -171,7 +171,7 @@ | ... | @@ -171,7 +171,7 @@ |
171 | v-model="item1.fwytzdbsm" | 171 | v-model="item1.fwytzdbsm" |
172 | ></el-select-tree> | 172 | ></el-select-tree> |
173 | </td> | 173 | </td> |
174 | <td colspan="2" class="tdright">用途</td> | 174 | <td colspan="2" class="tdright">实际用途</td> |
175 | <td colspan="4" > | 175 | <td colspan="4" > |
176 | <el-select-tree style="width:100%" | 176 | <el-select-tree style="width:100%" |
177 | ref="yt" | 177 | ref="yt" |
... | @@ -195,8 +195,9 @@ | ... | @@ -195,8 +195,9 @@ |
195 | <span><i class="requisite">*</i>房屋结构</span> | 195 | <span><i class="requisite">*</i>房屋结构</span> |
196 | </td> | 196 | </td> |
197 | <td colspan="1" class="tdright"> | 197 | <td colspan="1" class="tdright"> |
198 | <i class="iconfont iconicon-test" style="margin-right: 8px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> | 198 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> |
199 | <span> 删除</span> | 199 | 房屋结构 |
200 | |||
200 | </td> | 201 | </td> |
201 | <td colspan="9" > | 202 | <td colspan="9" > |
202 | <el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > | 203 | <el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > | ... | ... |
-
Please register or sign in to post a comment