Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ffe684e2 by 杨威
Options

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

2 parents 98fe80fa b588a832
Inline Side-by-side
Showing 9 changed files with 252 additions and 59 deletions
...@@ -7,5 +7,20 @@ ...@@ -7,5 +7,20 @@
7 "layerName": "ZRZ", 7 "layerName": "ZRZ",
8 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 8 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
9 "id": "10" 9 "id": "10"
10 },
11 {
12 "layerName": "DJQ",
13 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
14 "id": "13"
15 },
16 {
17 "layerName": "DJZQ",
18 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
19 "id": "14"
20 },
21 {
22 "layerName": "XJZQ",
23 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
24 "id": "19"
10 } 25 }
11 ] 26 ]
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -196,11 +196,19 @@ export default { ...@@ -196,11 +196,19 @@ export default {
196 attributes:self.currentClickZd, 196 attributes:self.currentClickZd,
197 geometry:geometry 197 geometry:geometry
198 } 198 }
199 self.geoJoint(geometry,function (isJoint,message) {
200 if(isJoint){
201 self.$message.warning(message)
202 return;
203 }else {
199 if(self.propertyInfo.type == "zd"){ 204 if(self.propertyInfo.type == "zd"){
200 self.saveZd(graphic); 205 self.saveZd(graphic);
201 }else{ 206 }else{
202 self.saveZRZ(graphic); 207 self.saveZRZ(graphic);
203 } 208 }
209 }
210 });
211
204 } else { 212 } else {
205 console.log('error submit!!'); 213 console.log('error submit!!');
206 return false; 214 return false;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 4
5 import layers from '@/assets/json/layers.json' 5 import layers from '@/assets/json/layers.json'
6 import queryUtils from "@libs/map/queryUtils"; 6 import queryUtils from "@libs/map/queryUtils";
7 import identifyUtils from '@/libs/map/IdentifyUtils'
7 import {loadModules} from "esri-loader" 8 import {loadModules} from "esri-loader"
8 import arcgisParser from 'terraformer-arcgis-parser' 9 import arcgisParser from 'terraformer-arcgis-parser'
9 import wktParse from 'terraformer-wkt-parser' 10 import wktParse from 'terraformer-wkt-parser'
...@@ -155,6 +156,54 @@ export default { ...@@ -155,6 +156,54 @@ export default {
155 primitive.type = "Polygon" 156 primitive.type = "Polygon"
156 }*/ 157 }*/
157 return arcgisParser.convert(primitive) 158 return arcgisParser.convert(primitive)
159 },
160 //导入空间图形是 先判断数据是否跨界
161 geoJoint(geometry,callBacFunction){
162 var self = this;
163 loadModules([
164 "esri/geometry/geometryEngine",
165 "esri/geometry/Polygon"
166 ]).then(([
167 geometryEngine,
168 Polygon
169 ]) => {
170 var djqLayer = null,djzqLayer = null,xjzqLayer = null;
171 djqLayer = self.getLayerByName("DJQ");
172 djzqLayer = self.getLayerByName("DJZQ");
173 xjzqLayer = self.getLayerByName("XJZQ");
174 var layerIds = [];
175 layerIds.push(djqLayer.id);
176 layerIds.push(djzqLayer.id);
177 layerIds.push(xjzqLayer.id);
178 var polygon = new Polygon(geometry);
179 identifyUtils.methods.identify(djqLayer.layerUrl,layerIds,polygon,function (res) {
180 var results = res.results;
181 var isJoint = false,layerName = "",message="";
182 if(!results || results.length == 0){
183 callBacFunction(true,"不在行政区内，请检查空间位置信息!!!");
184 }
185 for(var i = 0;i < results.length;i++){
186 var feature = results[i].feature;
187 var flag = geometryEngine.disjoint(polygon,feature.geometry);
188 if(flag){
189 isJoint = true;
190 layerName = results[i].layerName;
191 switch (layerName) {
192 case 'DJQ':message = "地块跨越地籍区，数据不合法!!!";break;
193 case 'DJZQ':message = "地块跨越地籍子区，数据不合法!!!";break;
194 case 'XJZQ':message = "地块跨越行政区，数据不合法!!!";break;
195 }
196 break
197 }
198 }
199 if(callBacFunction && typeof callBacFunction == "function"){
200 callBacFunction(isJoint,message);
201 }
202 })
203 }).catch(err => {
204 console.log(err);
205 throw (err);
206 })
158 } 207 }
159 208
160 } 209 }
......
...@@ -15,12 +15,15 @@ export default { ...@@ -15,12 +15,15 @@ export default {
15 var identifyTask = new IdentifyTask({ 15 var identifyTask = new IdentifyTask({
16 url:url 16 url:url
17 }), 17 }),
18 identifyParameters = new identifyParameters(); 18 identifyParameters = new IdentifyParameters();
19 identifyParameters.geometry = geometry; 19 identifyParameters.geometry = geometry;
20 if(layerIds){ 20 if(layerIds){
21 identifyParameters.layerIds = layerIds; 21 identifyParameters.layerIds = layerIds;
22 } 22 }
23 identifyParameters.layerOption = "all"; 23 identifyParameters.layerOption = "all";
24 identifyParameters.tolerance = 3;
25 identifyParameters.mapExtent = geometry.extent;
26 identifyParameters.returnGeometry = true;
24 identifyParameters.spatialReference = geometry.spatialReference; 27 identifyParameters.spatialReference = geometry.spatialReference;
25 identifyTask.execute(identifyParameters).then(result => { 28 identifyTask.execute(identifyParameters).then(result => {
26 if(callBackFunction && typeof callBackFunction == 'function'){ 29 if(callBackFunction && typeof callBackFunction == 'function'){
......
...@@ -135,7 +135,13 @@ ...@@ -135,7 +135,13 @@
135 default: 135 default:
136 break; 136 break;
137 } 137 }
138 this.$router.push(path); 138 this.$router.push({
139 path: path,
140 query: {
141 bsm: row.glbsm,
142 source: 2
143 }
144 });
139 }, 145 },
140 }, 146 },
141 computed: {}, 147 computed: {},
......
...@@ -16,29 +16,29 @@ ...@@ -16,29 +16,29 @@
16 <th class="qlr">权利人</th> 16 <th class="qlr">权利人</th>
17 <th class="zl">坐落</th> 17 <th class="zl">坐落</th>
18 </tr> 18 </tr>
19 <tr v-if="Object.keys(bgqData)==0"> 19 <tr v-if="Object.keys(zdFgqData)==0">
20 <td colspan="7"> 20 <td colspan="7">
21 <span class="noData">暂无数据</span> 21 <span class="noData">暂无数据</span>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr v-else> 24 <tr v-else>
25 <td class="xh">1</td> 25 <td class="xh">1</td>
26 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 26 <td class="zddm"><input type="text" class="formInput" v-model="zdFgqData.zddm"
27 readonly="readonly"/> 27 readonly="readonly"/>
28 </td> 28 </td>
29 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 29 <td class="bdcdyh"><input type="text" class="formInput" v-model="zdFgqData.bdcdyh"
30 readonly="readonly"/> 30 readonly="readonly"/>
31 </td> 31 </td>
32 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 32 <td class="xmmc"><input type="text" class="formInput" v-model="zdFgqData.xmmc"
33 readonly="readonly"/> 33 readonly="readonly"/>
34 </td> 34 </td>
35 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 35 <td class="bdcqzh"><input type="text" class="formInput" v-model="zdFgqData.bdcqzh"
36 readonly="readonly"/> 36 readonly="readonly"/>
37 </td> 37 </td>
38 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 38 <td class="qlr"><input type="text" class="formInput" v-model="zdFgqData.qlr"
39 readonly="readonly"/> 39 readonly="readonly"/>
40 </td> 40 </td>
41 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 41 <td class="zl"><input type="text" class="formInput" v-model="zdFgqData.zl"
42 readonly="readonly"/></td> 42 readonly="readonly"/></td>
43 </tr> 43 </tr>
44 </table> 44 </table>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <th class="xmmc">项目名称</th> 56 <th class="xmmc">项目名称</th>
57 <th class="zxx">幢信息</th> 57 <th class="zxx">幢信息</th>
58 </tr> 58 </tr>
59 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 59 <tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
60 <td class="cz"> 60 <td class="cz">
61 <el-button 61 <el-button
62 type="primary" 62 type="primary"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 </div> 146 </div>
147 147
148 <el-dialog 148 <el-dialog
149 v-if="fghData.newZdlist.length>0" 149 v-if="zdFghData.newZdlist.length>0"
150 title="提示" 150 title="提示"
151 :visible.sync="isopenXz" 151 :visible.sync="isopenXz"
152 width="50%" 152 width="50%"
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 <td>幢类型</td> 159 <td>幢类型</td>
160 <td>幢信息</td> 160 <td>幢信息</td>
161 </tr> 161 </tr>
162 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 162 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
163 <td> 163 <td>
164 <el-select v-model="item.ztype" 164 <el-select v-model="item.ztype"
165 > 165 >
...@@ -208,29 +208,29 @@ ...@@ -208,29 +208,29 @@
208 <th class="qlr">权利人</th> 208 <th class="qlr">权利人</th>
209 <th class="zl">坐落</th> 209 <th class="zl">坐落</th>
210 </tr> 210 </tr>
211 <tr v-if="Object.keys(bgqData)==0"> 211 <tr v-if="Object.keys(dzFgqData)==0">
212 <td colspan="7"> 212 <td colspan="7">
213 <span class="noData">暂无数据</span> 213 <span class="noData">暂无数据</span>
214 </td> 214 </td>
215 </tr> 215 </tr>
216 <tr v-else> 216 <tr v-else>
217 <td class="xh">1</td> 217 <td class="xh">1</td>
218 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 218 <td class="zddm"><input type="text" class="formInput" v-model="dzFgqData.zddm"
219 readonly="readonly"/> 219 readonly="readonly"/>
220 </td> 220 </td>
221 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 221 <td class="bdcdyh"><input type="text" class="formInput" v-model="dzFgqData.bdcdyh"
222 readonly="readonly"/> 222 readonly="readonly"/>
223 </td> 223 </td>
224 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 224 <td class="xmmc"><input type="text" class="formInput" v-model="dzFgqData.xmmc"
225 readonly="readonly"/> 225 readonly="readonly"/>
226 </td> 226 </td>
227 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 227 <td class="bdcqzh"><input type="text" class="formInput" v-model="dzFgqData.bdcqzh"
228 readonly="readonly"/> 228 readonly="readonly"/>
229 </td> 229 </td>
230 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 230 <td class="qlr"><input type="text" class="formInput" v-model="dzFgqData.qlr"
231 readonly="readonly"/> 231 readonly="readonly"/>
232 </td> 232 </td>
233 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 233 <td class="zl"><input type="text" class="formInput" v-model="dzFgqData.zl"
234 readonly="readonly"/></td> 234 readonly="readonly"/></td>
235 </tr> 235 </tr>
236 </table> 236 </table>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
248 <th class="xmmc">项目名称</th> 248 <th class="xmmc">项目名称</th>
249 <th class="zxx">幢信息</th> 249 <th class="zxx">幢信息</th>
250 </tr> 250 </tr>
251 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 251 <tr v-for="(item,index) in dzFghData.newZdlist" :key="index">
252 <td class="cz"> 252 <td class="cz">
253 <el-button 253 <el-button
254 type="primary" 254 type="primary"
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
337 </div> 337 </div>
338 338
339 <el-dialog 339 <el-dialog
340 v-if="fghData.newZdlist.length>0" 340 v-if="zdFghData.newZdlist.length>0"
341 title="提示" 341 title="提示"
342 :visible.sync="isopenXz" 342 :visible.sync="isopenXz"
343 :modal-append-to-body="false" 343 :modal-append-to-body="false"
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
350 <td>幢类型</td> 350 <td>幢类型</td>
351 <td>幢信息</td> 351 <td>幢信息</td>
352 </tr> 352 </tr>
353 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 353 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
354 <td> 354 <td>
355 <el-select v-model="item.ztype" 355 <el-select v-model="item.ztype"
356 > 356 >
...@@ -399,29 +399,29 @@ ...@@ -399,29 +399,29 @@
399 <th class="qlr">权利人</th> 399 <th class="qlr">权利人</th>
400 <th class="zl">坐落</th> 400 <th class="zl">坐落</th>
401 </tr> 401 </tr>
402 <tr v-if="Object.keys(bgqData)==0"> 402 <tr v-if="Object.keys(hFgqData)==0">
403 <td colspan="7"> 403 <td colspan="7">
404 <span class="noData">暂无数据</span> 404 <span class="noData">暂无数据</span>
405 </td> 405 </td>
406 </tr> 406 </tr>
407 <tr v-else> 407 <tr v-else>
408 <td class="xh">1</td> 408 <td class="xh">1</td>
409 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 409 <td class="zddm"><input type="text" class="formInput" v-model="hFgqData.zddm"
410 readonly="readonly"/> 410 readonly="readonly"/>
411 </td> 411 </td>
412 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 412 <td class="bdcdyh"><input type="text" class="formInput" v-model="hFgqData.bdcdyh"
413 readonly="readonly"/> 413 readonly="readonly"/>
414 </td> 414 </td>
415 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 415 <td class="xmmc"><input type="text" class="formInput" v-model="hFgqData.xmmc"
416 readonly="readonly"/> 416 readonly="readonly"/>
417 </td> 417 </td>
418 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 418 <td class="bdcqzh"><input type="text" class="formInput" v-model="hFgqData.bdcqzh"
419 readonly="readonly"/> 419 readonly="readonly"/>
420 </td> 420 </td>
421 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 421 <td class="qlr"><input type="text" class="formInput" v-model="hFgqData.qlr"
422 readonly="readonly"/> 422 readonly="readonly"/>
423 </td> 423 </td>
424 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 424 <td class="zl"><input type="text" class="formInput" v-model="hFgqData.zl"
425 readonly="readonly"/></td> 425 readonly="readonly"/></td>
426 </tr> 426 </tr>
427 </table> 427 </table>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
439 <th class="xmmc">项目名称</th> 439 <th class="xmmc">项目名称</th>
440 <th class="zxx">幢信息</th> 440 <th class="zxx">幢信息</th>
441 </tr> 441 </tr>
442 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 442 <tr v-for="(item,index) in hFghData.newZdlist" :key="index">
443 443
444 <td class="cz"> 444 <td class="cz">
445 <el-button 445 <el-button
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
529 </div> 529 </div>
530 530
531 <el-dialog 531 <el-dialog
532 v-if="fghData.newZdlist.length>0" 532 v-if="zdFghData.newZdlist.length>0"
533 title="提示" 533 title="提示"
534 :visible.sync="isopenXz" 534 :visible.sync="isopenXz"
535 :modal-append-to-body="false" 535 :modal-append-to-body="false"
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
542 <td>幢类型</td> 542 <td>幢类型</td>
543 <td>幢信息</td> 543 <td>幢信息</td>
544 </tr> 544 </tr>
545 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 545 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
546 <td> 546 <td>
547 <el-select v-model="item.ztype" 547 <el-select v-model="item.ztype"
548 > 548 >
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
595 595
596 export default { 596 export default {
597 name: "", 597 name: "",
598 components: {QueryData,zdQueryData}, 598 components: {QueryData, zdQueryData},
599 props: {}, 599 props: {},
600 data() { 600 data() {
601 return { 601 return {
...@@ -603,7 +603,9 @@ ...@@ -603,7 +603,9 @@
603 isopenXz: false, 603 isopenXz: false,
604 centerDialogVisible: false, 604 centerDialogVisible: false,
605 selectIndex: 0,// 当前选中序号 605 selectIndex: 0,// 当前选中序号
606 bgqData: {}, 606 zdFgqData: {}, // 宗地分割前数据
607 dzFgqData: {}, //多幢分割前数据
608 hFgqData: {}, // 户分割前数据
607 xzq: [], 609 xzq: [],
608 djq: [], 610 djq: [],
609 djzq: [], 611 djzq: [],
...@@ -680,7 +682,15 @@ ...@@ -680,7 +682,15 @@
680 userbsm: "", 682 userbsm: "",
681 fwlist: [] 683 fwlist: []
682 }, 684 },
683 fghData: { 685 zdFghData: {
686 oldZdbsm: "",
687 newZdlist: []
688 },
689 dzFghData: {
690 oldZdbsm: "",
691 newZdlist: []
692 },
693 hFghData: {
684 oldZdbsm: "", 694 oldZdbsm: "",
685 newZdlist: [] 695 newZdlist: []
686 }, 696 },
...@@ -701,7 +711,7 @@ ...@@ -701,7 +711,7 @@
701 console.log(node, 'node'); 711 console.log(node, 'node');
702 console.log(node.parent, 'node.parent') 712 console.log(node.parent, 'node.parent')
703 console.log(node.children, 'node.children') 713 console.log(node.children, 'node.children')
704 this.fghData.newZdlist[this.selectIndex].fwlist.push({ 714 this.zdFghData.newZdlist[this.selectIndex].fwlist.push({
705 zbsm: node.label, 715 zbsm: node.label,
706 ztype: '多幢' 716 ztype: '多幢'
707 } 717 }
...@@ -730,9 +740,23 @@ ...@@ -730,9 +740,23 @@
730 this.selectIndex = index 740 this.selectIndex = index
731 }, 741 },
732 save() { 742 save() {
733 console.log("save........") 743 switch (this.tabName) {
734 console.log(this.fghData) 744 case "zd":
735 zdfg(this.fghData).then(res => { 745 this.saveZd();
746 break
747 case "dz":
748 // 多幢保存
749 this.saveDz();
750 break
751 case "h":
752 this.saveH();
753 break
754 default:
755 break;
756 }
757 },
758 saveZd() {
759 zdfg(this.zdFghData).then(res => {
736 console.log(res) 760 console.log(res)
737 if (res.success) { 761 if (res.success) {
738 Message.success('保存成功') 762 Message.success('保存成功')
...@@ -741,7 +765,14 @@ ...@@ -741,7 +765,14 @@
741 } 765 }
742 }) 766 })
743 }, 767 },
744 getJbxx(id) { 768 saveDz() {
769
770 },
771 saveH() {
772
773 },
774 // 获取宗地基本信息
775 getZdJbxx(id) {
745 getQjZdjbxxDetailById(id).then(res => { 776 getQjZdjbxxDetailById(id).then(res => {
746 this.checkedData = res.result 777 this.checkedData = res.result
747 // 用户bsm暂时传空 778 // 用户bsm暂时传空
...@@ -767,8 +798,8 @@ ...@@ -767,8 +798,8 @@
767 this.djq = []; 798 this.djq = [];
768 this.djzq = []; 799 this.djzq = [];
769 if (index != undefined) { 800 if (index != undefined) {
770 this.fghData.newZdlist[index].djqbsm = '' 801 this.zdFghData.newZdlist[index].djqbsm = ''
771 this.fghData.newZdlist[index].djzqbsm = '' 802 this.zdFghData.newZdlist[index].djzqbsm = ''
772 } 803 }
773 getListByXzqbsm(id) 804 getListByXzqbsm(id)
774 .then((res) => { 805 .then((res) => {
...@@ -784,7 +815,7 @@ ...@@ -784,7 +815,7 @@
784 changeDjq(item, index) { 815 changeDjq(item, index) {
785 this.djzq = []; 816 this.djzq = [];
786 if (index != undefined) { 817 if (index != undefined) {
787 this.fghData.newZdlist[index].djzqbsm = '' 818 this.zdFghData.newZdlist[index].djzqbsm = ''
788 } 819 }
789 if (item == null) { 820 if (item == null) {
790 } else { 821 } else {
...@@ -801,7 +832,49 @@ ...@@ -801,7 +832,49 @@
801 } 832 }
802 }, 833 },
803 addRow() { 834 addRow() {
804 this.fghData.newZdlist.push({ 835 switch (this.tabName) {
836 case 'zd':
837 this.zdFghData.newZdlist.push({
838 xzqbsm: "",
839 djqbsm: "",
840 djzqbsm: "",
841 xmmc: "",
842 syqlxbsm: "",
843 zdtzmbsm: "",
844 userbsm: "",
845 fwlist: [
846 {
847 zbsm: "",
848 ztype: ""
849 }
850 ]
851 });
852 this.changeXzq(this.checkedData.xzqbsm)
853 this.changeDjq(this.checkedData.djqbsm)
854 this.$set(this.zdFghData.newZdlist, this.zdFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
855 break
856 case 'dz':
857 this.dzFghData.newZdlist.push({
858 xzqbsm: "",
859 djqbsm: "",
860 djzqbsm: "",
861 xmmc: "",
862 syqlxbsm: "",
863 zdtzmbsm: "",
864 userbsm: "",
865 fwlist: [
866 {
867 zbsm: "",
868 ztype: ""
869 }
870 ]
871 });
872 this.changeXzq(this.checkedData.xzqbsm)
873 this.changeDjq(this.checkedData.djqbsm)
874 this.$set(this.dzFghData.newZdlist, this.dzFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
875 break
876 case 'h':
877 this.hFghData.newZdlist.push({
805 xzqbsm: "", 878 xzqbsm: "",
806 djqbsm: "", 879 djqbsm: "",
807 djzqbsm: "", 880 djzqbsm: "",
...@@ -818,10 +891,26 @@ ...@@ -818,10 +891,26 @@
818 }); 891 });
819 this.changeXzq(this.checkedData.xzqbsm) 892 this.changeXzq(this.checkedData.xzqbsm)
820 this.changeDjq(this.checkedData.djqbsm) 893 this.changeDjq(this.checkedData.djqbsm)
821 this.$set(this.fghData.newZdlist, this.fghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) 894 this.$set(this.hFghData.newZdlist, this.hFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
895 break
896 default:
897 break
898 }
822 }, 899 },
823 delRow(index) { 900 delRow(index) {
824 this.fghData.newZdlist.splice(index, 1) 901 switch (this.tabName) {
902 case "zd":
903 this.zdFghData.newZdlist.splice(index, 1);
904 break;
905 case "dz":
906 this.dzFghData.newZdlist.splice(index, 1);
907 break;
908 case "h":
909 this.hFghData.newZdlist.splice(index, 1);
910 break;
911 default:
912 break
913 }
825 }, 914 },
826 close: function () { 915 close: function () {
827 this.centerDialogVisible = false; 916 this.centerDialogVisible = false;
...@@ -829,20 +918,43 @@ ...@@ -829,20 +918,43 @@
829 newAdd: function () { 918 newAdd: function () {
830 this.centerDialogVisible = true; 919 this.centerDialogVisible = true;
831 }, 920 },
832 addData: function (val) {
833 this.centerDialogVisible = false;
834 this.bgqData = val
835 },
836 getData: function (data) { 921 getData: function (data) {
837 this.bgqData = data 922 switch (this.tabName) {
923 case "zd":
924 this.zdFgqData = data;
925 break;
926 case "dz":
927 this.dzFgqData = data;
928 break;
929 case "h":
930 this.hFgqData = data;
931 break;
932 default:
933 break
934 }
935
838 }, 936 },
839 }, 937 },
840 computed: {}, 938 computed: {},
841 watch: { 939 watch: {
842 bgqData: { 940 zdFgqData: {
843 handler: function (item) { 941 handler: function (item) {
844 this.fghData.oldZdbsm = item.zdbsm 942 this.zdFghData.oldZdbsm = item.zdbsm;
845 this.getJbxx(item.zdbsm) 943 this.getZdJbxx(item.zdbsm);
944 },
945 deep: true
946 },
947 dzFgqData: {
948 handler: function (item) {
949 this.dzFgqData.oldZdbsm = item.glbsm;
950 this.getZdJbxx(item.glbsm);
951 },
952 deep: true
953 },
954 hFgqData: {
955 handler: function (item) {
956 this.hFgqData.oldZdbsm = item.glbsm;
957 this.getZdJbxx(item.glbsm);
846 }, 958 },
847 deep: true 959 deep: true
848 }, 960 },
...@@ -853,7 +965,7 @@ ...@@ -853,7 +965,7 @@
853 }, 965 },
854 deep: true 966 deep: true
855 } 967 }
856 }, 968 }
857 } 969 }
858 </script> 970 </script>
859 <style scoped lang="less"> 971 <style scoped lang="less">
......
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
372 return { 372 return {
373 tabName: 'zd', 373 tabName: 'zd',
374 centerDialogVisible: false, 374 centerDialogVisible: false,
375 bgqData: [], 375 zdFgqData: [],
376 hbhData: {}, 376 hbhData: {},
377 fgBoxWidth: 0, 377 fgBoxWidth: 0,
378 xzq: [], 378 xzq: [],
...@@ -462,10 +462,10 @@ ...@@ -462,10 +462,10 @@
462 }, 462 },
463 addData: function (val) { 463 addData: function (val) {
464 this.centerDialogVisible = false; 464 this.centerDialogVisible = false;
465 this.bgqData.push(val) 465 this.zdFgqData.push(val)
466 }, 466 },
467 getData: function (data) { 467 getData: function (data) {
468 this.bgqData.push(data) 468 this.zdFgqData.push(data)
469 }, 469 },
470 }, 470 },
471 computed: {}, 471 computed: {},
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
8 :before-remove="beforeRemove" 8 :before-remove="beforeRemove"
9 :on-success="uploadSuccess" 9 :on-success="uploadSuccess"
10 :on-error="uploadError" 10 :on-error="uploadError"
11 :show-file-list="false"
11 multiple 12 multiple
12 :limit="3" 13 :limit="3"
13 :on-exceed="handleExceed" 14 :on-exceed="handleExceed"
...@@ -107,7 +108,6 @@ ...@@ -107,7 +108,6 @@
107 }, 108 },
108 uploadSuccess(res, file, fileList) { 109 uploadSuccess(res, file, fileList) {
109 this.filesData.list = res.result; 110 this.filesData.list = res.result;
110 console.log(res, "res=========")
111 insertFile(this.filesData).then(res => { 111 insertFile(this.filesData).then(res => {
112 if (res.success) { 112 if (res.success) {
113 Message.success("上传成功") 113 Message.success("上传成功")
......