Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-26 14:53:46 +08:00
25 changed files with 394 additions and 407 deletions
@@ -42,7 +42,7 @@
<el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'" size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
<el-button v-btn-permission="''" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'" size="mini" @click="combineItems">合并条款</el-button>
<el-button v-btn-permission="''" size="mini" @click="combineItems">合并条款</el-button>
<el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
<el-button v-if="auditFlag==='1'" size="mini" @click="splitCheckBtn">审核</el-button>
<!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>-->
+1 -1
View File
@@ -828,7 +828,7 @@ export default {
.content {
padding-bottom: 10px;
height: calc(~'100% - 40px');
height: calc(~'100% - 7%');
/deep/ .el-button--mini {
padding: 5px 7px;
@@ -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
@@ -1,16 +1,16 @@
<!--标法规-工作组-项目费用统计信息-标准制修订补助资金收支统计--支出表-->
<template>
<div id="translateCost" class="child2">
<div id="expendSubsidy" class="child2">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="项目名称">
<el-input v-model="formQuery.name" size="small" placeholder="请输入项目名称"></el-input>
<el-form-item class="add-form-item" label="项目名称">
<el-input v-model.trim="formQuery.name" clearable size="small" placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="支出金额">
<el-input v-model="formQuery.cost" size="small" placeholder="请输入支出金额"></el-input>
<el-form-item class="add-form-item" label="支出金额">
<el-input v-model.trim="formQuery.cost" clearable size="small" placeholder="请输入支出金额"></el-input>
</el-form-item>
<el-form-item label="用途">
<el-input v-model="formQuery.purposes" size="small" placeholder="请输入用途">
<el-form-item class="add-form-item" label="用途">
<el-input v-model.trim="formQuery.purposes" clearable size="small" placeholder="请输入用途">
</el-input>
</el-form-item>
<el-form-item>
@@ -111,19 +111,19 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="项目名称">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
<el-form class="label-input-form" label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="项目名称">
<el-input v-model.trim="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="支出金额">
<el-input v-model="formShowData.cost" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="支出金额">
<el-input v-model.trim="formShowData.cost" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="用途">
<el-input v-model="formShowData.purposes" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="用途">
<el-input v-model.trim="formShowData.purposes" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="详细附件">
<el-form-item class="add-form-item" label="详细附件">
<el-upload
:disabled="acceptShow"
multiple
@@ -1,16 +1,16 @@
<!--标法规-工作组-项目费用统计信息-标准制修订补助资金收支统计--收入表-->
<template>
<div id="translateCost" class="child1">
<div id="inComeSubsidy" class="child1">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="标准名称">
<el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称"></el-input>
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model.trim="formQuery.name" clearable size="small" placeholder="请输入标准名称"></el-input>
</el-form-item>
<el-form-item label="标准编号">
<el-input v-model="formQuery.number" size="small" placeholder="请输入标准编号"></el-input>
<el-form-item class="add-form-item" label="标准编号">
<el-input v-model.trim="formQuery.number" clearable size="small" placeholder="请输入标准编号"></el-input>
</el-form-item>
<el-form-item label="补助来源">
<el-input v-model="formQuery.source" size="small" placeholder="请输入补助来源"></el-input>
<el-form-item class="add-form-item" label="补助来源">
<el-input v-model.trim="formQuery.source" clearable size="small" placeholder="请输入补助来源"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="queryData">查询</el-button>
@@ -108,25 +108,25 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="标准名称">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
<el-form class="label-input-form" label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model.trim="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="标准编号">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="标准编号">
<el-input v-model.trim="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="补助来源">
<el-input v-model="formShowData.source" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="补助来源">
<el-input v-model.trim="formShowData.source" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="补助金额">
<el-input v-model="formShowData.cost" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="补助金额">
<el-input v-model.trim="formShowData.cost" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="入账时间">
<el-form-item class="add-form-item" label="入账时间">
<el-date-picker
v-model="formShowData.time"
v-model.trim="formShowData.time"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -157,14 +157,14 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="名称" >
<el-input v-model.trim="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="序号" >
<el-input v-model.trim="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="备注" >
<el-input v-model.trim="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -2,23 +2,23 @@
<template>
<div class="listOf-Cost">
<el-tabs v-model="activeName" @tab-click="doubleClick">
<el-tab-pane label="协会费用信息统计" name="first" :key="'first'">
<child1 v-if="isChildUpdate1"></child1>
<el-tab-pane label="协会费用信息统计" name="societyCost">
<society-cost v-if="activeName ==='societyCost'"></society-cost>
</el-tab-pane>
<el-tab-pane label="参会费用信息统计" name="second" :key="'second'">
<child2 v-if="isChildUpdate2"></child2>
<el-tab-pane label="参会费用信息统计" name="reviseCost">
<revise-cost v-if="activeName ==='reviseCost'"></revise-cost>
</el-tab-pane>
<el-tab-pane label="参与外部标准制修订费用统计" name="third" :key="'third'">
<child3 v-if="isChildUpdate3"></child3>
<el-tab-pane label="参与外部标准制修订费用统计" name="attendCost">
<attend-cost v-if="activeName === 'attendCost'"></attend-cost>
</el-tab-pane>
<el-tab-pane label="采购费用信息统计" name="fourth" :key="'fourth'">
<child4 v-if="isChildUpdate4"></child4>
<el-tab-pane label="采购费用信息统计" name="purchaseCost">
<purchase-cost v-if="activeName === 'purchaseCost'"></purchase-cost>
</el-tab-pane>
<el-tab-pane label="翻译费用信息统计" name="fifth" :key="'fifth'">
<children v-if="isChildUpdate5"></children>
<el-tab-pane label="翻译费用信息统计" name="translateCost">
<translate-cost v-if="activeName === 'translateCost'"></translate-cost>
</el-tab-pane>
<el-tab-pane label="标准制修订补助资金收支统计" name="sixth" :key="'sixth'">
<child6 v-if="isChildUpdate6"></child6>
<el-tab-pane label="标准制修订补助资金收支统计" name="subsidyCost">
<subsidy-cost v-if="activeName === 'subsidyCost'"></subsidy-cost>
</el-tab-pane>
</el-tabs>
</div>
@@ -35,43 +35,20 @@ import subsidyCost from "../pages/subsidyCost";
export default {
name: "child5",
components: {
child1: societyCost,
child2: reviseCost,
child3: attendCost,
child4: purchaseCost,
children: translateCost,
child6: subsidyCost
societyCost,
reviseCost,
attendCost,
purchaseCost,
translateCost,
subsidyCost
},
data(){
return {
activeName: 'first',
isChildUpdate1: true,
isChildUpdate2: false,
isChildUpdate3: false,
isChildUpdate4: false,
isChildUpdate5: false,
isChildUpdate6: false
activeName: 'societyCost',
}
},
mounted() {
console.log(5)
},
methods: {
doubleClick(tab) {
if (tab.name === 'first') {
this.isChildUpdate1 = true
} else if (tab.name === 'second') {
this.isChildUpdate2 = true
} else if (tab.name === 'third') {
this.isChildUpdate3 = true
} else if (tab.name === 'fourth') {
this.isChildUpdate4 = true
} else if (tab.name === 'fifth') {
this.isChildUpdate5 = true
}else if (tab.name === 'sixth'){
this.isChildUpdate6 = true
}
}
}
@@ -1,16 +1,16 @@
<!--标法规-工作组-项目费用统计信息-参与外部标准制修订费用统计-->
<template>
<div id="reviseCost" class="child3">
<div id="attendCost" class="child3">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="标准号">
<el-input v-model="formQuery.proId" size="small" placeholder="请输入标准号"></el-input>
<el-form-item class="add-form-item" label="项目编号">
<el-input v-model.trim="formQuery.proId" clearable size="small" placeholder="请输入项目编号"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input v-model="formQuery.proName" size="small" placeholder="请输入标准名称"></el-input>
<el-form-item class="add-form-item" label="项目名称">
<el-input v-model.trim="formQuery.proName" clearable size="small" placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="项目类型">
<el-select v-model="formQuery.type" size="small" placeholder="请选择类型">
<el-form-item class="add-form-item" label="项目类型">
<el-select v-model.trim="formQuery.type" clearable size="small" placeholder="请选择类型">
<el-option
v-for="item in typeOptions"
:key="item.value"
@@ -115,9 +115,9 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="类型" prop="type">
<el-select v-model="formShowData.type" type="text" placeholder="请填写">
<el-form class="label-input-form" label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="类型" prop="type">
<el-select v-model.trim="formShowData.type" type="text" placeholder="请填写">
<el-option
v-for="item in typeOptions"
:key="item.value"
@@ -126,19 +126,19 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编号" prop="proId">
<el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="项目编号" prop="proId">
<el-input v-model.trim="formShowData.proId" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="proName">
<el-input v-model="formShowData.proName" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="项目名称" prop="proName">
<el-input v-model.trim="formShowData.proName" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用列支项" prop="costOutlay">
<el-input v-model="formShowData.costOutlay" placeholder="请选择">
<el-form-item class="add-form-item" label="费用列支项" prop="costOutlay">
<el-input v-model.trim="formShowData.costOutlay" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="费用支出" prop="cost">
<el-input v-model="formShowData.cost" placeholder="请选择">
<el-form-item class="add-form-item" label="费用支出" prop="cost">
<el-input v-model.trim="formShowData.cost" placeholder="请选择">
</el-input>
</el-form-item>
</el-form>
@@ -1,16 +1,16 @@
<!--标法规-工作组-项目费用统计信息-采购费用信息统计-->
<template>
<div id="attendCost" class="child4">
<div id="purchaseCost" class="child4">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="标准类型">
<el-input v-model="formQuery.type" size="small" placeholder="请输入标准类型"></el-input>
<el-form-item class="add-form-item" label="标准类型">
<el-input v-model.trim="formQuery.type" clearable size="small" placeholder="请输入标准类型"></el-input>
</el-form-item>
<el-form-item label="标准代号">
<el-input v-model="formQuery.number" size="small" placeholder="请输入标准代号"></el-input>
<el-form-item class="add-form-item" label="标准代号">
<el-input v-model.trim="formQuery.number" clearable size="small" placeholder="请输入标准代号"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称">
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model.trim="formQuery.name" clearable size="small" placeholder="请输入标准名称">
</el-input>
</el-form-item>
<el-form-item>
@@ -106,26 +106,26 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px 50px 10px 20px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="标准类型" prop="type">
<el-select v-model="formShowData.type" type="text" placeholder="请填写">
<el-form class="label-input-form" label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="标准类型" prop="type">
<el-select v-model.trim="formShowData.type" type="text" placeholder="请填写">
<el-option label="1" value="one"></el-option>
<el-option label="2" value="two"></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准代号" prop="number">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="标准代号" prop="number">
<el-input v-model.trim="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="name">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="标准名称" prop="name">
<el-input v-model.trim="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="页数" prop="pages">
<el-input v-model="formShowData.pages" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="页数" prop="pages">
<el-input v-model.trim="formShowData.pages" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用" prop="cost">
<el-input v-model="formShowData.cost" placeholder="请选择">
<el-form-item class="add-form-item" label="费用" prop="cost">
<el-input v-model.trim="formShowData.cost" placeholder="请选择">
</el-input>
</el-form-item>
</el-form>
@@ -152,14 +152,14 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="名称" >
<el-input v-model.trim="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="序号" >
<el-input v-model.trim="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="备注" >
<el-input v-model.trim="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -1,16 +1,16 @@
<!--标法规-工作组-项目费用统计信息-参会费用信息统计-->
<template>
<div id="attendCost" class="child2">
<div id="reviseCost" class="child2">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="主办单位">
<el-input v-model="formQuery.unit" size="small" placeholder="请输入主办单位"></el-input>
<el-form-item class="add-form-item" label="主办单位">
<el-input v-model.trim="formQuery.unit" clearable size="small" placeholder="请输入主办单位"></el-input>
</el-form-item>
<el-form-item label="会议名称">
<el-input v-model="formQuery.meetName" size="small" placeholder="请输入会议名称"></el-input>
<el-form-item class="add-form-item" label="会议名称">
<el-input v-model.trim="formQuery.meetName" clearable size="small" placeholder="请输入会议名称"></el-input>
</el-form-item>
<el-form-item label="费用列支">
<el-select size="small" v-model="formQuery.costOutlay">
<el-form-item class="add-form-item" label="费用列支">
<el-select size="small" clearable v-model.trim="formQuery.costOutlay">
<el-option
v-for="item in costOptions"
:key="item.value"
@@ -19,10 +19,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会议时间">
<el-form-item class="add-form-item" label="会议时间">
<el-date-picker
size="small"
v-model="formQuery.meetTime"
clearable
v-model.trim="formQuery.meetTime"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -130,32 +131,32 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="主办单位" prop="unit">
<el-input v-model="formShowData.unit" placeholder="请填写"></el-input>
<el-form class="label-input-form" label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="主办单位" prop="unit">
<el-input v-model.trim="formShowData.unit" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="会议名称" prop="meetName">
<el-input v-model="formShowData.meetName" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="会议名称" prop="meetName">
<el-input v-model.trim="formShowData.meetName" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="会议时间" prop="meetTime">
<el-form-item class="add-form-item" label="会议时间" prop="meetTime">
<el-date-picker
v-model="formShowData.meetTime"
v-model.trim="formShowData.meetTime"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="会费标准" prop="payStandard">
<el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="会费标准" prop="payStandard">
<el-input v-model.trim="formShowData.payStandard" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="实际发生" prop="payReality">
<el-input v-model="formShowData.payReality" placeholder="请选择">
<el-form-item class="add-form-item" label="实际发生" prop="payReality">
<el-input v-model.trim="formShowData.payReality" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="费用列支" prop="costOutlay">
<el-select size="small" v-model="formShowData.costOutlay">
<el-form-item class="add-form-item" label="费用列支" prop="costOutlay">
<el-select size="small" v-model.trim="formShowData.costOutlay">
<el-option
v-for="item in costOptions"
:key="item.value"
@@ -188,14 +189,14 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="名称" >
<el-input v-model.trim="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="序号" >
<el-input v-model.trim="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="备注" >
<el-input v-model.trim="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -252,7 +253,7 @@ export default {
costOptions: [
{ label: '列支1', value: '0' },
{ label: '列支2', value: '1' },
{ label: '列支2', value: '3' },
{ label: '列支3', value: '3' },
]
}
},
@@ -3,13 +3,13 @@
<div id="societyCost" class="child1">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="协会名称/标委会:">
<el-form-item class="add-form-item" label="协会名称:">
<el-input v-model="formQuery.scName" size="small" placeholder="请输入协会名称-标委会"></el-input>
</el-form-item>
<el-form-item label="费用列支:">
<el-form-item class="add-form-item" label="费用列支:">
<el-input v-model="formQuery.costOutlay" size="small" placeholder="请输入费用列支"></el-input>
</el-form-item>
<el-form-item label="每年缴费情况:">
<el-form-item class="add-form-item" label="每年缴费情况:">
<el-select v-model="formQuery.annualPayment" size="small" placeholder="请选择缴费情况">
<el-option
v-for="item in payOptions"
@@ -112,33 +112,33 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px 50px 10px 20px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="协会名称-标委会" prop="scName">
<el-form class="label-input-form" label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="协会名称-标委会" prop="scName">
<el-select v-model="formShowData.scName" type="text" placeholder="请填写">
<el-option label="1" value="one"></el-option>
<el-option label="2" value="two"></el-option>
</el-select>
</el-form-item>
<el-form-item label="协会名称-分委会" prop="sscName">
<el-form-item class="add-form-item" label="协会名称-分委会" prop="sscName">
<el-input v-model="formShowData.sscName" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="协会名称-工作组" prop="wgName">
<el-form-item class="add-form-item" label="协会名称-工作组" prop="wgName">
<el-input v-model="formShowData.wgName" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="会费标准" prop="payStandard">
<el-form-item class="add-form-item" label="会费标准" prop="payStandard">
<el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="实际发生" prop="payReality">
<el-form-item class="add-form-item" label="实际发生" prop="payReality">
<el-input v-model="formShowData.payReality" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="费用列支" prop="costOutlay">
<el-form-item class="add-form-item" label="费用列支" prop="costOutlay">
<el-input v-model="formShowData.costOutlay" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="每年缴费情况" prop="annualPayment">
<el-form-item class="add-form-item" label="每年缴费情况" prop="annualPayment">
<el-select v-model="formShowData.annualPayment" size="small" placeholder="请选择缴费情况">
<el-option
v-for="item in payOptions"
@@ -1,12 +1,12 @@
<!--标法规-工作组-项目费用统计信息-标准制修订补助资金收支统计-->
<template>
<div class="subsidy-Cost">
<el-tabs v-model="activeName" @tab-click="TreblingClick">
<el-tab-pane label="收入表" name="first" :key="'first'">
<child1 v-if="isChildUpdate1"></child1>
<div id="subsidyCost" class="subsidy-Cost">
<el-tabs v-model="tabsName" @tab-click="TreblingClick">
<el-tab-pane label="收入表" name="inComeSubsidy">
<in-come-subsidy v-if="tabsName === 'inComeSubsidy'"></in-come-subsidy>
</el-tab-pane>
<el-tab-pane label="支出表" name="second" :key="'second'">
<child2 v-if="isChildUpdate2"></child2>
<el-tab-pane label="支出表" name="expendSubsidy">
<expend-subsidy v-if="tabsName === 'expendSubsidy'"></expend-subsidy>
</el-tab-pane>
</el-tabs>
</div>
@@ -19,25 +19,18 @@ import expendSubsidy from "../miniPages/expendSubsidy";
export default {
name: "child6",
components: {
child1: inComeSubsidy,
child2: expendSubsidy
inComeSubsidy,
expendSubsidy
},
data(){
return {
activeName: 'first',
isChildUpdate1: true,
isChildUpdate2: false
tabsName: 'inComeSubsidy',
}
},
mounted() {
},
methods: {
TreblingClick(tab) {
if (tab.name === 'first') {
this.isChildUpdate1 = true
} else if (tab.name === 'second') {
this.isChildUpdate2 = true
}
}
}
};
@@ -3,14 +3,14 @@
<div id="translateCost" class="children">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery" class="demo-form-inline">
<el-form-item label="标准类型">
<el-input v-model="formQuery.type" size="small" placeholder="根据标准类型搜索"></el-input>
<el-form-item class="add-form-item" label="标准类型">
<el-input v-model.trim="formQuery.type" clearable size="small" placeholder="根据标准类型搜索"></el-input>
</el-form-item>
<el-form-item label="标准代号">
<el-input v-model="formQuery.number" size="small" placeholder="根据标准代号搜索"></el-input>
<el-form-item class="add-form-item" label="标准代号">
<el-input v-model.trim="formQuery.number" clearable size="small" placeholder="根据标准代号搜索"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input v-model="formQuery.name" size="small" placeholder="根据标准名称搜索"></el-input>
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model.trim="formQuery.name" clearable size="small" placeholder="根据标准名称搜索"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="queryData">查询</el-button>
@@ -116,36 +116,41 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="标准类型">
<el-select v-model="formShowData.type" type="text" placeholder="请填写">
<el-form class="label-input-form" label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item class="add-form-item" label="标准类型">
<el-select v-model.trim="formShowData.type" type="text" placeholder="请填写">
<el-option label="1" value="one"></el-option>
<el-option label="2" value="two"></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准代号">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
<el-form-item class="add-form-item" label="标准代号">
<el-input v-model.trim="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model.trim="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="翻译类型">
<el-input v-model="formShowData.translation" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="翻译类型">
<el-input v-model.trim="formShowData.translation" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="页数">
<el-input v-model="formShowData.pages" type="text" placeholder="请填写">
<el-form-item class="add-form-item" label="页数">
<el-input v-model.trim="formShowData.pages" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用">
<el-input v-model="formShowData.cost" placeholder="请填写">
<el-form-item class="add-form-item" label="费用">
<el-input v-model.trim="formShowData.cost" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="翻译完成时间">
<el-input v-model="formShowData.time" placeholder="请填写">
</el-input>
<el-form-item class="add-form-item" label="翻译完成时间">
<el-date-picker
v-model.trim="formShowData.time"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-form>
</div>
@@ -171,14 +176,14 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="名称" >
<el-input v-model.trim="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="序号" >
<el-input v-model.trim="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
<el-form-item class="add-form-item" label="备注" >
<el-input v-model.trim="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">