Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
8cb9ef98 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents faa23b76 75ea9880
Inline Side-by-side
Showing 8 changed files with 98 additions and 50 deletions
...@@ -20,4 +20,7 @@ yarn-error.log* ...@@ -20,4 +20,7 @@ yarn-error.log*
20 *.sln 20 *.sln
21 *.sw? 21 *.sw?
22 package-lock.json 22 package-lock.json
23 CadastralSystem.iml 23 CadastralSyst
24 em.iml
25 *.env
26 *.gitignore
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="50%" 6 width="50%"
7 @close="close" 7 @close="close"
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> 11 <span class="xl" @click="xl">祥例</span>
12 <table border="1"> 12 <table border="1">
...@@ -128,13 +128,30 @@ ...@@ -128,13 +128,30 @@
128 key: '2', 128 key: '2',
129 label: '实际层', 129 label: '实际层',
130 value: '2' 130 value: '2'
131 }, {
132 key: '3',
133 label: '空',
134 value: '3'
131 } 135 }
132 ] 136 ]
133 } 137 }
134 }, 138 },
135 methods: { 139 methods: {
136 lodding:function(){ 140 test: function () {
137 this.$emit('lodding') 141 for (let key in this.plshData) {
142 console.log(key)
143 console.log(this.plshData[key])
144 if (key === 'chqbl') {
145 continue;
146 }
147 if (this.plshData[key] !== '' && this.plshData[key] !== '3' && this.plshData[key] !== false) {
148 return true;
149 }
150 }
151 return false;
152 },
153 lodding: function () {
154 this.$emit('lodding')
138 }, 155 },
139 xl: function () { 156 xl: function () {
140 this.xlVisible = true; 157 this.xlVisible = true;
...@@ -156,6 +173,10 @@ ...@@ -156,6 +173,10 @@
156 } 173 }
157 }, 174 },
158 save: function () { 175 save: function () {
176 if (!this.test()) {
177 this.$message.info("请选择")
178 return;
179 }
159 this.plshData['bsms'] = this.bsms 180 this.plshData['bsms'] = this.bsms
160 updateSh(this.plshData).then(res => { 181 updateSh(this.plshData).then(res => {
161 if (res.success) { 182 if (res.success) {
...@@ -174,25 +195,25 @@ ...@@ -174,25 +195,25 @@
174 computed: { 195 computed: {
175 gz: function () { 196 gz: function () {
176 let gz = ""; 197 let gz = "";
177 if (this.plshData.shqz != "") { 198 if (this.plshData.shqz !== "") {
178 gz += this.plshData.shqz 199 gz += this.plshData.shqz
179 } 200 }
180 if (this.plshData.selectDyh) { 201 if (this.plshData.selectDyh) {
181 gz += "[单元号]" 202 gz += "[单元号]"
182 } 203 }
183 if (this.plshData.fgfA != "") { 204 if (this.plshData.fgfA !== "") {
184 gz += this.plshData.fgfA 205 gz += this.plshData.fgfA
185 } 206 }
186 if (this.plshData.c == 1) { 207 if (this.plshData.c === 1) {
187 gz += "[名义层]" 208 gz += "[名义层]"
188 } else if (this.plshData.c == 2) { 209 } else if (this.plshData.c === 2) {
189 gz += "[实际层]" 210 gz += "[实际层]"
190 } 211 }
191 if (this.plshData.fgfB != "") { 212 if (this.plshData.fgfB !== "") {
192 gz += this.plshData.fgfB 213 gz += this.plshData.fgfB
193 } 214 }
194 gz += "[户号]"; 215 gz += "[户号]";
195 if (this.plshData.shhz != "") { 216 if (this.plshData.shhz !== "") {
196 gz += this.plshData.shhz 217 gz += this.plshData.shhz
197 } 218 }
198 return gz; 219 return gz;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="60%" 6 width="60%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
...@@ -121,12 +121,12 @@ ...@@ -121,12 +121,12 @@
121 isVisible: false, 121 isVisible: false,
122 plzlData: { 122 plzlData: {
123 qz: '', 123 qz: '',
124 zd: '', 124 zd: '3',
125 zrz: '', 125 zrz: '3',
126 ljz: '', 126 ljz: '3',
127 zdy: '', 127 zdy: '3',
128 c: '', 128 c: '3',
129 h: '', 129 h: '3',
130 hz: '' 130 hz: ''
131 }, 131 },
132 zdgz: [ 132 zdgz: [
...@@ -160,6 +160,9 @@ ...@@ -160,6 +160,9 @@
160 }, { 160 }, {
161 label: "逻辑幢号", 161 label: "逻辑幢号",
162 value: '2' 162 value: '2'
163 }, {
164 label: "空",
165 value: '3'
163 } 166 }
164 ], 167 ],
165 zdygz: [ 168 zdygz: [
...@@ -169,6 +172,9 @@ ...@@ -169,6 +172,9 @@
169 }, { 172 }, {
170 label: "幢单元号", 173 label: "幢单元号",
171 value: '2' 174 value: '2'
175 }, {
176 label: "空",
177 value: '3'
172 } 178 }
173 ], 179 ],
174 cgz: [ 180 cgz: [
...@@ -180,6 +186,9 @@ ...@@ -180,6 +186,9 @@
180 key: '2', 186 key: '2',
181 label: '实际层', 187 label: '实际层',
182 value: '2' 188 value: '2'
189 }, {
190 label: "空",
191 value: '3'
183 } 192 }
184 ], 193 ],
185 hgz: [ 194 hgz: [
...@@ -191,15 +200,22 @@ ...@@ -191,15 +200,22 @@
191 key: '2', 200 key: '2',
192 label: '户号', 201 label: '户号',
193 value: '2' 202 value: '2'
203 }, {
204 label: "空",
205 value: '3'
194 } 206 }
195 ] 207 ]
196 } 208 }
197 }, 209 },
198 methods: { 210 methods: {
199 lodding:function(){ 211 lodding: function () {
200 this.$emit('lodding') 212 this.$emit('lodding')
201 }, 213 },
202 save: function () { 214 save: function () {
215 if (!this.test()) {
216 this.$message.info("请选择")
217 return;
218 }
203 this.plzlData['bsms'] = this.bsms; 219 this.plzlData['bsms'] = this.bsms;
204 updateZl(this.plzlData).then(res => { 220 updateZl(this.plzlData).then(res => {
205 if (res.success) { 221 if (res.success) {
...@@ -210,8 +226,15 @@ ...@@ -210,8 +226,15 @@
210 } 226 }
211 }) 227 })
212 }, 228 },
229 test: function () {
230 for (let key in this.plzlData) {
231 if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') {
232 return true;
233 }
234 }
235 return false;
236 },
213 cancel: function () { 237 cancel: function () {
214 console.log("cancel......")
215 this.close(); 238 this.close();
216 }, 239 },
217 close: function () { 240 close: function () {
...@@ -220,7 +243,6 @@ ...@@ -220,7 +243,6 @@
220 this.result(); 243 this.result();
221 }, 244 },
222 result: function () { 245 result: function () {
223 console.log("重置")
224 this.plzlData = { 246 this.plzlData = {
225 qz: '', 247 qz: '',
226 zd: '', 248 zd: '',
...@@ -237,45 +259,45 @@ ...@@ -237,45 +259,45 @@
237 gz: function () { 259 gz: function () {
238 // [前缀][宗地][自然幢][单元][室号][室号][后缀] 260 // [前缀][宗地][自然幢][单元][室号][室号][后缀]
239 let gz = ""; 261 let gz = "";
240 if (this.plzlData.qz != '') { 262 if (this.plzlData.qz !== '') {
241 gz += this.plzlData.qz 263 gz += this.plzlData.qz
242 } 264 }
243 265
244 if (this.plzlData.zd == 1) { 266 if (this.plzlData.zd === 1) {
245 gz += "[宗地坐落]"; 267 gz += "[宗地坐落]";
246 } else if (this.plzlData.zd == 2) { 268 } else if (this.plzlData.zd === 2) {
247 gz += "[宗地名称]"; 269 gz += "[宗地名称]";
248 } 270 }
249 271
250 if (this.plzlData.zrz == 1) { 272 if (this.plzlData.zrz === 1) {
251 gz += "[自然幢坐落]" 273 gz += "[自然幢坐落]"
252 } else if (this.plzlData.zrz == 2) { 274 } else if (this.plzlData.zrz === 2) {
253 gz += "[自然幢名称]"; 275 gz += "[自然幢名称]";
254 } 276 }
255 if (this.plzlData.ljz == 1) { 277 if (this.plzlData.ljz === 1) {
256 gz += "[逻辑幢名称]" 278 gz += "[逻辑幢名称]"
257 } else if (this.plzlData.ljz == 2) { 279 } else if (this.plzlData.ljz === 2) {
258 gz += "[逻辑幢号]" 280 gz += "[逻辑幢号]"
259 } 281 }
260 if (this.plzlData.zdy == 1) { 282 if (this.plzlData.zdy === 1) {
261 gz += "[幢单元名称]"; 283 gz += "[幢单元名称]";
262 } else if (this.plzlData.zdy == 2) { 284 } else if (this.plzlData.zdy === 2) {
263 gz += "[幢单元号]" 285 gz += "[幢单元号]"
264 } 286 }
265 if (this.plzlData.c == 1) { 287 if (this.plzlData.c === 1) {
266 gz += "[名义层]" 288 gz += "[名义层]"
267 } else if (this.plzlData.c == 2) { 289 } else if (this.plzlData.c === 2) {
268 gz += "[实际层]" 290 gz += "[实际层]"
269 } 291 }
270 if (this.plzlData.h == 1) { 292 if (this.plzlData.h === 1) {
271 gz += "[室号]" 293 gz += "[室号]"
272 } else if (this.plzlData.h == 2) { 294 } else if (this.plzlData.h === 2) {
273 gz += "[户号]" 295 gz += "[户号]"
274 } 296 }
275 if (this.plzlData.hz != "") { 297 if (this.plzlData.hz !== "") {
276 gz += this.plzlData.hz 298 gz += this.plzlData.hz
277 } 299 }
278 if (gz == "") { 300 if (gz === "") {
279 gz += "无" 301 gz += "无"
280 } 302 }
281 return gz; 303 return gz;
......
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
50 uploadUrl: '', 50 uploadUrl: '',
51 isVisible: false, 51 isVisible: false,
52 sxdrData: { 52 sxdrData: {
53 bsm: '' 53 bsm: '',
54 type:''
54 }, 55 },
55 errorData: [] 56 errorData: []
56 } 57 }
...@@ -72,13 +73,12 @@ ...@@ -72,13 +73,12 @@
72 this.reset(); 73 this.reset();
73 }, 74 },
74 downloadTemplate() { 75 downloadTemplate() {
75 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx); 76 window.open(`/api/tx/excelGeo/template?type=` + this.dylx);
76 }, 77 },
77 uploadSuccess(res, file, fileList) { 78 uploadSuccess(res, file, fileList) {
78 this.errorData = []; 79 this.errorData = [];
79 if (res.success) { 80 if (res.success) {
80 this.$message.success("上传成功") 81 this.$message.success("上传成功")
81 debugger
82 this.loading(); 82 this.loading();
83 this.close() 83 this.close()
84 } else { 84 } else {
...@@ -96,9 +96,10 @@ ...@@ -96,9 +96,10 @@
96 this.isVisible = val; 96 this.isVisible = val;
97 }, 97 },
98 dylx(val) { 98 dylx(val) {
99 this.sxdrData.type=val;
99 switch (val) { 100 switch (val) {
100 case "zd": 101 case "zd":
101 this.uploadUrl = "/api/tx/excelGeo/Zdimport"; 102 this.uploadUrl = "/api/tx/excelGeo/import";
102 break; 103 break;
103 default: 104 default:
104 break; 105 break;
......
...@@ -318,7 +318,7 @@ export default { ...@@ -318,7 +318,7 @@ export default {
318 xmmc:'测试自然幢', 318 xmmc:'测试自然幢',
319 bdcqzh:'A12111111111111111', 319 bdcqzh:'A12111111111111111',
320 dylx:'zrz', 320 dylx:'zrz',
321 zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b' 321 zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6'
322 } 322 }
323 ] 323 ]
324 }, 324 },
......
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
189 getLshsData(){ 189 getLshsData(){
190 let _this = this; 190 let _this = this;
191 const data = { 191 const data = {
192 "bsm": "d85a274a332ad2d35c922a3a95eb154f", 192 "bsm": this.$store.state.zdbsm,
193 "type": "zd" 193 "type": "zd"
194 }; 194 };
195 getLshs(data).then((res)=>{ 195 getLshs(data).then((res)=>{
......
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
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" placeholder="请输入定着物代码"
47 maxlength="9"
48 >
47 </el-input> 49 </el-input>
48 </td> 50 </td>
49 <td class="syqmj"> 51 <td class="syqmj">
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
70 <!-- <div class="pers"> 72 <!-- <div class="pers">
71 <el-button @click="save" type="primary">保存</el-button> 73 <el-button @click="save" type="primary">保存</el-button>
72 </div> --> 74 </div> -->
73 75
74 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 76 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
75 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 77 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
76 </div> 78 </div>
...@@ -237,7 +239,7 @@ ...@@ -237,7 +239,7 @@
237 padding: 18px; 239 padding: 18px;
238 height: auto; 240 height: auto;
239 width: 100%; 241 width: 100%;
240 242
241 table { 243 table {
242 margin-top: 10px; 244 margin-top: 10px;
243 background-color: #fff; 245 background-color: #fff;
......
...@@ -524,8 +524,10 @@ ...@@ -524,8 +524,10 @@
524 }, 524 },
525 created(){ 525 created(){
526 let bsm=this.$store.state.hbsm 526 let bsm=this.$store.state.hbsm
527 console.log(bsm,'户BSM') 527 // console.log(bsm,'户BSM')
528 this.getHInfo(bsm); 528 if (bsm) {
529 this.getHInfo(bsm);
530 }
529 this.$nextTick(()=>{ 531 this.$nextTick(()=>{
530 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 532 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
531 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320 533 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
...@@ -585,8 +587,7 @@ ...@@ -585,8 +587,7 @@
585 }, 587 },
586 //根据户bsm查询户信息 588 //根据户bsm查询户信息
587 getHInfo(hbsm){ 589 getHInfo(hbsm){
588 this.bsm = hbsm; 590 //this.bsm = hbsm;
589 console.log(hbsm);
590 getQjHDetailByBsm(hbsm).then((res)=>{ 591 getQjHDetailByBsm(hbsm).then((res)=>{
591 if(res.code===200){ 592 if(res.code===200){
592 this.form = res.result; 593 this.form = res.result;
...@@ -621,8 +622,6 @@ ...@@ -621,8 +622,6 @@
621 this.$set(this.form,"ycftxs", this.form.glftxs) 622 this.$set(this.form,"ycftxs", this.form.glftxs)
622 623
623 } 624 }
624 console.log("=============")
625 console.log(this.form)
626 if(res.result.fwytList.length===0){ 625 if(res.result.fwytList.length===0){
627 this.form.fwytList.push({ 626 this.form.fwytList.push({
628 glbsm:'', //关联标识码 627 glbsm:'', //关联标识码
......