Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
51b1d35a by “miaofang
Options

Merge branch 'dev'

2 parents 2f7aea23 42ebafed
Inline Side-by-side
Showing 18 changed files with 195 additions and 122 deletions
......@@ -4,6 +4,7 @@
* @LastEditTime: 2023-09-25 10:56:39
*/
import store from '@/store'
import { log } from 'bpmn-js-token-simulation'
// table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
export default class filter {
/**
......@@ -153,17 +154,37 @@ export default class filter {
ygmmzt: "已预告买卖",
ygdyzt: "已预告抵押",
dyzt: "已抵押",
sfbl: "正在补录"
sfbl: "正在补录",
qqzt:"已确权"
};
for (let key in row) {
if (row[key] === 1 && strategies[key]) {
keys++;
if (keys == 1) {
text += strategies[key];
if(text){
text += ',' +strategies[key];
}else{
text += strategies[key];
}
} else {
text += ',' + strategies[key];
}
}else if(row[key] ==2 && key=="qqzt"){
if(text){
text += ','+"已灭失";
}else{
text += "已灭失";
}
}else if(row[key] ==0 && key=="qqzt"){
if(text){
text += ','+"未确权";
}else{
text += "未确权";
}
}
}
......
......@@ -78,9 +78,9 @@ export default {
type: Number,
default: 0,
},
sqywInfo: {
sqywInfo: {
type: Object,
default: () => { }
default: () => { }
},
isJump: { type: Boolean, default: false },
},
......@@ -130,7 +130,7 @@ export default {
/**
* @description: 保存当前楼盘表
* @author: renchao
*/
*/
saveLpb(){
if (this.bsmList.length == 0) {
this.$message.error("请至少选择一条数据");
......@@ -138,7 +138,7 @@ export default {
}
this.loading = true;
againAddSldy({
bsmSqyw: this.sqywInfo.bsmSqyw,
bsmSqyw: this.sqywInfo.bsmSqyw,
bsmSlsq: this.sqywInfo.bsmSlsq,
bdcdysz: this.bsmList,
sjlx: "houses"
......@@ -208,6 +208,12 @@ export default {
* @author: renchao
*/
getLpb(zrzbsm, scyclx, actual) {
if(!zrzbsm){
this.$message({
message: "暂无楼盘表",
type: "warning",
});
}else{
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
if(scyclx){
......@@ -226,6 +232,8 @@ export default {
});
}
});
}
},
//户右键点击事件
/**
......
......@@ -237,7 +237,7 @@
td:first-child {
flex: inherit !important;
// min-width: 180px !important;
width:180px !important;
}
>tr:nth-child(odd) td {
......@@ -266,4 +266,4 @@
margin-left: 2px;
}
}
}
\ No newline at end of file
}
......
......@@ -67,7 +67,7 @@
正在注销
</div>
<p v-if="!['djyy', 'fj'].includes(item.prop)">
<p v-if="!['djyy', 'fj','zl'].includes(item.prop)">
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -194,12 +194,11 @@
type: "html",
maxWidth: 800, // 最大宽度
font_size: "", // 不设置则使用默认字体大小
style: `@font-face {
font-family: "STZHONGS";
src: url(${window.ttf}) format("truetype");
}`,
// 继承原来的所有样式
targetStyles: ["*"],
scanStyle:false,
});
this.render = false
},
......
......@@ -12,7 +12,7 @@
style="page-break-after: always">
<div class="title">{{ title }}</div>
<div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
<table class="xxTable">
<table class="xxxTable">
<tr v-for="item in columns" :key="item.name">
<td>
{{ item.despriction }}
......@@ -109,10 +109,12 @@
</script>
<style lang="scss" scoped>
.tbalede {
width: 100%;
margin: auto;
position: relative;
background-color: salmon;
.num {
position: absolute;
right: 10px;
......@@ -128,12 +130,12 @@
position: relative;
margin: 0 3px;
}
.xxTable {
.xxxTable {
width: 100%;
border-collapse: collapse;
tr td {
border: 2px solid rgb(227, 226, 226);
border: 1px solid rgb(139, 137, 137);
text-align: center;
height: 40px;
font-size: 13px;
......@@ -148,4 +150,6 @@
}
}
}
</style>
......
......@@ -236,7 +236,7 @@
td:first-child {
flex: inherit !important;
// min-width: 180px !important;
width: 180px !important;
}
>tr:nth-child(odd) td {
......@@ -265,4 +265,4 @@
margin-left: 2px;
}
}
}
\ No newline at end of file
}
......
......@@ -33,7 +33,7 @@
</tr>
<tr>
<td>等级</td>
<td>{{ zdjbxx.djmc }}</td>
<td>{{ zdjbxx.dj|dictionary("A50") }}</td>
<td>价格</td>
<td>{{ zdjbxx.jg }}</td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-12-19 09:40:39
* @LastEditTime: 2024-03-05 16:03:50
-->
<template>
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
......@@ -169,11 +169,11 @@
that.loadStatus = '1';
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
// LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
} else {
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
}
LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
//窗口关闭后，回调函数中保存的设计代码
if (LODOP.CVERSION)
......
......@@ -30,30 +30,30 @@
<el-row>
<el-col :span="3">
<el-form-item label="身份证读卡器">
<el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
<el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="领证人" prop="lzrxm" label-width="70px">
<el-input v-model="ruleForm.lzrxm"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
<el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
<el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
<el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="证件号" prop="lzrzjh" label-width="70px">
<el-input v-model="ruleForm.lzrzjh"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="领证人电话" prop="lzrdh">
<el-input v-model="ruleForm.lzrdh"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -133,7 +133,8 @@
total: 0,
columns: datas.columns().lzgrid,
data: []
}
},
show:true
}
},
mounted () {
......@@ -202,6 +203,7 @@
getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
if (res.code === 200) {
this.tableData.data = res.result.list;
this.show=!res.result.list.length>0;
this.$nextTick(() => {
this.tableData.data.forEach(item => {
that.$refs.table.toggleRowSelection(item)
......
......@@ -6,17 +6,39 @@
<template>
<div>
<div>
<el-form-item label="共有方式：">
<el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
<el-radio label="3">其它共有</el-radio>
</el-radio-group>
</el-form-item>
<div>
<el-form-item label="共有方式：">
<el-radio-group :disabled="!disabled" v-model="sldyData.gyfs" change="gyfsChange">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
<el-radio label="3">其它共有</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div v-show="sldyData.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group v-model="sldyData.sqfbcz" :disabled="!disabled">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="持证人：" v-show="sldyData.sqfbcz == '0'">
<el-select v-model="czr" placeholder="持证人" :disabled="!disabled">
<el-option
v-for="(item, index) in tableDataList"
:key="index"
:label="item.sqrmc"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</div>
</div>
<lb-table
:column="column" :pagination="false"
:column="column"
:pagination="false"
:key="key"
:heightNumSetting="true"
:minHeight="0"
......@@ -24,7 +46,7 @@
:data="tableDataList"
>
</lb-table>
<addQlr
<addSqr
v-model="dialog"
:details="details"
:showButton="disabled"
......@@ -35,24 +57,24 @@
<script>
import { mapGetters } from "vuex";
import { getIdCardInfo } from "@/utils/operation.js";
import addQlr from "./addSqr.vue";
import addSqr from "./addSqr.vue";
export default {
components: {
addQlr,
},
components: { addSqr },
computed: {
...mapGetters(["dictData"]),
},
props: {
tableData: {
qlrData: {
type: Array,
default: function () {
return [];
},
},
gyfs: {
type: String,
default: "1",
sldyData: {
type: Object,
default: function () {
return {};
},
},
disabled: {
type: Boolean,
......@@ -105,24 +127,6 @@ export default {
},
},
{
label: "身份证读卡器",
align: "center",
render: (h, scope) => {
return (
<el-button
type="text"
icon="el-icon-tickets"
disabled={!this.disabled}
onClick={() => {
this.readClick(scope.row);
}}
>
读取
</el-button>
);
},
},
{
prop: "sqrmc",
label: "姓名/名称",
},
......@@ -181,10 +185,11 @@ export default {
},
],
column: [],
czr: "",
};
},
watch: {
tableData: {
qlrData: {
handler: function (val, oldVal) {
let that = this;
this.$nextTick(() => {
......@@ -198,12 +203,24 @@ export default {
immediate: true,
deep: true,
},
gyfs: {
//监听共有方式
"sldyData.gyfs": {
handler(newVal, oldValue) {
let dataList = _.cloneDeep(this.InformationTable);
if (newVal == 0) {
if (newVal == "0") {
if (this.tableDataList.length > 1) {
this.$message({
showClose: true,
message: "单独所有，只能添加一条权利人记录",
type: "error",
});
sldyData.gyfs = oldValue;
return false;
}
this.ruleForm.qlrList[0].sfczr = "1";
this.column = _.cloneDeep(dataList);
this.tableDataList = _.cloneDeep(this.tableData);
this.tableDataList = _.cloneDeep(this.qlrData);
this.key++;
} else if (newVal == "1" || newVal == "3") {
this.column = dataList;
......@@ -217,6 +234,39 @@ export default {
},
immediate: true,
},
//监听申请分别持证
"sldyData.sqfbcz": {
handler(newVal, oldValue) {
if (newVal == 0) {
let that = this;
if (sldyData.gyfs != "0") {
this.tableDataList.forEach((item) => {
if (item.bsmSqr == that.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
}
});
}
} else {
this.tableDataList.forEach((item, index) => {
item.sfczr = "1";
});
this.czr = "";
}
},
immediate: true,
},
},
mounted() {
let that = this;
if (this.sldyData.gyfs != "0" && this.sldyData.sqfbcz == 0) {
this.qlrData.forEach((item) => {
if (item.sfczr == "1") {
that.czr = item.bsmSqr;
}
});
}
},
methods: {
/**
......@@ -227,25 +277,6 @@ export default {
handleupdateDetail(value) {
let that = this;
let arr = this.tableData.map((item) => item.zjh);
// if (this.isaddupdate) {
// if (!arr.includes(value.zjh)) {
// this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
// this.$emit('upDateQlrxxList', this.tableDataList)
// } else {
// setTimeout(() => {
// that.$message.error('证件号不能重复')
// }, 1500)
// }
// } else {
// if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
// this.tableDataList[this.dataIndex] = _.cloneDeep(value);
// this.$emit('upDateQlrxxList', this.tableDataList)
// } else {
// setTimeout(() => {
// that.$message.error('证件号不能重复')
// }, 1500)
// }
// }
if (this.isaddupdate) {
if (!_.isEqual(value, this.tableData)) {
......
......@@ -380,9 +380,9 @@
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
@upDateQlrxxList="upDateQlrxxList"
:disabled="!viewEdit"
:tableData="ruleForm.qlrList"
:disabled="viewEdit"
:gyfs="ruleForm.sldy.gyfs" />
<div class="slxx_title title-block">
登记原因
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-30 15:46:45
* @LastEditTime: 2024-03-04 16:30:49
-->
<template>
<div class="szxx">
......@@ -29,7 +29,7 @@
<span>{{ item.bdcdyh }}</span>
</div>
<div class="text color_iray">
<span>{{ item.zl }}</span>
<span style="word-break:break-all;">{{ item.zl }}</span>
</div>
<div class="text color_red">
<span>{{ item.yt }}</span>
......@@ -298,7 +298,6 @@
.text {
margin-bottom: 8px;
text-align: left;
text-indent: 16px;
}
.text.tac {
text-align: center;
......@@ -323,9 +322,9 @@
}
.card_padding {
padding-top: 8px;
font-size: 14px;
line-height: 22px;
padding: 8px 15px;
}
/deep/.el-card__body {
padding: 0px;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-06 13:26:37
* @LastEditTime: 2024-03-05 16:43:23
-->
<template>
<div>
......@@ -635,7 +635,7 @@
// 保存当前字体设置
const originalFont = context.font;
// 设置新的字体大小
context.font = '16px 楷体'; // 替换为你想要的字体和大小
context.font = '15px 楷体'; // 替换为你想要的字体和大小
// 绘制 bdcdyh
context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
// 恢复原始字体设置
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-06 13:23:44
* @LastEditTime: 2024-03-05 16:42:30
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
......@@ -558,7 +558,7 @@
// 保存当前字体设置
const originalFont = context.font;
// 设置新的字体大小
context.font = '16px 楷体'; // 替换为你想要的字体和大小
context.font = '15px 楷体'; // 替换为你想要的字体和大小
// 绘制 bdcdyh
context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
// 恢复原始字体设置
......
......@@ -235,10 +235,10 @@
if (res.code === 200) {
let { total, records } = res.result;
records.forEach((item) => {
item.qlrmc = item.qlrmc.join(",");
item.ywh = item.ywh.join(",");
item.zl = item.zl.join(",");
item.outstepdate = item.outstepdate[0];
// item.qlrmc = item.qlrmc.join(",");
// item.ywh = item.ywh.join(",");
// item.zl = item.zl.join(",");
// item.outstepdate = item.outstepdate[0];
});
this.tableData.total = total ? total : 0;
this.tableData.data = records ? records : [];
......@@ -270,9 +270,10 @@
);
window.open(href, `djbworkFrameview${item.bsmSlsq}`);
} else {
let bestepid=item.bestepid==null?"":item.bestepid;
const { href } = this.$router.resolve(
"/workFrameView?bsmSlsq=" + item.bsmSlsq +
"&bestepid=" + item.bestepid
"&bestepid=" + bestepid
);
window.open(href, `workFrameView${item.bsmSlsq}`)
}
......
......@@ -42,14 +42,11 @@ class data extends filter {
if (scope.row.yygqzt == '1') {
return <div class='suspend'>异议挂起</div>
}
switch (scope.row.lczt) {
case '1':
return <div class='allow'>进行中</div>
case '2':
return <div class='prohibit'>已结束</div>
case '3':
return <span>进行中</span>
}
if (scope.row.jssj == null) {
return <div class='allow'>进行中</div>
}else{
return <div class='prohibit'>已结束</div>
}
}
},
{
......@@ -70,6 +67,11 @@ class data extends filter {
width: '200'
},
{
prop: "bdcdyh",
label: "不动产单元号",
minWidth: '150',
},
{
label: "权利人",
width: '120',
render: (h, scope) => {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 16:48:57
* @LastEditTime: 2024-03-04 14:13:04
-->
<template>
<div class="from-clues">
......@@ -58,7 +58,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
......@@ -106,7 +106,7 @@
property="syqmj"
label="面积">
</el-table-column>
<el-table-column
<el-table-column
property="qlytmc"
label="用途">
</el-table-column>
......@@ -207,6 +207,7 @@
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
this.queryForm.bhqkbsm = ""
selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
......@@ -287,7 +288,7 @@
*/
handleRowClick (row) {
this.queryForm.bhqkbsm = row.bhqkbsm
//this.radioVal = row.bdcdyh
this.radioVal = row.bhqkbsm
//row.bglx = '1'
selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
this.$endLoading();
......
......@@ -98,6 +98,7 @@
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./djbcxdata";
import { getDjbBysearch } from "@/api/search.js";
import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
export default {
name: "djbcx",
......@@ -137,7 +138,8 @@
},
qllxs: [],
isDialog: false,
djbxxData: {}
djbxxData: {},
zrzbsm:""
}
},
computed: {
......@@ -188,15 +190,18 @@
* @author: renchao
*/
handleLpbClick (item) {
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
bsm: item.zrzbsm,
let params = {zdbsm:item.bsmZd};
getZrzListByBsmSlsq(params).then((res) => {
if (res.code === 200) {
}
});
console.log("zrzbsm",item,item.zrzbsm);
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: item.zrzbsm,
zrzbsm: item.zrzbsm,
zdbsm: item.zrzbsm,
onlyShow: true
}
})
}, '90%', true)
}
}
}
......