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

This commit is contained in:
yanyizhou
2021-11-26 10:40:12 +08:00
31 changed files with 981 additions and 855 deletions
+98 -63
View File
@@ -1,68 +1,76 @@
import axios from '@/common/axiosV2'
import axios from "@/common/axiosV2";
// 查询未整改项列表接口
export function standUnqualified (data) {
export function standUnqualified(data) {
return axios({
url: '/api/sarStandUnqualified/sar-stand-unqualified',
method: 'get',
url: "/api/sarStandUnqualified/sar-stand-unqualified",
method: "get",
params: data
})
}
// 人员菜单列表获取
export function roleTreeData (data) {
return axios({
url: '/api/SarInstitution/institution/institutionAndUser',
method: 'get',
params: data
})
}
// 上传文件
export function uploadFileText (data) {
return axios({
url: 'api/att/attFile/upload',
method: 'get',
params: data
})
}
export function dicTypeData (data) {
return axios({
url: 'api/sys/dictype/getDicTypeListCode',
method: 'get',
params: data
})
}
export function StandardsInfoPage (data) {
return axios({
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak',
method: 'get',
params: data
})
}
// 车型库清单的下拉列表
export function solostarData (data) {
return axios({
url: 'api/sarStandProjectLibrary/solostar',
method: 'get',
params: data
})
}
// 活动日历查询接口
export function meetingByMonth (params) {
return axios({
url: 'api/sapMeetInfo/getMeetingsByMonthType',
method: 'get',
params
})
});
}
export function addUn (closeState, standId,standName,standSerialNumber, itemsNum,itemsName, productType, productLine,
productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, qaEngineerName,
authEngineerName, dutyEngineerName, planCloseTime) {
// 人员菜单列表获取
export function roleTreeData(data) {
return axios({
url: "/api/SarInstitution/institution/institutionAndUser",
method: "get",
params: data
});
}
// 上传文件
export function uploadFileText(data) {
return axios({
url: "api/att/attFile/upload",
method: "get",
params: data
});
}
export function dicTypeData(data) {
return axios({
url: "api/sys/dictype/getDicTypeListCode",
method: "get",
params: data
});
}
export function StandardsInfoPage(data) {
return axios({
url: "api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak",
method: "get",
params: data
});
}
// 车型库清单的下拉列表
export function solostarData(data) {
return axios({
url: "api/sarStandProjectLibrary/solostar",
method: "get",
params: data
});
}
// 活动日历查询接口
export function meetingByMonth(params) {
return axios({
url: "api/sapMeetInfo/getMeetingsByMonthType",
method: "get",
params
});
}
//未符合项模块新增
export function addUn(
closeState, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
const data = {
closeState,
standSerialNumber, //标准号
standName, //标准名称
standId,
itemsNum, //条款号
itemsName, //条款名称
productType,
@@ -73,14 +81,41 @@ export function addUn (closeState, standId,standName,standSerialNumber, itemsNum
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
qaEngineerName,
authEngineerName,
dutyEngineerName,
planCloseTime, //计划关闭时间
}
planCloseTime //计划关闭时间
};
return axios({
url: 'api/sarStandUnqualified/sar-stand-unqualified/addOne',
method: 'post',
url: "api/sarStandUnqualified/sar-stand-unqualified/addOne",
method: "post",
data
})
});
}
//未符合项模块编辑
export function editUn(
closeState, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
const data = {
closeState,
standSerialNumber, //标准号
standName, //标准名称
itemsNum, //条款号
itemsName, //条款名称
productType,
productLine, //产品线
productName, //项目名称
reason, //不合规项目
responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
planCloseTime, //计划关闭时间
id
};
return axios({
url: "api/sarStandUnqualified/sar-stand-unqualified/updateOne",
method: "post",
data
});
}
+1 -1
View File
@@ -254,7 +254,7 @@ export default {
{
title: '标准化活动日历',
path: '/standCalendar',
menuId: '0ea66e3dd36873082b6851f69e92c8be'
menuId: ''
},
// {
// title: '标准比对库',
+10 -4
View File
@@ -43,6 +43,12 @@
return "";
}
},
type: {
type: String,
default () {
return "";
}
},
urlChild: {
type: String,
default () {
@@ -169,7 +175,7 @@
if (node.level >= 1) {
setTimeout(() => {
this.getChildByList(node.data.id, resolve);
this.getChildByList(node.data.level,node.data.vppsCode, resolve);
}, 500);
return resolve([]); // 加上这个,防止在该节点没有子节点时一直转圈的问题发生。
}
@@ -186,8 +192,8 @@
}
})
},
getChildByList( _parentID,resolve) { // 获取子节点请求
let params = {ids : _parentID};
getChildByList( level,vppsCode,resolve) { // 获取子节点请求
let params = {level : level,vppsCode :vppsCode,type : this.type};
this.$http.get(this.urlChild, params, {
_this: this
}, res => {
@@ -200,7 +206,7 @@
},
loadTreeData(resolve) {
// 获取loadtreeData 就是父节点数据,getChildByList就是异步获取子节点数据
this.$http.get(this.url, '', {
this.$http.get(this.url, {type : this.type}, {
_this: this
}, res => {
if(res.data){
-7
View File
@@ -54,15 +54,10 @@ import { mapMutations, mapActions } from 'vuex'
// 路由拦截
router.beforeEach(function (to, from, next) {
console.log("auth : to =>", to);
console.log(webLoginType)
let toName = to.name
let token = store.state.token
let path = to.path;
let requireAuth = to.meta.requireAuth;
console.log("auth : path =>" + path);
console.log("token : token =>" + token);
console.log("requireAuth : requireAuth =>" + requireAuth);
let taskId = to.query.taskIds;
let prcId = to.query.prcId;
let prcNum = to.query.prcNum;
@@ -71,7 +66,6 @@ router.beforeEach(function (to, from, next) {
let routerType = to.query.routerType;
let param = "taskIds=" + taskId + "&prcId=" + prcId
+ "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
console.log(store)
let url = window.location.search
let code = "";
if(url){
@@ -232,7 +226,6 @@ router.beforeEach(function (to, from, next) {
next({path: routerPath + '?' + param2})
}
}
console.log("res : res =>", res);
})
}
if(path === '/loginVerify'){
@@ -1194,7 +1194,6 @@ export default {
methods: {
child1Func(child1){
const list = []
console.log(child1)
if(child1 && child1.length > 1){
list.push(child1[0])
return list
@@ -2157,7 +2156,6 @@ export default {
const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
// const relatedPlansRes = await this.queryRelatedPlans()
// const relatedPlans = relatedPlansRes.list
console.log(formFieldList)
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
location.isShowImp = '0'
@@ -2194,16 +2192,12 @@ export default {
displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter ( item => item.label === '过程稿件');
console.log(list)
if(location.label === '基础信息' && list && list.length > 0){
if (!list[0].child) {
location['child1'] = []
}else {
const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS');
console.log(childList)
console.log(childList.length)
location['child1'] = childList
console.log(location['child1'])
}
}
@@ -148,7 +148,6 @@
}
let list
list = res.data.slice(0, c)
console.log(list)
this.linkList = list
})
}
@@ -39,10 +39,10 @@
<div class="action-bar">
<el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
<el-button v-btn-permission="''" size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<!-- <el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
<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>-->
@@ -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
@@ -1337,6 +1337,54 @@ export default {
})
}
break
case '17':
if (row.taskInfo === '法规认证部副部长审核') {
this.$router.push({
name: 'zcrhStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '法规认证部副总监批准') {
this.$router.push({
name: 'zcrhStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '公司副总批准') {
this.$router.push({
name: 'zcrhStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '修订入会信息') {
this.$router.push({
name: 'zcrhStep1-1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
// 政策入会流程
case '18':
if (row.taskInfo === '法规认证部副部长批准') {
this.$router.push({
@@ -1373,7 +1421,7 @@ export default {
})
}
break
// 政策参会流程
// 政策参会流程
case '19':
if (row.taskInfo === '申请人填写表单') {
this.$router.push({
@@ -1410,7 +1458,6 @@ export default {
})
}
break
case '21':
if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
this.$router.push({
@@ -3,13 +3,13 @@
<div id="translateCost" class="child2">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="项目名称">
<el-form-item class="add-form-item" label="项目名称">
<el-input v-model="formQuery.name" 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.cost" 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.purposes" size="small" placeholder="请输入用途">
</el-input>
</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-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="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="支出金额">
<el-form-item class="add-form-item" label="支出金额">
<el-input v-model="formShowData.cost" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="用途">
<el-form-item class="add-form-item" label="用途">
<el-input v-model="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
@@ -3,13 +3,13 @@
<div id="translateCost" class="child1">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="标准名称">
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model="formQuery.name" 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.number" 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.source" size="small" placeholder="请输入补助来源"></el-input>
</el-form-item>
<el-form-item>
@@ -108,23 +108,23 @@
: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-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="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="标准编号">
<el-form-item class="add-form-item" label="标准编号">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="补助来源">
<el-form-item class="add-form-item" label="补助来源">
<el-input v-model="formShowData.source" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="补助金额">
<el-form-item class="add-form-item" label="补助金额">
<el-input v-model="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"
type="datetime"
@@ -157,13 +157,13 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-form-item class="add-form-item" label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-form-item class="add-form-item" label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-form-item class="add-form-item" label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
@@ -3,13 +3,13 @@
<div id="reviseCost" class="child3">
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="标准号">
<el-form-item class="add-form-item" label="标准号">
<el-input v-model="formQuery.proId" 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.proName" 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.type" size="small" placeholder="请选择类型">
<el-option
v-for="item in typeOptions"
@@ -115,8 +115,8 @@
: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-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="formShowData.type" type="text" placeholder="请填写">
<el-option
v-for="item in typeOptions"
@@ -126,18 +126,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编号" prop="proId">
<el-form-item class="add-form-item" label="项目编号" prop="proId">
<el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="proName">
<el-form-item class="add-form-item" label="项目名称" prop="proName">
<el-input v-model="formShowData.proName" type="text" 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="cost">
<el-form-item class="add-form-item" label="费用支出" prop="cost">
<el-input v-model="formShowData.cost" placeholder="请选择">
</el-input>
</el-form-item>
@@ -3,13 +3,13 @@
<div id="attendCost" class="child4">
<!-- 第一第二行表单 -->
<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.type" 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.number" 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.name" size="small" placeholder="请输入标准名称">
</el-input>
</el-form-item>
@@ -106,25 +106,25 @@
: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-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="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-form-item class="add-form-item" label="标准代号" prop="number">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="name">
<el-form-item class="add-form-item" label="标准名称" prop="name">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="页数" prop="pages">
<el-form-item class="add-form-item" label="页数" prop="pages">
<el-input v-model="formShowData.pages" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用" prop="cost">
<el-form-item class="add-form-item" label="费用" prop="cost">
<el-input v-model="formShowData.cost" placeholder="请选择">
</el-input>
</el-form-item>
@@ -152,13 +152,13 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-form-item class="add-form-item" label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-form-item class="add-form-item" label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-form-item class="add-form-item" label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
@@ -3,13 +3,13 @@
<div id="attendCost" class="child2">
<!-- 第一第二行表单 -->
<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.unit" 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.meetName" size="small" placeholder="请输入会议名称"></el-input>
</el-form-item>
<el-form-item label="费用列支">
<el-form-item class="add-form-item" label="费用列支">
<el-select size="small" v-model="formQuery.costOutlay">
<el-option
v-for="item in costOptions"
@@ -19,7 +19,7 @@
</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"
@@ -130,14 +130,14 @@
: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-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="formShowData.unit" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="会议名称" prop="meetName">
<el-form-item class="add-form-item" label="会议名称" prop="meetName">
<el-input v-model="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"
type="datetime"
@@ -146,15 +146,15 @@
placeholder="选择日期时间">
</el-date-picker>
</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-select size="small" v-model="formShowData.costOutlay">
<el-option
v-for="item in costOptions"
@@ -188,13 +188,13 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-form-item class="add-form-item" label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-form-item class="add-form-item" label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-form-item class="add-form-item" label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
@@ -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"
@@ -3,13 +3,13 @@
<div id="translateCost" class="children">
<!-- 第一第二行表单 -->
<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.type" 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.number" 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.name" size="small" placeholder="根据标准名称搜索"></el-input>
</el-form-item>
<el-form-item>
@@ -116,34 +116,34 @@
: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-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="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-form-item class="add-form-item" label="标准代号">
<el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-form-item class="add-form-item" label="标准名称">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="翻译类型">
<el-form-item class="add-form-item" label="翻译类型">
<el-input v-model="formShowData.translation" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="页数">
<el-form-item class="add-form-item" label="页数">
<el-input v-model="formShowData.pages" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用">
<el-form-item class="add-form-item" label="费用">
<el-input v-model="formShowData.cost" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="翻译完成时间">
<el-form-item class="add-form-item" label="翻译完成时间">
<el-input v-model="formShowData.time" placeholder="请填写">
</el-input>
</el-form-item>
@@ -171,13 +171,13 @@
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称" >
<el-form-item class="add-form-item" label="名称" >
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="序号" >
<el-form-item class="add-form-item" label="序号" >
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
</el-form-item>
<el-form-item label="备注" >
<el-form-item class="add-form-item" label="备注" >
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
</el-form-item>
</el-form>
@@ -632,60 +632,60 @@
</template>
</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
<custom-input-num
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input-num>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'FILE'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@fileSuccess="fileSuccess"
></custom-file>
</template>
<template v-else-if="field.attrType === 'TEXTAREA'">
<custom-textarea
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-textarea>
</template>
<!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' ">
<template>
<custom-select
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
<template v-if="field.attrField === 'ZRBM'">
<el-form-item
prop="ZRBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">责任部门</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
<custom-input-num
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input-num>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'FILE'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@fileSuccess="fileSuccess"
></custom-file>
</template>
<template v-else-if="field.attrType === 'TEXTAREA'">
<custom-textarea
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-textarea>
</template>
<!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION'">
<template>
<custom-select
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
<template v-if="field.attrField === 'ZRBM'">
<el-form-item
prop="ZRBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">责任部门</template>
<el-input
:key="field.attrField"
@@ -1171,6 +1171,7 @@
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
:type="'car'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
@@ -1182,6 +1183,7 @@
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
:type="'truck'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
File diff suppressed because it is too large Load Diff