Skip to content

任超 / js.CadastralSystem

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

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

2 parents b57394b8 89a7d9c2
Inline Side-by-side
Showing 13 changed files with 349 additions and 140 deletions
......@@ -4,7 +4,7 @@ import request from '@/plugin/axios'
*/
export function getDbxList(data) {
return request({
url: '/system/basiccommon/queryDbx',
url: '/qj/workarea/getDbx',
method: 'post',
data : data,
})
......
......@@ -18,4 +18,34 @@ export function getInfo(token) {
method: 'get',
params: { token }
})
}
\ No newline at end of file
}
/**
* 创建工作流
*/
export function createProcessInstance(data) {
return request({
url: '/workflow/createProcessInstance',
method: 'post',
data: data
})
}
/**
* 流程的预提交
*/
export function pretransitProcess(data) {
return request({
url: '/workflow/pretransitProcess',
method: 'post',
data: data
})
}
/**
* 流程提交
*/
export function transitProcess(data) {
return request({
url: '/workflow/transitProcess',
method: 'post',
data: data
})
}
......
......@@ -369,4 +369,8 @@ ol, ul { list-style:none; }
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #00cacd;
border-color: #00cacd;
}
//表格划过行背景色
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #F5FBFF;
}
\ No newline at end of file
......
<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>
......@@ -18,7 +18,7 @@
<el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
</el-upload>
</div>
<el-button type="primary" class="download" @click="downloadTemplate">下载模板</el-button>
<el-button type="primary" class="download" @click="downloadTemplate" icon="iconfont iconxiazai1">下载模板</el-button>
</div>
<ul>
<li v-for="(item,index) in errorData" :key="index">{{item}}</li>
......
<template>
<el-tabs v-model="activeName" type="card">
<div class="main">
<!-- <p class="tips">查询条件</p> -->
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<!-- <p class="tips">查询列表</p> -->
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
@row-dblclick="doubleClick"
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="dylx" align="left" width="100" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
</template>
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column prop="addtime" align="left" width="120" label="转入时间">
<template slot-scope="scope">
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="查看" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next,total" :total="total"
:current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange">
</el-pagination>
</div>
<div class="main">
<!-- <p class="tips">查询条件</p> -->
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<!-- <p class="tips">查询列表</p> -->
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
@row-dblclick="doubleClick"
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="dylx" align="left" width="100" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
</template>
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column prop="addtime" align="left" width="120" label="转入时间">
<template slot-scope="scope">
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="查看" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next,total" :total="total"
:current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
</el-tabs>
</div>
</template>
<script>
......@@ -67,7 +65,7 @@
props: {},
data() {
return {
activeName:'zhcx',
activeName:'dbx',
type:'add',
total: 0,
pageNo: 1,
......@@ -161,7 +159,8 @@
query: {
bsm: row.glbsm,
source: 2,
auth: '0,1,2'
auth: '0,1,2',
workitemInstanceId:row.id
}
});
},
......
<template>
<el-tabs v-model="activeName" type="card" @tab-remove="removeTab">
<el-tabs v-model="activeName" @tab-remove="removeTab">
<el-tab-pane label="待办箱" name="dbx"><dbxInfo></dbxInfo></el-tab-pane>
<!-- <el-tab-pane-->
<!-- v-for="(item, index) in editableTabs"-->
......@@ -11,7 +11,6 @@
<!-- </el-tab-pane>-->
</el-tabs>
</template>
<script>
import dbxInfo from "@/views/dbx/dbxinfo/index"
......@@ -62,7 +61,6 @@
}
});
}
this.activeName = activeName;
this.editableTabs = tabs.filter(tab => tab.name !== targetName);
},
......
<template>
<div class="log-content">
<div class="main">
<div class="log-search">
字典名称：
<el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</div>
<div class="log-detail">
<div class="log-detail" :style="{ height: dicHeight+'px' }">
<div class="log-menu">
<div style="height: 40px">
<span class="menu-title">
......@@ -33,10 +33,11 @@
<div class="log-table">
<el-table
:data="concreteDic"
style="width: 100%;margin-bottom: 20px;"
row-key="bsm"
height="100%"
border
:default-expand-all="false"
:row-class-name="tableRowClassName"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="mc" align="center" label="名称">
</el-table-column>
......@@ -174,7 +175,7 @@
},
startValue: '',
endValue:'',
dicHeight:0,
}
},
methods:{
......@@ -303,9 +304,19 @@
removeStorage(){
sessionStorage.removeItem("state");
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
return "";
}
},
},
mounted() {
this.getData();
this.$nextTick(() => {
this.dicHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 237;
})
},
watch:{
menuvisible(value) {
......@@ -319,7 +330,7 @@
}
</script>
<style scoped>
<style scoped lang="less">
.log-content{
width: 100%;
/*border: 1px solid red;*/
......@@ -336,24 +347,23 @@
margin-top: 10px;
width: 100%;
border: 1px solid #E6E6E6;
height: 900px;
overflow: scroll;
background-color: white;
box-sizing: border-box;
padding: 6px;
}
.log-menu{
width: 17%;
float: left;
height: 900px;
overflow: scroll;
height: 100%;
overflow-y: scroll;
border-right: 1px solid #E6E6E6;
}
.log-table{
width: 81%;
float: right;
height: 900px;
overflow: scroll;
height: 100%;
}
.el-button {
......@@ -364,9 +374,13 @@
font-weight: bold;
font-size: 20px;
margin-top: 20px;
margin-left: 5px;
float: left;
width: 100%
width: 100%;
text-indent: 10px;
.el-button {
position: relative;
top: -2px;
}
}
ul{
......
<template>
<div class="log-content">
<div class="main">
<div class="log-search">
开始时间：
<el-date-picker
......@@ -47,7 +47,7 @@
</el-dialog>
<div class="log-table">
<el-table :data="tableData">
<el-table :data="tableData" :height="tableHeight" :row-class-name="tableRowClassName">
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column prop="operationtype" align="center" label="操作类型">
......@@ -84,7 +84,7 @@
total: 0,
pageNo: 1,
pageSize: 50,
pageSize: 15,
outerVisible: false,
innerVisible: false,
......@@ -114,7 +114,7 @@
},
startValue: '',
endValue:'',
tableHeight: 0,
}
},
methods:{
......@@ -140,11 +140,12 @@
"startTime": this.startValue,
"endTime": this.endValue,
"pageNo": 1,
"pageSize": 50
"pageSize": 15
};
getLogData(data).then((res)=>{
console.log(res.result);
this.tableData = res.result.records;
this.total = res.result.total
})
},
getError(){
......@@ -167,10 +168,20 @@
openDetail(data){
this.operationDataVisible = true;
this.currentOperationData = data.operationJson;
}
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
return "";
}
},
},
mounted() {
this.getData();
this.$nextTick(() => {
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 290;
})
}
}
</script>
......@@ -191,7 +202,7 @@
.log-table{
margin-top: 10px;
width: 100%;
border: 1px solid #E6E6E6;
box-shadow: 0 2px 15px 1px rgba(49, 132, 245, 0.1);
}
.el-button {
width: 100px;
......
......@@ -161,6 +161,7 @@ import { insertQjZdjbxx } from "@api/zd";
import { insertZrzjbxx } from "@api/zrz";
import { insertDzjbxx } from "@api/dz";
import { insertGzwjbxx } from "@api/gzw";
import { createProcessInstance } from "@api/user";
export default {
name: "",
......@@ -196,6 +197,7 @@ export default {
userbsm: "",
xmmc: "",
xzqbsm: "",
type: "zd",
zdtzmbsm: ""
},
ruleForm1:{
......@@ -291,24 +293,54 @@ export default {
newZd() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
insertQjZdjbxx(this.ruleForm)
// insertQjZdjbxx(this.ruleForm)
// .then((res) => {
// console.log(res.result);
// if (res.code == "200") {
// this.getRightTree(res.result,'0,1,2');
// this.$message({
// message: "创建成功！",
// type: "success",
// });
// this.$store.state.zdbsm = res.result;
// //todo 跳转到宗地基本信息内容表页面 (预留)
// this.close();
// this.$router.push({
// path: '/zd', query:{
// source: 2,
// bsm:res.result
// }
// });
// } else {
// this.$message.error(res.message);
// }
// })
// .catch((error) => {});
let data = {
params:this.ruleForm,
workflowName:'新建1'
}
createProcessInstance(data)
.then((res) => {
console.log(res.result);
if (res.code == "200") {
this.getRightTree(res.result,'0,1,2');
console.log(res);
if (res.needShow) {
// this.getRightTree(res.result,'0,1,2');
this.$message({
message: "创建成功！",
type: "success",
});
this.$store.state.zdbsm = res.result;
//todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.$router.push({
path: '/zd', query:{
source: 2,
bsm:res.result
}
});
// 根据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
// }
// });
} else {
this.$message.error(res.message);
}
......@@ -499,6 +531,7 @@ export default {
margin-left: 20px;
margin-top: 20px;
/deep/.el-tabs__content{
background-color: #fff!important;
position: relative!important;
}
.el-tabs__item{
......
......@@ -364,10 +364,11 @@
</tr>
</table>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont el-icon-search">保存</el-button>
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
<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>
</template>
......@@ -376,6 +377,7 @@
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,
......@@ -398,11 +400,11 @@
components: {
Qlr,
Qlxz,
Lcytj
},
props: {},
data() {
return {
//树型结构
show: true,
clearable: true,
......@@ -478,7 +480,9 @@
BHQKID: "",
DJZQDM: "",
SYQLXID: "",
}
},
lcytjVisible:false,
workitemInstanceId:'',
};
},
mixins: [geoUtils],
......@@ -858,14 +862,17 @@
status: 1,
type: "zd"
}
submit(data).then((res) => {
if (res.code === 200) {
this.$message.success("提交成功！")
this.getZdjbxxData(this.curZdbsm);
this.$store.state.oldZdbsm = '';
this.getRightTree(this.curZdbsm,'0,1,2')
}
})
this.lcytjVisible = false;
this.lcytjVisible = true;
this.workitemInstanceId = this.$route.query.workitemInstanceId;
// submit(data).then((res) => {
// if (res.code === 200) {
// this.$message.success("提交成功！")
// this.getZdjbxxData(this.curZdbsm);
// this.$store.state.oldZdbsm = '';
// this.getRightTree(this.curZdbsm,'0,1,2')
// }
// })
},
getQlrxxData() {
// console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
......@@ -1066,6 +1073,9 @@
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
/deep/.iconfont{
font-size: 14px;
}
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
......
......@@ -592,9 +592,9 @@
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
}
// if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
// }
this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2')
}
})
......
......@@ -5,34 +5,34 @@
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
<tbody>
<tr height="30">
<td colspan="12" align="center" ><font size="4">幢单元基本信息</font></td>
<td colspan="12" align="center" ><font size="4">幢单元基本信息</font></td>
</tr>
<tr height="30">
<td colspan="2" align="center" >幢单元号</td>
<td colspan="2" align="center" class="tdright">幢单元号</td>
<td colspan="4" >
<el-input v-model="form.zdyh"></el-input>
</td>
<td colspan="2" align="center" >幢单元名称</td>
<td colspan="2" align="center" class="tdright"><i class="requisite">*</i>幢单元名称</td>
<td colspan="4" >
<el-input v-model="form.zdymc"></el-input>
<el-input v-model="form.zdymc" ref="zdymc"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地上层数</td>
<td colspan="2" align="center" class="tdright">地上层数</td>
<td colspan="4" >
<el-input v-model="form.dscs"></el-input>
</td>
<td colspan="2" align="center" >地下层数</td>
<td colspan="2" align="center" class="tdright">地下层数</td>
<td colspan="4" >
<el-input v-model="form.dxcs"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >总层数</td>
<td colspan="2" align="center" class="tdright">总层数</td>
<td colspan="4" >
<el-input v-model="form.zcs"></el-input>
</td>
<td colspan="2" align="center" >备注</td>
<td colspan="2" align="center" class="tdright">备注</td>
<td colspan="4" >
<el-input v-model="form.bz"></el-input>
</td>
......@@ -93,32 +93,37 @@
submitForm(formName,zrzbsm,ljzbsm) {
this.form.zrzbsm=zrzbsm;
this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm;
//判断zdybsm是否为空，不为空的时候是编辑，为空的时候是新增
if (this.zdybsm == '') {
this.$refs[formName].validate((valid) => {
if (valid) {
insertZdyInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存成功!")
//更新树结构数据
this.$parent.$parent.getLpbMenuTree(zrzbsm);
//关闭弹框
this.$parent.$parent.closeDaialog()
}
return true;
})
} else {
console.log('error submit!!');
return false;
}
});
if (this.form.zdymc == '') {
this.$message.warning("请完善表单后再继续操作");
this.$refs.zdymc.$el.style.border = '1px solid red';
}else{
//编辑幢单元接口
updateQjZdy(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("保存成功")
}
})
//判断zdybsm是否为空，不为空的时候是编辑，为空的时候是新增
if (this.zdybsm == '') {
this.$refs[formName].validate((valid) => {
if (valid) {
insertZdyInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存成功!")
//更新树结构数据
this.$parent.$parent.getLpbMenuTree(zrzbsm);
//关闭弹框
this.$parent.$parent.closeDaialog()
}
return true;
})
} else {
console.log('error submit!!');
return false;
}
});
}else{
//编辑幢单元接口
updateQjZdy(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("保存成功")
}
})
}
}
},
getZdyInfo(bsm){
......@@ -150,6 +155,14 @@
},
immediate: true
},
"form.zdymc":{
handler: function (item) {
if(item!=''){
this.$refs.zdymc.$el.style.border = '';
}
},
immediate: true
},
}
}
</script>
......