Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3cba72e9 by 田浩浩
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents f5b76728 7f33f084
Inline Side-by-side
Showing 35 changed files with 276 additions and 281 deletions
export default {
SERVERAPI: '/service-bdcdj-Tian',
SERVERCAI: '/service-bdcdj-Tian'
SERVERAPI: '/service-bdcdj9',
// SERVERCAI: '/service-bdcdj-Tian'
}
\ No newline at end of file
......
......@@ -13,8 +13,7 @@ export function getQlxxDictList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -36,8 +35,6 @@ export function editDictNode (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode',
method: 'post',
data,
showLoading: true,
loadingTarget: '正在提交中...'
data
})
}
\ No newline at end of file
......
......@@ -13,8 +13,6 @@ export function addJtfcCxjgXx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx',
method: 'post',
data,
showLoading: true,
loadingTarget: '正在查询中...'
data
})
}
\ No newline at end of file
......
......@@ -4,12 +4,11 @@ import SERVER from './config'
/*
业务办理-选择单元-查询宗地基本信息
*/
export function selectZdjbxx(data) {
export function selectZdjbxx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -17,36 +16,33 @@ export function selectZdjbxx(data) {
/*
业务办理-选择单元-查询建设用地、宅基地信息
*/
export function selectJsydQlxx(data) {
export function selectJsydQlxx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-选择单元-查询自然幢信息
*/
export function selectZrz(data) {
export function selectZrz (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-选择单元-查询户信息
*/
export function selectH(data) {
export function selectH (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -56,8 +52,7 @@ export function selectOtherH (data) {
return request({
url: 'ywbl/ywsq/selectOtherH',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -76,52 +71,48 @@ export function selectOtherH (data) {
/*
业务办理-选择权利信息-根据条件进行列表查询
*/
export function selectQlxx(data) {
export function selectQlxx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-选择抵押权信息-根据条件进行列表查询
*/
export function selectDiyaq(data) {
export function selectDiyaq (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-选择查封信息-根据条件进行列表查询
*/
export function selectCfdj(data) {
export function selectCfdj (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-业务申请-添加收藏业务
*/
export function deleteCollectBiz(bsmSqyw) {
export function deleteCollectBiz (bsmSqyw) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
method: 'post'
})
}
// 国有建设用地使用权/房屋使用权 -选择不动产单元
export function choiceBdcdy(data) {
export function choiceBdcdy (data) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
method: 'post',
data,
showLoading: true
data
})
}
\ No newline at end of file
......
......@@ -8,8 +8,7 @@ export function getSysSqdjywBysearch (data) {
return request({
url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -38,9 +37,7 @@ export function saveSqdjyw (data) {
return request({
url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw',
method: 'post',
data,
showLoading: true,
loadingTarget: '正在保存中...'
data
})
}
......@@ -51,8 +48,7 @@ export function sysSqywmbszSearch (data) {
return request({
url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/search',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -71,7 +67,6 @@ export function updateSysSqywmbsz (data) {
return request({
url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/updateSysSqywmbsz',
method: 'put',
data,
showLoading: true
data
})
}
\ No newline at end of file
......
......@@ -7,8 +7,7 @@ export function getErrorLogList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/xtjk/view/getErrorLogList',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -19,8 +18,7 @@ export function getOperationLogList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/xtjk/view/getOperationLogList',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -30,7 +28,6 @@ export function getOperationLogList (data) {
export function getServerInfo () {
return request({
url: SERVER.SERVERAPI + '/rest/xtjk/view/getServerInfo',
method: 'get',
showLoading: true
method: 'get'
})
}
......
......@@ -3,11 +3,10 @@ import SERVER from './config'
/*
业务办理-获取收藏业务集合
*/
export function getCollectBiz (headers) {
export function getCollectBiz () {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getCollectBiz',
method: 'post',
headers
method: 'post'
})
}
......@@ -17,20 +16,16 @@ export function getCollectBiz (headers) {
export function getleftMenu () {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getleftMenu',
method: 'post',
headers: {
showLoading: false
}
method: 'post'
})
}
/*
业务办理-获取下个节点内容
*/
export function getNextNode (bsmSqyw, headers) {
export function getNextNode (bsmSqyw) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getNextNode?parentid=' + bsmSqyw,
method: 'post',
headers
method: 'post'
})
}
......@@ -52,18 +47,17 @@ export function selectScBdcdy (data) {
// return request({
// url: 'ywbl/ywsq/selectFwsyq',
// method: 'post',
// data,
// data
// showLoading: true
// })
// }
// 待办箱列表查询接口
export function searchTaskToDo (data, headers) {
export function searchTaskToDo (data) {
return request({
url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskToDo',
method: 'post',
data,
headers
data
})
}
// 待办箱/不动产单元删除接口
......@@ -81,8 +75,7 @@ export function startBusinessFlow (data) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -92,19 +85,17 @@ export function searchTaskDone (data) {
return request({
url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskDone',
method: 'post',
data,
showLoading: true
data
})
}
/*
业务办理-选择权利信息-根据条件进行列表查询
*/
export function selectQlxx (data, headers) {
export function selectQlxx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
method: 'post',
data,
headers
data
})
}
/*
......@@ -114,8 +105,7 @@ export function selectDiyaq (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -125,8 +115,7 @@ export function selectCfdj (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -152,8 +141,7 @@ export function choiceBdcdy (data) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -162,8 +150,7 @@ export function deleteBdcdy (data) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteBdcdy',
method: 'post',
data,
showLoading: true
data
})
}
......@@ -172,7 +159,22 @@ export function selectOtherH (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectOtherH',
method: 'post',
data,
showLoading: true
data
})
}
// 认领任务
export function claimTask (bsmSlsq,bestepid) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
method: 'get',
})
}
// 取消认领任务
export function unClaimTask (bsmSlsq,bestepid) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
method: 'get',
})
}
\ No newline at end of file
......
......@@ -17,8 +17,7 @@ export function getZsglrkList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglrkList',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -28,9 +27,7 @@ export function zsrk (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsrk',
method: 'post',
data,
showLoading: true,
loadingTarget: '正在保存中...'
data
})
}
/*
......@@ -60,8 +57,7 @@ export function getZsglffList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglffList',
method: 'post',
data,
showLoading: true
data
})
}
/*
......@@ -90,9 +86,7 @@ export function zsff (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsff',
method: 'post',
data,
showLoading: true,
loadingTarget: '正在保存中...'
data
})
}
/*
......@@ -112,8 +106,7 @@ export function getZssyqkList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZssyqkList',
method: 'post',
data,
showLoading: true
data
})
}
/*
......
......@@ -2,9 +2,12 @@ import Vue from 'vue'
import Popup from './index.vue'
const PopupBox = Vue.extend(Popup)
Popup.install = function (title, editItem, data) {
Popup.install = function (title, editItem, data, formData) {
data.title = title
data.editItem = editItem
if (formData) {
data.formData = formData
}
let instance = new PopupBox({
data
}).$mount()
......@@ -13,5 +16,4 @@ Popup.install = function (title, editItem, data) {
instance.isShow = true
})
}
export default Popup
\ No newline at end of file
export default Popup
......
......@@ -55,21 +55,21 @@ export default {
},
mounted () {
// 计算滚动条高度
// setTimeout(() => {
// if (this.btnShow) {
// if (this.height == 'auto') {
// this.contentHeight = (this.$refs.contentRef.offsetHeight - 200) + 'px'
// } else {
// this.contentHeight = this.height
// }
// } else {
// if (this.height == 'auto') {
// this.contentHeight = this.$refs.contentRef.offsetHeight
// } else {
// this.contentHeight = this.height
// }
// }
// }, 500)
setTimeout(() => {
if (this.btnShow) {
if (this.height == 'auto') {
this.contentHeight = (this.$refs.contentRef.offsetHeight - 200) + 'px'
} else {
this.contentHeight = this.height
}
} else {
if (this.height == 'auto') {
this.contentHeight = this.$refs.contentRef.offsetHeight
} else {
this.contentHeight = this.height
}
}
}, 300)
},
methods: {
onCancel () {
......@@ -78,12 +78,12 @@ export default {
},
onConfirm () {
this.loading = true
let isOk = this.$refs.childRef.childFn() //子组件方法 必须命名一致
if (isOk || isOk == undefined) { //如果子组件没有 return false 就代表子组件方法一切正常
this.isShow = false
let res = new Promise((resolve, reject) => {
this.confirm()
} else { //否则
console.log('弹窗不关闭')
resolve(true)
})
if (res) {
this.isShow = false
}
},
loadingFn (e) { //加载状态
......@@ -93,11 +93,10 @@ export default {
return (r) =>
require.ensure([], () =>
r(require(`@/views/${view}.vue`))
);
)
}
},
destroyed () {
// if appendToBody is true, remove DOM node after destroy
if (this.appendToBody && this.$el && this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el);
}
......@@ -146,6 +145,8 @@ export default {
.ls-mask-content {
padding: 20px;
width: 100%;
min-height: 30%;
max-height: 95%;
overflow: scroll;
}
......
弹窗封装
2.用法以及参数：
this.$popup('提示','ywbl/dbx/aa',{
formData:this.formData, //父组件传给子组件的参数
cancel: function () {}, //取消事件的回调
confirm: function () {}, //确认事件的回调
})
3.子组件的方法名字必须统一为 childFn()
4.子组件切记props接收 父组件传参formData
以及在使用结束后传loading状态给父组件
this.$popup('提示','ywbl/dbx/aa',{
width: '75%', // 初始化75% 不需要改的话 可以直接不要
formData: this.formData, // 父组件传给子组件的参数
cancel: function () {}, //取消事件的回调 没有按钮可以不需要
confirm: function () {} //确认事件的回调 没有按钮可以不需要
})
5.后续有修改请添加在此处文档说明作用
\ No newline at end of file
......
......@@ -8,11 +8,15 @@ import './styles/element-variables.scss'
import '@/styles/index.scss'
import Base from './components/Base/base' // 全局组件引入
import mixin from '@/utils/mixin/theme.js'
import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
Vue.mixin(mixin);
import rules from './utils/rule.js'
// 全局方法挂载
Vue.prototype.$rules = rules
// 全局加载
Vue.prototype.$startLoading = startLoadingAddCount
Vue.prototype.$endLoading = endLoadingSubCount
import Popup from './components/tanchuang/index'
Vue.prototype.$popup = Popup.install
......
......@@ -3,7 +3,7 @@
*/
import axios from 'axios'
import { Message } from 'element-ui'
import { startLoadingAddCount, endLoadingSubCount } from './requestLoading'
import { endLoadingSubCount } from './requestLoading'
// create an axios instance
const service = axios.create({
......@@ -12,11 +12,6 @@ const service = axios.create({
headers: {
'Content-Type': 'application/json; charset=utf-8',
'Authorization': 'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6'
//token列表
//'Authorization': 'bearer AT-12-eRKHta5I8ZWftIU86sSyJ8rUkPhMvMJU'
//renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
//tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
//zhangh:bearer AT-7-Tx8dlZH0LNRc33UjD1CX1xwa-1D7kQmQ
},
timeout: 15000
})
......@@ -24,20 +19,12 @@ const service = axios.create({
// request interceptor
service.interceptors.request.use(
config => {
if (config.headers.showLoading !== false) {
startLoadingAddCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
config.headers.target ? config.headers.target : 'body');
}
config.headers.Authorization =
'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6'
config.headers.Accept = 'application/json'
return config
},
error => {
if (error.headers.showLoading !== false) {
endLoadingSubCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
config.headers.target ? config.headers.target : 'body');
}
Message.error('请求超时!');
return Promise.reject(error)
}
......@@ -46,9 +33,6 @@ service.interceptors.request.use(
// response interceptor
service.interceptors.response.use(
response => {
if (response.config.headers.showLoading !== false) {
endLoadingSubCount();
}
/**
* 对响应数据判断:
* 如果成功返回数据，就通过return把数据返出去
......@@ -62,15 +46,13 @@ service.interceptors.response.use(
return response;
},
error => {
endLoadingSubCount()
// 对响应错误做点什么
Message({
message: '服务器异常,请联系管理员',
type: 'error',
duration: 5 * 1000
})
if (error.config.headers.showLoading !== false) {
endLoadingSubCount();
}
return Promise.reject(error);
}
)
......@@ -92,12 +74,6 @@ function handleErrorData (errMes) {
case 500:
Message.error("服务器错误!");
break;
case 504:
Message.error("网络超时!");
break;
case 2002:
Message.error(errMes.message);
break;
default:
Message.error("服务正在联调中，请稍后!");
break;
......
// import { Loading } from 'element-ui'
import Loading from '@/components/loading/index.js';
// 定义 loading
let loading
// loading开始 方法
function startLoading (LoadingText = '正在加载中...', target = "body") {
function startLoading (target, loadingText = '正在加载中...') {
loading = Loading.service({
text: LoadingText,
text: loadingText,
spinner: 'el-icon-loading',
background: 'rgba(255, 255, 255, 0.5)',
target: target
target: target ? '#' + target : 'body'
})
}
......
......@@ -328,8 +328,7 @@ export default {
};
},
mounted () {
this.getLpb('9434bdb243ba342cc6c043065fc9e480');
// this.getLpb(this.zrzbsm);
this.getLpb(this.zrzbsm ? this.zrzbsm : '9434bdb243ba342cc6c043065fc9e480');
setTimeout(() => {
//让滚动条滚动至最下面 -6是横向滚动条的高度
this.$refs.lpbContent.scrollTop =
......@@ -679,7 +678,6 @@ export default {
handleAddH () { },
handleMoveH () {
// 移动户
console.log(this.chData, "chData");
console.log(this.$parent.scyclx, "实预测类型");
this.moveHvisible = true;
},
......@@ -726,7 +724,7 @@ export default {
type: "warning",
});
}
});
})
})
.catch(() => { });
},
......@@ -743,15 +741,14 @@ export default {
} else {
this.$message({
message: res.message,
type: "warning",
});
type: "warning"
})
}
});
})
},
//户合并
handleHb (type) {
let olbBsms = '';
console.log(this.fghbChoosedList, 'fghbChoosedList');
this.hbsmList.forEach((item, index) => {
olbBsms += index < this.hbsmList.length - 1 ? item + ',' : item
})
......@@ -771,7 +768,6 @@ export default {
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
vm.loadingShow('请求发送中');
// hhb(params).then((res) => {
// vm.loadingHide();
// if (res.code == 200) {
......@@ -801,7 +797,6 @@ export default {
},
//户分割保存
savefgData () {
vm.loadingShow('请求发送中');
// hfg(this.fgData).then((res) => {
// vm.loadingHide();
// if (res.code == 200) {
......@@ -1040,8 +1035,8 @@ export default {
.zdy-name {
width: 100%;
bottom: 0;
position: absolute;
// bottom: 0;
// position: absolute;
height: 40px;
// background-color: rosybrown;
// border:1px solid #E6E6E6
......
......@@ -39,7 +39,7 @@
}
.xxTable {
border-spacing: 1px;
//border-spacing: 1px;
width: 100%;
tr>th {
......@@ -146,4 +146,4 @@
margin-left: 2px;
}
}
}
\ No newline at end of file
}
......
......@@ -28,9 +28,9 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
:total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
<lb-table :page-size="pageData.size" id="dydjb" border @sort-change="handleSort"
:current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
</div>
......@@ -66,7 +66,7 @@ export default {
methods: {
// 初始化数据
fetchData () {
getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#dydjb' }).then((res) => {
let { records, total } = res.result;
this.tableData.data = records;
this.tableData.total = total;
......@@ -78,27 +78,22 @@ export default {
dydjbClick (scope) {
// var sqcxBsm = scope.row.bsmSqcx;
this.$popup({
title: "打印登记薄",
width: "65%",
this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
btnShow: true,
editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
height: "800px",
formData: {
sqcxdata: scope.row,
},
cancel: function () { }, //取消事件的回调
confirm: function () {
// that.loadBdcdylist();
}, //确认事件的回调
});
}
})
},
queryClick () {
this.fetchData();
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -25,9 +25,9 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
<lb-table :page-size="pageData.size" border id="jtfc" :current-page.sync="pageData.current"
:total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
<addjtfc v-model="isDialog" />
......@@ -66,10 +66,9 @@ export default {
queryClick () {
this.fetchData();
},
// 初始化数据
fetchData () {
getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#jtfc' }).then((res) => {
let { records, total } = res.result;
this.tableData.data = records;
this.tableData.total = total;
......@@ -80,9 +79,9 @@ export default {
},
handleAdd () {
this.isDialog = true;
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -27,9 +27,9 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
:total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
<lb-table :page-size="pageData.size" border id="sqcxjl" @sort-change="handleSort"
:current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
</div>
......@@ -61,11 +61,10 @@ export default {
queryClick () {
this.fetchData();
},
// 初始化数据
fetchData () {
getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#sqcxjl' }).then((res) => {
let { records, total } = res.result;
this.tableData.data = records;
this.tableData.total = total;
......@@ -74,7 +73,6 @@ export default {
handleSort (name, sort) {
console.log(name, sort);
},
// 查看
handleViewClick (scope) {
var sqcxBsm = scope.row.bsmSqcx;
......@@ -91,10 +89,10 @@ export default {
confirm: function () {
// that.loadBdcdylist();
}, //确认事件的回调
});
},
},
};
})
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -81,7 +81,7 @@ import {
getStepFormInfo,
} from "@/api/fqsq.js";
import { mapGetters } from "vuex"
import { deleteFlow } from "@/api/ywbl.js";
import { deleteFlow,unClaimTask} from "@/api/ywbl.js";
import ProcessViewer from './components/processViewer.vue'
import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
import { getForm } from "./flowform.js";
......@@ -132,16 +132,36 @@ export default {
clxxIndex: "",
//材料信息选项卡对象
clxxTab: {},
//页面监听时间
_beforeUnload_time: "",
};
},
mounted () {
this.loadBdcdylist();
this.flowInitParam();
//添加页面监听事件
window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
window.addEventListener('unload', e => this.unloadHandler(e))
},
destroyed() {
window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
window.removeEventListener('unload', e => this.unloadHandler(e))
},
computed: {
...mapGetters(["oldDetail", "newDetail"])
},
methods: {
beforeunloadHandler() {
this._beforeUnload_time = new Date().getTime()
},
unloadHandler(e) {
this._gap_time = new Date().getTime() - this._beforeUnload_time
//判断是窗口关闭还是刷新
if (this._gap_time <= 5) {
//取消认领
unClaimTask(this.bsmSlsq,this.bestepid)
}
},
changeLoadIndex () {
this.loadIndex++
},
......@@ -367,6 +387,8 @@ export default {
break;
case "signout":
window.close();
//取消认领
unClaimTask(this.bsmSlsq,this.bestepid)
break;
case "B9":
var formdata = new FormData();
......
......@@ -70,7 +70,7 @@ import searchBox from '../components/search.vue'
import table from "@/utils/mixin/table"
import searchMin from "../components/mixin/index"
import { datas, sendThis } from "./dbxdata"
import { searchTaskToDo, deleteFlow } from "@/api/ywbl.js"
import { searchTaskToDo, deleteFlow ,claimTask} from "@/api/ywbl.js"
export default {
name: "dbx",
components: { searchBox },
......@@ -114,8 +114,10 @@ export default {
},
// 列表渲染接口
fetchData () {
searchTaskToDo({ ...this.queryForm, ...this.pageData }, { 'target': '#dbx' }).then(res => {
this.$startLoading('dbx')
searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
if (res.code === 200) {
this.$endLoading()
let { total, records } = res.result
records.forEach(item => {
item.qlrmc = item.qlrmc.join(',')
......@@ -172,6 +174,9 @@ export default {
ywhClick (item) {
const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
window.open(href, '_blank');
//从待办箱进入的调取任务领取接口
claimTask(item.bsmSlsq,item.bestepid)
}
}
}
......
......@@ -43,7 +43,7 @@ class data extends filter {
case '2':
return <div class='prohibit'>已结束</div>
case '3':
return <span>进行中</span>
return <div class='allow'>进行中</div>
}
}
},
......
......@@ -355,4 +355,4 @@ export default {
/deep/.el-form-item__label {
padding-bottom: 0px;
}
</style>
\ No newline at end of file
</style>
......
......@@ -140,6 +140,15 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :class="flag ? 'marginBot0' : ''" label="发证方式：">
<el-radio-group v-model="ruleForm.slywxx.fzfs">
<el-radio label="1">小证</el-radio>
<el-radio label="2">大证</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
<el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
<el-radio-group v-model="ruleForm.slywxx.sffbcz">
......@@ -195,9 +204,7 @@ export default {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
}
}
});
......@@ -231,8 +238,18 @@ export default {
},
onSubmit () {
saveBatchData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
console.log(res);
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功！",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -249,10 +249,18 @@ export default {
},
onSubmit () {
saveData(this.ruleForm).then((res) => {
console.log(this.ruleForm);
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功！",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -253,24 +253,12 @@ export default {
},
methods: {
onClick(){
this.$popup({
titleStyle: "left",
title: "登记簿详情", // 弹窗标题
editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容
formData: {
bsmSldy: this.propsParam.bsmSldy,
qllx: this.propsParam.qllx
},
width: "1220px",
height: "790px",
// cancelText: '取消摆烂', // 右边按钮文本
// confirmText: '确定点击', //左边按钮文本
cancel: () => {
console.log("取消回调");
},
confirm: () => {
console.log("确认回调");
},
this.$popup("房屋信息比对","ywbl/fdcq2/slxxCompareDetai",
{
formData: {
bsmSldy: this.propsParam.bsmSldy,
qllx: this.propsParam.qllx
}
});
},
// 更新权利人信息
......@@ -284,9 +272,18 @@ export default {
onSubmit () {
saveGZBatchData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功！",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -266,9 +266,18 @@ export default {
},
onSubmit () {
saveLogoutData(this.ruleForm).then((res) => {
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功！",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -228,26 +228,20 @@ export default {
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
}
});
},
onSubmit () {
saveBHZData(this.ruleForm).then((res) => {
console.log(this.ruleForm);
if (res.code === 200 && res.result) {
console.log(res);
//this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功！",
type: "success",
});
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
}
});
},
......
......@@ -44,6 +44,7 @@
<script>
import {getFdcqLSInfo} from "@/api/registerBook.js";
import { datas } from "@/views/registerBook/qlxxFormData.js";
export default {
data() {
return {
......@@ -73,7 +74,6 @@ export default {
},
methods: {
loadData() {
console.log(this.propsParam.formData);
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
formdata.append("qllx", this.propsParam.formData.qllx);
......
......@@ -60,7 +60,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :heightNum="300" @sort-change="handleSort" border
<lb-table :page-size="pageData.size" id="ybxLoading" :heightNum="300" @sort-change="handleSort" border
:current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
......@@ -111,7 +111,7 @@ export default {
},
// 列表渲染接口
fetchData () {
searchTaskDone({ ...this.queryForm, ...this.pageData }).then(res => {
searchTaskDone({ ...this.queryForm, ...this.pageData }, { 'target': '#ybxLoading' }).then(res => {
if (res.code === 200) {
let { total, records } = res.result
this.pageData.total = total;
......
<template>
<dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
<component :is="editItem" @closeDialog="closeDialog" :isJump="isJump" @updateDialog="updateDialog" :djywbm="djywbm" :djywmc="djywmc"
:key="key" />
<component :is="editItem" @closeDialog="closeDialog" :isJump="isJump" id="slectBdc" @updateDialog="updateDialog"
:djywbm="djywbm" :key="key" />
</dialogBox>
</template>
<script>
......@@ -24,12 +24,12 @@ export default {
this.myValue = val
this.key++
if (this.$route.query.sqywbm) {
let dd = queueDjywmc(this.$route.query.sqywbm)
let dd = queueDjywmc(this.$route.query.sqywbm, { 'target': '#slectBdc' })
this.editItem = this.loadView(dd)
}
},
'djywbm' (val) {
let dd = queueDjywmc(val)
let dd = queueDjywmc(val, { 'target': '#slectBdc' })
this.editItem = this.loadView(dd)
}
},
......
......@@ -66,7 +66,7 @@
<el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
</div>
</div>
<fqsqDialog v-model="isDialog" :djywbm="djywbm" :djywmc="djywmc"/>
<fqsqDialog v-model="isDialog" :djywbm="djywbm"/>
</div>
</template>
<script>
......
......@@ -111,15 +111,8 @@ export default {
moreQueryClick () { },
openDialog (scroll) {
this.$popup('登记簿详情', 'registerBook/djbFrame', {
formData: scroll,
width: "1220px",
height: "790px",
cancel: () => {
console.log("取消回调");
},
confirm: () => {
console.log("确认回调");
},
width: '90%',
formData: scroll
});
},
handleLpbClick (item) {
......
......@@ -108,6 +108,9 @@ export default {
if (item.ywrmc.length != 0) {
item.ywrmcStr = String(item.ywrmc)
}
if(item.zlList.length != 0){
item.zlStr = String(item.zlList)
}
})
this.pageData.total = total;
this.tableData.data = records
......
......@@ -21,14 +21,21 @@ class data extends filter {
},
{
label: "流程状态",
width: '80',
render: (h, scope) => {
if(scope.row.cfgqzt == '1'){
return <div class='suspend'>查封挂起</div>
}
if(scope.row.yygqzt == '1'){
return <div class='suspend'>异议挂起</div>
}
switch (scope.row.lczt) {
case '1':
return <span>进行中</span>
return <div class='allow'>进行中</div>
case '2':
return <span>已结束</span>
return <div class='prohibit'>已结束</div>
case '3':
return <span>进行中</span>
return <div class='allow'>进行中</div>
}
}
},
......@@ -77,7 +84,7 @@ class data extends filter {
}
},
{
prop: "zl",
prop: "zlStr",
label: "坐落",
},
{
......