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 {
confirm(type){
if (type == 'sh') {
let params = {
executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
executeActors: this.sprList.filter(i => i.accountNo == this.spr),
message: "",
params: {
shyj:this.shData.shyj
......@@ -166,11 +166,15 @@ export default {
this.$message({
type:'success',
message:'审核通过'
});
this.shVisible = false;
this.$router.push({
path: '/dbx'
})
});
}else{
let params = {
executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
executeActors: this.sprList.filter(i => i.accountNo == this.spr),
message: "",
params: {},
targetNodes: [],
......@@ -178,6 +182,10 @@ export default {
};
transitProcess(params).then((res) => {
this.$message.success("提交成功！")
this.setTjDialog(false);
this.$router.push({
path: '/dbx'
})
});
}
},
......

25.1 KB | W: | H:

20.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -338,7 +338,8 @@ export default {
this.$router.push({
path: '/zd', query:{
source: 2,
bsm:res.processInstance.title
bsm:res.processInstance.title,
workitemInstanceId:res.workitemInstance.id
}
});
} else {
......
......@@ -2,7 +2,7 @@
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
<!-- <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane> -->
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd">
<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
......@@ -32,12 +32,14 @@ import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
import Lcgz from "./lcgz"
import {queryStatus} from "@api/search"
import Fldcb from "@components/Fldcb/Fldcb"
// import Fldcb from "@components/Fldcb/Fldcb"
import {getQjZdjbxxDetailById} from '@api/zd'
export default {
name: "",
components: {
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
// zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz
},
props: {},
data() {
......@@ -91,9 +93,9 @@ export default {
case 'mjftb':
this.mjftbVisible = true;
break;
case 'fldcb':
this.fldbcVisible = true;
break;
// case 'fldcb':
// this.fldbcVisible = true;
// break;
case 'jzd':
this.jzdVisible = true;
break;
......
<template>
<div class="main">
<div class="button">
<el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
<el-button type="primary" @click="oneExit" :disabled="isDisabled" icon="el-icon-edit">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
<el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
</div>
<div class="table">
......
<template>
<div class="main">
<div class="button">
<el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
<el-button type="primary" @click="oneExit" :disabled="isDisabled" icon="el-icon-edit">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
<el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
</div>
<div class="table">
......
......@@ -72,7 +72,7 @@
</tr>
</table>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled" icon="iconfont iconbaocun">保存</el-button>
</div>
</div>
</template>
......