Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
99de54c7 by 杨威
Options

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

2 parents dad0d6d1 d2d493fe
Inline Side-by-side
Showing 3 changed files with 96 additions and 21 deletions
...@@ -286,6 +286,7 @@ ...@@ -286,6 +286,7 @@
286 import { getSearchList } from "@api/search"; 286 import { getSearchList } from "@api/search";
287 import { fwsxbgbl } from "@api/common"; 287 import { fwsxbgbl } from "@api/common";
288 import {getQjHDetailByBsm} from "@api/h"; 288 import {getQjHDetailByBsm} from "@api/h";
289 import { createProcessInstance } from "@api/user";
289 import {queryFwsxbg} from "@api/search" 290 import {queryFwsxbg} from "@api/search"
290 import lpbContent from "./../../views/zrz/lpb/bjlp/lpbContent/index" 291 import lpbContent from "./../../views/zrz/lpb/bjlp/lpbContent/index"
291 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb"; 292 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
...@@ -389,7 +390,8 @@ ...@@ -389,7 +390,8 @@
389 lpbContentHeight: 0, 390 lpbContentHeight: 0,
390 lpbContentwidth: 0, 391 lpbContentwidth: 0,
391 lpbloading:true, 392 lpbloading:true,
392 hbsm:'' 393 hbsm:'',
394 workflowName:'宗地范围属性变更'
393 }; 395 };
394 }, 396 },
395 created() {}, 397 created() {},
...@@ -476,7 +478,7 @@ ...@@ -476,7 +478,7 @@
476 },*/ 478 },*/
477 //点击办理 479 //点击办理
478 handleClick(row) { 480 handleClick(row) {
479 let params = { bsm: row.bsm, type: this.queryType }; 481 let params = { bsm: row.bsm, type: this.queryType, ywlx:"fwsxbg"};
480 this.bdcdyh = row.bdcdyh; 482 this.bdcdyh = row.bdcdyh;
481 if(row.dylx == 'h0' || row.dylx == 'h1'){ 483 if(row.dylx == 'h0' || row.dylx == 'h1'){
482 this.hbsm = row.bsm; 484 this.hbsm = row.bsm;
...@@ -496,40 +498,100 @@ ...@@ -496,40 +498,100 @@
496 type: 'warning' 498 type: 'warning'
497 }).then(() => { 499 }).then(() => {
498 vm.loadingShow('业务办理中'); 500 vm.loadingShow('业务办理中');
499 fwsxbgbl(params) 501
500 .then((res) => { 502 let data = {
501 vm.loadingHide(); 503 params:params,
502 if (res.success) { 504 workflowName:this.workflowName
505 }
506
507 // fwsxbgbl(params)
508 // .then((res) => {
509 // vm.loadingHide();
510 // if (res.success) {
511 // // this.$message({
512 // // message: res.message,
513 // // type: "变更成功",
514 // // });
515 // let path = "";
516 // switch (this.queryType) {
517 // case "zrz":
518 // this.$store.state.zrzbsm = res.result;
519 // this.getTreeByBsm(res.result,this.queryType,'0,1,2');
520 // path = "/zrz";
521 // break;
522 // case "zd":
523 // this.$store.state.zdbsm = res.result;
524 // this.getRightTree(res.result,'0,1,2');
525 // path = "/zd";
526 // break;
527 // case "dz":
528 // this.$store.state.dzbsm = res.result;
529 // this.getTreeByBsm(res.result,this.queryType,'0,1,2');
530 // path = "/dz";
531 // break;
532 // default:
533 // break;
534 // }
535 // this.$router.push({
536 // path: path,
537 // query: {
538 // bsm: res.result,
539 // source: 2,
540 // auth:'2'
541 // }
542 // });
543 // } else {
544 // this.$message({
545 // message: res.message,
546 // type: "warning",
547 // });
548 // }
549 // })
550 // .catch((error) => {
551 // vm.loadingHide();
503 // this.$message({ 552 // this.$message({
504 // message: res.message, 553 // message: res.message,
505 // type: "变更成功", 554 // type: "error",
506 // }); 555 // });
556 // });
557 createProcessInstance(data)
558 .then((res) => {
559 console.log(res);
560 vm.loadingHide();
561 if (res.needShow) {
562 this.$message({
563 message: "创建成功！",
564 type: "success",
565 });
566
507 let path = ""; 567 let path = "";
508 switch (this.queryType) { 568 switch (this.queryType) {
509 case "zrz": 569 case "zrz":
510 this.$store.state.zrzbsm = res.result; 570 this.$store.state.zrzbsm = res.processInstance.title;
511 this.getTreeByBsm(res.result,this.queryType,'0,1,2'); 571 this.getTreeByBsm(res.processInstance.title,this.queryType,'0,1,2');
512 path = "/zrz"; 572 path = "/zrz";
513 break; 573 break;
514 case "zd": 574 case "zd":
515 this.$store.state.zdbsm = res.result; 575 this.$store.state.zdbsm = res.processInstance.title;
516 this.getRightTree(res.result,'0,1,2'); 576 this.getRightTree(res.processInstance.title,'0,1,2');
517 path = "/zd"; 577 path = "/zd";
518 break; 578 break;
519 case "dz": 579 case "dz":
520 this.$store.state.dzbsm = res.result; 580 this.$store.state.dzbsm = res.processInstance.title;
521 this.getTreeByBsm(res.result,this.queryType,'0,1,2'); 581 this.getTreeByBsm(res.processInstance.title,this.queryType,'0,1,2');
522 path = "/dz"; 582 path = "/dz";
523 break; 583 break;
524 default: 584 default:
525 break; 585 break;
526 } 586 }
587
527 this.$router.push({ 588 this.$router.push({
528 path: path, 589 path: path,
529 query: { 590 query: {
530 bsm: res.result, 591 bsm: res.processInstance.title,
531 source: 2, 592 source: 2,
532 auth:'2' 593 auth:'2',
594 workitemInstanceId:res.workitemInstance.id
533 } 595 }
534 }); 596 });
535 } else { 597 } else {
...@@ -738,6 +800,19 @@ ...@@ -738,6 +800,19 @@
738 queryType(val){ 800 queryType(val){
739 console.log(val,"范围属性变更,tab") 801 console.log(val,"范围属性变更,tab")
740 this.queryData.type=val; 802 this.queryData.type=val;
803 switch (val) {
804 case "zrz":
805 this.workflowName = "自然幢范围属性变更";
806 break;
807 case "zd":
808 this.workflowName = "宗地范围属性变更";
809 break;
810 case "dz":
811 this.workflowName = "多幢范围属性变更";
812 break;
813 default:
814 break;
815 }
741 } 816 }
742 }, 817 },
743 }; 818 };
......
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
328 // .catch((error) => {}); 328 // .catch((error) => {});
329 let data = { 329 let data = {
330 params:this.ruleForm, 330 params:this.ruleForm,
331 workflowName:'新建1' 331 workflowName:'新建宗地'
332 } 332 }
333 createProcessInstance(data) 333 createProcessInstance(data)
334 .then((res) => { 334 .then((res) => {
......
...@@ -252,25 +252,25 @@ ...@@ -252,25 +252,25 @@
252 switch (row.dylx) { 252 switch (row.dylx) {
253 case "zd": 253 case "zd":
254 this.$store.state.zdbsm = res.processInstance.title; 254 this.$store.state.zdbsm = res.processInstance.title;
255 this.getRightTree(res.result,'0,1,2'); 255 this.getRightTree(res.processInstance.title,'0,1,2');
256 break; 256 break;
257 case "zrz": 257 case "zrz":
258 this.$store.state.zrzbsm = res.processInstance.title; 258 this.$store.state.zrzbsm = res.processInstance.title;
259 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 259 this.getTreeByBsm(res.processInstance.title,row.dylx,'0,1,2');
260 break; 260 break;
261 case "h": 261 case "h":
262 case "h0": 262 case "h0":
263 case "h1": 263 case "h1":
264 this.$store.state.hbsm = res.processInstance.title; 264 this.$store.state.hbsm = res.processInstance.title;
265 this.getTreeByBsm(res.result,'h','0,1,2'); 265 this.getTreeByBsm(res.processInstance.title,'h','0,1,2');
266 break; 266 break;
267 case "dz": 267 case "dz":
268 this.$store.state.dzbsm = res.processInstance.title; 268 this.$store.state.dzbsm = res.processInstance.title;
269 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 269 this.getTreeByBsm(res.processInstance.title,row.dylx,'0,1,2');
270 break; 270 break;
271 case "gzw": 271 case "gzw":
272 this.$store.state.dzbsm = res.processInstance.title; 272 this.$store.state.dzbsm = res.processInstance.title;
273 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 273 this.getTreeByBsm(res.processInstance.title,row.dylx,'0,1,2');
274 break; 274 break;
275 275
276 default: 276 default:
......