Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2c8a791c by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 08f5ecde 89a48c0c
Expand all
Inline Side-by-side
Showing 5 changed files with 38 additions and 42 deletions
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div> 10 <div>
11 <span class="xl" @click="xl">祥例</span>
12 <table border="1"> 11 <table border="1">
13 <tr> 12 <tr>
14 <td>室号前缀</td> 13 <td>室号前缀</td>
...@@ -57,15 +56,7 @@ ...@@ -57,15 +56,7 @@
57 <div class="gz"> 56 <div class="gz">
58 <span>室号规则：{{gz}}</span> 57 <span>室号规则：{{gz}}</span>
59 </div> 58 </div>
60 </div> 59 <div class="xlgz">
61 <div>
62 <el-dialog
63 title="祥例"
64 :visible.sync="xlVisible"
65 width="50%"
66 :modal-append-to-body="false"
67 >
68 <div class="xlgz">
69 <span> 60 <span>
70 样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”) 61 样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
71 <br/> 62 <br/>
...@@ -79,8 +70,7 @@ ...@@ -79,8 +70,7 @@
79 <br/> 70 <br/>
80 样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”) 71 样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”)
81 </span> 72 </span>
82 </div> 73 </div>
83 </el-dialog>
84 </div> 74 </div>
85 <div class="shop"> 75 <div class="shop">
86 <el-button type="primary" @click="save">保存</el-button> 76 <el-button type="primary" @click="save">保存</el-button>
...@@ -109,7 +99,6 @@ ...@@ -109,7 +99,6 @@
109 data() { 99 data() {
110 return { 100 return {
111 isVisible: false, 101 isVisible: false,
112 xlVisible: false,
113 plshData: { 102 plshData: {
114 shqz: '', 103 shqz: '',
115 selectDyh: false, 104 selectDyh: false,
...@@ -153,9 +142,6 @@ ...@@ -153,9 +142,6 @@
153 lodding: function () { 142 lodding: function () {
154 this.$emit('lodding') 143 this.$emit('lodding')
155 }, 144 },
156 xl: function () {
157 this.xlVisible = true;
158 },
159 close: function () { 145 close: function () {
160 this.$emit("close") 146 this.$emit("close")
161 this.isVisible = false 147 this.isVisible = false
...@@ -204,9 +190,9 @@ ...@@ -204,9 +190,9 @@
204 if (this.plshData.fgfA !== "") { 190 if (this.plshData.fgfA !== "") {
205 gz += this.plshData.fgfA 191 gz += this.plshData.fgfA
206 } 192 }
207 if (this.plshData.c === 1) { 193 if (+this.plshData.c === 1) {
208 gz += "[名义层]" 194 gz += "[名义层]"
209 } else if (this.plshData.c === 2) { 195 } else if (+this.plshData.c === 2) {
210 gz += "[实际层]" 196 gz += "[实际层]"
211 } 197 }
212 if (this.plshData.fgfB !== "") { 198 if (this.plshData.fgfB !== "") {
...@@ -267,7 +253,7 @@ ...@@ -267,7 +253,7 @@
267 253
268 .gz { 254 .gz {
269 color: #b2b2b2; 255 color: #b2b2b2;
270 font-size: 12px; 256 font-size: 14px;
271 margin-top: 40px; 257 margin-top: 40px;
272 } 258 }
273 259
......
...@@ -262,36 +262,35 @@ ...@@ -262,36 +262,35 @@
262 if (this.plzlData.qz !== '') { 262 if (this.plzlData.qz !== '') {
263 gz += this.plzlData.qz 263 gz += this.plzlData.qz
264 } 264 }
265 265 if (+this.plzlData.zd === 1) {
266 if (this.plzlData.zd === 1) {
267 gz += "[宗地坐落]"; 266 gz += "[宗地坐落]";
268 } else if (this.plzlData.zd === 2) { 267 } else if (+this.plzlData.zd === 2) {
269 gz += "[宗地名称]"; 268 gz += "[宗地名称]";
270 } 269 }
271 270
272 if (this.plzlData.zrz === 1) { 271 if (+this.plzlData.zrz === 1) {
273 gz += "[自然幢坐落]" 272 gz += "[自然幢坐落]"
274 } else if (this.plzlData.zrz === 2) { 273 } else if (+this.plzlData.zrz === 2) {
275 gz += "[自然幢名称]"; 274 gz += "[自然幢名称]";
276 } 275 }
277 if (this.plzlData.ljz === 1) { 276 if (+this.plzlData.ljz === 1) {
278 gz += "[逻辑幢名称]" 277 gz += "[逻辑幢名称]"
279 } else if (this.plzlData.ljz === 2) { 278 } else if (+this.plzlData.ljz === 2) {
280 gz += "[逻辑幢号]" 279 gz += "[逻辑幢号]"
281 } 280 }
282 if (this.plzlData.zdy === 1) { 281 if (+this.plzlData.zdy === 1) {
283 gz += "[幢单元名称]"; 282 gz += "[幢单元名称]";
284 } else if (this.plzlData.zdy === 2) { 283 } else if (+this.plzlData.zdy === 2) {
285 gz += "[幢单元号]" 284 gz += "[幢单元号]"
286 } 285 }
287 if (this.plzlData.c === 1) { 286 if (+this.plzlData.c === 1) {
288 gz += "[名义层]" 287 gz += "[名义层]"
289 } else if (this.plzlData.c === 2) { 288 } else if (+this.plzlData.c === 2) {
290 gz += "[实际层]" 289 gz += "[实际层]"
291 } 290 }
292 if (this.plzlData.h === 1) { 291 if (+this.plzlData.h === 1) {
293 gz += "[室号]" 292 gz += "[室号]"
294 } else if (this.plzlData.h === 2) { 293 } else if (+this.plzlData.h === 2) {
295 gz += "[户号]" 294 gz += "[户号]"
296 } 295 }
297 if (this.plzlData.hz !== "") { 296 if (this.plzlData.hz !== "") {
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 :close-on-click-modal="false"
10 >
10 <div class="search"> 11 <div class="search">
11 <el-row> 12 <el-row>
12 <el-col :span="24"> 13 <el-col :span="24">
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
64 <td>不动产权证号</td> 65 <td>不动产权证号</td>
65 <td>权利人</td> 66 <td>权利人</td>
66 <td>坐落</td> 67 <td>坐落</td>
68 <td>自然幢数量</td>
67 </tr> 69 </tr>
68 <tr v-if="Data.length==0"> 70 <tr v-if="Data.length==0">
69 <td colspan="8"> 71 <td colspan="8">
...@@ -81,6 +83,7 @@ ...@@ -81,6 +83,7 @@
81 <td>{{item.bdcqzh}}</td> 83 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlr}}</td> 84 <td>{{item.qlr}}</td>
83 <td>{{item.zl}}</td> 85 <td>{{item.zl}}</td>
86 <td>{{item.zrzCount}}</td>
84 </tr> 87 </tr>
85 </table> 88 </table>
86 </div> 89 </div>
...@@ -167,8 +170,14 @@ ...@@ -167,8 +170,14 @@
167 this.getData(this.queryData) 170 this.getData(this.queryData)
168 }, 171 },
169 addData: function (val) { 172 addData: function (val) {
170 this.$emit("getData", val) 173 let flag;
171 if (this.isZdClose) { 174 this.$emit("getData",
175 val
176 , i => {
177 flag = i
178 })
179 console.log(flag,"返回值")
180 if (flag&&this.isZdClose) {
172 this.close(); 181 this.close();
173 } 182 }
174 }, 183 },
...@@ -234,9 +243,11 @@ ...@@ -234,9 +243,11 @@
234 .noData { 243 .noData {
235 color: #b2b2b2; 244 color: #b2b2b2;
236 } 245 }
237 .table-bode{ 246
247 .table-bode {
238 height: 450px; 248 height: 450px;
239 } 249 }
250
240 .page { 251 .page {
241 margin-top: 20px; 252 margin-top: 20px;
242 } 253 }
......
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
237 <th class="xmmc" width="300px">项目名称</th> 237 <th class="xmmc" width="300px">项目名称</th>
238 <th class="xmmc">幢信息</th> 238 <th class="xmmc">幢信息</th>
239 </tr> 239 </tr>
240 <tr v-for="(item,index) in dzFghData.fwlist" :key="index*Math.random()"> 240 <tr v-for="(item,index) in dzFghData.fwlist" :key="index">
241 <td class="cz"> 241 <td class="cz">
242 <el-button 242 <el-button
243 type="primary" 243 type="primary"
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 </el-select> 258 </el-select>
259 </td> 259 </td>
260 <td class="xmmc"> 260 <td class="xmmc">
261 <input type="text" v-model="item.xmmc" class="formInput"/> 261 <el-input v-model="item.xmmc" ></el-input>
262 </td> 262 </td>
263 <td class="zxx"> 263 <td class="zxx">
264 <div class="fghzxx"> 264 <div class="fghzxx">
...@@ -767,10 +767,10 @@ ...@@ -767,10 +767,10 @@
767 case 'dz': 767 case 'dz':
768 this.dzFghData.fwlist.push( 768 this.dzFghData.fwlist.push(
769 { 769 {
770 "xmmc": "", 770 xmmc: "",
771 "zrzlist": [], 771 zrzlist: [],
772 "zrzmclist": [], 772 zrzmclist: [],
773 "ztype": "zrz" 773 ztype: "zrz"
774 } 774 }
775 ); 775 );
776 this.dzFghData.olddzbsm = this.dzFgqData.bsm; 776 this.dzFghData.olddzbsm = this.dzFgqData.bsm;
......