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">
......
......@@ -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";
......