Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b5125572 by renchao@pashanhoo.com
Options

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

2 parents 150145c9 69c583cc
Expand all
Inline Side-by-side
Showing 21 changed files with 664 additions and 355 deletions
/*
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-08 13:43:33
* @LastEditTime: 2023-06-16 16:06:39
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
const url = SERVER.SERVERAPI + '/rest/zhcx/lpcx/'
//
import request from "@/utils/request";
let SERVER = window.config
? window.config
: JSON.parse(localStorage.getItem("ApiUrl"));
const url = SERVER.SERVERAPI + "/rest/zhcx/lpcx/";
//
/**
* @description:楼盘查询- 根据条件进行列表查询
* @param {*} data
* @author: renchao
*/
export function getLpZrz (data) {
export function getLpZrz(data) {
return request({
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpZrz',
method: 'post',
data: data
})
url: "service-lpb-zq/rest/zhcx/lpcx/getLpZrz",
method: "post",
data: data,
});
}
/**
......@@ -25,32 +27,47 @@ export function getLpZrz (data) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpb (zrzbsm) {
export function getLpb(zrzbsm) {
return request({
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=1&zrzbsm=' + zrzbsm,
method: 'get'
})
url: "service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
});
}
/**
* @description: 获取楼盘表房屋用途,房屋性质右侧房屋用途统计数据
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpbFwytAndQlxz (zrzbsm) {
export function getLpbFwytAndQlxz(zrzbsm) {
return request({
url: 'service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm,
method: 'get'
})
url:
"service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=0&zrzbsm=" +
zrzbsm,
method: "get",
});
}
/**
* @description: 获取楼盘表缺失项统计
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpbQsxtj (zrzbsm) {
export function getLpbQsxtj(zrzbsm) {
return request({
url: url + 'getLpbQsxtj?scyclx=1&zrzbsm=' + zrzbsm,
method: 'get'
})
url: "service-lpb-zq/rest/zhcx/lpcx/getLpbQsxtj?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
});
}
/**
* @description: 楼盘表 获取单元状态统计数据
* @param {*} data
* zrzbsm 自然幢标识码
* scyclx 实测预测类型 0预测，1实测
* @return {*}
*/
export function getLpbTj(zrzbsm) {
return request({
url: "service-lpb-zq/rest/zhcx/lpcx/getLpbTj?scyclx=0&zrzbsm=" + zrzbsm,
method: "get",
});
}
......
......@@ -73,7 +73,7 @@ export function choiceBdcdy (data) {
*/
export function selectRepairQlxx (data) {
return request({
url: 'ywbl/ywsq/selectRepairQlxx',
url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectRepairQlxx',
method: 'post',
data
})
......
<svg t="1661331325273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2167" width="200" height="200"><path d="M521.309091 158.254545a27.927273 27.927273 0 0 1 27.927273 27.927273v586.472727a27.927273 27.927273 0 0 1-27.927273 27.927273h-372.363636a83.781818 83.781818 0 0 1-83.781819-83.781818V242.036364a83.781818 83.781818 0 0 1 83.781819-83.781819z m400.290909 0a83.781818 83.781818 0 0 1 83.502545 76.893091l0.279273 6.888728v474.763636a83.781818 83.781818 0 0 1-76.893091 83.502545l-6.888727 0.279273h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 744.727273h260.654545a27.927273 27.927273 0 0 0 27.554909-23.412364l0.372364-4.514909V242.036364a27.927273 27.927273 0 0 0-23.412364-27.554909L921.6 214.109091h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 158.254545h260.654545z m-428.218182 55.854546H148.945455a27.927273 27.927273 0 0 0-27.55491 23.412364L121.018182 242.036364v474.763636a27.927273 27.927273 0 0 0 27.927273 27.927273h344.436363V214.109091z" p-id="2168"></path></svg>
\ No newline at end of file
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-09 09:20:10
-->
<template>
<el-dialog
:close-on-click-modal="false"
title="选择权利类型"
class="qllxdialog"
:visible.sync="dialogVisible"
custom-class="insetDialog"
append-to-body
width="20%"
>
<el-select v-model="qllxvalue" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<!-- <el-radio-group v-model="radio">
<el-radio :label="1">111</el-radio>
<el-radio :label="2">111</el-radio>
</el-radio-group> -->
<el-button type="primary" @click="handleSubmit">确定</el-button>
<el-button type="primary" @click="closeDialog">取消</el-button>
</el-dialog>
</template>
<script>
export default {
data () {
return {
dialogVisible:false,
options: [
{
value: "选项1",
label: "抵押权",
},
{
value: "选项2",
label: "地役权",
},
{
value: "选项3",
label: "预告登记",
},
{
value: "选项4",
label: "异议登记",
},
{
value: "选项5",
label: "查封登记",
},
],
qllxvalue: "",
radio:3,
qllxobj:{
qllx:"",
bsmQlxx
}
};
},
methods: {
closeDialog () {
this.dialogVisible=false
},
handleSubmit () {
let qllxobj={
qllx:this.value,
bsmQlxx:this.value
}
// this.$parent.addRepairRecord(qllxobj)
},
},
};
</script>
<style scoped lang="scss">
.qllxdialog{
margin-top: 200px;
/deep/.el-dialog__body{
margin-top: 10px;
height: 100px;
}
.el-button{
margin-top: 10px;
margin-left: 20px;
}
}
</style>
......@@ -5,126 +5,159 @@
*/
//流程环节操作按钮
export function getForm (tabName, djywbm) {
let form;
switch (tabName) {
// case "jsydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx.vue");
// break;
// case "jsydsyqslxx300":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
// break;
// case "fwsyqslxx100":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx.vue");
// break;
// case "fwsyqslxx300":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
// break;
// case "nydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue");
// break;
// case "nydsyqslxx200":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue");
// break;
// case "tdslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/tdslxx.vue");
// break;
// case "plslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/plcfslxx.vue");
// break;
// case "diyaqSlxx":
// form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
// break;
// case "ygmm100":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
// break;
// case "ygmm300":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx300.vue");
// break;
// case "ygdy100":
// case "ygdy300":
// form = require("@/views/ywbl/slsqxx/ygdy/slxx.vue");
// break;
// case "zjgcdyqSlxx":
// form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
// break;
// case "szxx":
// form = require("@/views/djbworkflow/components/szxx.vue");
// break;
// case "fzxx":
// form = require("@/views/djbworkflow/components/fzxx.vue");
// break;
// case "zdt":
// form = require("@/views/djbworkflow/components/zdt.vue");
// break;
// 宗地基本信息
case "zdjbxx":
form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
break;
// 查封登记
case "cfdj":
form = require("@/views/djbworkflow/djbBook/cfdj.vue");
break;
// 国有建设用地使用权
case "jsydsyq":
form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
break;
// 农用地使用权
case "nydsyq":
form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
break;
// 房屋产权2
case "fdcq2":
form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
break;
// 抵押权
case "diyaq":
form = require("@/views/djbworkflow/djbBook/diyaq.vue");
break;
// 预告登记
case "ygdj":
form = require("@/views/djbworkflow/djbBook/ygdj.vue");
break;
// 地役权
case "diyiq":
form = require("@/views/djbworkflow/djbBook/diyiq.vue");
break;
// 登记簿封面
case "djbfm":
form = require("@/views/djbworkflow/djbBook/djbfm.vue");
break;
// 异议登记
case "yydj":
form = require("@/views/djbworkflow/djbBook/yydj.vue");
break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
// break;
// case "slxx":
// form = require("@/views/djbworkflow/djbBook/slxx.vue");
// break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/clxx.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
break;
let form;
switch (tabName) {
// case "jsydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx.vue");
// break;
// case "jsydsyqslxx300":
// form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
// break;
// case "fwsyqslxx100":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx.vue");
// break;
// case "fwsyqslxx300":
// form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
// break;
// case "nydsyqslxx100":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue");
// break;
// case "nydsyqslxx200":
// form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue");
// break;
// case "tdslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/tdslxx.vue");
// break;
// case "plslxxCfdj":
// form = require("@/views/ywbl/slsqxx/cfdj/plcfslxx.vue");
// break;
// case "diyaqSlxx":
// form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
// break;
// case "ygmm100":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
// break;
// case "ygmm300":
// form = require("@/views/ywbl/slsqxx/ygdj/slxx300.vue");
// break;
// case "ygdy100":
// case "ygdy300":
// form = require("@/views/ywbl/slsqxx/ygdy/slxx.vue");
// break;
// case "zjgcdyqSlxx":
// form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
// break;
// case "szxx":
// form = require("@/views/djbworkflow/components/szxx.vue");
// break;
// case "fzxx":
// form = require("@/views/djbworkflow/components/fzxx.vue");
// break;
// case "zdt":
// form = require("@/views/djbworkflow/components/zdt.vue");
// break;
case "zdjbxx":
form = require("@/views/registerBook/zdjbxx.vue");
break;
case "cfdj":
form = require("@/views/registerBook/cfdj.vue");
break;
case "jsydsyq":
form = require("@/views/registerBook/jsydsyq.vue");
break;
case "nydsyq":
form = require("@/views/registerBook/nydsyq.vue");
break;
case "fdcq2":
form = require("@/views/registerBook/fdcq2.vue");
break;
case "diyaq":
form = require("@/views/registerBook/diyaq.vue");
break;
case "ygdj":
form = require("@/views/registerBook/ygdj.vue");
break;
// 地役权
case "diyiq":
form = require("@/views/registerBook/diyiq.vue");
break;
// 登记簿封面
case "djbfm":
form = require("@/views/registerBook/djbfm.vue");
break;
// 异议登记
case "yydj":
form = require("@/views/registerBook/yydj.vue");
break;
// // 宗地基本信息
// case "zdjbxx":
// form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
// break;
// // 查封登记
// case "cfdj":
// form = require("@/views/djbworkflow/djbBook/cfdj.vue");
// break;
// // 国有建设用地使用权
// case "jsydsyq":
// form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
// break;
// // 农用地使用权
// case "nydsyq":
// form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
// break;
// // 房屋产权2
// case "fdcq2":
// form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
// break;
// // 抵押权
// case "diyaq":
// form = require("@/views/djbworkflow/djbBook/diyaq.vue");
// break;
// // 预告登记
// case "ygdj":
// form = require("@/views/djbworkflow/djbBook/ygdj.vue");
// break;
// // 地役权
// case "diyiq":
// form = require("@/views/djbworkflow/djbBook/diyiq.vue");
// break;
// // 登记簿封面
// case "djbfm":
// form = require("@/views/djbworkflow/djbBook/djbfm.vue");
// break;
// // 异议登记
// case "yydj":
// form = require("@/views/djbworkflow/djbBook/yydj.vue");
// break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
// break;
// case "slxx":
// form = require("@/views/djbworkflow/djbBook/slxx.vue");
// break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/clxx.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/components/clxxUnify.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/components/spyj.vue");
// break;
default:
form = require("@/views/error-page/404.vue");
break;
}
return (r) => require.ensure([], () => r(form));
// case "clxx":
// form = require("@/views/djbworkflow/components/clxxUnify.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/components/spyj.vue");
// break;
default:
form = require("@/views/error-page/404.vue");
break;
}
return (r) => require.ensure([], () => r(form));
}
......
......@@ -80,7 +80,7 @@ export default {
break;
case "B2": //材料分屏按钮
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/settScreen", this.splitScreen);
this.$store.dispatch("app/set1tScreen", this.splitScreen);
if (this.splitScreen) {
//如果当前选项卡为材料信息内容，递减到上一个选项卡内容
if (this.tabName == this.clxxTab.value) {
......@@ -100,60 +100,45 @@ export default {
case "B4":
this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
break;
case "B5":
const h = this.$createElement;
this.$msgbox({
title: '消息',
message: h('p', null, [
h('span', null, '内容可以是 '),
h('i', { style: 'color: teal' }, 'VNode')
]),
showCancelButton: true,
confirmButtonText: '确定',
cancelButtonText: '取消',
beforeClose: (action, instance, done) => {
if (action === 'confirm') {
instance.confirmButtonLoading = true;
instance.confirmButtonText = '执行中...';
setTimeout(() => {
done();
setTimeout(() => {
instance.confirmButtonLoading = false;
}, 300);
}, 3000);
} else {
done();
}
}
}).then(action => {
this.addRepairRecord()
this.$message({
type: 'info',
message: 'action: ' + action
});
});
// this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
// bsmSlsq: this.bsmSlsq,
// entryType: '1'
// }, '65%', true)
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.addRepairRecord()
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// case "B5":
// const h = this.$createElement;
// this.$msgbox({
// title: '请选择新增权利类型',
// message: h('p', null, [
// h('span', null, '内容可以是 '),
// h('el-button', { style: 'color: teal' }, 'VNode'),
// h('i', { style: 'color: teal' }, 'VNode')
// ]),
// showCancelButton: true,
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// beforeClose: (action, instance, done) => {
// if (action === 'confirm') {
// instance.confirmButtonLoading = true;
// instance.confirmButtonText = '执行中...';
// setTimeout(() => {
// done();
// setTimeout(() => {
// instance.confirmButtonLoading = false;
// }, 300);
// }, 3000);
// } else {
// done();
// }
// }
// }).then(action => {
// this.addRepairRecord()
// this.$message({
// type: 'info',
// message: 'action: ' + action
// });
// });
break;
// break;
case "B5":
// this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
this.$refs.qllxlist.dialogVisible=true
break;
case "B6":
//根据编号获取对应信息
getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
......
......@@ -62,6 +62,8 @@
</div>
</div>
</div>
<!-- 新增补录信息勾选权利类型 -->
<qllxDailog ref="qllxlist"/>
</div>
</template>
<style scoped lang="scss">
......@@ -70,18 +72,18 @@
</style>
<script>
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform"
import { getForm } from "./flowform";
import NoticeBar from "@/components/NoticeBar/index";
import { unClaimTask } from "@/api/ywbl.js";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbbl.js"
import { addRepairRecord } from "@/api/djbbl.js";
// 获取权利类型数组
import { getQllxByBdcdyid } from "@/api/djbbl.js"
import { getQllxByBdcdyid } from "@/api/djbbl.js";
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
......@@ -90,6 +92,7 @@ export default {
NoticeBar,
ProcessViewer,
ordinaryMenu,
qllxDailog,
},
mixins: [WorkFlow],
data() {
......@@ -104,8 +107,10 @@ export default {
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
// 弹框显示
dialogVisible: true,
// 权利类型数组
qllxlist:[],
qllxlist: [],
//表单集合
tabList: [],
//选择加载哪一个组件
......@@ -118,100 +123,101 @@ export default {
clxxTab: {},
//页面监听时间
_beforeUnload_time: "",
treedata:{},
tabdata:[],
defaultNode:{}
};
},
mounted() {
treedata: {},
tabdata: [],
defaultNode: {},
};
},
mounted() {},
methods: {
getQllxByBdcdyid(){
console.log("this.currentSelectProps.bdcdyid",this.currentSelectProps.bdcdyid);
getQllxByBdcdyid({bdcdyid:this.currentSelectProps.bdcdyid}).then((res) => {
if (res.code === 200) {
console.log("Qllxlist",res);
getQllxByBdcdyid() {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
console.log("Qllxlist", res);
}
}
});
);
},
// 获取右侧选项卡
getCurrentSelectProps (val) {
this.currentSelectProps = val
if(this.currentSelectProps.bsmRepair){
this.tabset(val)
}else{
this.getdjblist()
}
},
// 获取渲染登记簿列表
getdjblist(){
getBdcqljqtsx({
getCurrentSelectProps(val) {
this.currentSelectProps = val;
if (this.currentSelectProps.bsmRepair) {
this.tabset(val);
} else {
this.getdjblist();
}
},
// 获取渲染登记簿列表
getdjblist() {
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
console.log("this.currentSelectProps.qllx",this.currentSelectProps);
this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
console.log("this.defaultNode",this.defaultNode);
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
this.defaultNode = getNode(
this.currentSelectProps.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
""
);
this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
});
}
});
setTimeout(() => {
let settree=JSON.parse(JSON.stringify(this.treedata))
this.tabdata=[...settree,...settree[1].children[0].children[0].children]
this.tabdata.forEach((item,index,arr) => {
arr[index].name=item.label;
arr[index].value=item.id
})
this.tabList=this.tabdata
this.getQllxByBdcdyid()
}, 200)
},
tabset(val){
this.tabName = '';
this.tabList = [
{
name:val.qllxmc+ "补录信息",
value: "slxx",
sort: 1,
},
{
name: "审批意见",
value: "spyj",
sort: 2,
},
{
name: "材料信息",
value: "clxx",
sort: 2,
},
setTimeout(() => {
let settree = JSON.parse(JSON.stringify(this.treedata));
this.tabdata = [
...settree,
...settree[1].children[0].children[0].children,
];
this.tabdata.forEach((item, index, arr) => {
arr[index].name = item.label;
arr[index].value = item.id;
});
this.tabList = this.tabdata;
this.getQllxByBdcdyid();
}, 200);
},
this.$nextTick(function () {
this.tabName = 'slxx';
});
tabset(val) {
this.tabName = "";
this.tabList = [
{
name: val.qllxmc + "补录信息",
value: "slxx",
sort: 1,
},
{
name: "审批意见",
value: "spyj",
sort: 2,
},
{
name: "材料信息",
value: "clxx",
sort: 2,
},
];
this.$nextTick(function () {
this.tabName = "slxx";
});
},
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
//右侧表单选项卡事件
beforeLeave(activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
getFromRouter (tabname) {
for (let item of this.tabList) {
getFromRouter(tabname) {
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
this.currentSelectTab = item;
break;
}
}
......@@ -219,27 +225,29 @@ export default {
},
// 增加补录记录
addRepairRecord(row){
console.log("this.currentSelectProps",this.currentSelectProps);
let from={
bsmQlxx:"",
bsmSlsq:this.bsmSlsq,
bsmSldy:this.currentSelectProps.bsmSldy,
operate:"C",
qllx:this.currentSelectProps.qllx
}
if(row){
from.bsmQlxx=row.bsmQlxx
from.operate="U"
from.qllx=row.qllx
}
addRepairRecord(row) {
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
bsmSldy: this.currentSelectProps.bsmSldy,
operate: "C",
qllx: this.currentSelectProps.qllx,
};
if (row) {
from.bsmQlxx = row.bsmQlxx;
from.operate = "U";
from.qllx = row.qllx;
}
addRepairRecord(from).then((res) => {
addRepairRecord(from).then((res) => {
this.$nextTick(() => {
this.$refs.Menu.getleftMenubl(res.result);
});
this.$refs.Menu.getleftMenubl(res.result);
});
});
},
},
},
};
</script>
<style scoped lang="scss">
</style>
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 15:47:12
* @LastEditors: yangwei
* @LastEditTime: 2023-03-02 16:35:36
* @LastEditTime: 2023-06-16 16:14:51
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
* @Description:
*
......@@ -37,7 +37,7 @@
:data-qszt="hs.qszt"
ref="hBsm"
:key="hsIndex"
style="border-color: rgb(230, 230, 230)"
:style="{'border-color': borderColor}"
:class="hs.select ? 'tdSelect' : ''"
@click="handleClickH($event.target, hs.bsm, hs)"
@dblclick="dbclick(hs.bsm)"
......@@ -82,7 +82,12 @@
<script>
export default {
name: "BdcdjWebCh",
inject: ["openMenu", "selectAll"],
inject: {
openMenu:{value:'openMenu',default:null},
selectAll:{value:'selectAll',default:null},
changeChoosedObj:{value:'changeChoosedObj',default:null},
clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null}
},
props: {
ch: {
type: Array,
......@@ -101,6 +106,8 @@ export default {
hqsztList: [],
//区分单双击事件的定时器
time: null,
// 边框颜色
borderColor:'rgb(230, 230, 230)'
};
},
mounted() {},
......@@ -108,48 +115,32 @@ export default {
// 层选中事件
handleClickC(e, item) {
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className += " tdSelect"; //加边框
this.cbsmList.push(item.bsm);
} else {
//选中→未选中
e.target.className = "floor";
this.cbsmList = this.cbsmList.filter((i) => i != item.bsm);
}
// if (e.target.className.indexOf("tdSelect") == -1) {
// //未选中→选中
// e.target.className += " tdSelect"; //加边框
// this.cbsmList.push(item.bsm);
// } else {
// //选中→未选中
// e.target.className = "floor";
// this.cbsmList = this.cbsmList.filter((i) => i != item.bsm);
// }
// this.$parent.getCbsm(this.cbsmList);
},
//户单击事件
handleClickH(e, bsm, hs) {
let self = this;
// 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
// this.closeMenu();
//判断点击的户是否选中
if (!hs.select) {
//未选中→选中
hs.select = true; //加边框
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList
} else {
//选中→未选中
hs.select = false;
this.hbsmList = this.hbsmList.filter((i) => i != bsm);
this.hqsztList = this.hqsztList.filter((i) => i != hs.qszt);
}
}, 200);
},
// 户单元状态点击事件
hDyztClick(e, bsm, hs) {
this.handleClickH(e.target.parentNode, bsm, hs);
// this.handleClickH(e.target.parentNode, bsm, hs);
},
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
// clearTimeout(this.time);
},
//幢单元全选/反选
zdySelectAll(val) {
zdySelectAll(val,flag) {
// 手动点击全部取消选中
!flag && this.clearChangeChoosedObj()
this.ch.forEach((c) => {
c.hs.forEach((h) => {
if (val) {
......@@ -158,10 +149,16 @@ export default {
this.hbsmList.push(h.bsm)
} else {
h.select = false;
this.borderColor = 'rgb(230, 230, 230)'
this.hbsmList = []
}
});
});
this.$refs.hBsm && this.$refs.hBsm.forEach((item) => {
// item.style.borderColor = this.borderColor
item.style.backgroundColor = '#fff';
// item.style.border = `1px solid ${this.borderColor}`
});
},
},
watch: {
......@@ -172,6 +169,34 @@ export default {
immediate: true,
deep: true,
},
changeChoosedObj: {
handler(val) {
debugger
//清除选中户
this.borderColor = 'rgb(230, 230, 230)';
this.zdySelectAll(false,true)
if (val.bsms.length) {
this.$refs.hBsm.forEach((item) => {
val.bsms.forEach((i,ind) => {
if (item.dataset.bsm == i) {
if (ind == 0) {
//定位到第一个户所在位置
window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop;
window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft;
}
item.style.border = '1px solid '+ val.color;
// item.style.backgroundColor = val.color;
}
});
});
}else{
this.borderColor = 'rgb(230, 230, 230)'
}
},
immediate: true,
deep: true,
},
},
};
</script>
......@@ -181,16 +206,26 @@ export default {
display: flex;
flex-direction: column-reverse;
.chTable {
margin-left: -1px;
// margin-left: -1px;
border-color: #e4ebf4 !important;
border-collapse: collapse;
border-spacing: 0;
// position: relative;
tr {
.floor {
min-width: 56px;
background: #e8f2ff;
border: 1px solid #acbae8;
}
&:first-child {
.floor {
border-radius: 4px 0px 0px 1px;
}
}
td {
min-width: 138px;
height: 72px;
line-height: 72px;
height: 64px;
line-height: 64px;
text-align: center;
cursor: pointer;
position: relative;
......@@ -204,7 +239,7 @@ export default {
left: 6px;
top: 6px;
border: 1px solid;
border-radius: 8px;
border-radius: 3px 0px 3px 0px;
}
.lin {
color: #f7b500;
......@@ -223,7 +258,7 @@ export default {
width: 138px;
height: 18px;
position: absolute;
bottom: 32px;
bottom: 28px;
box-sizing: border-box;
padding: 0 6px;
li {
......@@ -239,7 +274,8 @@ export default {
}
}
.tdSelect {
border: 1px solid #006cff !important;
border: 1px solid ;
border-color: #5A78DE !important;
background-image: url("./images/tdSelect.png");
background-repeat: no-repeat;
background-position: right top;
......
<template>
<div class="lpbContent-wrap" ref="lpbContentWrap">
<div class="lpbContent">
<div class="lpbContent" ref="lpbContent">
<!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
<div class="ch-zdy-wrap">
<!-- 幢单元 -->
......@@ -13,9 +13,10 @@
</div>
<!-- 自然幢名称 -->
<p class="lpb-xmmc">
<el-checkbox @change="zdySelectAll($event)">{{
<!-- <el-checkbox @change="zdySelectAll($event)">{{
lpbData.xmmc
}}</el-checkbox>
}}</el-checkbox> -->
{{lpbData.xmmc}}
</p>
<!-- 右键菜单 -->
<ul
......@@ -38,6 +39,8 @@ export default {
return {
openMenu: this.openMenu,
selectAll: this.selectAllObj,
changeChoosedObj:this.changeChoosedObj,
clearChangeChoosedObj:this.clearChangeChoosedObj
};
},
name: "",
......@@ -72,20 +75,27 @@ export default {
//右键菜单定位位置
lpbChLeft: 100,
lpbChTop: 100,
// 改变户选中状态
changeChoosedObj:{
bsms:[],
color:''
}
};
},
mounted() {
this.getLpb("dfc08a0cc6a25188990ea53d1d2c500e");
// setTimeout(() => {
// //让滚动条滚动至最下面 -6是横向滚动条的高度
// this.$refs.lpbContent.scrollTop =
// this.$refs.lpbContent.scrollHeight -
// this.$refs.lpbContent.clientHeight -
// 6;
// }, 200);
// window.lpbContent = this;
this.getLpb(this.zrzbsm);
window.lpbContent = this;
},
methods: {
// 改变户选中状态
changeChoosed(bsms, color){
debugger
this.changeChoosedObj.bsms = bsms;
this.changeChoosedObj.color = color;
},
clearChangeChoosedObj(){
this.changeChoosedObj.bsms = [];
},
//全选户
zdySelectAll(val) {
this.selectAllObj.selectAll = val;
......@@ -113,7 +123,7 @@ export default {
openMenu(e, item, type) {
this.lpbChLeft = e.pageX - 96;
this.lpbChTop = e.pageY - 23;
this.lpbChVisible = true;
// this.lpbChVisible = true;
},
//关闭户右键菜单
closeMenu() {
......
......@@ -10,7 +10,7 @@
-->
<template>
<div class="ljzs-wrap">
<div v-for="ljzarr in ljzsCptd" :key="ljzarr[0].bsm">
<div v-for="ljzarr in ljzsCptd" :style="{'margin-bottom': ljzarr.length == 1 ? '34px':'80px'}" :key="ljzarr[0].bsm">
<!-- 多个同起始层逻辑幢 横向排列 -->
<div class="ch-zdy-wrap" v-if="ljzarr.length > 1">
<div v-for="ljz in ljzarr" :key="ljz.ljzmc" class="same-floor-ljz">
......@@ -94,7 +94,7 @@ export default {
display: flex;
flex-direction: column-reverse;
> div {
margin-bottom: 80px;
// margin-bottom: 80px;
margin-right: 20px;
display: flex;
flex-direction: column;
......@@ -110,8 +110,8 @@ export default {
}
.ljz-xmmc {
position: absolute;
width: calc(100% + 1px);
bottom: -60px;
width: calc(100% - 4px);
bottom: -34px;
}
}
.cs-none {
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 16:29:04
* @LastEditors: yangwei
* @LastEditTime: 2023-03-02 14:45:19
* @LastEditTime: 2023-06-08 13:58:58
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
* @Description:
*
......@@ -13,9 +13,10 @@
<div v-for="zdy in realZdys" :key="zdy.bsm">
<!-- 幢单元名称 -->
<p class="lpb-xmmc">
<el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
<!-- <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
zdy.zdymc
}}</el-checkbox>
}}</el-checkbox> -->
{{zdy.zdymc}}
</p>
<!-- 每个幢单元下的层户 -->
<ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -67,6 +71,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getJsydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -67,6 +71,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getJsydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -22,6 +22,10 @@
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -96,6 +100,11 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getNydsyqList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -20,6 +20,10 @@
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]">
<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="deleteDialog(row)">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
......@@ -61,6 +65,12 @@ export default {
},
methods: {
loadData () {
// 判断是否在登记簿补录调的子页面
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getYgdjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......
......@@ -61,6 +61,11 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
})
}
getYydjList({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
......@@ -95,6 +100,62 @@ export default {
}
return name;
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
// data: row,
// })
},
// 删除
deleteDialog(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
// deleteClmx(bsmClmx).then(res => {
// if (res.code == 200) {
// that.$emit('updateList', res.result)
// that.$message({
// message: '删除成功!',
// type: 'success'
// })
// }
// })
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
}
},
};
</script>
......
......@@ -28,6 +28,19 @@ class data extends filter {
}
},
{
prop: "status",
label: "状态",
render: (h, scope) => {
return (
<div>
{/* <a v-on:click="doSomething"></a> */}
<a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
<span v-show={scope.row.sfbl == 1}>,正在补录</span>
</div>
)
}
},
{
label: "权属状态",
width: '80',
render: (h, scope) => {
......@@ -55,10 +68,7 @@ class data extends filter {
)
}
},
{
prop: "ywh",
label: "业务号",
},
{
prop: "qllxmc",
label: "权利类型",
......