db269d5c by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 70985458 999bc88c
......@@ -52,7 +52,14 @@
</div>
<span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
<span v-else>{{ row[item.prop] }}</span>
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:54:00
* @LastEditTime: 2023-08-23 15:54:12
-->
<template>
<div class="djxxTable">
......@@ -62,7 +62,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:52:10
* @LastEditTime: 2023-08-23 15:54:23
-->
<template>
<div class="djxxTable">
......@@ -56,7 +56,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 15:00:12
* @LastEditTime: 2023-08-23 15:57:40
-->
<template>
<div class="content">
......@@ -14,17 +14,15 @@
:default-expand-all="true"
:expand-on-click-node="false"
node-key="id"
:default-checked-keys="[showTab]"
>
:default-checked-keys="[showTab]">
</el-tree>
<el-collapse v-model="activeName" accordion>
<el-collapse-item
class="sfqqq"
ref="sfq"
class="sfqqq"
ref="sfq"
v-for="(item, index) in sfqdata"
:key="index"
:name="index"
>
:name="index">
<template slot="title">
<span class="text" @click="addlist(item)">
<span>
......@@ -34,11 +32,10 @@
</template>
<el-button
v-for="(item, index) in item.children"
:re='item'
:re='item'
:key="index"
class="sfqcontent"
@click="addlist(item, index)"
>
@click="addlist(item, index)">
{{ item.label }}
</el-button>
</el-collapse-item>
......@@ -48,308 +45,308 @@
<component
:is="componentTag"
@getBdcdyh="getBdcdyh"
v-bind="currentSelectProps"
/>
v-bind="currentSelectProps" />
</div>
</div>
</template>
<script>
import { getBdcqljqtsx } from "@/api/djbDetail.js";
import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
export default {
data() {
return {
activeName: 0,
//接收参数
// propsParam: this.$attrs,
//左侧目录
catalog: {},
//选择加载哪一个组件
componentTag: "",
//子组件接收参数
currentSelectProps: {},
//左侧树形结构数据
treedata: [],
sfqdata: [],
keyy:"",
iskey:"",
defaultNode: "",
defaultProps: {
value: "id",
children: "children",
label: "label",
},
showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
};
},
props: ["formData"],
mounted() {
this.loadData(this.formData.bdcdyh);
},
methods: {
/**
* @description: getBdcdyh
* @author: miaofang
* 点击不动产单元号事件
*/
getBdcdyh(val) {
this.addloadData(val);
},
/**
* @description: addloadData
* @author: miaofang
*/
addloadData(val) {
getBdcqljqtsx({
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
}).then((res) => {
if (res.code === 200) {
if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
let index= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==val.bdcdyid;
});
this.activeName=index
this.setstyle(index,0,this.iskey);
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
this.activeName = this.sfqdata.length - 1;
this.$nextTick(() => {
this.setstyle(this.sfqdata.length - 1,0,this.iskey);
})
}
}
});
this.currentSelectProps = {
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
import { getBdcqljqtsx } from "@/api/djbDetail.js";
import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
export default {
data () {
return {
activeName: 0,
//接收参数
// propsParam: this.$attrs,
//左侧目录
catalog: {},
//选择加载哪一个组件
componentTag: "",
//子组件接收参数
currentSelectProps: {},
//左侧树形结构数据
treedata: [],
sfqdata: [],
keyy: "",
iskey: "",
defaultNode: "",
defaultProps: {
value: "id",
children: "children",
label: "label",
},
showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
};
},
/**
* @description: loadData
* @author: renchao
*/
loadData(val) {
getBdcqljqtsx({
bdcdyid: this.formData.bdcdyid,
bdcdyh: val,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(val);
this.sfqdata.push(
loadsfqData(res.result, val, this.formData.bdcdyid)
);
this.$nextTick(function () {
this.defaultNode = getNode(
this.formData.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
this.formData.bdcdylx || ""
props: ["formData"],
mounted () {
this.loadData(this.formData.bdcdyh);
},
methods: {
/**
* @description: getBdcdyh
* @author: miaofang
* 点击不动产单元号事件
*/
getBdcdyh (val) {
this.addloadData(val);
},
/**
* @description: addloadData
* @author: miaofang
*/
addloadData (val) {
getBdcqljqtsx({
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
}).then((res) => {
if (res.code === 200) {
if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
let index = this.sfqdata.findIndex((item) => {
return item.bdcdyid == val.bdcdyid;
});
this.activeName = index
this.setstyle(index, 0, this.iskey);
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
this.activeName = this.sfqdata.length - 1;
this.$nextTick(() => {
this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
})
}
}
});
this.currentSelectProps = {
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
};
},
/**
* @description: loadData
* @author: renchao
*/
loadData (val) {
getBdcqljqtsx({
bdcdyid: this.formData.bdcdyid,
bdcdyh: val,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(val);
this.sfqdata.push(
loadsfqData(res.result, val, this.formData.bdcdyid)
);
this.sfqdata[0].children.forEach((item,index) => {
if( item.id==this.defaultNode.id){
this.iskey=index
}
})
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.loadComponent(this.defaultNode.form);
this.$nextTick(function () {
this.defaultNode = getNode(
this.formData.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
this.formData.bdcdylx || ""
);
this.sfqdata[0].children.forEach((item, index) => {
if (item.id == this.defaultNode.id) {
this.iskey = index
}
})
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.loadComponent(this.defaultNode.form);
this.setstyle(0,0,this.iskey);
this.setstyle(0, 0, this.iskey);
});
}
});
this.currentSelectProps = {
bdcdyid: this.formData.bdcdyid,
bdcdyh: val,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
};
},
/**
* @description: handleNodeClick
* @param {*} data
* @author: renchao
*/
handleNodeClick(data) {
this.loadComponent(data.form);
},
/**
* @description: setstyle
* @param {*} data
* @author: renchao
* 设置样式和点击定位到当前功能
*/
setstyle(newindex,index,key) {
if(key!=undefined||this.keyy==index){
if(key!=undefined){
this.keyy=key
}
this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#f5f5f5";
dpme.style.color = "#0079fe";
dpme.style.borderRight = "4px solid #0079fe";
}else{
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
});
}
});
this.currentSelectProps = {
bdcdyid: this.formData.bdcdyid,
bdcdyh: val,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
};
},
/**
* @description: handleNodeClick
* @param {*} data
* @author: renchao
*/
handleNodeClick (data) {
this.loadComponent(data.form);
},
/**
* @description: setstyle
* @param {*} data
* @author: renchao
* 设置样式和点击定位到当前功能
*/
setstyle (newindex, index, key) {
if (key != undefined || this.keyy == index) {
if (key != undefined) {
this.keyy = key
}
this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#f5f5f5";
dpme.style.color = "#0079fe";
dpme.style.borderRight = "4px solid #0079fe";
} else {
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#ffffff";
dpme.style.color = "black";
dpme.style.border = "none";
}
dpme.style.color = "black";
dpme.style.border = "none";
}
},
/**
* @description: addlist
* @param {*} data
* @author: renchao
* 新增列表功能
*/
addlist(data, index) {
if(index!=undefined){
let newindex= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==data.bdcdyid;
});
this.setstyle(newindex,index);
this.currentSelectProps.bdcdyid = data.bdcdyid;
this.loadComponent(data.form);
}else{
let newindex= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==data.bdcdyid;
});
this.setstyle(newindex,index,this.iskey);
this.currentSelectProps.bdcdyid = data.bdcdyid;
}
},
/**
* @description: addlist
* @param {*} data
* @author: renchao
* 新增列表功能
*/
addlist (data, index) {
if (index != undefined) {
let newindex = this.sfqdata.findIndex((item) => {
return item.bdcdyid == data.bdcdyid;
});
this.setstyle(newindex, index);
this.currentSelectProps.bdcdyid = data.bdcdyid;
this.loadComponent(data.form);
} else {
let newindex = this.sfqdata.findIndex((item) => {
return item.bdcdyid == data.bdcdyid;
});
this.setstyle(newindex, index, this.iskey);
this.currentSelectProps.bdcdyid = data.bdcdyid;
}
},
/**
* @description: loadComponent
* @param {*} form
* @author: renchao
*/
loadComponent (form) {
console.log(form, 'form');
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
},
/**
* @description: loadComponent
* @param {*} form
* @author: renchao
*/
loadComponent(form) {
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
},
};
};
</script>
<style scoped lang="scss">
/deep/.rollTable {
height: calc(100vh - 300px) !important;
}
/deep/.rollTable {
height: calc(100vh - 300px) !important;
}
.content {
width: 100%;
height: 100%;
display: flex;
.content {
width: 100%;
height: 100%;
display: flex;
.left {
width: 256px;
height: 704px;
background-color: #f5f5f5;
color: #333;
border: 1px solid rgb(228, 228, 228);
overflow-y: auto;
}
.left {
width: 256px;
height: 704px;
background-color: #f5f5f5;
color: #333;
border: 1px solid rgb(228, 228, 228);
overflow-y: auto;
}
.right {
width: calc(100% - 256px);
height: 704px;
// overflow-y: scroll;
// overflow: auto;
background-color: #f5f5f5;
border: 1px solid rgb(228, 228, 228);
.right {
width: calc(100% - 256px);
height: 704px;
// overflow-y: scroll;
// overflow: auto;
background-color: #f5f5f5;
border: 1px solid rgb(228, 228, 228);
}
}
}
/deep/ .expanded.el-tree-node__expand-icon,
/deep/ .el-tree-node__expand-icon {
visibility: hidden;
}
/deep/ .el-tree-node__content {
border: 1px solid rgb(228, 228, 228);
height: 45px;
}
/deep/ .expanded.el-tree-node__expand-icon,
/deep/ .el-tree-node__expand-icon {
visibility: hidden;
}
/deep/ .el-tree-node:focus > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
/deep/ .el-tree-node__content {
border: 1px solid rgb(228, 228, 228);
height: 45px;
}
/deep/.el-tree-node {
white-space: pre-wrap;
}
/deep/ .el-tree-node:focus > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
/deep/ .is-current > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
/deep/.el-tree-node {
white-space: pre-wrap;
}
/deep/.el-collapse-item__header {
width: 100%;
cursor: pointer;
position: relative;
.el-collapse-item__arrow {
position: absolute;
top: 15px;
right: 0px;
/deep/ .is-current > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
align-items: center;
.text {
/deep/.el-collapse-item__header {
width: 100%;
cursor: pointer;
position: relative;
.el-collapse-item__arrow {
position: absolute;
top: 15px;
right: 0px;
}
align-items: center;
.text {
width: 100%;
height: 45px;
display: inline-block;
span {
margin-left: 60px;
padding-top: 10px;
display: inline-block;
line-height: 15px;
}
}
height: 45px;
display: inline-block;
line-height: 45px;
border: 1px solid rgb(228, 228, 228);
}
/deep/.el-collapse-item__content {
padding-bottom: 5px;
}
/deep/.sfqcontent {
white-space: wrap;
border: none;
padding: 0;
margin: 0;
cursor: pointer;
width: 100%;
height: 100px;
word-break: break-word;
display: inline;
span {
margin-left: 60px;
padding-top: 10px;
display: inline-block;
font-size: 13px;
display: block;
line-height: 15px;
margin-left: 70px;
}
height: 45px;
border: 1px solid rgb(228, 228, 228);
border-right: 4px solid #f5f5f5;
}
.sfqcontent:hover {
background-color: #f5f5f5;
color: black;
}
height: 45px;
display: inline-block;
line-height: 45px;
border: 1px solid rgb(228, 228, 228);
}
/deep/.el-collapse-item__content {
padding-bottom: 5px;
}
/deep/.sfqcontent {
white-space: wrap;
border: none;
padding: 0;
margin: 0;
cursor: pointer;
width: 100%;
height: 100px;
word-break: break-word;
display: inline;
span {
font-size: 13px;
display: block;
line-height: 15px;
margin-left: 70px;
.sfqcontent:focus {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
}
height: 45px;
border: 1px solid rgb(228, 228, 228);
border-right: 4px solid #f5f5f5;
}
.sfqcontent:hover {
background-color: #f5f5f5;
color: black;
}
.sfqcontent:focus {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
}
</style>
......
......@@ -46,7 +46,13 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop !== 'qszt' && !judge(item.label)"> {{ row[item.prop] }}</span>
<el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
</el-tooltip>
<span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
<div class="many" v-if="judge(item.label)">
<div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
{{ label[item.prop] }}
......@@ -147,10 +153,10 @@
* @param {*} lable
* @author: renchao
*/
judge(label){
judge (label) {
if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) {
return true
}else{
} else {
return false
}
},
......@@ -187,20 +193,20 @@
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
.cols{
td{
.many{
.cols {
td {
.many {
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
div{
div {
flex: 1;
border-right: 2px solid #e3e2e2;
line-height: 40px;
overflow: unset;
}
div:last-child{
div:last-child {
border: 0;
}
}
......
......@@ -62,7 +62,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......@@ -70,6 +70,7 @@
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:01:40
* @LastEditTime: 2023-08-23 15:54:45
-->
<template>
<div class="djxxTable">
......@@ -51,7 +51,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:03:14
* @LastEditTime: 2023-08-23 15:54:51
-->
<template>
<div class="djxxTable">
......@@ -96,7 +96,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......@@ -104,7 +104,6 @@
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:21
* @LastEditTime: 2023-08-23 15:54:56
-->
<template>
<div class="djxxTable">
......@@ -51,7 +51,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:33
* @LastEditTime: 2023-08-23 15:55:02
-->
<template>
<div class="djxxTable">
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:41
* @LastEditTime: 2023-08-23 15:55:15
-->
<template>
<div class="djxxTable">
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
......@@ -219,7 +219,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -296,6 +296,11 @@
this.ruleForm.diyaq.sfczjzhxz = "0";
this.czrOptions = this.ruleForm.qlrList;
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
},
......@@ -309,6 +314,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {
slsq: {},
ssQlxx: {},
......@@ -362,7 +368,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -371,7 +377,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -177,7 +177,7 @@
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-form-item label="持证人1:">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option
v-for="(item,index) in czrOptions"
......@@ -277,7 +277,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
czr:'',
ruleForm: {
flow: {
ywh: "",
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-22 14:25:14
* @LastEditTime: 2023-08-23 16:03:51
-->
<template>
<div class="slxx">
......@@ -331,7 +331,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -398,11 +398,13 @@
...res.result,
...res.result.qlxxdatas,
}
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.$set(this.ruleForm, "czr", item.zjh)
this.czr = item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
})
......@@ -428,6 +430,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr: "",
ruleForm: {
flow: {
ywh: ''
......@@ -532,7 +535,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -541,7 +544,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-17 13:46:51
* @LastEditTime: 2023-08-23 16:04:01
-->
<template>
<div class="slxx">
......@@ -212,7 +212,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -272,11 +272,13 @@
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.$set(this.ruleForm, "czr", item.zjh)
this.czr = item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
......@@ -293,6 +295,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr: "",
ruleForm: {
flow: {
ywh: ''
......@@ -436,7 +439,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -445,7 +448,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:48
* @LastEditTime: 2023-08-23 15:56:52
-->
<template>
<div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
......@@ -162,7 +162,7 @@
<el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0&&ruleForm.sldyList[0].sqfbcz=='0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -252,6 +252,7 @@
zdjbxx: {}, //宗地基本信息
},
czrOptions: [],
czr:"",
//传递参数
propsParam: this.$attrs,
//表单是否可操作
......@@ -289,6 +290,11 @@
this.gyfs = this.ruleForm.sldyList[0].gyfs;
this.splicingFdcq2Info();
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
});
},
methods: {
......@@ -383,7 +389,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -392,7 +398,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-17 13:57:20
* @LastEditTime: 2023-08-23 16:04:10
-->
<template>
<!-- 受理信息 -->
......@@ -157,7 +157,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs != '1' && ruleForm.sffbcz=='0'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -207,9 +207,9 @@
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.$set(this.ruleForm, "czr", item.zjh)
this.czr = item.sqrmc
}
})
this.czrOptions = this.ruleForm.qlrList;
......@@ -227,6 +227,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr: "",
ruleForm: {
ywh: "",
slry: "",
......@@ -349,7 +350,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -358,7 +359,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -157,7 +157,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -232,6 +232,11 @@
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
})
})
},
......@@ -252,6 +257,7 @@
mjdw: "1",
//表单是否可操作
viewEdit: true,
czr:"",
key: 0,
isShow: false,
disabled: true,
......@@ -340,7 +346,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -349,7 +355,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -170,7 +170,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -240,6 +240,11 @@
})
this.czrOptions = this.ruleForm.qlrList;
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
});
},
......@@ -253,6 +258,7 @@
viewEdit: false,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {
slywxx: {},
qlxx: {},
......@@ -334,7 +340,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -343,7 +349,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-22 16:28:21
* @LastEditTime: 2023-08-23 16:04:19
-->
<template>
<div class="slxx">
......@@ -208,7 +208,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -285,11 +285,15 @@
...res.result,
...res.result.qlxxdatas,
};
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.$set(this.ruleForm, "czr", item.zjh)
this.czr = item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
: this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
})
......@@ -303,6 +307,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr: "",
ruleForm: {
flow: {
ywh: "",
......@@ -397,7 +402,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -406,7 +411,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -199,7 +199,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -265,6 +265,11 @@
}
})
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
},
......@@ -277,6 +282,7 @@
disabled: true,
//持证人选项
czrOptions: [],
czr:"",
ruleForm: {
zdjbxx: {
ghytmc: ''
......@@ -331,7 +337,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -340,7 +346,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -199,7 +199,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -270,6 +270,11 @@
}
})
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
......@@ -284,6 +289,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -332,7 +338,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -341,7 +347,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -208,7 +208,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -285,6 +285,11 @@
...res.result,
...res.result.qlxxdatas,
};
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
......@@ -302,6 +307,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
flow: {
ywh: "",
......@@ -396,7 +402,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -405,7 +411,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 16:09:58
* @LastEditTime: 2023-08-23 16:04:31
-->
<template>
<!-- 受理信息 -->
......@@ -279,7 +279,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -367,6 +367,12 @@
this.czrOptions = this.ruleForm.qlrList;
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.czr = item.sqrmc
}
})
});
});
},
......@@ -393,6 +399,7 @@
isShow: false,
disabled: true,
czrOptions: [],
czr: "",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -479,7 +486,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -488,7 +495,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -200,7 +200,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -268,6 +268,11 @@
})
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
}
})
},
......@@ -283,6 +288,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
qlxx: {}
, sldy: {}
......@@ -354,7 +360,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -363,7 +369,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -136,7 +136,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -204,6 +204,11 @@
}
})
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
}
});
},
......@@ -218,6 +223,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: this.$attrs,
......@@ -297,7 +303,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -306,7 +312,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -203,7 +203,7 @@
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
......@@ -279,6 +279,11 @@
}
})
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
setTimeout(() => {
that.loading = false;
}, 300);
......@@ -297,6 +302,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: this.$attrs,
......@@ -362,7 +368,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -371,7 +377,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -162,7 +162,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'&&ruleForm.sldyList[0].sqfbcz == '0' ">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -224,9 +224,9 @@
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.$set(this.ruleForm, "czr", item.zjh)
this.czr = item.sqrmc
}
})
} else {
......@@ -244,6 +244,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr: "",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -292,7 +293,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -301,7 +302,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -218,7 +218,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -287,6 +287,11 @@
}
})
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
}
})
......@@ -301,6 +306,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -360,7 +366,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -369,7 +375,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......