Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
79657ce5 by 杨威
Options

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

2 parents 8c9b315c 312e6c30
Inline Side-by-side
Showing 6 changed files with 303 additions and 92 deletions
...@@ -195,9 +195,13 @@ ...@@ -195,9 +195,13 @@
195 </el-form> 195 </el-form>
196 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 196 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button> 197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button>
198 <el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button>
199 <el-button type="primary" @click="registerCall">登记调用</el-button> 198 <el-button type="primary" @click="registerCall">登记调用</el-button>
200 </div> 199 </div>
200 <div class="sh-btn">
201 <el-button type="primary" @click="thdz">退回</el-button>
202 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
203 <el-button type="primary" @click="shdz" v-if="workFlowState">审核</el-button>
204 </div>
201 </div> 205 </div>
202 206
203 </template> 207 </template>
...@@ -206,7 +210,8 @@ ...@@ -206,7 +210,8 @@
206 import Qlr from "@components/formMenu/qlr"; 210 import Qlr from "@components/formMenu/qlr";
207 import Qlxz from "@components/formMenu/qlxz"; 211 import Qlxz from "@components/formMenu/qlxz";
208 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "@api/dz"; 212 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "@api/dz";
209 import {getQjZdjbxxDetailById} from "@api/zd" 213 import {getQjZdjbxxDetailById} from "@api/zd";
214 import { getActivityDetail } from "@api/user";
210 import {submit,registerCall} from "@api/common" 215 import {submit,registerCall} from "@api/common"
211 export default { 216 export default {
212 name:'zrz', 217 name:'zrz',
...@@ -289,6 +294,8 @@ ...@@ -289,6 +294,8 @@
289 mainBoxWidth: 0, 294 mainBoxWidth: 0,
290 295
291 rules:[], 296 rules:[],
297
298 workFlowState:false,
292 } 299 }
293 }, 300 },
294 created() { 301 created() {
...@@ -303,11 +310,49 @@ ...@@ -303,11 +310,49 @@
303 } 310 }
304 }, 311 },
305 mounted(){ 312 mounted(){
313 this.getActivityDetail();
306 this.$nextTick(() => { 314 this.$nextTick(() => {
307 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 315 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
308 }) 316 })
309 }, 317 },
310 methods: { 318 methods: {
319
320
321 getActivityDetail(){
322 let params = {
323 "params": {},
324 "workflowPeriod": "current",
325 "workitemInstanceId": this.$route.query.workitemInstanceId
326 }
327 getActivityDetail(params).then(res => {
328 this.workFlowState = res.workitemInstance.apps.some(function(item) {
329 return item == 'shenpibiao';
330 });
331 })
332 },
333
334 shdz(){
335 let data = {
336 bdcdyh:this.form.bdcdyh,
337 zl:this.form.zl,
338 shyj:'',
339 shr:'admin',
340 shsj:'2021-01-22'
341 };
342 vm.setShDialog(true,data)
343 },
344
345 thdz(){
346 let data = {
347 bdcdyh:this.form.bdcdyh,
348 zl:this.form.zl,
349 shyj:'',
350 shr:'admin',
351 shsj:'2021-01-22'
352 }
353 vm.rollback(data);
354 },
355
311 registerCall(){ 356 registerCall(){
312 let data={ 357 let data={
313 type:'dz', 358 type:'dz',
...@@ -533,19 +578,20 @@ ...@@ -533,19 +578,20 @@
533 }) 578 })
534 }, 579 },
535 onSubmit(){ 580 onSubmit(){
536 console.log(this.form) 581 vm.setTjDialog(true);
537 let data={ 582 // console.log(this.form)
538 glbsm:this.bsm, 583 // let data={
539 status:1, 584 // glbsm:this.bsm,
540 type:"dz" 585 // status:1,
541 } 586 // type:"dz"
542 submit(data).then((res)=>{ 587 // }
543 if(res.code===200){ 588 // submit(data).then((res)=>{
544 this.$message.success("提交完成！"); 589 // if(res.code===200){
545 this.getDzDetailByBsm(this.$route.query.bsm) 590 // this.$message.success("提交完成！");
546 this.getTreeByBsm(this.$route.query.bsm,'dz','0,1,2') 591 // this.getDzDetailByBsm(this.$route.query.bsm)
547 } 592 // this.getTreeByBsm(this.$route.query.bsm,'dz','0,1,2')
548 }) 593 // }
594 // })
549 }, 595 },
550 getZddm(zdbsm){ 596 getZddm(zdbsm){
551 getQjZdjbxxDetailById(zdbsm).then((res)=>{ 597 getQjZdjbxxDetailById(zdbsm).then((res)=>{
...@@ -716,5 +762,15 @@ ...@@ -716,5 +762,15 @@
716 border-color: rgba(0, 202, 205, .8); 762 border-color: rgba(0, 202, 205, .8);
717 } 763 }
718 } 764 }
765
766 .sh-btn{
767 position: fixed;
768 top: 74px;
769 right: 20px;
770 z-index: 999;
771 .el-button{
772 padding: 10px 30px;
773 }
774 }
719 } 775 }
720 </style> 776 </style>
......
...@@ -162,6 +162,9 @@ import { insertZrzjbxx } from "@api/zrz"; ...@@ -162,6 +162,9 @@ import { insertZrzjbxx } from "@api/zrz";
162 import { insertDzjbxx } from "@api/dz"; 162 import { insertDzjbxx } from "@api/dz";
163 import { insertGzwjbxx } from "@api/gzw"; 163 import { insertGzwjbxx } from "@api/gzw";
164 import { createProcessInstance } from "@api/user"; 164 import { createProcessInstance } from "@api/user";
165 import { getZrzDetailByBsm} from "@api/zrz"
166 import { getDzDetailByBsm} from "@api/dz";
167
165 168
166 export default { 169 export default {
167 name: "", 170 name: "",
...@@ -198,22 +201,29 @@ export default { ...@@ -198,22 +201,29 @@ export default {
198 xmmc: "", 201 xmmc: "",
199 xzqbsm: "", 202 xzqbsm: "",
200 type: "zd", 203 type: "zd",
201 zdtzmbsm: "" 204 zdtzmbsm: "",
205 ywlx:"create"
202 }, 206 },
203 ruleForm1:{ 207 ruleForm1:{
204 zdbsm:'', 208 zdbsm:'',
205 xmmc:'', 209 xmmc:'',
206 userbsm:'' 210 userbsm:'',
211 type: "zrz",
212 ywlx:"create"
207 }, 213 },
208 ruleForm2:{ 214 ruleForm2:{
209 zdbsm:'', 215 zdbsm:'',
210 xmmc:'', 216 xmmc:'',
211 userbsm:'' 217 userbsm:'',
218 type: "dz",
219 ywlx:"create"
212 }, 220 },
213 ruleForm4:{ 221 ruleForm4:{
214 zdzhbsm:'', 222 zdzhbsm:'',
215 xmmc:'', 223 xmmc:'',
216 userbsm:'' 224 userbsm:'',
225 type: "gzw",
226 ywlx:"create"
217 }, 227 },
218 rules: { 228 rules: {
219 xzqbsm: [ 229 xzqbsm: [
...@@ -359,31 +369,65 @@ export default { ...@@ -359,31 +369,65 @@ export default {
359 if (valid) { 369 if (valid) {
360 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : ''; 370 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
361 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : ''; 371 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
362 insertZrzjbxx(this.ruleForm1) 372 // insertZrzjbxx(this.ruleForm1)
373 // .then((res) => {
374 // if (res.code == "200") {
375 // //获取左侧树数据
376 // this.$store.state.oldZdbsm = '';
377 // this.getTreeByBsm(res.result.bsm,'zrz','0,1,2');
378 // this.$message({
379 // message: "创建成功！",
380 // type: "success",
381 // });
382 // //todo 跳转到自然幢基本信息内容表页面 (预留)
383 // this.$store.state.zdbsm=res.result.zdbsm;
384 // this.$store.state.zrzbsm=res.result.bsm;
385 // this.$store.state.xmmc=res.result.xmmc;
386 // this.$store.state.newZdbsm = res.result.zdbsm;
387 // this.close();
388 // this.$router.push({
389 // path: '/zrz', query:{
390 // source: 1,
391 // bsm:res.result.bsm,
392 // auth: '0,1,2'
393 // }
394 // });
395 // } else {
396 // this.$message.error("创建失败！");
397 // }
398 // })
399 // .catch((error) => {});
400 let data = {
401 params:this.ruleForm1,
402 workflowName:'新建自然幢'
403 };
404 createProcessInstance(data)
363 .then((res) => { 405 .then((res) => {
364 if (res.code == "200") { 406 console.log(res);
365 //获取左侧树数据 407 if (res.needShow) {
366 this.$store.state.oldZdbsm = ''; 408 this.getTreeByBsm(res.processInstance.title,"zrz",'0,1,2');
367 this.getTreeByBsm(res.result.bsm,'zrz','0,1,2');
368 this.$message({ 409 this.$message({
369 message: "创建成功！", 410 message: "创建成功！",
370 type: "success", 411 type: "success",
371 }); 412 });
372 //todo 跳转到自然幢基本信息内容表页面 (预留) 413 this.close();
373 this.$store.state.zdbsm=res.result.zdbsm; 414
374 this.$store.state.zrzbsm=res.result.bsm; 415 this.$store.state.zrzbsm = res.processInstance.title;
375 this.$store.state.xmmc=res.result.xmmc; 416 this.$nextTick(()=>{
376 this.$store.state.newZdbsm = res.result.zdbsm; 417 this.loadCache(res.processInstance.title,'zrz');
418 })
419 // todo 跳转到宗地基本信息内容表页面 (预留)
377 this.close(); 420 this.close();
378 this.$router.push({ 421 this.$router.push({
379 path: '/zrz', query:{ 422 path: '/zrz', query:{
380 source: 1, 423 source: 1,
381 bsm:res.result.bsm, 424 bsm:res.processInstance.title,
425 workitemInstanceId:res.workitemInstance.id,
382 auth: '0,1,2' 426 auth: '0,1,2'
383 } 427 }
384 }); 428 });
385 } else { 429 } else {
386 this.$message.error("创建失败！"); 430 this.$message.error("创建失败");
387 } 431 }
388 }) 432 })
389 .catch((error) => {}); 433 .catch((error) => {});
...@@ -394,6 +438,30 @@ export default { ...@@ -394,6 +438,30 @@ export default {
394 }); 438 });
395 439
396 }, 440 },
441
442 loadCache(bsm,type){
443 if(type === 'zrz'){
444 getZrzDetailByBsm(bsm).then((res)=>{
445 if(res.code === 200){
446 this.$store.state.zdbsm=res.result.zdbsm;
447 this.$store.state.zrzbsm=res.result.bsm;
448 this.$store.state.xmmc=res.result.xmmc;
449 this.$store.state.newZdbsm = res.result.zdbsm;
450 }
451 })
452 }else if(type === 'dz'){
453 getDzDetailByBsm(bsm).then((res)=>{
454 if(res.code === 200){
455 this.$store.state.zdbsm=res.result.zdbsm;
456 this.$store.state.dzbsm=res.result.bsm;
457 this.$store.state.xmmc=res.result.xmmc;
458 this.$store.state.newZdbsm = res.result.zdbsm;
459 }
460 })
461 }
462
463 },
464
397 newGzw(){ 465 newGzw(){
398 this.$refs['ruleForm4'].validate((valid) => { 466 this.$refs['ruleForm4'].validate((valid) => {
399 if (valid) { 467 if (valid) {
...@@ -432,28 +500,62 @@ export default { ...@@ -432,28 +500,62 @@ export default {
432 this.$refs['ruleForm2'].validate((valid) => { 500 this.$refs['ruleForm2'].validate((valid) => {
433 if (valid) { 501 if (valid) {
434 this.ruleForm2.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : ''; 502 this.ruleForm2.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
435 insertDzjbxx(this.ruleForm2) 503 // insertDzjbxx(this.ruleForm2)
504 // .then((res) => {
505 // if (res.code == "200") {
506 // this.getTreeByBsm(res.result.bsm,'dz','0,1,2');
507 // this.$message({
508 // message: "创建成功！",
509 // type: "success",
510 // });
511 // this.$store.state.zdbsm=res.result.zdbsm;
512 // this.$store.state.dzbsm=res.result.bsm;
513 // this.$store.state.xmmc=res.result.xmmc;
514 // this.$store.state.newZdbsm = res.result.zdbsm;
515 // this.close();
516 // this.$router.push({
517 // path: '/dz', query:{
518 // source: 1,
519 // bsm:res.result.bsm,
520 // auth: '0,1,2'
521 // }
522 // });
523 // } else {
524 // this.$message.error("创建失败！");
525 // }
526 // })
527 // .catch((error) => {});
528 let data = {
529 params:this.ruleForm2,
530 workflowName:'新建多幢'
531 };
532 createProcessInstance(data)
436 .then((res) => { 533 .then((res) => {
437 if (res.code == "200") { 534 console.log(res);
438 this.getTreeByBsm(res.result.bsm,'dz','0,1,2'); 535 if (res.needShow) {
536 this.getTreeByBsm(res.processInstance.title,"dz",'0,1,2');
439 this.$message({ 537 this.$message({
440 message: "创建成功！", 538 message: "创建成功！",
441 type: "success", 539 type: "success",
442 }); 540 });
443 this.$store.state.zdbsm=res.result.zdbsm; 541 this.close();
444 this.$store.state.dzbsm=res.result.bsm; 542
445 this.$store.state.xmmc=res.result.xmmc; 543 this.$store.state.dzbsm = res.processInstance.title;
446 this.$store.state.newZdbsm = res.result.zdbsm; 544 this.$nextTick(()=>{
545 this.loadCache(res.processInstance.title,'dz');
546 })
547 // todo 跳转到宗地基本信息内容表页面 (预留)
447 this.close(); 548 this.close();
448 this.$router.push({ 549 this.$router.push({
449 path: '/dz', query:{ 550 path: '/dz', query:{
450 source: 1, 551 source: 1,
451 bsm:res.result.bsm, 552 bsm:res.processInstance.title,
553 workitemInstanceId:res.workitemInstance.id,
452 auth: '0,1,2' 554 auth: '0,1,2'
453 } 555 }
454 }); 556 });
455 } else { 557 } else {
456 this.$message.error("创建失败！"); 558 this.$message.error("创建失败");
457 } 559 }
458 }) 560 })
459 .catch((error) => {}); 561 .catch((error) => {});
......
...@@ -182,26 +182,26 @@ ...@@ -182,26 +182,26 @@
182 this.$store.state.oldZdbsm = ''; 182 this.$store.state.oldZdbsm = '';
183 switch (row.dylx) { 183 switch (row.dylx) {
184 case "zd": 184 case "zd":
185 this.$store.state.zdbsm = row.glbsm; 185 this.$store.state.zdbsm = res.result;
186 this.getRightTree(row.glbsm,'0,1,2'); 186 this.getRightTree(res.result,'0,1,2');
187 break; 187 break;
188 case "zrz": 188 case "zrz":
189 this.$store.state.zrzbsm = row.glbsm; 189 this.$store.state.zrzbsm = res.result;
190 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 190 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
191 break; 191 break;
192 case "h": 192 case "h":
193 case "h0": 193 case "h0":
194 case "h1": 194 case "h1":
195 this.$store.state.hbsm = row.glbsm; 195 this.$store.state.hbsm = res.result;
196 this.getTreeByBsm(row.glbsm,'h','0,1,2'); 196 this.getTreeByBsm(res.result,'h','0,1,2');
197 break; 197 break;
198 case "dz": 198 case "dz":
199 this.$store.state.dzbsm = row.glbsm; 199 this.$store.state.dzbsm = res.result;
200 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 200 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
201 break; 201 break;
202 case "gzw": 202 case "gzw":
203 this.$store.state.dzbsm = row.glbsm; 203 this.$store.state.dzbsm = res.result;
204 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 204 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
205 break; 205 break;
206 206
207 default: 207 default:
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
214 this.$router.push({ 214 this.$router.push({
215 path: path, 215 path: path,
216 query: { 216 query: {
217 bsm: row.glbsm, 217 bsm: res.result,
218 source: 2, 218 source: 2,
219 auth:'1' 219 auth:'1'
220 } 220 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <!-- <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane> --> 5 <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
7 <el-tab-pane label="界址点" name="jzd"> 7 <el-tab-pane label="界址点" name="jzd">
8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd> 8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
...@@ -32,13 +32,13 @@ import lshs from "./lshs"; ...@@ -32,13 +32,13 @@ import lshs from "./lshs";
32 import fjcl from "./fjcl/fjcl" 32 import fjcl from "./fjcl/fjcl"
33 import Lcgz from "./lcgz" 33 import Lcgz from "./lcgz"
34 import {queryStatus} from "@api/search" 34 import {queryStatus} from "@api/search"
35 // import Fldcb from "@components/Fldcb/Fldcb" 35 import Fldcb from "@components/Fldcb/Fldcb"
36 import {getQjZdjbxxDetailById} from '@api/zd' 36 import {getQjZdjbxxDetailById} from '@api/zd'
37 export default { 37 export default {
38 name: "", 38 name: "",
39 components: { 39 components: {
40 // zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz 40 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
41 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz 41 //zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz
42 42
43 }, 43 },
44 props: {}, 44 props: {},
...@@ -93,9 +93,9 @@ export default { ...@@ -93,9 +93,9 @@ export default {
93 case 'mjftb': 93 case 'mjftb':
94 this.mjftbVisible = true; 94 this.mjftbVisible = true;
95 break; 95 break;
96 // case 'fldcb': 96 case 'fldcb':
97 // this.fldbcVisible = true; 97 this.fldbcVisible = true;
98 // break; 98 break;
99 case 'jzd': 99 case 'jzd':
100 this.jzdVisible = true; 100 this.jzdVisible = true;
101 break; 101 break;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <tr> 9 <tr>
10 <td colspan="2" class="tdright">行政区</td> 10 <td colspan="2" class="tdright">行政区</td>
11 <td colspan="2"> 11 <td colspan="2">
12 <el-select 12 <el-select name="xzq"
13 :disabled="disabled" 13 :disabled="disabled"
14 class="formSelect" 14 class="formSelect"
15 v-model="formData.xzqbsm" 15 v-model="formData.xzqbsm"
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </td> 26 </td>
27 <td colspan="2" class="tdright">地籍区</td> 27 <td colspan="2" class="tdright">地籍区</td>
28 <td colspan="2"> 28 <td colspan="2">
29 <el-select 29 <el-select name="djq"
30 class="formSelect" 30 class="formSelect"
31 :disabled="disabled" 31 :disabled="disabled"
32 v-model="formData.djqbsm" 32 v-model="formData.djqbsm"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 <td colspan="2" class="tdright">地籍子区</td> 44 <td colspan="2" class="tdright">地籍子区</td>
45 <td colspan="2"> 45 <td colspan="2">
46 <el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm"> 46 <el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm">
47 <el-option 47 <el-option name="djzq"
48 v-for="item in $store.state.djzqList" 48 v-for="item in $store.state.djzqList"
49 :key="item.bsm" 49 :key="item.bsm"
50 :label="item.mc" 50 :label="item.mc"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 <tr> 57 <tr>
58 <td colspan="2" class="tdright">权利类型</td> 58 <td colspan="2" class="tdright">权利类型</td>
59 <td colspan="4"> 59 <td colspan="4">
60 <el-select class="formSelect" :disabled="disabled" v-model="formData.qllxbsm"> 60 <el-select name="qllx" class="formSelect" :disabled="disabled" v-model="formData.qllxbsm">
61 <el-option 61 <el-option
62 v-for="item in $store.state.qllxList" 62 v-for="item in $store.state.qllxList"
63 :key="item.bsm" 63 :key="item.bsm"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </td> 69 </td>
70 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td> 70 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td>
71 <td colspan="4"> 71 <td colspan="4">
72 <el-select class="formSelect" ref="zdtzm" :disabled="disabled" 72 <el-select name="zdtzm" class="formSelect" ref="zdtzm" :disabled="disabled"
73 v-model="formData.zdtzmbsm"> 73 v-model="formData.zdtzmbsm">
74 <el-option 74 <el-option
75 v-for="item in $store.state.zdtzmList" 75 v-for="item in $store.state.zdtzmList"
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <tr> 84 <tr>
85 <td colspan="2" class="tdright">权利设定方式</td> 85 <td colspan="2" class="tdright">权利设定方式</td>
86 <td colspan="4"> 86 <td colspan="4">
87 <el-select class="formSelect" :disabled="disabled" v-model="formData.qlsdfs"> 87 <el-select name="qlsdfs" class="formSelect" :disabled="disabled" v-model="formData.qlsdfs">
88 <el-option 88 <el-option
89 v-for="item in $store.state.qlsdfsList" 89 v-for="item in $store.state.qlsdfsList"
90 :key="item.bsm" 90 :key="item.bsm"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 </td> 96 </td>
97 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td> 97 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td>
98 <td colspan="4" class="psr"> 98 <td colspan="4" class="psr">
99 <input :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19" 99 <input name="zddm" :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
100 type="text" 100 type="text"
101 class="formInput percent80" 101 class="formInput percent80"
102 v-model="formData.zddm" 102 v-model="formData.zddm"
...@@ -110,12 +110,12 @@ ...@@ -110,12 +110,12 @@
110 <tr> 110 <tr>
111 <td colspan="2" class="tdright">地籍号</td> 111 <td colspan="2" class="tdright">地籍号</td>
112 <td colspan="4"> 112 <td colspan="4">
113 <input type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/> 113 <input name="djh" type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/>
114 </td> 114 </td>
115 115
116 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td> 116 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
117 <td colspan="4" class="psr"> 117 <td colspan="4" class="psr">
118 <input 118 <input name="bdcdyh"
119 type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh" 119 type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh"
120 maxlength="28" 120 maxlength="28"
121 class="formInput" 121 class="formInput"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <tr> 127 <tr>
128 <td colspan="2" class="tdright">项目名称</td> 128 <td colspan="2" class="tdright">项目名称</td>
129 <td colspan="4" class="psr"> 129 <td colspan="4" class="psr">
130 <input :disabled="disabled" 130 <input name="xmmc" :disabled="disabled"
131 type="text" 131 type="text"
132 class="formInput " 132 class="formInput "
133 v-model="formData.xmmc" 133 v-model="formData.xmmc"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 </td> 135 </td>
136 <td colspan="2" class="tdright">预编宗地代码</td> 136 <td colspan="2" class="tdright">预编宗地代码</td>
137 <td colspan="4" class="psr"> 137 <td colspan="4" class="psr">
138 <input :disabled="disabled" 138 <input name="ybzddm" :disabled="disabled"
139 type="text" 139 type="text"
140 class="formInput " 140 class="formInput "
141 v-model="formData.ybzddm" 141 v-model="formData.ybzddm"
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
154 <!-- >--> 154 <!-- >-->
155 <!-- </el-option>--> 155 <!-- </el-option>-->
156 <!-- </el-select>--> 156 <!-- </el-select>-->
157 <el-select-tree 157 <el-select-tree name="gmjjhyfl"
158 style="width:100%" 158 style="width:100%"
159 v-if="show" 159 v-if="show"
160 :default-expand-all="defaultExpandAll" 160 :default-expand-all="defaultExpandAll"
...@@ -170,13 +170,13 @@ ...@@ -170,13 +170,13 @@
170 </td> 170 </td>
171 <td colspan="2" class="tdright">价格(元)</td> 171 <td colspan="2" class="tdright">价格(元)</td>
172 <td colspan="4" class="psr"> 172 <td colspan="4" class="psr">
173 <input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/> 173 <input id="jgid" :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/>
174 </td> 174 </td>
175 </tr> 175 </tr>
176 <tr> 176 <tr>
177 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td> 177 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
178 <td colspan="10"> 178 <td colspan="10">
179 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl" 179 <input name="zl" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
180 class="formInput" v-model="formData.zl"/> 180 class="formInput" v-model="formData.zl"/>
181 </td> 181 </td>
182 </tr> 182 </tr>
...@@ -294,28 +294,28 @@ ...@@ -294,28 +294,28 @@
294 <td colspan="2" rowspan="4" class="tdright">宗地四至</td> 294 <td colspan="2" rowspan="4" class="tdright">宗地四至</td>
295 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> 295 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
296 <td colspan="8" class="psr"> 296 <td colspan="8" class="psr">
297 <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled" 297 <input name="zdszb" type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled"
298 class="formInput" v-model="formData.zdszb"/> 298 class="formInput" v-model="formData.zdszb"/>
299 </td> 299 </td>
300 </tr> 300 </tr>
301 <tr> 301 <tr>
302 <td colspan="2" class="tdright"><i class="requisite">*</i>东至</td> 302 <td colspan="2" class="tdright"><i class="requisite">*</i>东至</td>
303 <td colspan="8" class="psr"> 303 <td colspan="8" class="psr">
304 <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled" 304 <input name="zdszd" type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled"
305 class="formInput" v-model="formData.zdszd"/> 305 class="formInput" v-model="formData.zdszd"/>
306 </td> 306 </td>
307 </tr> 307 </tr>
308 <tr> 308 <tr>
309 <td colspan="2" class="tdright"><i class="requisite">*</i>南至</td> 309 <td colspan="2" class="tdright"><i class="requisite">*</i>南至</td>
310 <td colspan="8" class="psr"> 310 <td colspan="8" class="psr">
311 <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled" 311 <input name="zdszn" type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled"
312 class="formInput" v-model="formData.zdszn"/> 312 class="formInput" v-model="formData.zdszn"/>
313 </td> 313 </td>
314 </tr> 314 </tr>
315 <tr> 315 <tr>
316 <td colspan="2" class="tdright"><i class="requisite">*</i>西至</td> 316 <td colspan="2" class="tdright"><i class="requisite">*</i>西至</td>
317 <td colspan="8" class="psr"> 317 <td colspan="8" class="psr">
318 <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled" 318 <input name="zdszx" type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled"
319 class="formInput" v-model="formData.zdszx"/> 319 class="formInput" v-model="formData.zdszx"/>
320 </td> 320 </td>
321 </tr> 321 </tr>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
332 </td> 332 </td>
333 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td> 333 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td>
334 <td colspan="4" > 334 <td colspan="4" >
335 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj" 335 <input name="zdmj" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj"
336 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/> 336 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
337 </td> 337 </td>
338 </tr> 338 </tr>
......
...@@ -274,11 +274,15 @@ ...@@ -274,11 +274,15 @@
274 </table> 274 </table>
275 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 275 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button> 276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
277 <el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button>
278 <el-button type="primary" @click="registerCall">登记调用</el-button> 277 <el-button type="primary" @click="registerCall">登记调用</el-button>
279 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> --> 278 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
280 </div> 279 </div>
281 </div> 280 </div>
281 <div class="sh-btn">
282 <el-button type="primary" @click="thzrz">退回</el-button>
283 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
284 <el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
285 </div>
282 </div> 286 </div>
283 </template> 287 </template>
284 288
...@@ -288,6 +292,7 @@ ...@@ -288,6 +292,7 @@
288 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz" 292 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz"
289 import {getQjZdjbxxDetailById} from "@api/zd" 293 import {getQjZdjbxxDetailById} from "@api/zd"
290 import {submit,registerCall} from "@api/common" 294 import {submit,registerCall} from "@api/common"
295 import { getActivityDetail } from "@api/user";
291 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 296 import geoUtils from "@components/lineTree/tx/js/geoUtils";
292 export default { 297 export default {
293 name:'zrz', 298 name:'zrz',
...@@ -316,6 +321,8 @@ ...@@ -316,6 +321,8 @@
316 lx:"zrz", 321 lx:"zrz",
317 bsm:'', 322 bsm:'',
318 323
324 workFlowState:false,
325
319 initZrzh:'', 326 initZrzh:'',
320 finishZrzh:'', 327 finishZrzh:'',
321 hcount:0, 328 hcount:0,
...@@ -418,6 +425,19 @@ ...@@ -418,6 +425,19 @@
418 mixins:[geoUtils], 425 mixins:[geoUtils],
419 methods: { 426 methods: {
420 427
428 getActivityDetail(){
429 let params = {
430 "params": {},
431 "workflowPeriod": "current",
432 "workitemInstanceId": this.$route.query.workitemInstanceId
433 }
434 getActivityDetail(params).then(res => {
435 this.workFlowState = res.workitemInstance.apps.some(function(item) {
436 return item == 'shenpibiao';
437 });
438 })
439 },
440
421 updateSjfyyt(data){ 441 updateSjfyyt(data){
422 data.fwsjytbsm = data.fwytzdbsm; 442 data.fwsjytbsm = data.fwytzdbsm;
423 }, 443 },
...@@ -614,22 +634,45 @@ ...@@ -614,22 +634,45 @@
614 },ybsm); 634 },ybsm);
615 }, 635 },
616 onSubmit(){ 636 onSubmit(){
617 let data={ 637 vm.setTjDialog(true);
618 glbsm:this.bsm, 638 // let data={
619 status:1, 639 // glbsm:this.bsm,
620 type:"zrz" 640 // status:1,
621 } 641 // type:"zrz"
622 submit(data).then((res)=>{ 642 // }
623 if(res.code===200){ 643 // submit(data).then((res)=>{
624 this.$message.success("提交完成！"); 644 // if(res.code===200){
625 this.getZrzDetailByBsm(this.$route.query.bsm); 645 // this.$message.success("提交完成！");
626 this.$store.state.oldZdbsm = ''; 646 // this.getZrzDetailByBsm(this.$route.query.bsm);
627 this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2') 647 // this.$store.state.oldZdbsm = '';
628 }else{ 648 // this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
629 this.$message.error(res.message); 649 // }else{
650 // this.$message.error(res.message);
651 // }
652 // })
653 },
654 shzrz(){
655 let data = {
656 bdcdyh:this.form.bdcdyh,
657 zl:this.form.zl,
658 shyj:'',
659 shr:'admin',
660 shsj:'2021-01-22'
661 };
662 vm.setShDialog(true,data)
663 },
664
665 thzrz(){
666 let data = {
667 bdcdyh:this.form.bdcdyh,
668 zl:this.form.zl,
669 shyj:'',
670 shr:'admin',
671 shsj:'2021-01-22'
630 } 672 }
631 }) 673 vm.rollback(data);
632 }, 674 },
675
633 open() { 676 open() {
634 const self = this; 677 const self = this;
635 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 678 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
...@@ -820,6 +863,7 @@ ...@@ -820,6 +863,7 @@
820 this.hcount = res.result; 863 this.hcount = res.result;
821 } 864 }
822 }); 865 });
866 this.getActivityDetail();
823 this.$nextTick(() => { 867 this.$nextTick(() => {
824 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 868 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
825 }) 869 })
...@@ -981,5 +1025,14 @@ ...@@ -981,5 +1025,14 @@
981 border-color: rgba(0, 202, 205, .8); 1025 border-color: rgba(0, 202, 205, .8);
982 } 1026 }
983 } 1027 }
1028 .sh-btn{
1029 position: fixed;
1030 top: 74px;
1031 right: 20px;
1032 z-index: 999;
1033 .el-button{
1034 padding: 10px 30px;
1035 }
1036 }
984 } 1037 }
985 </style> 1038 </style>
......