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) {
url: '/system/basiccommon/query/'+businessId,
method: 'get',
})
}
/**
* 通知公告
*/
export function getTzggList(data,params) {
return request({
url: `/system/tzgg/getTzggPageList?pageNo=${params.pageNo}&pageSize=${params.pageSize}`,
method: 'post',
data : data,
})
}
\ No newline at end of file
......
......@@ -319,3 +319,18 @@ export function updateFldc(data) {
data:data
})
}
/**
*根据宗地标识码获取权籍_集体土地所有权宗地分类面积调查记录
* @param zdbsm
*/
export function getZdbsms(zdBsm) {
return request({
url:'/bg/zdSplitMerge/getZdbsms',
method:'get',
params:{
zdBsm
}
})
}
\ No newline at end of file
......
......@@ -137,6 +137,7 @@ ol, ul { list-style:none; }
position: unset;
/deep/.el-tab-pane{
height: 100%;
overflow-y: auto;
}
background-color: #F4F9FF;
padding: 0;
......
......@@ -264,13 +264,20 @@ export default {
break;
}
if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'||item.type == 'gzw'){
let data = {
source: 2,
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
};
if(this.$route.query.workitemInstanceId){
data.workitemInstanceId = this.$route.query.workitemInstanceId;
}
if(this.$route.query.ywbsm){
data.ywbsm = this.$route.query.ywbsm;
}
this.$router.push({
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
query:data
});
}
},
......
......@@ -264,7 +264,11 @@ export default {
if(this.$route.path == '/zrz'){
this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth)
}else if(this.$route.path == '/zd'){
this.getRightTree(this.$store.state.zdbsm,'0,1,2')
if(this.$route.query.source === 'bsms'){
this.getTreeByS(this.$store.state.zdbsms);
}else {
this.getRightTree(this.$store.state.zdbsm,'0,1,2')
}
}else if(this.$route.path == '/dz'){
this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
}else if(this.$route.path == '/gzw'){
......
......@@ -57,10 +57,11 @@
<script>
import SearchHead from "@components/searchHead/searchHead";
import {getDbxList} from "@api/dbx";
import {getZdbsms} from '@api/zd'
export default {
name: "",
inject:['getRightTree','getTreeByBsm','getTreeList'],
inject:['getRightTree','getTreeByBsm','getTreeList','getTreeByS'],
components: {SearchHead},
props: {},
data() {
......@@ -123,22 +124,44 @@
//点击办理
handleClick(row) {
let path = "";
let data ={
bsm: row.glbsm,
ywbsm: row.businessId,
source: "2",
auth: '0,1,2',
workitemInstanceId:row.id
};
this.$store.state.oldZdbsm = '';
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
path = "/zrz";
this.gotoDetailPage(path,data);
break;
case "zd":
this.$store.state.zdbsm = row.glbsm;
this.getRightTree(row.glbsm,'0,1,2');
if(row.templetName === '分割宗地'){
data.source = 'bsms';
getZdbsms(row.glbsm).then((res)=>{
if(res.code === 200){
this.$store.state.zdbsms = res.result;
this.getTreeByS(res.result);
}
})
}else {
this.getRightTree(row.glbsm,'0,1,2');
}
path = "/zd";
this.$nextTick(()=>{
this.gotoDetailPage(path,data);
})
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
path = "/dz";
this.gotoDetailPage(path,data);
break;
case "h":
case "h0":
......@@ -146,31 +169,35 @@
path="/h";
this.$store.state.hbsm=row.glbsm
this.getTreeByBsm(row.glbsm,'h','0,1,2');
this.gotoDetailPage(path,data);
break;
case "gzw":
this.$store.state.gzwbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
this.gotoDetailPage(path,data);
path = "/gzw";
break;
case "lq":
// this.$store.state.zrzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
this.gotoDetailPage(path,data);
path = "/lq";
break;
default:
break;
}
},
gotoDetailPage(path,data){
this.$router.push({
path: path,
query: {
bsm: row.glbsm,
ywbsm: row.businessId,
source: 2,
auth: '0,1,2',
workitemInstanceId:row.id
}
query: data
});
},
//定位
//图形定位
postionToMap(rowData){
......
......@@ -135,15 +135,20 @@
break;
case "zd":
path = "/zd";
this.$store.state.zdbsm = row.glbsm
this.$store.state.zdbsm = row.glbsm;
this.getRightTree(row.glbsm,'0,1,2');
break;
case "h":
path = "/h";
this.$store.state.hbsm = row.glbsm
this.$store.state.hbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,'h','0,1,2');
type = "2";
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
path = "/dz";
break;
default:
break;
}
......
......@@ -305,13 +305,14 @@
getListByPbsm,
getDdicByMC
} from "@api/common";
import {getQjZdjbxxDetailById, zdfg, getZrz} from '@api/zd'
import {getQjZdjbxxDetailById, zdfg, getZrz,getZdbsms} from '@api/zd'
import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from '@api/dz'
import {getHZdxx} from '@api/h'
import zdQueryData from '@components/zdQueryData/zdQueryData'
import dzQueryData from '@components/dzQueryData/dzQueryData'
import {Message} from 'element-ui'
import hfghb from '../hfghb/index'
import { createProcessInstance } from "@api/user";
export default {
name: "",
......@@ -368,11 +369,15 @@
},
zdFghData: {
oldZdbsm: "",
newZdlist: []
newZdlist: [],
type:"zd",
ywlx:"change"
},
dzFghData: {
olddzbsm: "",
fwlist: []
fwlist: [],
type:"dz",
ywlx:"change"
},
hFghData: {
oldZdbsm: "",
......@@ -449,19 +454,25 @@
case "zd":
this.zdFghData = {
oldZdbsm: "",
newZdlist: []
newZdlist: [],
type:"zd",
ywlx:"change"
}
break
case "dz":
this.dzFghData = {
olddzbsm: "",
fwlist: []
fwlist: [],
type:"dz",
ywlx:"change"
}
break
case "h":
this.hFghData = {
oldZdbsm: "",
newZdlist: []
newZdlist: [],
type:"h",
ywlx:"change"
}
break;
default:
......@@ -609,26 +620,61 @@
if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) {
vm.loadingShow('正在保存中');
zdfg(this.zdFghData).then(res => {
vm.loadingHide()
if (res.success) {
this.$store.state.zdbsms = res.result;
//更新目录树
this.getTreeByS(res.result);
this.$router.push({
path: '/zd',
query: {
bsm: res.result[0],
source: 3, //分割标识
}
});
} else {
Message.error("保存失败")
}
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
let data = {
params:this.zdFghData,
workflowName:'分割宗地'
}
// zdfg(this.zdFghData).then(res => {
// vm.loadingHide()
// if (res.success) {
// this.$store.state.zdbsms = res.result;
// //更新目录树
// this.getTreeByS(res.result);
// this.$router.push({
// path: '/zd',
// query: {
// bsm: res.result[0],
// source: 3, //分割标识
// }
// });
// } else {
// Message.error("保存失败")
// }
// }).catch((error)=>{
// vm.loadingHide();
// console.log(error);
// })
createProcessInstance(data)
.then((res) => {
vm.loadingHide()
if (res.needShow) {
//res.processInstance.title; 宗地标识码
getZdbsms(res.processInstance.title).then((res1)=>{
if(res1.code === 200){
this.$store.state.zdbsms = res1.result;
this.getTreeByS(res1.result);
this.$router.push({
path: '/zd',
query: {
bsm: res1.result[0],
source: 3, //分割标识
ywbsm:res.processInstance.businessId,
workitemInstanceId:res.workitemInstance.id
}
});
}
});
} else {
Message.error("保存失败")
}
}).catch((error) => {
vm.loadingHide();
console.log(error);
});
}else{
Message.warning("请完善分割后的宗地项目名称后重试")
}
......
......@@ -55,10 +55,13 @@
<el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
</el-table-column>
<el-table-column
prop="date"
align="center"
prop="createDate"
align="right"
label="发布时间"
>
<template slot-scope="scope">
{{changeDate(scope.row.createDate)}}
</template>
</el-table-column>
</el-table>
</el-card>
......@@ -115,7 +118,7 @@
<script>
import { Chart, registerShape } from '@antv/g2';
import {getDbxList,getYbxList} from "@api/dbx";
import {getDbxList,getYbxList,getTzggList} from "@api/dbx";
export default {
components:{},
data() {
......@@ -186,9 +189,10 @@ export default {
this.initG2qllx();
this.initG2tdfwtj();
this.initG2xntjid();
this.getTzggList();
},
methods: {
download(row,column,event){
download(row,column,event){
window.open(row.url)
},
handleSelect(item) {
......@@ -238,7 +242,7 @@ export default {
let data = {
pageSize:15,
pageNo:1
}
};
getDbxList(data).then((res)=>{
if(res.code === 200){
this.workList.forEach((item,index)=>{
......@@ -266,6 +270,24 @@ export default {
})
})
},
getTzggList(){ //通知公告
let data={
status: "4",
};
let params={
pageNo:1,
pageSize:4
};
getTzggList(data,params).then(res=>{
if(res.code=200){
console.log(res.result,'通知公告')
this.tableData=res.result.list;
}
})
},
changeDate(date){
return date.substring(0,11)
},
initG2qllx(){
const data = [
{ item: '国有建设用地使用权', count: 40, percent: 0.4 },
......
......@@ -284,6 +284,7 @@
path: path,
query: {
bsm: res.processInstance.title,
ywbsm: res.processInstance.businessId,
source: 2,
workitemInstanceId:res.workitemInstance.id,
auth:'1'
......
......@@ -48,10 +48,11 @@
<script>
import SearchHeadYbx from "@components/searchHead/searchHeadYbx";
import {getYbxList,queryByBusinessId} from "@api/dbx";
import {getZdbsms} from '@api/zd';
export default {
name: "",
inject:['getRightTree','getTreeByBsm'],
inject:['getRightTree','getTreeByBsm','getTreeByS'],
components: {SearchHeadYbx},
props: {},
data() {
......@@ -134,21 +135,41 @@
console.log(data);
let path = "";
let params ={
bsm: data.glbsm,
ywbsm: data.glbsm,
source: 2,
auth: '0,1,2',
processInstanceId:row.id
};
this.$store.state.oldZdbsm = '';
switch (data.dylx) {
case "zrz":
this.$store.state.zrzbsm = data.glbsm;
this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2');
path = "/zrz";
this.gotoDetailPage(path,params);
break;
case "zd":
this.$store.state.zdbsm = data.glbsm;
this.getRightTree(data.glbsm,'0,1,2');
path = "/zd";
if(row.templetName === '分割宗地'){
params.source = 'bsms';
getZdbsms(data.glbsm).then((response)=>{
if(response.code === 200){
this.$store.state.zdbsms = response.result;
this.getTreeByS(response.result);
}
})
}else {
this.getRightTree(row.glbsm,'0,1,2');
}
this.gotoDetailPage(path,params);
break;
case "dz":
this.$store.state.dzbsm = data.glbsm;
this.getTreeByBsm(data.glbsm,data.dylx,'0,1,2');
this.gotoDetailPage(path,params);
path = "/dz";
break;
case "h":
......@@ -157,31 +178,31 @@
path="/h";
this.$store.state.hbsm=data.glbsm
this.getTreeByBsm(data.glbsm,'h','0,1,2');
this.gotoDetailPage(path,params);
break;
case "gzw":
this.$store.state.gzwbsm = data.glbsm;
this.getTreeByBsm(data.glbsm,"gzw",'0,1,2');
path = "/gzw";
this.gotoDetailPage(path,params);
break;
default:
break;
}
this.$router.push({
path: path,
query: {
bsm: data.glbsm,
ywbsm: data.glbsm,
source: 2,
auth: '0,1,2',
processInstanceId:row.id
}
});
}
})
},
gotoDetailPage(path,data){
this.$router.push({
path: path,
query: data
});
},
//定位
//图形定位
postionToMap(rowData){
......
......@@ -149,6 +149,7 @@
},
uploadSuccess(res, file, fileList) {
this.$message.success("上传成功")
vm.loadingHide();
this.getFileList();
},
handleRemove(file, fileList) {
......
......@@ -372,7 +372,7 @@
</div>
</div>
<div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
<el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'">终止</el-button>
<el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'||workFlowphase == 'zdfg'||workFlowphase == 'fwsxbg'">终止</el-button>
<el-button type="primary" @click="thzd" v-show="rollbackDetails.length>0">退回</el-button>
<el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button>
......@@ -521,6 +521,7 @@
getActivityDetail(params).then(res => {
this.workFlowData= res;
this.workFlowphase = res.properties.phase;
console.log(this.workFlowphase,"this.workFlowphase")
this.rollbackDetails = res.rollbackDetails;
this.workFlowState = res.workitemInstance.apps.some(function(item) {
return item == 'shenpibiao';
......
......@@ -282,7 +282,7 @@
</div>
</div>
<div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
<el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'">终止</el-button>
<el-button type="primary" @click="lczz" v-show="workFlowphase == 'modify'||workFlowphase == 'fwsxbg'">终止</el-button>
<el-button type="primary" @click="thzrz" v-show="rollbackDetails.length>0">退回</el-button>
<el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
......