Skip to content

bdc / bdcdj-web

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

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

2 parents f2c98c62 0dddfd39
Expand all
Inline Side-by-side
Showing 9 changed files with 95 additions and 51 deletions
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:32:45
* @LastEditTime: 2023-09-20 10:24:29
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -108,3 +108,19 @@ export function sjClmxDelete (bsmClmx) {
method: 'delete'
})
}
/**
* @description: 获取自然幢列表
* @param {*} data
* @author: renchao
*/
export function getZrzListByBsmSlsq (params) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/zjgcdy/getZrzListByBsmSlsq',
method: 'get',
params
})
}
......
......@@ -2,7 +2,7 @@
/*
* @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
* @Autor: renchao
* @LastEditTime: 2023-08-16 15:16:49
* @LastEditTime: 2023-09-20 14:20:39
*/
import axios from 'axios'
import Router from '@/router'
......@@ -77,7 +77,7 @@ service.interceptors.response.use(
Router.replace({
path: '/login',
query: {
redirect: Router.currentRoute.value.fullPath
redirect: Router.currentRoute.fullPath
}
})
return false
......
<!--
* @Author: yangwei
* @Date: 2023-02-28 15:47:12
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-09-20 15:17:07
* @LastEditors: yangwei
* @LastEditTime: 2023-09-20 17:14:39
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
* @Description:
*
......@@ -71,14 +71,14 @@
</template>
<script>
export default {
export default {
name: "BdcdjWebCh",
inject: {
openMenu: { value: 'openMenu', default: null },
selectAll: { value: 'selectAll', default: null },
changeChoosedObj: { value: 'changeChoosedObj', default: null },
clearChangeChoosedObj: { value: 'clearChangeChoosedObj', default: null },
getBsmList: { value: 'getBsmList', default: null }
openMenu:{value:'openMenu',default:null},
selectAll:{value:'selectAll',default:null},
changeChoosedObj:{value:'changeChoosedObj',default:null},
clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null},
getBsmList:{value:'getBsmList',default:null}
},
props: {
ch: {
......@@ -87,12 +87,12 @@
return [];
},
},
onlyShow: {
onlyShow:{
type: Boolean,
default: true,
}
},
data () {
data() {
return {
//选中户bsm合集
hbsmList: [],
......@@ -101,16 +101,17 @@
//区分单双击事件的定时器
time: null,
// 边框颜色
borderColor: 'rgb(230, 230, 230)',
borderColor:'rgb(230, 230, 230)',
// 申请单元列表数据
unitIdList: [],
unitIdList:[],
// 组件标识
compFlag: Math.random()
compFlag:Math.random()
};
},
mounted () {
mounted() {
// 根据申请单元列表数据处理选中户
if (window.unitData && window.unitData.length) {
console.log("window.unitData",window.unitData);
if(window.unitData && window.unitData.length){
window.unitData.forEach(e => {
this.unitIdList.push(e.bdcdyid)
})
......@@ -133,7 +134,7 @@
* @param {*} item
* @author: renchao
*/
handleClickC (e, item) {
handleClickC(e, item) {
if (!this.onlyShow) {
// 判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
......@@ -163,7 +164,7 @@
* @param {*} hs
* @author: renchao
*/
handleClickH (e, bsm, hs) {
handleClickH(e, bsm, hs) {
if (!this.onlyShow) {
let self = this;
// 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
......@@ -195,7 +196,7 @@
* @param {*} hs
* @author: renchao
*/
hDyztClick (e, bsm, hs) {
hDyztClick(e, bsm, hs) {
if (!this.onlyShow) {
this.handleClickH(e.target.parentNode, bsm, hs);
}
......@@ -206,7 +207,7 @@
* @param {*} bsm
* @author: renchao
*/
dbclick (bsm) {
dbclick(bsm) {
// clearTimeout(this.time);
},
//幢单元全选/反选
......@@ -216,7 +217,7 @@
* @param {*} flag
* @author: renchao
*/
zdySelectAll (val, flag) {
zdySelectAll(val,flag) {
// 手动点击全部取消选中
!flag && this.clearChangeChoosedObj()
this.ch.forEach((c) => {
......@@ -239,55 +240,55 @@
});
},
//清除选中
clearChoosed () {
clearChoosed(){
//清除选中户
this.zdySelectAll(false)
//清除选中层
this.cbsmList = [];
this.$refs.cBsm && this.$refs.cBsm.forEach((item) => {
this.$refs.cBsm && this.$refs.cBsm.forEach((item)=>{
item.className = 'floor'
})
},
},
watch: {
selectAll: {
handler (val) {
handler(val) {
this.zdySelectAll(val.selectAll);
val.cancelChoosed && this.clearChoosed()
},
immediate: true,
deep: true,
},
hbsmList (val) {
hbsmList(val){
let list = []
val.length && val.forEach((i) => {
val.length && val.forEach((i)=>{
this.ch.forEach((c) => {
c.hs.forEach((h) => {
if (i == h.bsm) {
list.push(
{
bdcdyh: h.bdcdyh,
bsm: h.bsm,
dyhbsm: h.dyhbsm,
bdcdyid: h.dyhbsm,
bdcdylx: '7',
flag: this.compFlag
bdcdyh:h.bdcdyh,
bsm:h.bsm,
dyhbsm:h.dyhbsm,
bdcdyid:h.dyhbsm,
bdcdylx:'7',
flag:this.compFlag
}
)
}
});
});
})
this.getBsmList(list, this.compFlag)
this.getBsmList(list,this.compFlag)
},
changeChoosedObj: {
handler (val) {
handler(val) {
this.borderColor = 'rgb(230, 230, 230)';
if (val.bsms.length) {
//清除选中户
this.zdySelectAll(false, true)
this.zdySelectAll(false,true)
this.$refs.hBsm.forEach((item) => {
val.bsms.forEach((i, ind) => {
val.bsms.forEach((i,ind) => {
if (item.dataset.bsm == i) {
if (ind == 0) {
//定位到第一个户所在位置
......@@ -306,9 +307,8 @@
deep: true,
}
},
};
};
</script>
<style lang="scss" scoped>
.ch-wrap {
display: flex;
......
......@@ -19,7 +19,7 @@
}}</el-checkbox>
</p>
<el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="submitForm" :loading="loading">发起申请</el-button>
<el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button>
<!-- 右键菜单 -->
<ul
v-show="lpbChVisible"
......
......@@ -41,11 +41,24 @@
{
prop: "bdcdyh",
label: "不动产单元号",
width: '250',
},
{
prop: "qllxmc",
label: "权利类型",
},
{
prop: "jzwmc",
label: "建筑物名称",
},
{
prop: "xmmc",
label: "项目名称",
},
{
prop: "zl",
label: "坐落",
},
}
],
dataList: [],
selectBdcdy: [],
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-18 11:11:19
* @LastEditTime: 2023-09-20 16:56:46
*/
import { getPrintTemplateByCode } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
......@@ -157,12 +157,15 @@ export default {
)
break;
case "B8":
getZrzbsmList(this.bsmSlsq).then((res) => {
!window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
if (res.code === 200) {
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0],
onlyShow: false,
unitData: window.unitData
unitData: window.unitData,
bsmSlsq:this.bsmSlsq,
showSave:true,
djlx: window.djlx
}, '90%', true)
} else {
this.$message.error(res.message)
......@@ -171,6 +174,13 @@ export default {
.catch((err) => {
this.$message.error(err)
});
window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', {
onlyShow: false,
unitData: window.unitData,
bsmSlsq:this.bsmSlsq,
showSave:true,
djlx: window.djlx
}, '90%', true)
break;
// 图形定位
case "B-TXDW":
......
......@@ -342,6 +342,8 @@
this.loading = false
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
window.djlx = res.result.sldy.djlx
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
item.id = item.bsmSqr
if (item.sfczr == '1') {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 10:01:27
* @LastEditTime: 2023-09-20 17:08:30
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -38,7 +38,7 @@
</div>
<!-- 表格 -->
<div class="loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="210"
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="this.zrzbsm ? 390 : 290"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
......@@ -52,7 +52,7 @@
</template>
<script>
import store from '@/store/index.js'
import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js";
import { ywPopupDialog,popupCacel } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectAllHInfo.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
......@@ -64,7 +64,10 @@
props: {
isJump: { type: Boolean, default: false },
sqywInfo: { type: Object, default: () => { } },
zrzbsm: {
type: String,
default: "",
},
},
data () {
return {
......@@ -88,7 +91,7 @@
*/
queryClick () {
this.$startLoading();
this.queryForm.zrzbsm = this.sqywInfo.bsm;
this.queryForm.zrzbsm = this.zrzbsm || this.sqywInfo.bsm;
// this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
......@@ -143,7 +146,7 @@
* @author: renchao
*/
close(){
ywPopupCacel()
popupCacel()
},
/**
* @description: handleSelectionChange
......