Merge branch 'develop' into FOTON

This commit is contained in:
Superman_Main
2021-11-27 20:36:00 +08:00
47 changed files with 6603 additions and 6063 deletions
@@ -15,10 +15,10 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:" prop="comityName">
<el-form-item class="add-form-item" label="协会名称:" prop="comityName">
<el-select
v-model="rh_pageData.comityName"
placeholder="请选择标委会">
@@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select
v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委">
@@ -44,7 +44,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-select
v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组">
@@ -57,10 +57,9 @@
</el-form-item>
</el-col>
</el-row>
<el-divider/>
<el-row>
<el-col :span="8">
<el-form-item label="会员角色:" prop="comityRole">
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
<el-select
v-model="rh_pageData.comityRole"
placeholder="请选择会员角色">
@@ -73,7 +72,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
<el-select
v-model="rh_pageData.comityState"
placeholder="选择协会状态">
@@ -86,7 +85,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
<el-select
v-model="rh_pageData.comityKind"
placeholder="请选择入会性质">
@@ -99,8 +98,7 @@
</el-form-item>
</el-col>
</el-row>
<el-divider/>
<el-form-item label="信息来源:" prop="infoSources">
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
<el-upload
style="width: 30%"
class="upload_style"
@@ -124,8 +122,7 @@
</el-button>
</el-upload>
</el-form-item>
<el-divider/>
<el-form-item label="协会构成:" prop="comityMake">
<el-form-item class="add-form-item" label="协会构成:" prop="comityMake">
<el-form
class="make_form"
ref="rh_pageData.comityMake"
@@ -133,42 +130,40 @@
label-width="auto">
<el-row>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
<el-input
v-model="rh_pageData.comityMake.makeQualification" placeholder="请填写资质"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
<el-input v-model="rh_pageData.comityMake.makeRole" placeholder="请填写成员"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
<el-input v-model="rh_pageData.comityMake.makeCost" placeholder="请填写费用估计"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
<el-input v-model="rh_pageData.comityMake.makeDuties" placeholder="请填写职责"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
<el-input v-model="rh_pageData.comityMake.makeTime" placeholder="请填写任期"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-form-item>
<el-divider/>
<el-form-item label="工作方向:" prop="workPath">
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea"/>
</el-form-item>
<el-divider/>
<el-form-item label="协会外部联系方式:" style="margin-bottom: 50px">
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-bottom: 50px">
<div class="comityTel_btn">
<el-button
type="primary"
@@ -785,7 +780,6 @@ export default {
}
.content_form {
border: 1px solid #DCDFE6;
padding-top: 15px;
.el-divider--horizontal {
@@ -801,7 +795,6 @@ export default {
}
.make_form {
border: 1px solid #DCDFE6;
padding: 10px;
/deep/ .el-form-item__label-wrap {
@@ -14,71 +14,71 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-row>
<el-col :span="8">
<el-form-item label="文件编号:" prop="comityFileNum">
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
{{ rh_pageData.comityFileNum || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件名称:" prop="comityFileName">
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
{{ rh_pageData.comityFileName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="工作方向:" prop="workPath">
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
</el-form-item>
<el-form-item label="协会外部联系方式:">
<el-form-item class="add-form-item" label="协会外部联系方式:">
<el-table
:data="rh_pageData.comityTel"
border
@@ -97,7 +97,7 @@
<ProcessTitle>
<template slot="title">选择人员</template>
</ProcessTitle>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:">
<el-input
:disabled="true"
style="width: 30%"
@@ -431,6 +431,12 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff ;
}
/deep/.el-textarea.is-disabled .el-textarea__inner {
background-color: #fff;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
@@ -14,68 +14,68 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" label-width="150px">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px">
<el-row>
<el-col :span="8">
<el-form-item label="文件编号:" prop="comityFileNum">
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
{{ rh_pageData.comityFileNum || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件名称:" prop="comityFileName">
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
{{ rh_pageData.comityFileName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="协会外部联系方式:">
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
<el-table
:data="rh_pageData.comityTel"
border
@@ -96,7 +96,7 @@
</ProcessTitle>
<el-row>
<el-col :span="8">
<el-form-item label="参与人:">
<el-form-item class="add-form-item" label="参与人:">
<el-input
style="width: 100%"
placeholder="请填写"
@@ -106,7 +106,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位:">
<el-form-item class="add-form-item" label="单位:">
<el-input
style="width: 100%"
placeholder="请填写"
@@ -115,7 +115,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门:">
<el-form-item class="add-form-item" label="部门:">
<el-input
style="width: 100%"
placeholder="请填写部门"
@@ -126,7 +126,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="身份:">
<el-form-item class="add-form-item" label="身份:">
<el-input
style="width: 100%"
placeholder="请填写身份"
@@ -135,7 +135,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话:">
<el-form-item class="add-form-item" label="电话:">
<el-input
style="width: 100%"
placeholder="请填写电话"
@@ -144,7 +144,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮箱:">
<el-form-item class="add-form-item" label="邮箱:">
<el-input
style="width: 100%"
placeholder="请填写邮箱"
@@ -155,7 +155,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="参与人部门领导:">
<el-form-item class="add-form-item" label="参与人部门领导:">
<el-input
style="width: 100%"
placeholder="请填写"
@@ -165,7 +165,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资料:">
<el-form-item class="add-form-item" label="资料:">
<el-input
style="width: 100%"
placeholder="请填写"
@@ -495,6 +495,9 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff ;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
@@ -14,71 +14,71 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-row>
<el-col :span="8">
<el-form-item label="文件编号:" prop="comityFileNum">
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
{{ rh_pageData.comityFileNum || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件名称:" prop="comityFileName">
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
{{ rh_pageData.comityFileName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="工作方向:" prop="workPath">
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
</el-form-item>
<el-form-item label="协会外部联系方式:">
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
<el-table
:data="rh_pageData.comityTel"
border
@@ -94,7 +94,7 @@
<el-table-column prop="tel_mail" align="center" label="邮箱"/>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:" style="margin-top: 10px">
<el-table
:data="rh_pageData.myPartRole"
border
@@ -445,6 +445,9 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/.el-textarea.is-disabled .el-textarea__inner {
background-color: #fff;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
@@ -14,71 +14,71 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-row>
<el-col :span="8">
<el-form-item label="文件编号:" prop="comityFileNum">
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
{{ rh_pageData.comityFileNum || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件名称:" prop="comityFileName">
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
{{ rh_pageData.comityFileName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="工作方向:" prop="workPath">
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
</el-form-item>
<el-form-item label="协会外部联系方式:">
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
<el-table
:data="rh_pageData.comityTel"
border
@@ -122,7 +122,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="我司参与人员:">
<el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
<div class="myPart_btn">
<el-button
type="danger"
@@ -17,71 +17,71 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
<el-row>
<el-col :span="8">
<el-form-item label="文件编号:" prop="comityFileNum">
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
{{ rh_pageData.comityFileNum || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件名称:" prop="comityFileName">
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
{{ rh_pageData.comityFileName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协会状态:" prop="comityState">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入会性质:" prop="comityKind">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质:">
<el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成员:">
<el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="工作方向:" prop="workPath">
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
</el-form-item>
<el-form-item label="协会外部联系方式:">
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
<el-table
:data="rh_pageData.comityTel"
border
@@ -97,7 +97,7 @@
<el-table-column prop="tel_mail" align="center" label="邮箱"/>
</el-table>
</el-form-item>
<el-form-item label="我司参与人员:">
<el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
<div class="myPart_btn">
<el-button
type="danger"
@@ -14,44 +14,44 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
<el-form class="label-input-form" ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="标委会:">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分标委:">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作组:">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="参会人:">
<el-form-item class="add-form-item" label="参会人:">
{{ hh_pageData.partPeople || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参会时间:">
<el-form-item class="add-form-item" label="参会时间:">
{{ hh_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ hh_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item class="add-form-item" >
<div class="table_btn">
<el-button type="primary" size="small" @click="table_add">添加</el-button>
<el-button type="danger" size="small" @click="table_delete">批量删除</el-button>
@@ -84,7 +84,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item>
<el-form-item class="add-form-item" style="margin-top: 10px" >
<el-table
:data="hh_pageData.themeTable"
border
@@ -102,7 +102,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="其他资料:" prop="otherFile">
<el-form-item class="add-form-item" label="其他资料:" prop="otherFile">
<el-upload
:action="actionPath"
multiple
@@ -132,7 +132,7 @@
class="label-input-form">
<el-timeline-item timestamp="参会人填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<el-form-item class="add-form-item" prop="startUserName" style="margin-bottom: 0">
<h4>参会人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
@@ -143,7 +143,7 @@
</el-timeline-item>
<el-timeline-item timestamp="法规工程师" placement="top" :color="roleForm.engineerUserId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineerUser" style="margin-bottom: 0">
<el-form-item class="add-form-item" prop="engineerUser" style="margin-bottom: 0">
<h4>法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
@@ -14,44 +14,44 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
<el-form class="label-input-form" ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="标委会:">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分标委:">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作组:">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="参会人:">
<el-form-item class="add-form-item" label="参会人:">
{{ hh_pageData.partPeople || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参会时间:">
<el-form-item class="add-form-item" label="参会时间:">
{{ hh_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ hh_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item class="add-form-item" style="margin-top: 10px">
<el-table
:data="hh_pageData.standardTable"
border
@@ -71,7 +71,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item>
<el-form-item class="add-form-item" style="margin-top: 10px">
<el-table
:data="hh_pageData.themeTable"
border
@@ -89,7 +89,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="其他资料:" prop="otherFile">
<el-form-item class="add-form-item" label="其他资料:" prop="otherFile">
<el-upload
:action="''"
name="name"
@@ -15,24 +15,24 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
<el-input
v-model="ch_pageData.meetingName"
placeholder="请填写"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
<el-input v-model="ch_pageData.primaryUnit" placeholder="请填写"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
<el-select
v-model="ch_pageData.associaName"
placeholder="请选择标委会">
@@ -45,7 +45,7 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item>
<el-form-item class="add-form-item">
<el-select
v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委">
@@ -58,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
<el-form-item>
<el-form-item class="add-form-item">
<el-select
v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组">
@@ -73,7 +73,7 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="datetime"
@@ -84,19 +84,19 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
<el-input v-model="ch_pageData.meetingPlace" placeholder="请填写"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
<el-input v-model="ch_pageData.feeStand" placeholder="请填写"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
<el-select
v-model="ch_pageData.feeKind"
placeholder="请选择费用列支">
@@ -111,7 +111,7 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
style="width: 70%"
class="upload_style"
@@ -137,7 +137,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
<el-radio v-model="ch_pageData.sort" label="1">计划内</el-radio>
<el-radio v-model="ch_pageData.sort" label="2">计划外</el-radio>
</el-form-item>
@@ -14,51 +14,51 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
action=""
name="file"
@@ -70,12 +70,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
{{ ch_pageData.sort || '-'}}
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item class="add-form-item" >
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -92,7 +92,7 @@
<ProcessTitle>
<template slot="title">选择人员</template>
</ProcessTitle>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:">
<el-input
:disabled="true"
style="width: 30%"
@@ -392,6 +392,9 @@ export default {
.el-divider--horizontal {
margin-top: 0px;
}
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff ;
}
/deep/.el-table__body-wrapper {
height: auto!important;
}
@@ -14,51 +14,51 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
action=""
name="file"
@@ -69,12 +69,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
{{ ch_pageData.sort || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item class="add-form-item">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -93,7 +93,7 @@
</ProcessTitle>
<el-row>
<el-col :span="8">
<el-form-item label="人员:">
<el-form-item class="add-form-item" label="人员:">
<el-input
:disabled="true"
style="width: 100%"
@@ -103,7 +103,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位:">
<el-form-item class="add-form-item" label="单位:">
<el-input
style="width: 100%"
placeholder="请填写"
@@ -112,7 +112,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门:">
<el-form-item class="add-form-item" label="部门:">
<el-input
style="width: 100%"
placeholder="请填写部门"
@@ -123,7 +123,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="参与人部门领导:">
<el-form-item class="add-form-item" label="参与人部门领导:">
<el-input
style="width: 100%"
placeholder="请选择"
@@ -133,7 +133,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话:">
<el-form-item class="add-form-item" label="电话:">
<el-input
style="width: 100%"
placeholder="请填写电话"
@@ -142,7 +142,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮箱:">
<el-form-item class="add-form-item" label="邮箱:">
<el-input
style="width: 100%"
placeholder="请填写邮箱"
@@ -465,6 +465,9 @@ export default {
padding-left: 30px;
padding-top: 15px;
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff ;
}
.el-divider--horizontal {
margin-top: 0px;
}
@@ -14,51 +14,51 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
action=""
name="file"
@@ -69,12 +69,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
{{ ch_pageData.sort || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="议题:">
<el-form-item class="add-form-item" label="议题:">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -88,7 +88,7 @@
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:">
<el-table
:data="ch_pageData.myPartRole"
border
@@ -14,51 +14,51 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
action=""
name="file"
@@ -69,12 +69,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
{{ ch_pageData.sort || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="议题:">
<el-form-item class="add-form-item" label="议题:">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -95,7 +95,7 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:">
<div class="myPart_btn">
<el-button
type="danger"
@@ -17,51 +17,51 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
<el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<el-upload
action=""
name="file"
@@ -72,12 +72,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
<el-form-item class="add-form-item" label="类别:">
{{ ch_pageData.sort || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="议题:">
<el-form-item class="add-form-item" label="议题:">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -91,7 +91,7 @@
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<el-form-item class="add-form-item" label="入会人员:">
<el-table
:data="ch_pageData.myPartRole"
border
@@ -488,7 +488,8 @@ export default {
statusId: '',
itemsNum1: '',
itemsName1: '',
oldNumber: ''
oldNumber: '',
fileType: '',
},
formRules: {
itemsNum: [
@@ -722,6 +723,7 @@ export default {
this.standId = bringData[0].standId
this.statusId = bringData[0].id
this.form.statusId = bringData[0].id
this.form.fileType = bringData[0].fileType
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
@@ -164,13 +164,13 @@
<ProcessTitle v-show="verifySarStandard">
<template slot="title">实施日期</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard" >
<div class="prc-content-border content_input" v-show="verifySarStandard" >
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.ssrq"
type="date"
type="dates"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
@@ -178,7 +178,7 @@
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrq"
type="date"
type="dates"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
@@ -188,7 +188,7 @@
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
type="dates"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
@@ -554,6 +554,7 @@
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:type="'car'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
@@ -570,6 +571,7 @@
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:type="'truck'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
@@ -1281,6 +1283,7 @@
zbjbdFileList: [],
kwjFileList: [],
glwjFileList: [],
nodeList5: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1404,9 +1407,9 @@
standSystemName: '',// 标准体系名称
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrq: [], // 实施日期(标准文本)
xcxssrq: [], // 新车型实施日期(标准文本)
zccssrq: [], // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
@@ -1464,6 +1467,8 @@
zrUserName: '',
jlUserId: '',
jlUserName: '',
wssmr: '',
wssmrId: '',
applyUpdUserId: this.$store.getters.userInfo.userId,
applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
@@ -2799,6 +2804,11 @@
position: relative;
overflow: hidden;
}
.prc-content-border {
/deep/ .el-input__inner {
padding-left: 30px;
}
}
/deep/ .el-dialog__body {
padding: 0 20px 10px;
color: #606266;
@@ -791,6 +791,7 @@
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
:type="'car'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel" ></tree-select-new>
@@ -805,6 +806,7 @@
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
:type="'truck'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
@@ -25,6 +25,22 @@
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="分解单来源" class="add-form-item form-item-disabled">
<el-select
@change="fileTypeChange"
v-model="listForm.fileType"
placeholder="请选择"
filterable
>
<el-option
v-for="item in decomposeOptions"
:value="item.attrField"
:key="item.id"
:label="item.attrName"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
</el-form-item>
@@ -522,7 +538,7 @@ export default {
// 查询相关参数
searching: false,
commentText:'',
fileType: 'FBGBJBD',
fileType: '',
standardSearch: {
standType: "",
standName: ""
@@ -531,6 +547,7 @@ export default {
productLine: '',
uname: '',
},
decomposeOptions: [], //分解单来源数据
standardTypeOptions: [
{
value: "INLAND",
@@ -717,7 +734,12 @@ export default {
this.standardSearch.standType = type;
},
choiceShow() {
this.ListModel = true;
if(!this.fileType){
this.$message.warning('请先选择分解单来源')
}else{
this.getStandData();
this.ListModel = true;
}
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -913,7 +935,7 @@ export default {
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
type: "FBGBJBD"
type: this.fileType
}, {
_this: this
}, res => {
@@ -1002,6 +1024,9 @@ export default {
this.page = 1;
this.getStandData();
},
fileTypeChange(type){
this.fileType = type
},
//获取标准数据
getStandData() {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
@@ -1050,10 +1075,19 @@ export default {
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
//查找分解单来源数据
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
_this: this
}, res => {
res.data.forEach(item => {
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
this.decomposeOptions.push(item)
}
})
})
this.getData();
this.getTree();
this.getProductData();
this.getStandData();
}
};
@@ -25,6 +25,22 @@
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="分解单来源" class="add-form-item form-item-disabled">
<el-select
@change="fileTypeChange"
v-model="listForm.fileType"
placeholder="请选择"
filterable
>
<el-option
v-for="item in decomposeOptions"
:value="item.attrField"
:key="item.id"
:label="item.attrName"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
</el-form-item>
@@ -261,6 +277,7 @@
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<loading :loading="tableLoading">数据获取中</loading>
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
@@ -500,6 +517,7 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process";
import file from "@/pages/knowledgeGraph/components/file";
export default {
name: "xmpgStep1",
@@ -516,6 +534,7 @@ export default {
satisfyFlag: true,
active: "1",
standModel: false,
tableLoading: false,
sarAccessListDatas: [],
productData: [], //添加抽屉的数据
standList: [], //新添加的标准
@@ -524,7 +543,7 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
fileType: "FBGBJBD",
fileType: "",
projectSearch: {
productLine: '',
uname: '',
@@ -533,6 +552,7 @@ export default {
standType: "",
standName: ""
},
decomposeOptions: [], //分解单数据
standardTypeOptions: [
{
value: "INLAND",
@@ -710,7 +730,13 @@ export default {
this.standardSearch.standType = type;
},
choiceShow() {
this.ListModel = true;
if(!this.fileType){
this.$message.warning('请先选择分解单来源')
}else{
this.getStandData();
this.ListModel = true;
}
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -906,7 +932,7 @@ export default {
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
type: "FBGBJBD"
type: this.fileType
}, {
_this: this
}, res => {
@@ -999,8 +1025,12 @@ export default {
this.page = 1;
this.getStandData();
},
fileTypeChange(type){
this.fileType = type
},
//获取标准数据
getStandData() {
this.tableLoading = true
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
@@ -1011,6 +1041,7 @@ export default {
}, res => {
this.sarAccessListDatas = res.records;
this.total = res.total;
this.tableLoading = false
}, e => {
});
@@ -1047,9 +1078,18 @@ export default {
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
//查找分解单来源数据
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
_this: this
}, res => {
res.data.forEach(item => {
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
this.decomposeOptions.push(item)
}
})
})
this.getTree();
this.getProductData();
this.getStandData();
}
};