Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
46ef0c8c by tianhaohao@pashanhoo.com
Options

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

2 parents a2c29d99 c0efa606
Inline Side-by-side
Showing 6 changed files with 64 additions and 28 deletions
......@@ -209,10 +209,12 @@
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
if (scyclx) {
if (res.result.syclx == "1") {
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
}
// if (res.result.syclx == "1") {
// res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
// this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
// }
} else {
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-03-07 09:52:35
* @LastEditTime: 2024-03-11 10:58:28
-->
<!-- 批量删除弹框 -->
<template>
......@@ -48,14 +48,6 @@
label: "权利类型",
},
{
prop: "jzwmc",
label: "建筑物名称",
},
{
prop: "xmmc",
label: "项目名称",
},
{
prop: "zl",
label: "坐落",
}
......@@ -64,6 +56,14 @@
selectBdcdy: [],
}
},
// {
// prop: "jzwmc",
// label: "建筑物名称",
// },
// {
// prop: "xmmc",
// label: "项目名称",
// },
methods: {
/**
* @description: 批量删除确定按钮
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-12-26 15:00:22
* @LastEditTime: 2024-03-11 15:18:56
-->
<template>
<dialogBox
......@@ -24,6 +24,7 @@
v-if="activeName==1"
:model="ruleForm"
:rules="rules"
style="height:490px"
ref="ruleForm"
label-width="120px">
<el-form-item label="身份证读卡器" style="margin-top:-10px;margin-bottom:0">
......@@ -261,7 +262,7 @@
</el-col>
</el-row>
</el-form>
<div v-if="activeName==2" class="padding10">
<div v-if="activeName==2" class="padding10" style="height:550px">
<el-form :model="queryFormQY" label-width="80px">
<el-row>
<el-col :span="8">
......@@ -283,7 +284,7 @@
</el-col>
</el-row>
</el-form>
<el-table :data="tableDataQy.data" border v-Loading="loading" :height="563">
<el-table :data="tableDataQy.data" border v-Loading="loading" :height="450">
<el-table-column label="序号" type="index" width="50" align="center">
<template slot-scope="scope">
{{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
......@@ -301,7 +302,7 @@
@current-change="handleQYCurrentChange"></el-pagination>
</div>
<div v-if="activeName==3" class="padding10">
<div v-if="activeName==3" class="padding10" style="height:550px">
<el-form :model="queryFormYH" label-width="80px">
<el-row>
<el-col :span="8">
......@@ -323,7 +324,7 @@
</el-col>
</el-row>
</el-form>
<el-table :data="tableDataYh.data" border v-Loading="loading" :height="563">
<el-table :data="tableDataYh.data" border v-Loading="loading" :height="450">
<el-table-column label="序号" type="index" width="50" align="center">
<template slot-scope="scope">
{{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-03-07 09:13:26
* @LastEditTime: 2024-03-13 09:33:38
*/
import Vue from 'vue'
import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
......@@ -142,6 +142,7 @@ export default {
{ bsmSlsq: this.$route.query.bsmSlsq }, '70%', true
)
break;
// B8 可编辑 house 不可编辑
case "B8":
!window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
if (res.code === 200) {
......@@ -169,6 +170,36 @@ export default {
djlx: window.djlx
}, '85%', true, false)
break;
case "house":
!window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
if (res.code === 200) {
ywPopupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0],
onlyShow: false,
unitData: window.unitData,
bsmSlsq: this.bsmSlsq,
onlyShow: true,
showSave: true,
djlx: window.djlx,
isworkFrame: true
}, '85%', true, false)
} else {
this.$message.error(res.message)
}
})
.catch((err) => {
this.$message.error(err)
});
window.djlx && ywPopupDialog('楼盘表', 'lpb/zjgcdy', {
onlyShow: false,
unitData: window.unitData,
onlyShow: true,
bsmSlsq: this.bsmSlsq,
showSave: true,
djlx: window.djlx
}, '85%', true, false)
break;
break;
// 图形定位
case "B-TXDW":
getZdInfo(this.currentSelectProps.bdcdyid).then(res => {
......@@ -256,7 +287,7 @@ export default {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 14:10:35
* @LastEditTime: 2024-03-13 10:33:28
-->
<template>
<div class="from-clues">
......@@ -61,7 +61,7 @@
label="选择"
width="50">
<template slot-scope="scope">
<el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio>
<el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bhqkbsm">{{''}}</el-radio>
</template>
</el-table-column>
<el-table-column
......@@ -100,6 +100,7 @@
</el-table-column>
<el-table-column
property="qlrmc"
width="160"
label="权利人">
</el-table-column>
<el-table-column
......@@ -129,7 +130,7 @@
<el-table-column
label="操作"
fixed="right"
width="80">
width="60">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button>
</template>
......@@ -301,6 +302,7 @@
* @author: renchao
*/
handleRowClick (row) {
this.radioVal = row.bhqkbsm
this.queryForm.bhqkbsm = row.bhqkbsm
selectHSplitMerge({ ...this.queryForm }).then((res) => {
this.$endLoading();
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-02 16:38:27
* @LastEditTime: 2024-03-13 13:54:08
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -10,25 +10,25 @@
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="自然幢号">
<el-input placeholder="请输入自然幢号" maxlength="24" v-model="queryForm.zrzh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="项目名称">
<el-input placeholder="" v-model="queryForm.xmmc" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="2" class="btnColRight">
</el-col> -->
<el-col :span="16" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
......@@ -44,7 +44,7 @@
:data="tableData.data">
</lb-table>
</div>
<div class="submit_button" style="text-align:center">
<div class="submit_button" style="text-align:center" v-if="!sqywInfo.onlyShow">
<el-button @click="close">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading" v-else>发起申请</el-button>
......