Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c185d4f9 by 焦泽平
Options

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

2 parents 23538d49 57ec4db4
Inline Side-by-side
Showing 5 changed files with 259 additions and 162 deletions
......@@ -4,25 +4,107 @@
<div class="loading" v-show="isShow">
<div class="content">
<i class="fa fa-spinner fa-pulse fa-3x fa-fw" style="color:#0081FF"></i>
<span>{{tips}}</span>
<span>{{ tips }}</span>
</div>
</div>
<!-- 审核 -->
<el-dialog
v-dialogDrag
:modal="false"
:close-on-click-modal="false"
title="审核"
:visible.sync="shVisible"
width="600px"
class="sh-dialog"
>
<div class="sh-wrap">
<el-row :gutter="20">
<el-col :span="24">
<span class="label">不动产单元号：</span>
<span class="value">{{shData.bdcdyh}}</span>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<span class="label">坐落：</span>
<span class="value">{{shData.zl}}</span>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<span class="label">审核意见：</span>
<el-input
class="value"
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="shData.shyj">
</el-input>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<span class="label">审核人：</span>
<span class="value">{{shData.shr}}</span>
</el-col>
<el-col :span="12">
<span class="label">审核时间：</span>
<span class="value">{{shData.shsj}}</span>
</el-col>
</el-row>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirm('sh')">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</span>
</el-dialog>
<!-- 提交 -->
<el-dialog
v-dialogDrag
:close-on-click-modal="false"
title="选择审批人"
:visible.sync="tjVisible"
width="500px"
@close="visible = false"
:modal-append-to-body="false"
>
<div class="spr">
<el-radio
v-model="spr"
:label="item.accountNo"
v-for="item in sprList"
:key="item.accountNo"
border
>{{ item.name }}</el-radio
>
</div>
<div class="dialog-footer">
<el-button type="primary" @click="confirm('tj')">确 定</el-button>
<el-button @click="tjVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { rollbackProcess, transitProcess,pretransitProcess } from "@api/user";
export default {
provide(){
return{
reload:this.reload
}
provide() {
return {
reload: this.reload,
};
},
data(){
return{
isRouterAlive:true,
isShow:false,
tips:'正在努力加载中...'
}
data() {
return {
isRouterAlive: true,
isShow: false,
tips: "正在努力加载中...",
shVisible:false,
shData:{},
tjVisible:false,
sprList:[],
spr:''
};
},
mounted() {
window.addEventListener("unload", this.saveState);
......@@ -32,28 +114,92 @@ export default {
saveState() {
sessionStorage.setItem("state", JSON.stringify(this.$store.state));
},
reload(){
reload() {
this.isRouterAlive = false;
this.$nextTick(function () {
this.$nextTick(function() {
this.isRouterAlive = true;
})
});
},
loadingShow(tips){
loadingShow(tips) {
this.isShow = true;
this.tips = tips+'...';
this.tips = tips + "...";
},
loadingHide(){
loadingHide() {
this.isShow = false;
},
//审核内容弹框
setShDialog(flag,data){
this.shVisible = flag;
this.shData = data;
console.log(data,'data');
},
//提交流程弹框
setTjDialog(flag){
this.tjVisible = flag;
},
//获取提交的审批人
getSpr() {
let params = {
params: {},
workitemInstanceId: this.$route.query.workitemInstanceId,
};
pretransitProcess(params).then((res) => {
this.sprList = res[0].masterActors;
this.spr = res[0].masterActors[0].accountNo;
});
},
cancel(){
this.shVisible = false;
},
confirm(type){
if (type == 'sh') {
let params = {
executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
message: "",
params: {
shyj:this.shData.shyj
},
targetNodes: [],
workitemInstanceId:this.$route.query.workitemInstanceId
};
transitProcess(params).then((res) => {
this.$message({
type:'success',
message:'审核通过'
})
});
}else{
let params = {
executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
message: "",
params: {},
targetNodes: [],
workitemInstanceId:this.$route.query.workitemInstanceId
};
transitProcess(params).then((res) => {
this.$message.success("提交成功！")
});
}
},
},
watch: {
tjVisible: {
handler(val) {
if (val) {
this.getSpr();
}
},
immediate: true,
},
},
};
</script>
<style lang="less">
#app{
#app {
position: relative;
.loading{
.loading {
width: 100%;
height: 100%;
// background-color: rgba(255, 255, 255, .3);
......@@ -61,13 +207,13 @@ export default {
top: 0;
left: 0;
z-index: 1000;
.content{
.content {
width: 240px;
height: 160px;
background: #FFFFFF;
background: #ffffff;
box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.24);
border-radius: 4px;
border: 1px solid #E6E6E6;
border: 1px solid #e6e6e6;
box-sizing: border-box;
padding: 32px;
position: absolute;
......@@ -75,50 +221,81 @@ export default {
left: 50%;
margin-left: -80px;
margin-top: -120px;
i,span{
i,
span {
display: block;
margin: 0 auto;
text-align: center;
}
span{
span {
margin-top: 26px;
color: #6D7278;
color: #6d7278;
font-size: 14px;
}
}
}
.sh-dialog{
/deep/.el-dialog__body{
padding-bottom: 0!important;
}
.sh-wrap{
margin-top: 10px;
.el-row{
margin: 20px 0;
font-size: 16px;
.label{
display: inline-block;
width: 114px;
text-align: right;
vertical-align: top;
}
.value{
display: inline-block;
width: calc(100% - 114px);
vertical-align: top;
}
}
}
}
.spr {
margin: 20px 0;
}
.dialog-footer {
text-align: center;
}
}
.popper-zxx{
padding: 0!important;
/deep/ .el-tabs__header{
.popper-zxx {
padding: 0 !important;
/deep/ .el-tabs__header {
margin-bottom: 10px;
}
ul{
ul {
margin-bottom: 10px;
li{
li {
cursor: pointer;
padding: 8px 16px;
position: relative;
i{
i {
position: absolute;
right: 20px;
top: 11px;
color: #4EB2FF;
color: #4eb2ff;
display: none;
}
}
li:hover{
background: #F0F9FF;
li:hover {
background: #f0f9ff;
}
.cantClick{
color: #BBB!important;
cursor: not-allowed!important;
.cantClick {
color: #bbb !important;
cursor: not-allowed !important;
}
.cantClick:hover{
background: #ffffff!important;
.cantClick:hover {
background: #ffffff !important;
}
.choosed{
i{
.choosed {
i {
display: inline-block;
}
}
......
<template>
<el-dialog
v-dialogDrag
:close-on-click-modal="false"
title="选择审批人"
:visible.sync="visible"
width="500px"
@close="visible = false"
:modal-append-to-body="false"
>
<div class="spr">
<el-radio
v-model="spr"
:label="item.activityInstance"
v-for="item in sprList"
:key="item.activityInstance"
border
>{{ item.name }}</el-radio
>
</div>
<div class="dialog-footer">
<el-button type="primary" @click="confirm">确 定</el-button>
<el-button @click="visible = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { pretransitProcess, transitProcess } from "@api/user";
export default {
name: "",
components: {},
props: {
visible: {
type: Boolean,
default: function() {
return false;
},
},
workitemInstanceId: {
type: String,
default: "",
},
},
data() {
return {
spr: "",
sprList: [],
};
},
created() {},
mounted() {},
methods: {
confirm() {
let params = {
executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
message: "",
params: {},
targetNodes: [],
workitemInstanceId:this.$route.query.workitemInstanceId
};
transitProcess(params).then((res) => {
this.$message.success("提交成功！")
});
},
getSpr() {
let params = {
params: {},
workitemInstanceId: this.$route.query.workitemInstanceId,
};
pretransitProcess(params).then((res) => {
this.sprList = res[0].masterActors;
this.spr = res[0].masterActors[0].activityInstance;
});
},
},
computed: {},
watch: {
visible: {
handler(val) {
if (val) {
this.getSpr();
}
},
immediate: true,
},
},
};
</script>
<style scoped lang="less">
.spr {
margin: 20px 0;
}
.dialog-footer {
text-align: center;
}
</style>
......@@ -324,7 +324,7 @@ export default {
.then((res) => {
console.log(res);
if (res.needShow) {
// this.getRightTree(res.result,'0,1,2');
this.getRightTree(res.processInstance.title,'0,1,2');
this.$message({
message: "创建成功！",
type: "success",
......@@ -332,15 +332,15 @@ export default {
this.close();
// 根据res.processInstance.businessId去查询zdbsm TODO
// this.$store.state.zdbsm = res.result;
//todo 跳转到宗地基本信息内容表页面 (预留)
// this.close();
// this.$router.push({
// path: '/zd', query:{
// source: 2,
// bsm:res.result
// }
// });
this.$store.state.zdbsm = res.processInstance.title;
// todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.$router.push({
path: '/zd', query:{
source: 2,
bsm:res.processInstance.title
}
});
} else {
this.$message.error(res.message);
}
......
......@@ -13,7 +13,8 @@
<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl>
</el-tab-pane>
</el-tabs>
<!-- </div> -->
</template>
......
......@@ -368,7 +368,9 @@
<el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
<Lcytj :visible="lcytjVisible" :workitemInstanceId="workitemInstanceId"></Lcytj>
</div>
<div class="sh-btn">
<el-button type="primary" @click="shzd">审核</el-button>
</div>
</div>
</template>
......@@ -377,7 +379,6 @@
import Qlr from "@components/formMenu/qlr";
import Qlxz from "@components/formMenu/qlxz";
import geoUtils from "@components/lineTree/tx/js/geoUtils";
import Lcytj from "@components/lcytj"
import {
getAllList,
getDdicByMC,
......@@ -400,7 +401,6 @@
components: {
Qlr,
Qlxz,
Lcytj
},
props: {},
data() {
......@@ -481,8 +481,6 @@
DJZQDM: "",
SYQLXID: "",
},
lcytjVisible:false,
workitemInstanceId:'',
};
},
mixins: [geoUtils],
......@@ -857,14 +855,12 @@
},
//提交宗地基本信息
submitZDxx() {
let data = {
glbsm: this.$store.state.zdbsm,
status: 1,
type: "zd"
}
this.lcytjVisible = false;
this.lcytjVisible = true;
this.workitemInstanceId = this.$route.query.workitemInstanceId;
vm.setTjDialog(true);
// let data = {
// glbsm: this.$store.state.zdbsm,
// status: 1,
// type: "zd"
// }
// submit(data).then((res) => {
// if (res.code === 200) {
// this.$message.success("提交成功！")
......@@ -939,6 +935,17 @@
})
.catch((error) => {
});
},
//宗地审核流程
shzd(){
let data = {
bdcdyh:this.formData.bdcdyh,
zl:this.formData.zl,
shyj:'',
shr:'admin',
shsj:'2021-01-22'
}
vm.setShDialog(true,data)
}
},
computed: {
......@@ -1082,5 +1089,14 @@
border-color: rgba(0, 202, 205, .8);
}
}
.sh-btn{
position: fixed;
top: 74px;
right: 20px;
z-index: 999;
.el-button{
padding: 10px 30px;
}
}
}
</style>
......