Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2aaac241 by 杨威
Options

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

2 parents 1cac55cd 9da67928
Inline Side-by-side
Showing 14 changed files with 224 additions and 62 deletions
...@@ -29,4 +29,15 @@ export function queryByBusinessId(businessId) { ...@@ -29,4 +29,15 @@ export function queryByBusinessId(businessId) {
29 url: '/system/basiccommon/query/'+businessId, 29 url: '/system/basiccommon/query/'+businessId,
30 method: 'get', 30 method: 'get',
31 }) 31 })
32 }
33
34 /**
35 * 通知公告
36 */
37 export function getTzggList(data,params) {
38 return request({
39 url: `/system/tzgg/getTzggPageList?pageNo=${params.pageNo}&pageSize=${params.pageSize}`,
40 method: 'post',
41 data : data,
42 })
32 } 43 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -319,3 +319,18 @@ export function updateFldc(data) { ...@@ -319,3 +319,18 @@ export function updateFldc(data) {
319 data:data 319 data:data
320 }) 320 })
321 } 321 }
322
323
324 /**
325 *根据宗地标识码获取权籍_集体土地所有权宗地分类面积调查记录
326 * @param zdbsm
327 */
328 export function getZdbsms(zdBsm) {
329 return request({
330 url:'/bg/zdSplitMerge/getZdbsms',
331 method:'get',
332 params:{
333 zdBsm
334 }
335 })
336 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -137,6 +137,7 @@ ol, ul { list-style:none; } ...@@ -137,6 +137,7 @@ ol, ul { list-style:none; }
137 position: unset; 137 position: unset;
138 /deep/.el-tab-pane{ 138 /deep/.el-tab-pane{
139 height: 100%; 139 height: 100%;
140 overflow-y: auto;
140 } 141 }
141 background-color: #F4F9FF; 142 background-color: #F4F9FF;
142 padding: 0; 143 padding: 0;
......
...@@ -264,13 +264,20 @@ export default { ...@@ -264,13 +264,20 @@ export default {
264 break; 264 break;
265 } 265 }
266 if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'||item.type == 'gzw'){ 266 if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'||item.type == 'gzw'){
267 let data = {
268 source: 2,
269 bsm:item.bsm,
270 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
271 };
272 if(this.$route.query.workitemInstanceId){
273 data.workitemInstanceId = this.$route.query.workitemInstanceId;
274 }
275 if(this.$route.query.ywbsm){
276 data.ywbsm = this.$route.query.ywbsm;
277 }
267 this.$router.push({ 278 this.$router.push({
268 path: '/'+item.type, 279 path: '/'+item.type,
269 query:{ 280 query:data
270 source: 2,
271 bsm:item.bsm,
272 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
273 }
274 }); 281 });
275 } 282 }
276 }, 283 },
......
...@@ -264,7 +264,11 @@ export default { ...@@ -264,7 +264,11 @@ export default {
264 if(this.$route.path == '/zrz'){ 264 if(this.$route.path == '/zrz'){
265 this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth) 265 this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth)
266 }else if(this.$route.path == '/zd'){ 266 }else if(this.$route.path == '/zd'){
267 this.getRightTree(this.$store.state.zdbsm,'0,1,2') 267 if(this.$route.query.source === 'bsms'){
268 this.getTreeByS(this.$store.state.zdbsms);
269 }else {
270 this.getRightTree(this.$store.state.zdbsm,'0,1,2')
271 }
268 }else if(this.$route.path == '/dz'){ 272 }else if(this.$route.path == '/dz'){
269 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth) 273 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
270 }else if(this.$route.path == '/gzw'){ 274 }else if(this.$route.path == '/gzw'){
......
...@@ -57,10 +57,11 @@ ...@@ -57,10 +57,11 @@
57 <script> 57 <script>
58 import SearchHead from "@components/searchHead/searchHead"; 58 import SearchHead from "@components/searchHead/searchHead";
59 import {getDbxList} from "@api/dbx"; 59 import {getDbxList} from "@api/dbx";
60 import {getZdbsms} from '@api/zd'
60 61
61 export default { 62 export default {
62 name: "", 63 name: "",
63 inject:['getRightTree','getTreeByBsm','getTreeList'], 64 inject:['getRightTree','getTreeByBsm','getTreeList','getTreeByS'],
64 components: {SearchHead}, 65 components: {SearchHead},
65 props: {}, 66 props: {},
66 data() { 67 data() {
...@@ -123,22 +124,44 @@ ...@@ -123,22 +124,44 @@
123 //点击办理 124 //点击办理
124 handleClick(row) { 125 handleClick(row) {
125 let path = ""; 126 let path = "";
127 let data ={
128 bsm: row.glbsm,
129 ywbsm: row.businessId,
130 source: "2",
131 auth: '0,1,2',
132 workitemInstanceId:row.id
133 };
126 this.$store.state.oldZdbsm = ''; 134 this.$store.state.oldZdbsm = '';
127 switch (row.dylx) { 135 switch (row.dylx) {
128 case "zrz": 136 case "zrz":
129 this.$store.state.zrzbsm = row.glbsm; 137 this.$store.state.zrzbsm = row.glbsm;
130 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 138 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
131 path = "/zrz"; 139 path = "/zrz";
140 this.gotoDetailPage(path,data);
132 break; 141 break;
133 case "zd": 142 case "zd":
134 this.$store.state.zdbsm = row.glbsm; 143 this.$store.state.zdbsm = row.glbsm;
135 this.getRightTree(row.glbsm,'0,1,2'); 144 if(row.templetName === '分割宗地'){
145 data.source = 'bsms';
146 getZdbsms(row.glbsm).then((res)=>{
147 if(res.code === 200){
148 this.$store.state.zdbsms = res.result;
149 this.getTreeByS(res.result);
150 }
151 })
152 }else {
153 this.getRightTree(row.glbsm,'0,1,2');
154 }
136 path = "/zd"; 155 path = "/zd";
156 this.$nextTick(()=>{
157 this.gotoDetailPage(path,data);
158 })
137 break; 159 break;
138 case "dz": 160 case "dz":
139 this.$store.state.dzbsm = row.glbsm; 161 this.$store.state.dzbsm = row.glbsm;
140 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 162 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
141 path = "/dz"; 163 path = "/dz";
164 this.gotoDetailPage(path,data);
142 break; 165 break;
143 case "h": 166 case "h":
144 case "h0": 167 case "h0":
...@@ -146,31 +169,35 @@ ...@@ -146,31 +169,35 @@
146 path="/h"; 169 path="/h";
147 this.$store.state.hbsm=row.glbsm 170 this.$store.state.hbsm=row.glbsm
148 this.getTreeByBsm(row.glbsm,'h','0,1,2'); 171 this.getTreeByBsm(row.glbsm,'h','0,1,2');
172 this.gotoDetailPage(path,data);
149 break; 173 break;
150 case "gzw": 174 case "gzw":
151 this.$store.state.gzwbsm = row.glbsm; 175 this.$store.state.gzwbsm = row.glbsm;
152 this.getTreeByBsm(row.glbsm,"gzw",'0,1,2'); 176 this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
177 this.gotoDetailPage(path,data);
153 path = "/gzw"; 178 path = "/gzw";
154 break; 179 break;
155 case "lq": 180 case "lq":
156 // this.$store.state.zrzbsm = row.glbsm; 181 // this.$store.state.zrzbsm = row.glbsm;
157 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 182 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
183 this.gotoDetailPage(path,data);
158 path = "/lq"; 184 path = "/lq";
159 break; 185 break;
160 default: 186 default:
161 break; 187 break;
162 } 188 }
189
190
191
192 },
193
194 gotoDetailPage(path,data){
163 this.$router.push({ 195 this.$router.push({
164 path: path, 196 path: path,
165 query: { 197 query: data
166 bsm: row.glbsm,
167 ywbsm: row.businessId,
168 source: 2,
169 auth: '0,1,2',
170 workitemInstanceId:row.id
171 }
172 }); 198 });
173 }, 199 },
200
174 //定位 201 //定位
175 //图形定位 202 //图形定位
176 postionToMap(rowData){ 203 postionToMap(rowData){
......
...@@ -135,15 +135,20 @@ ...@@ -135,15 +135,20 @@
135 break; 135 break;
136 case "zd": 136 case "zd":
137 path = "/zd"; 137 path = "/zd";
138 this.$store.state.zdbsm = row.glbsm 138 this.$store.state.zdbsm = row.glbsm;
139 this.getRightTree(row.glbsm,'0,1,2'); 139 this.getRightTree(row.glbsm,'0,1,2');
140 break; 140 break;
141 case "h": 141 case "h":
142 path = "/h"; 142 path = "/h";
143 this.$store.state.hbsm = row.glbsm 143 this.$store.state.hbsm = row.glbsm;
144 this.getTreeByBsm(row.glbsm,'h','0,1,2'); 144 this.getTreeByBsm(row.glbsm,'h','0,1,2');
145 type = "2"; 145 type = "2";
146 break; 146 break;
147 case "dz":
148 this.$store.state.dzbsm = row.glbsm;
149 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
150 path = "/dz";
151 break;
147 default: 152 default:
148 break; 153 break;
149 } 154 }
......
...@@ -305,13 +305,14 @@ ...@@ -305,13 +305,14 @@
305 getListByPbsm, 305 getListByPbsm,
306 getDdicByMC 306 getDdicByMC
307 } from "@api/common"; 307 } from "@api/common";
308 import {getQjZdjbxxDetailById, zdfg, getZrz} from '@api/zd' 308 import {getQjZdjbxxDetailById, zdfg, getZrz,getZdbsms} from '@api/zd'
309 import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from '@api/dz' 309 import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from '@api/dz'
310 import {getHZdxx} from '@api/h' 310 import {getHZdxx} from '@api/h'
311 import zdQueryData from '@components/zdQueryData/zdQueryData' 311 import zdQueryData from '@components/zdQueryData/zdQueryData'
312 import dzQueryData from '@components/dzQueryData/dzQueryData' 312 import dzQueryData from '@components/dzQueryData/dzQueryData'
313 import {Message} from 'element-ui' 313 import {Message} from 'element-ui'
314 import hfghb from '../hfghb/index' 314 import hfghb from '../hfghb/index'
315 import { createProcessInstance } from "@api/user";
315 316
316 export default { 317 export default {
317 name: "", 318 name: "",
...@@ -368,11 +369,15 @@ ...@@ -368,11 +369,15 @@
368 }, 369 },
369 zdFghData: { 370 zdFghData: {
370 oldZdbsm: "", 371 oldZdbsm: "",
371 newZdlist: [] 372 newZdlist: [],
373 type:"zd",
374 ywlx:"change"
372 }, 375 },
373 dzFghData: { 376 dzFghData: {
374 olddzbsm: "", 377 olddzbsm: "",
375 fwlist: [] 378 fwlist: [],
379 type:"dz",
380 ywlx:"change"
376 }, 381 },
377 hFghData: { 382 hFghData: {
378 oldZdbsm: "", 383 oldZdbsm: "",
...@@ -449,19 +454,25 @@ ...@@ -449,19 +454,25 @@
449 case "zd": 454 case "zd":
450 this.zdFghData = { 455 this.zdFghData = {
451 oldZdbsm: "", 456 oldZdbsm: "",
452 newZdlist: [] 457 newZdlist: [],
458 type:"zd",
459 ywlx:"change"
453 } 460 }
454 break 461 break
455 case "dz": 462 case "dz":
456 this.dzFghData = { 463 this.dzFghData = {
457 olddzbsm: "", 464 olddzbsm: "",
458 fwlist: [] 465 fwlist: [],
466 type:"dz",
467 ywlx:"change"
459 } 468 }
460 break 469 break
461 case "h": 470 case "h":
462 this.hFghData = { 471 this.hFghData = {
463 oldZdbsm: "", 472 oldZdbsm: "",
464 newZdlist: [] 473 newZdlist: [],
474 type:"h",
475 ywlx:"change"
465 } 476 }
466 break; 477 break;
467 default: 478 default:
...@@ -609,26 +620,61 @@ ...@@ -609,26 +620,61 @@
609 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 620 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
610 if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) { 621 if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) {
611 vm.loadingShow('正在保存中'); 622 vm.loadingShow('正在保存中');
612 zdfg(this.zdFghData).then(res => { 623 let data = {
613 vm.loadingHide() 624 params:this.zdFghData,
614 if (res.success) { 625 workflowName:'分割宗地'
615 this.$store.state.zdbsms = res.result; 626 }
616 //更新目录树 627
617 this.getTreeByS(res.result); 628 // zdfg(this.zdFghData).then(res => {
618 this.$router.push({ 629 // vm.loadingHide()
619 path: '/zd', 630 // if (res.success) {
620 query: { 631 // this.$store.state.zdbsms = res.result;
621 bsm: res.result[0], 632 // //更新目录树
622 source: 3, //分割标识 633 // this.getTreeByS(res.result);
623 } 634 // this.$router.push({
624 }); 635 // path: '/zd',
625 } else { 636 // query: {
626 Message.error("保存失败") 637 // bsm: res.result[0],
627 } 638 // source: 3, //分割标识
628 }).catch((error)=>{ 639 // }
629 vm.loadingHide(); 640 // });
630 console.log(error); 641 // } else {
631 }) 642 // Message.error("保存失败")
643 // }
644 // }).catch((error)=>{
645 // vm.loadingHide();
646 // console.log(error);
647 // })
648
649 createProcessInstance(data)
650 .then((res) => {
651 vm.loadingHide()
652 if (res.needShow) {
653 //res.processInstance.title; 宗地标识码
654 getZdbsms(res.processInstance.title).then((res1)=>{
655 if(res1.code === 200){
656 this.$store.state.zdbsms = res1.result;
657 this.getTreeByS(res1.result);
658 this.$router.push({
659 path: '/zd',
660 query: {
661 bsm: res1.result[0],
662 source: 3, //分割标识
663 ywbsm:res.processInstance.businessId,
664 workitemInstanceId:res.workitemInstance.id
665 }
666 });
667 }
668 });
669 } else {
670 Message.error("保存失败")
671 }
672 }).catch((error) => {
673 vm.loadingHide();
674 console.log(error);
675 });
676
677
632 }else{ 678 }else{
633 Message.warning("请完善分割后的宗地项目名称后重试") 679 Message.warning("请完善分割后的宗地项目名称后重试")
634 } 680 }
......
...@@ -55,10 +55,13 @@ ...@@ -55,10 +55,13 @@
55 <el-table-column prop="title" width="500" align="left" class="tr-title" label="标题"> 55 <el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
56 </el-table-column> 56 </el-table-column>
57 <el-table-column 57 <el-table-column
58 prop="date" 58 prop="createDate"
59 align="center" 59 align="right"
60 label="发布时间" 60 label="发布时间"
61 > 61 >
62 <template slot-scope="scope">
63 {{changeDate(scope.row.createDate)}}
64 </template>
62 </el-table-column> 65 </el-table-column>
63 </el-table> 66 </el-table>
64 </el-card> 67 </el-card>
...@@ -115,7 +118,7 @@ ...@@ -115,7 +118,7 @@
115 118
116 <script> 119 <script>
117 import { Chart, registerShape } from '@antv/g2'; 120 import { Chart, registerShape } from '@antv/g2';
118 import {getDbxList,getYbxList} from "@api/dbx"; 121 import {getDbxList,getYbxList,getTzggList} from "@api/dbx";
119 export default { 122 export default {
120 components:{}, 123 components:{},
121 data() { 124 data() {
...@@ -186,9 +189,10 @@ export default { ...@@ -186,9 +189,10 @@ export default {
186 this.initG2qllx(); 189 this.initG2qllx();
187 this.initG2tdfwtj(); 190 this.initG2tdfwtj();
188 this.initG2xntjid(); 191 this.initG2xntjid();
192 this.getTzggList();
189 }, 193 },
190 methods: { 194 methods: {
191 download(row,column,event){ 195 download(row,column,event){
192 window.open(row.url) 196 window.open(row.url)
193 }, 197 },
194 handleSelect(item) { 198 handleSelect(item) {
...@@ -238,7 +242,7 @@ export default { ...@@ -238,7 +242,7 @@ export default {
238 let data = { 242 let data = {
239 pageSize:15, 243 pageSize:15,
240 pageNo:1 244 pageNo:1
241 } 245 };
242 getDbxList(data).then((res)=>{ 246 getDbxList(data).then((res)=>{
243 if(res.code === 200){ 247 if(res.code === 200){
244 this.workList.forEach((item,index)=>{ 248 this.workList.forEach((item,index)=>{
...@@ -266,6 +270,24 @@ export default { ...@@ -266,6 +270,24 @@ export default {
266 }) 270 })
267 }) 271 })
268 }, 272 },
273 getTzggList(){ //通知公告
274 let data={
275 status: "4",
276 };
277 let params={
278 pageNo:1,
279 pageSize:4
280 };
281 getTzggList(data,params).then(res=>{
282 if(res.code=200){
283 console.log(res.result,'通知公告')
284 this.tableData=res.result.list;
285 }
286 })
287 },
288 changeDate(date){
289 return date.substring(0,11)
290 },
269 initG2qllx(){ 291 initG2qllx(){
270 const data = [ 292 const data = [
271 { item: '国有建设用地使用权', count: 40, percent: 0.4 }, 293 { item: '国有建设用地使用权', count: 40, percent: 0.4 },
......
...@@ -284,6 +284,7 @@ ...@@ -284,6 +284,7 @@
284 path: path, 284 path: path,
285 query: { 285 query: {
286 bsm: res.processInstance.title, 286 bsm: res.processInstance.title,
287 ywbsm: res.processInstance.businessId,
287 source: 2, 288 source: 2,
288 workitemInstanceId:res.workitemInstance.id, 289 workitemInstanceId:res.workitemInstance.id,
289 auth:'1' 290 auth:'1'
......
...@@ -48,10 +48,11 @@ ...@@ -48,10 +48,11 @@
48 <script> 48 <script>
49 import SearchHeadYbx from "@components/searchHead/searchHeadYbx"; 49 import SearchHeadYbx from "@components/searchHead/searchHeadYbx";
50 import {getYbxList,queryByBusinessId} from "@api/dbx"; 50 import {getYbxList,queryByBusinessId} from "@api/dbx";
51 import {getZdbsms} from '@api/zd';
51 52
52 export default { 53 export default {
53 name: "", 54 name: "",
54 inject:['getRightTree','getTreeByBsm'], 55 inject:['getRightTree','getTreeByBsm','getTreeByS'],
55 components: {SearchHeadYbx}, 56 components: {SearchHeadYbx},
56 props: {}, 57 props: {},
57 data() { 58 data() {
...@@ -134,21 +135,41 @@ ...@@ -134,21 +135,41 @@
134 console.log(data); 135 console.log(data);
135 136
136 let path = ""; 137 let path = "";
138 let params ={
139 bsm: data.glbsm,
140 ywbsm: data.glbsm,
141 source: 2,
142 auth: '0,1,2',
143 processInstanceId:row.id
144 };
137 this.$store.state.oldZdbsm = ''; 145 this.$store.state.oldZdbsm = '';
138 switch (data.dylx) { 146 switch (data.dylx) {
139 case "zrz": 147 case "zrz":
140 this.$store.state.zrzbsm = data.glbsm; 148 this.$store.state.zrzbsm = data.glbsm;
141 this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2'); 149 this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2');
142 path = "/zrz"; 150 path = "/zrz";
151 this.gotoDetailPage(path,params);
143 break; 152 break;
144 case "zd": 153 case "zd":
145 this.$store.state.zdbsm = data.glbsm; 154 this.$store.state.zdbsm = data.glbsm;
146 this.getRightTree(data.glbsm,'0,1,2');
147 path = "/zd"; 155 path = "/zd";
156 if(row.templetName === '分割宗地'){
157 params.source = 'bsms';
158 getZdbsms(data.glbsm).then((response)=>{
159 if(response.code === 200){
160 this.$store.state.zdbsms = response.result;
161 this.getTreeByS(response.result);
162 }
163 })
164 }else {
165 this.getRightTree(row.glbsm,'0,1,2');
166 }
167 this.gotoDetailPage(path,params);
148 break; 168 break;
149 case "dz": 169 case "dz":
150 this.$store.state.dzbsm = data.glbsm; 170 this.$store.state.dzbsm = data.glbsm;
151 this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2'); 171 this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2');
172 this.gotoDetailPage(path,params);
152 path = "/dz"; 173 path = "/dz";
153 break; 174 break;
154 case "h": 175 case "h":
...@@ -157,31 +178,31 @@ ...@@ -157,31 +178,31 @@
157 path="/h"; 178 path="/h";
158 this.$store.state.hbsm=data.glbsm 179 this.$store.state.hbsm=data.glbsm
159 this.getTreeByBsm(data.glbsm,'h','0,1,2'); 180 this.getTreeByBsm(data.glbsm,'h','0,1,2');
181 this.gotoDetailPage(path,params);
160 break; 182 break;
161 case "gzw": 183 case "gzw":
162 this.$store.state.gzwbsm = data.glbsm; 184 this.$store.state.gzwbsm = data.glbsm;
163 this.getTreeByBsm(data.glbsm,"gzw",'0,1,2'); 185 this.getTreeByBsm(data.glbsm,"gzw",'0,1,2');
164 path = "/gzw"; 186 path = "/gzw";
187 this.gotoDetailPage(path,params);
165 break; 188 break;
166 default: 189 default:
167 break; 190 break;
168 } 191 }
169 this.$router.push({
170 path: path,
171 query: {
172 bsm: data.glbsm,
173 ywbsm: data.glbsm,
174 source: 2,
175 auth: '0,1,2',
176 processInstanceId:row.id
177 }
178 });
179 192
180 } 193 }
181 }) 194 })
182 195
183 196
184 }, 197 },
198
199 gotoDetailPage(path,data){
200 this.$router.push({
201 path: path,
202 query: data
203 });
204 },
205
185 //定位 206 //定位
186 //图形定位 207 //图形定位
187 postionToMap(rowData){ 208 postionToMap(rowData){
......
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
149 }, 149 },
150 uploadSuccess(res, file, fileList) { 150 uploadSuccess(res, file, fileList) {
151 this.$message.success("上传成功") 151 this.$message.success("上传成功")
152 vm.loadingHide();
152 this.getFileList(); 153 this.getFileList();
153 }, 154 },
154 handleRemove(file, fileList) { 155 handleRemove(file, fileList) {
......
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
372 </div> 372 </div>
373 </div> 373 </div>
374 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 374 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
375 <el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'">终止</el-button> 375 <el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'||workFlowphase == 'zdfg'||workFlowphase == 'fwsxbg'">终止</el-button>
376 <el-button type="primary" @click="thzd" v-show="rollbackDetails.length>0">退回</el-button> 376 <el-button type="primary" @click="thzd" v-show="rollbackDetails.length>0">退回</el-button>
377 <el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button> 377 <el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button>
378 <el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button> 378 <el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button>
...@@ -521,6 +521,7 @@ ...@@ -521,6 +521,7 @@
521 getActivityDetail(params).then(res => { 521 getActivityDetail(params).then(res => {
522 this.workFlowData= res; 522 this.workFlowData= res;
523 this.workFlowphase = res.properties.phase; 523 this.workFlowphase = res.properties.phase;
524 console.log(this.workFlowphase,"this.workFlowphase")
524 this.rollbackDetails = res.rollbackDetails; 525 this.rollbackDetails = res.rollbackDetails;
525 this.workFlowState = res.workitemInstance.apps.some(function(item) { 526 this.workFlowState = res.workitemInstance.apps.some(function(item) {
526 return item == 'shenpibiao'; 527 return item == 'shenpibiao';
......
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
282 </div> 282 </div>
283 </div> 283 </div>
284 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 284 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
285 <el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'">终止</el-button> 285 <el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'||workFlowphase == 'fwsxbg'">终止</el-button>
286 <el-button type="primary" @click="thzrz" v-show="rollbackDetails.length>0">退回</el-button> 286 <el-button type="primary" @click="thzrz" v-show="rollbackDetails.length>0">退回</el-button>
287 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button> 287 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
288 <el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button> 288 <el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
......