76ee6f57 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 7f74b4ff cf368790
This file is too large to display.
......@@ -6,78 +6,91 @@
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
/**
* @description: 获取申请查询列表
* @description: 添加补录记录
* @param {*} data
* @author: renchao
*/
export function getSqcxPage (data) {
export function addRepairRecord (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getSqcxPage',
url: SERVER.SERVERAPI + '/rest/djbRepair/addRepairRecord',
method: 'post',
data
})
}
/**
* @description: 新增申请查询家庭房产信息
* @description: 删除流程
* @param {*} data
* @author: renchao
*/
export function addJtfcCxjgXx (data) {
export function deleteFlow (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx',
url: SERVER.SERVERAPI + '/rest/djbRepair/deleteFlow',
method: 'post',
data
})
}
/**
* @description: 新增申请查询房屋明细信息
* @description: 删除补录记录
* @param {*} data
* @author: renchao
*/
export function addFwmxCxjgXx (data) {
export function deleteRepairRecord (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addFwmxCxjgXx',
url: SERVER.SERVERAPI + '/rest/djbRepair/deleteRepairRecord',
method: 'post',
data
})
}
/**
* @description: 获取申请查询记录详细信息
* @param {*} params
* @description: 初始化内容
* @param {*} data
* @author: renchao
*/
export function getJtfcInfo (params) {
export function init (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcInfo/',
method: 'get',
params
url: SERVER.SERVERAPI + '/rest/djbRepair/init',
method: 'post',
data
})
}
/**
* @description: 获取房屋明细记录详细信息
* @param {*} params
* @description: 左侧菜单集合
* @param {*} data
* @author: renchao
*/
export function getFwmxInfo (params) {
export function leftMenubl (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxInfo/',
method: 'get',
params
url: SERVER.SERVERAPI + '/rest/djbRepair/leftMenu',
method: 'post',
data
})
}
/**
* @description: 打印家庭房产
* @description: 保存数据
* @param {*} data
* @author: renchao
*/
export function printJtcfInfo (data) {
export function save (data) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/addRepairRecord',
url: SERVER.SERVERAPI + '/rest/djbRepair/save',
method: 'post',
data
})
}
/**
* @description: 发起业务申请流程
* @param {*} data
* @author: renchao
*/
export function startBusinessFlow (data) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/startBusinessFlow',
method: 'post',
data
})
......
......@@ -68,7 +68,7 @@
if (process.env.NODE_ENV === 'development') {
localStorage.removeItem('token')
} else {
Cookies.remove('accessToken')
Cookies.remove('ACCESS_TOKEN')
}
if (window._config.casEnable) {
window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
......
/*
* @Description: 项目权限
* @Autor: renchao
* @LastEditTime: 2023-06-13 10:49:43
* @LastEditTime: 2023-06-13 15:50:18
*/
import Vue from 'vue'
import axios from 'axios'
......@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => {
let hasAddDict = store.state.dict.addDict
let hasAddRoute = store.state.permission.addRoutes
// cas操作
const token = localStorage.getItem("token") || Cookies.get('accessToken');
const token = localStorage.getItem("token") || Cookies.get('ACCESS_TOKEN');
if (to.path === '/login') {
if (token) {
next('/')
......@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
if (process.env.NODE_ENV === 'development') {
localStorage.setItem('token', res.data.content.accessToken)
} else {
Cookies.set('accessToken', res.data.content.accessToken)
Cookies.set('ACCESS_TOKEN', res.data.content.accessToken)
}
window.location.href = localStorage.getItem('location')
......
......@@ -2,7 +2,7 @@
/*
* @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器
* @Autor: renchao
* @LastEditTime: 2023-06-13 10:50:32
* @LastEditTime: 2023-06-13 15:52:38
*/
import axios from 'axios'
import Router from '@/router'
......@@ -78,7 +78,7 @@ service.interceptors.response.use(
if (process.env.NODE_ENV === 'development') {
localStorage.removeItem('token')
} else {
Cookies.remove('accessToken')
Cookies.remove('ACCESS_TOKEN')
}
if (window._config.casEnable) {
window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl);
......
......@@ -44,6 +44,7 @@
<script>
import { mapGetters } from 'vuex'
import { leftMenu } from "@/api/fqsq.js"
import { leftMenubl } from "@/api/djbbl.js"
import { deleteSlbdcdy } from "@/api/ywbl.js";
import { getBdcqljqtsx } from "@/api/registerBook.js";
import { loadTreeData, getNode } from "./djbFrameData.js";
......@@ -111,6 +112,22 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
}
})
this.loadData ()
this.getleftMenubl()
},
getleftMenubl(){
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
leftMenubl(formdata).then((res) => {
console.log("左侧菜单集合",res);
// if (res.code === 200 && res.result) {
// this.currentSelectProps = res.result[0];
// this.$emit('getCurrentSelectProps', this.currentSelectProps);
// // this.getdjblist()
// }
}
)
},
// 获取登记簿菜单
loadData () {
......
<!--
* @Description :查封登记信息
* @Autor : miaofang
* @LastEditTime : 2023-06-08 17:04:19
* @LastEditTime : 2023-06-13 13:56:45
-->
<template>
<div class="djxxTable">
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
<!--
* @Description :抵押权登记信息
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:41:50
* @LastEditTime : 2023-06-13 13:56:37
-->
<template>
<div class="djxxTable">
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
......@@ -29,7 +29,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
<!--
* @Description : 房地产权2
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:42:33
* @LastEditTime : 2023-06-13 14:33:55
-->
<template>
<div class="djxxTable">
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......@@ -77,6 +76,7 @@ export default {
qszt: this.checkList,
}).then((res) => {
if (res.code === 200) {
console.log("国有建设",res);
this.tableData = res.result;
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
......@@ -105,11 +105,6 @@ export default {
}
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
......
<!--
* @Description :国有建设用地使用权
* @Autor : miaofang
* @LastEditTime : 2023-06-09 13:33:38
* @LastEditTime : 2023-06-13 13:55:51
-->
<template>
<div class="djxxTable">
......@@ -30,7 +30,6 @@
>
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......@@ -86,7 +85,6 @@
}).then((res) => {
if (res.code === 200) {
this.tableData = res.result;
console.log("111111111111this.tableDat1",this.tableData);
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
datas.columns().emptycolNum - this.tableData.length;
......
......@@ -29,7 +29,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
<!--
* @Description :预告登记
* @Autor : miaofang
* @LastEditTime : 2023-06-12 09:17:17
* @LastEditTime : 2023-06-13 13:57:01
-->
<template>
<div class="djxxTable">
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
<!--
* @Description :异议登记
* @Autor : miaofang
* @LastEditTime : 2023-06-09 13:55:42
* @LastEditTime : 2023-06-13 13:57:04
-->
<template>
<div class="djxxTable">
......@@ -27,7 +27,6 @@
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="AddDialog(row)">新增</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
......
......@@ -42,8 +42,6 @@ export default {
methods: {
//加载流程初始参数
flowInitParam () {
this.bsmSlsq='dd7176d47d79abc17739a1ca06172e96'
this.bestepid='cs'
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
......@@ -51,6 +49,7 @@ export default {
if (res.code === 200) {
this.leftButtonList = res.result.button;
this.rightButtonList = res.result.operation;
console.log("this.leftButtonList",this.leftButtonList);
// this.rightButtonList.splice(0,2)
}
})
......@@ -58,6 +57,7 @@ export default {
},
//流程环节操作按钮
operation (item) {
console.log("流程环节操作按钮信息",item);
//按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
//操作按钮 登簿:record 转件:transfer 退回:back 退出:signout
let that = this;
......@@ -103,10 +103,11 @@ export default {
this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
break;
case "B5":
this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
bsmSlsq: this.bsmSlsq,
entryType: '1'
}, '65%', true)
// this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
// bsmSlsq: this.bsmSlsq,
// entryType: '1'
// }, '65%', true)
this.addRepairRecord()
break;
case "B6":
//根据编号获取对应信息
......
......@@ -81,7 +81,7 @@ import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { leftMenu } from "@/api/fqsq.js"
import { addRepairRecord } from "@/api/djbbl.js"
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
components: {
......@@ -128,11 +128,13 @@ export default {
this.currentSelectProps = val
this.getdjblist()
},
// 获取登记簿列表
getdjblist(){
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
console.log("登记簿列表",res);
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
......@@ -141,6 +143,7 @@ export default {
});
}
});
setTimeout(() => {
let settree=JSON.parse(JSON.stringify(this.treedata))
this.tabdata=[...settree,...settree[1].children[0].children[0].children]
......@@ -149,10 +152,24 @@ export default {
arr[index].value=item.id
})
this.tabList=this.tabdata
console.log("登记簿列表",this.tabList);
}, 200)
// this.tabdatalet
},
addRepairRecord(){
addRepairRecord({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
console.log("添加补录记录",res);
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
});
}
});
},
tabset(){
this.tabList = [
......
<!--
* @Description: 页面提供插件下载
* @Autor: renchao
* @LastEditTime: 2023-06-13 15:49:55
-->
<template>
<div class='downLoad'>
<p>{{formData}}是否下载文件?</p>
<div>
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" @click="handleDown">确定</el-button>
</div>
</div>
</template>
<script>
export default {
props: {
formData: {
type: Object,
default: {}
}
},
methods: {
handleDown () {
let a = document.createElement('a')
a.style.display = 'none'
a.setAttribute('download', 'bg.jpg')
// a.href = require('../../../../public/')
document.body.appendChild(a)
console.log('href', a.href)
a.click()
document.body.removeChild(a)
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
</style>
\ No newline at end of file
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-13 13:12:25
* @LastEditTime: 2023-06-13 15:05:35
-->
<template>
<div>
......@@ -195,15 +195,20 @@
// 身份证读取
readClick (row) {
console.log(row, 'row');
var httpurl = "http://127.0.0.1:33088/";
var url = httpurl + "function=get_idcard&readnew=0"
axios.post(url).then(res => {
if (res.data.code == 1) {
this.$message({
message: res.data.message,
type: 'warning'
})
} else {
let data = res.data.IDCardInfo
row.sqrmc = data.name
row.zjzl = 1
row.zjh = data.cardID
}
})
},
// 修改
......
......@@ -202,6 +202,7 @@
});
},
ywhClick (item) {
console.log("代办箱列表信息",item);
//判断用户是否拥有该任务的权限,若有则跳转,无权限则给予提示并刷新页面
judgeUserTaskPermission({
bsmSlsq: item.bsmSlsq,
......
......@@ -73,7 +73,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -4,21 +4,13 @@
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
<el-row>
<!-- <el-col :span="5">
<el-form-item label="权利类型">
<el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="5">
<el-col :span="10">
<el-form-item label="不动产单元号" label-width="105px">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="10">
<el-form-item label="不动产权证号" label-width="105px">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
</el-input>
......@@ -30,7 +22,12 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
......@@ -41,12 +38,16 @@
</el-form>
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
<div class="from-clues-content loadingtext" >
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.size" class="loadingtext"
:current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
<div class="submit_button">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" plain @click="submitForm">发起申请</el-button>
</div>
</div>
</template>
<script>
......@@ -54,18 +55,23 @@ import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "../javascript/selectDjbbl.js";
import { getDjbBysearch } from "@/api/zhcx.js";
import jump from "../components/mixin/jump";
export default {
name: "djbcx",
mixins: [table],
mixins: [table, jump],
mounted () {
sendThis(this);
this.queryClick()
},
props: {
isJump: { type: Boolean, default: false },
sqywInfo: { type: Object, default: () => { } },
},
data () {
return {
bdcdysz: [],
queryForm: {
qllx: "",
zl: "",
bdcdyh: "",
bdcqzh: "",
ywh: "",
......@@ -100,9 +106,9 @@ export default {
}
});
},
handleSort (name, sort) {
console.log(name, sort);
},
// handleSort (name, sort) {
// console.log(name, sort);
// },
// 高级查询
moreQueryClick () { },
// openDialog (scroll) {
......@@ -129,6 +135,61 @@ export default {
window.open(href, `urlname${item.bdcdyid}`);
},
submitForm () {
if (this.bdcdysz.length == 0) {
this.$message.error("请至少选择一条数据");
return;
}
startBusinessFlow({
bsmSqyw: this.bsmSqyw,
bdcdysz: this.bdcdysz,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
}).then((res) => {
if (res.code == 200) {
this.$message({
showClose: true,
message: '发起申请成功',
type: 'success'
})
if (!this.isJump) {
this.jump(res.result, this.djywbm)
} else {
store.dispatch('user/refreshPage', true);
}
} else {
this.$message.error(res.message);
}
this.$popupCacel()
})
},
handleSelectionChange (val) {
this.bdcdysz = val;
},
handleRowClick(row){
// 如果状态是1,那就是单选
if(this.sqywInfo.sqywdylx=="1"){
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if( bdcdysz.length == 1 ) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
}else{
this.$refs.table.toggleRowSelection(row);
}
},
}
}
</script>
......
......@@ -136,6 +136,7 @@
this.$refs.table.toggleRowSelection(row, true);
}
},
handleRowClick(row){
// 如果状态是1,那就是单选
if(this.sqywInfo.sqywdylx=="1"){
......
......@@ -11,6 +11,11 @@ class data extends filter {
columns () {
return [
{
type: 'selection',
label: '全选',
selectable: this.selected
},
{
label: '序号',
type: 'index',
width: '50',
......@@ -53,10 +58,6 @@ class data extends filter {
{
prop: "ywh",
label: "业务号",
width: '110',
render: (h, scope) => {
return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
}
},
{
prop: "qllxmc",
......