Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9096e8b5 by 杨威
Options

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

2 parents ce36d359 4ae33e91
Inline Side-by-side
Showing 7 changed files with 25 additions and 14 deletions
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
154 confirm(type){ 154 confirm(type){
155 if (type == 'sh') { 155 if (type == 'sh') {
156 let params = { 156 let params = {
157 executeActors: this.sprList.filter(i => i.activityInstance == this.spr), 157 executeActors: this.sprList.filter(i => i.accountNo == this.spr),
158 message: "", 158 message: "",
159 params: { 159 params: {
160 shyj:this.shData.shyj 160 shyj:this.shData.shyj
...@@ -166,11 +166,15 @@ export default { ...@@ -166,11 +166,15 @@ export default {
166 this.$message({ 166 this.$message({
167 type:'success', 167 type:'success',
168 message:'审核通过' 168 message:'审核通过'
169 });
170 this.shVisible = false;
171 this.$router.push({
172 path: '/dbx'
169 }) 173 })
170 }); 174 });
171 }else{ 175 }else{
172 let params = { 176 let params = {
173 executeActors: this.sprList.filter(i => i.activityInstance == this.spr), 177 executeActors: this.sprList.filter(i => i.accountNo == this.spr),
174 message: "", 178 message: "",
175 params: {}, 179 params: {},
176 targetNodes: [], 180 targetNodes: [],
...@@ -178,6 +182,10 @@ export default { ...@@ -178,6 +182,10 @@ export default {
178 }; 182 };
179 transitProcess(params).then((res) => { 183 transitProcess(params).then((res) => {
180 this.$message.success("提交成功！") 184 this.$message.success("提交成功！")
185 this.setTjDialog(false);
186 this.$router.push({
187 path: '/dbx'
188 })
181 }); 189 });
182 } 190 }
183 }, 191 },
......

25.1 KB | W: | H:

20.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -338,7 +338,8 @@ export default { ...@@ -338,7 +338,8 @@ export default {
338 this.$router.push({ 338 this.$router.push({
339 path: '/zd', query:{ 339 path: '/zd', query:{
340 source: 2, 340 source: 2,
341 bsm:res.processInstance.title 341 bsm:res.processInstance.title,
342 workitemInstanceId:res.workitemInstance.id
342 } 343 }
343 }); 344 });
344 } else { 345 } else {
......
...@@ -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,12 +32,14 @@ import lshs from "./lshs"; ...@@ -32,12 +32,14 @@ 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
42
41 }, 43 },
42 props: {}, 44 props: {},
43 data() { 45 data() {
...@@ -91,9 +93,9 @@ export default { ...@@ -91,9 +93,9 @@ export default {
91 case 'mjftb': 93 case 'mjftb':
92 this.mjftbVisible = true; 94 this.mjftbVisible = true;
93 break; 95 break;
94 case 'fldcb': 96 // case 'fldcb':
95 this.fldbcVisible = true; 97 // this.fldbcVisible = true;
96 break; 98 // break;
97 case 'jzd': 99 case 'jzd':
98 this.jzdVisible = true; 100 this.jzdVisible = true;
99 break; 101 break;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="button"> 3 <div class="button">
4 <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button> 4 <el-button type="primary" @click="oneExit" :disabled="isDisabled" icon="el-icon-edit">编辑</el-button>
5 <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button> 5 <el-button type="primary" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
6 <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button> 6 <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
7 </div> 7 </div>
8 <div class="table"> 8 <div class="table">
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="button"> 3 <div class="button">
4 <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button> 4 <el-button type="primary" @click="oneExit" :disabled="isDisabled" icon="el-icon-edit">编辑</el-button>
5 <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button> 5 <el-button type="primary" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
6 <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button> 6 <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
7 </div> 7 </div>
8 <div class="table"> 8 <div class="table">
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 </tr> 72 </tr>
73 </table> 73 </table>
74 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 74 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
75 <el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled">保存</el-button> 75 <el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
76 </div> 76 </div>
77 </div> 77 </div>
78 </template> 78 </template>
......