250d1225 by 杨威

合并修改

2 parents c5092ce9 47cd4455
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </tr> 55 </tr>
56 </table> 56 </table>
57 <div class="gz"> 57 <div class="gz">
58 <span>室号规则:[单元号][分割符A][层号][分割符A][室号前缀][室号][室号后缀]</span> 58 <span>室号规则:{{gz}}</span>
59 </div> 59 </div>
60 </div> 60 </div>
61 <div> 61 <div>
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
94 <script> 94 <script>
95 import {updateSh} from './../../api/zrz' 95 import {updateSh} from './../../api/zrz'
96 import {Message} from 'element-ui' 96 import {Message} from 'element-ui'
97
97 export default { 98 export default {
98 name: "plSh", 99 name: "plSh",
99 props: { 100 props: {
...@@ -154,8 +155,8 @@ ...@@ -154,8 +155,8 @@
154 save: function () { 155 save: function () {
155 this.plshData['bsms'] = this.bsms 156 this.plshData['bsms'] = this.bsms
156 console.log(this.plshData) 157 console.log(this.plshData)
157 updateSh(this.plshData).then(res=>{ 158 updateSh(this.plshData).then(res => {
158 if (res.success){ 159 if (res.success) {
159 this.close(); 160 this.close();
160 } else { 161 } else {
161 Message.error(res.message) 162 Message.error(res.message)
...@@ -166,6 +167,33 @@ ...@@ -166,6 +167,33 @@
166 this.close() 167 this.close()
167 } 168 }
168 }, 169 },
170 computed: {
171 gz: function () {
172 let gz = "";
173 if (this.plshData.shqz != "") {
174 gz += this.plshData.shqz
175 }
176 if (this.plshData.isSelectDyh) {
177 gz += "[单元号]"
178 }
179 if (this.plshData.fgfA != "") {
180 gz += this.plshData.fgfA
181 }
182 if (this.plshData.c == 1) {
183 gz += "[名义层]"
184 } else if (this.plshData.c == 2) {
185 gz += "[实际层]"
186 }
187 if (this.plshData.fgfB != "") {
188 gz += this.plshData.fgfB
189 }
190 gz += "[户号]";
191 if (this.plshData.shhz != "") {
192 gz += this.plshData.shhz
193 }
194 return gz;
195 }
196 },
169 watch: { 197 watch: {
170 plShVisible: function (val) { 198 plShVisible: function (val) {
171 this.isVisible = val 199 this.isVisible = val
......
1 <template>
2 <div>
3 <el-dialog
4 title="批量坐落"
5 :visible.sync="isVisible"
6 width="60%"
7 @close="close"
8 :modal-append-to-body="false"
9 center>
10 <div>
11 <table border="1">
12 <tr>
13 <td>前缀</td>
14 <td>宗地</td>
15 <td>自然幢</td>
16 <td>逻辑幢</td>
17 <td>幢单元</td>
18 <td></td>
19 <td></td>
20 <td>后缀</td>
21 </tr>
22 <tr>
23 <td>
24 <input type="text" class="inputtitle" v-model="plzlData.qz"/>
25 </td>
26 <td>
27 <el-select v-model="plzlData.zd">
28 <el-option v-for="i in zdgz"
29 :key="i.label"
30 :label="i.label"
31 :value="i.value">
32
33 </el-option>
34 </el-select>
35 </td>
36 <td>
37 <el-select v-model="plzlData.zrz">
38 <el-option v-for="i in zrzgz"
39 :key="i.label"
40 :label="i.label"
41 :value="i.value">
42
43 </el-option>
44 </el-select>
45 </td>
46 <td>
47 <el-select v-model="plzlData.ljz">
48 <el-option v-for="i in ljzgz"
49 :key="i.label"
50 :label="i.label"
51 :value="i.value">
52
53 </el-option>
54 </el-select>
55 </td>
56 <td>
57 <el-select v-model="plzlData.zdy">
58 <el-option v-for="i in zdygz"
59 :key="i.label"
60 :label="i.label"
61 :value="i.value">
62
63 </el-option>
64 </el-select>
65 </td>
66 <td>
67 <el-select v-model="plzlData.c">
68 <el-option v-for="i in cgz"
69 :key="i.label"
70 :label="i.label"
71 :value="i.value">
72
73 </el-option>
74 </el-select>
75 </td>
76 <td>
77 <el-select v-model="plzlData.h">
78 <el-option v-for="i in hgz"
79 :key="i.label"
80 :label="i.label"
81 :value="i.value">
82
83 </el-option>
84 </el-select>
85 </td>
86 <td>
87 <input type="text" class="inputtitle" v-model="plzlData.hz"/>
88 </td>
89 </tr>
90 </table>
91 <div class="gz">
92 <span>户坐落规则:{{gz}}</span>
93 </div>
94 </div>
95 <div class="shop">
96 <el-button type="primary" @click="save">保存</el-button>
97 <el-button type="primary" @click="result">重置</el-button>
98 <el-button type="primary" @click="cancel">取消</el-button>
99 </div>
100 </el-dialog>
101 </div>
102 </template>
103
104 <script>
105 export default {
106 name: "plZl",
107 props: {
108 plZlVisible: {
109 type: Boolean,
110 default: false
111 },
112 bsms: {
113 type: Array
114 },
115 measureType: {
116 type: Number
117 }
118 },
119 data() {
120 return {
121 isVisible: false,
122 plzlData: {
123 qz: '',
124 zd: '',
125 zrz: '',
126 ljz: '',
127 zdy: '',
128 c: '',
129 h: '',
130 hz: ''
131 },
132 zdgz: [
133 {
134 label: '宗地坐落',
135 value: '1'
136 }, {
137 label: "宗地名称",
138 value: '2'
139 }, {
140 label: "空",
141 value: '3'
142 }
143 ],
144 zrzgz: [
145 {
146 label: '自然幢坐落',
147 value: '1'
148 }, {
149 label: "自然幢名称",
150 value: '2'
151 }, {
152 label: "空",
153 value: '3'
154 }
155 ],
156 ljzgz: [
157 {
158 label: '逻辑幢名称',
159 value: '1'
160 }, {
161 label: "逻辑幢号",
162 value: '2'
163 }
164 ],
165 zdygz: [
166 {
167 label: '幢单元名称',
168 value: '1'
169 }, {
170 label: "幢单元号",
171 value: '2'
172 }
173 ],
174 cgz: [
175 {
176 key: '1',
177 label: '明义层',
178 value: '1'
179 }, {
180 key: '2',
181 label: '实际层',
182 value: '2'
183 }
184 ],
185 hgz: [
186 {
187 key: '1',
188 label: '室号',
189 value: '1'
190 }, {
191 key: '2',
192 label: '户号',
193 value: '2'
194 }
195 ]
196 }
197 },
198 methods: {
199 save: function () {
200 this.plzlData['bsms'] = this.bsms;
201 this.plzlData['measureType'] = this.measureType;
202 console.log("save......", this.plzlData)
203 },
204 cancel: function () {
205 console.log("cancel......")
206 },
207 close: function () {
208 this.$emit("close")
209 this.isVisible = false
210 this.result();
211 },
212 result: function () {
213 console.log("重置")
214 }
215 },
216 computed: {
217 gz: function () {
218 // [前缀][宗地][自然幢][单元][室号][室号][后缀]
219 let gz = "";
220 if (this.plzlData.qz != '') {
221 gz += this.plzlData.qz
222 }
223
224 if (this.plzlData.zd == 1) {
225 gz += "[宗地坐落]";
226 } else if (this.plzlData.zd == 2) {
227 gz += "[宗地名称]";
228 }
229
230 if (this.plzlData.zrz == 1) {
231 gz += "[自然幢坐落]"
232 } else if (this.plzlData.zrz == 2) {
233 gz += "[自然幢名称]";
234 }
235 if (this.plzlData.ljz == 1) {
236 gz += "[逻辑幢名称]"
237 } else if (this.plzlData.ljz == 2) {
238 gz += "[逻辑幢号]"
239 }
240 if (this.plzlData.zdy == 1) {
241 gz += "[幢单元名称]";
242 } else if (this.plzlData.zdy == 2) {
243 gz += "[幢单元号]"
244 }
245 if (this.plzlData.c == 1) {
246 gz += "[名义层]"
247 } else if (this.plzlData.c == 2) {
248 gz += "[实际层]"
249 }
250 if (this.plzlData.h == 1) {
251 gz += "[室号]"
252 } else if (this.plzlData.h == 2) {
253 gz += "[户号]"
254 }
255 if (this.plzlData.hz != "") {
256 gz += this.plzlData.hz
257 }
258 if (gz == "") {
259 gz += "无"
260 }
261 return gz;
262 }
263 },
264 watch: {
265 plZlVisible: function (val) {
266 this.isVisible = val
267 }
268 }
269 }
270 </script>
271
272 <style scoped lang="less">
273 table {
274 margin-top: 10px;
275 background-color: #fff;
276 font-size: 14px;
277 width: 100%;
278 :hover {
279 cursor: pointer;
280 }
281 }
282
283 td {
284 text-align: center;
285 height: 36px;
286 min-width: 60px;
287 }
288
289 .xl {
290 color: blue;
291 float: right;
292 }
293
294 .xl:hover {
295 cursor: pointer;
296 }
297
298 .inputtitle {
299 line-height: 38px;
300 width: 90%;
301 border: none;
302 outline: none;
303 }
304
305 .shop {
306 text-align: center;
307 margin-top: 20px;
308 }
309
310 .gz {
311 color: #b2b2b2;
312 font-size: 12px;
313 margin-top: 40px;
314 }
315
316 .xlgz {
317 span {
318 font-size: 16px;
319 line-height: 22px;
320 span {
321 color: red;
322 }
323 }
324 }
325 </style>
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
120 </el-dialog> 120 </el-dialog>
121 <!-- 批量操作弹出框 --> 121 <!-- 批量操作弹出框 -->
122 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h> 122 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h>
123 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" :measureType="tabPosition" @close="plZlClose"></pl-zl>
123 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> 124 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
124 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh> 125 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
125 <!-- 双击户的弹出框 --> 126 <!-- 双击户的弹出框 -->
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
140 import PlC from "./../../../../components/plc/plC" 141 import PlC from "./../../../../components/plc/plC"
141 import PlSh from "./../../../../components/plsh/plSh" 142 import PlSh from "./../../../../components/plsh/plSh"
142 import PlH from "./../../../../components/plh/plH" 143 import PlH from "./../../../../components/plh/plH"
144 import PlZl from "./../../../../components/plzl/plZl"
143 import LineTree from "../../../../components/lineTree/lineTree"; 145 import LineTree from "../../../../components/lineTree/lineTree";
144 import addLjz from "./ljz/index"; 146 import addLjz from "./ljz/index";
145 import addZdy from "./zdy/index"; 147 import addZdy from "./zdy/index";
...@@ -150,7 +152,7 @@ import { getLpbMenuTree } from "../../../../api/lpb"; ...@@ -150,7 +152,7 @@ import { getLpbMenuTree } from "../../../../api/lpb";
150 152
151 export default { 153 export default {
152 name: "", 154 name: "",
153 components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh,PlH,hbj }, 155 components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh,PlH ,PlZl,hbj},
154 props: {}, 156 props: {},
155 data() { 157 data() {
156 return { 158 return {
...@@ -160,7 +162,7 @@ export default { ...@@ -160,7 +162,7 @@ export default {
160 plhVisible:false, 162 plhVisible:false,
161 plShVisible:false, 163 plShVisible:false,
162 hbjVisible:false, 164 hbjVisible:false,
163 tabPosition:'0', 165 tabPosition:1,
164 radio1: "", 166 radio1: "",
165 radio2: "", 167 radio2: "",
166 createFlag: false, 168 createFlag: false,
...@@ -249,6 +251,9 @@ export default { ...@@ -249,6 +251,9 @@ export default {
249 }, 100); 251 }, 100);
250 }, 252 },
251 methods: { 253 methods: {
254 plZlClose(){
255 this.plzlVisible=false
256 },
252 plcClose(){ 257 plcClose(){
253 this.plcVisible=false; 258 this.plcVisible=false;
254 }, 259 },
......