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

This commit is contained in:
yanyizhou
2021-11-17 16:47:39 +08:00
9 changed files with 1425 additions and 698 deletions
+6 -6
View File
@@ -6647,15 +6647,15 @@ var PDFPageView = function () {
//cover.innerText = userInfo.uName + "," + userInfo.workNum;
var defaultSettings = {
watermark_txt: msg,
watermark_x: 0,//水印起始位置x轴坐标
watermark_x: 50,//水印起始位置x轴坐标
watermark_y: 0,//水印起始位置Y轴坐标
watermark_rows: 10,//水印行数
watermark_cols: 10,//水印列数
watermark_x_space: 100,//水印x轴间隔
watermark_y_space: 200,//水印y轴间隔
watermark_cols: 3,//水印列数
watermark_x_space: 30,//水印x轴间隔
watermark_y_space: 100,//水印y轴间隔
watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
watermark_alpha: 0.4,//水印透明度
watermark_fontsize: '56px',//水印字体大小
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '50px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
watermark_width: 120,//水印宽度
watermark_height: 80,//水印长度
+119 -11
View File
@@ -1,5 +1,7 @@
import axios from '@/common/axiosV2'
/** 协会费用信息统计接口 */
// 获取所有统计数据
export function statisticsAll (data) {
return axios({
@@ -12,7 +14,7 @@ export function statisticsAll (data) {
export function queryStatistics (data) {
return axios({
url: 'api/wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts',
method: 'post',
method: 'get',
params: data
})
}
@@ -21,7 +23,7 @@ export function queryStatistics (data) {
export function queryStatistics (data) {
return axios({
url: 'api/wgdCensusZ/wgd-assoc-cost/getAssocCostById',
method: 'post',
method: 'get',
params: data
})
}
@@ -30,7 +32,7 @@ export function queryStatistics (data) {
export function statisticsEdit (data) {
return axios({
url: 'api/wgdCensusZ/wgd-assoc-cost/modAssocCost',
method: 'post',
method: 'put',
params: data
})
}
@@ -42,18 +44,124 @@ export function statisticsAdd (data) {
params: data
})
}
// 单个数据删除
export function delOnlyOne (data) {
return axios({
url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCost',
method: 'get',
params: data
})
}
// 多数据删除
export function delMore (data) {
return axios({
url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCosts',
method: 'delete',
params: data
})
}
/** 参会费用信息统计 */
// 查询
export function meetAll (data) {
return axios({
url: 'api/wgdCensusZ/wgd-meet-cost/queryAllMeetCosts',
method: 'get',
params: data
})
}
// 编辑
export function meetEdit (data) {
return axios({
url: 'api/wgdCensusZ/wgd-meet-cost/modMeetCost',
method: 'put',
params: data
})
}
// 新增
export function meetAdd (data) {
return axios({
url: 'api/wgdCensusZ/wgd-meet-cost/addMeetCost',
method: 'post',
params: data
})
}
// 删除
export function meetDel (data) {
return axios({
url: 'api/wgdCensusZ/wgd-meet-cost/delMeetCosts',
method: 'delete',
params: data
})
}
/** 参与外部标准制修订费用统计 */
// 数据查询
export function reviseAll (data) {
return axios({
url: 'api/wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts',
method: 'get',
params: data
})
}
// 编辑
export function reviseEdit (data) {
return axios({
url: 'api/wgdCensusZ/wgd-ex-revise-cost/modExReviseCost',
method: 'put',
params: data
})
}
// 新增
export function reviseAdd (data) {
return axios({
url: 'api/wgdCensusZ/wgd-ex-revise-cost/addExReviseCost',
method: 'post',
params: data
})
}
export function reviseDel (data) {
return axios({
url: 'api/wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts',
method: 'delete',
params: data
})
}
/** 采购费用信息统计接口 */
// 查询
export function CgfysAll (data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/queryAllCgfys',
method: 'get',
params: data
})
}
/*// 查询详情
export function CgfyDetail(data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/getCgfyById',
method: 'get',
params: data
})
}*/
// 编辑接口
export function CgfysEdit (data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/modCgfy',
method: 'get',
params: data
})
}
// 新增接口
export function CgfysAdd (data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/addCgfy',
method: 'get',
params: data
})
}
// 单条删除
export function CgfysDelOne (data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/delCgfy',
method: 'get',
params: data
})
}
// 批量删除
export function CgfysDelMore (data) {
return axios({
url: 'api/wgdCensusLeo/wgd-cgfy/delCgfys',
method: 'get',
params: data
})
@@ -2,19 +2,19 @@
<div class="data-statis">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="协会信息数据统计" name="listOfSociety">
<list-of-society></list-of-society>
<list-of-society v-if="activeName === 'listOfSociety'"></list-of-society>
</el-tab-pane>
<el-tab-pane label="委员信息数据统计" name="listOfMember">
<list-of-member></list-of-member>
<list-of-member v-if="activeName === 'listOfMember'"></list-of-member>
</el-tab-pane>
<el-tab-pane label="参与外部协会会议统计" name="listOfMeeting">
<list-of-meeting></list-of-meeting>
<list-of-meeting v-if="activeName === 'listOfMeeting'"></list-of-meeting>
</el-tab-pane>
<el-tab-pane label="参与外部标准制修订信息统计" name="listOfStandard">
<list-of-standard></list-of-standard>
<list-of-standard v-if="activeName === 'listOfStandard'"></list-of-standard>
</el-tab-pane>
<el-tab-pane label="标准法规研究项目费用统计信息" name="listOfCost">
<list-of-cost></list-of-cost>
<list-of-cost v-if="activeName === 'listOfCost'"></list-of-cost>
</el-tab-pane>
</el-tabs>
</div>
File diff suppressed because it is too large Load Diff
@@ -102,155 +102,291 @@
@pageSizeChange="pageSizeChange"/>
</div>
<!-- 新增抽屉 -->
<el-drawer
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;"></div>
<el-form style="overflow-y: scroll" label-width="150px" :model="formShowData" :rules="formRules">
<el-form-item label="协会名称-委员会">
<el-input v-model="formShowData.totalName" type="text"></el-input>
</el-form-item>
<el-form-item label="协会名称-分表委">
<el-input v-model="formShowData.branchName" type="text"></el-input>
</el-form-item>
<el-form-item label="协会名称-工作组">
<el-input v-model="formShowData.workName" type="text"></el-input>
</el-form-item>
<el-form-item label="会员角色">
<el-select v-model="formShowData.vipRole" 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-select v-model="formShowData.players" 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.standard" type="text"></el-input>
</el-form-item>
<el-form-item label="标准负责人">
<el-select v-model="formShowData.standardLeader" 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-select v-model="formShowData.leader" 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.startTime" type="text"></el-input>
</el-form-item>
<el-form-item label="本届入会时间">
<el-input v-model="formShowData.thisTime" type="text"></el-input>
</el-form-item>
<el-form-item label="会费标准">
<el-input v-model="formShowData.costStandard" type="text"></el-input>
</el-form-item>
<el-form-item label="费用列支">
<el-select v-model="formShowData.cost" 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.lastTime" type="text"></el-input>
</el-form-item>
<el-form-item label="缴纳年限">
<el-input v-model="formShowData.costYears" type="text"></el-input>
</el-form-item>
<el-form-item label="2017年缴费">
<el-input v-model="formShowData.cost2017" type="text"></el-input>
</el-form-item>
<el-form-item label="2018年缴费">
<el-select v-model="formShowData.cost2018" placeholder="请选择2018年缴费">
<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="2019年缴费">
<el-input v-model="formShowData.cost2019" type="text"></el-input>
</el-form-item>
<el-form-item label="2020年缴费">
<el-input v-model="formShowData.cost2020" type="text"></el-input>
</el-form-item>
<el-form-item label="2021年缴费">
<el-input v-model="formShowData.cost2021" type="text"></el-input>
</el-form-item>
<el-form-item label="经办人">
<el-select v-model="formShowData.person" 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-select v-model="formShowData.partment" 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-select v-model="formShowData.nature" 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-select v-model="formShowData.state" 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.linkMan" type="text"></el-input>
</el-form-item>
<el-form-item label="协会联络人电话">
<el-input v-model="formShowData.num" type="text"></el-input>
</el-form-item>
<el-form-item label="协会联络人邮箱">
<el-input v-model="formShowData.email" type="text"></el-input>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
<el-button size="small" type="primary" @click="submit()">提交</el-button>
</div>
</el-drawer>
<!-- 导入弹框 -->
<!-- <el-dialog
title="导入文件"
:visible.sync="dialogVisible1"
width="30%"
>
<el-button class="leading-in">点击或拖拽上传文件</el-button>
</el-dialog>
<el-dialog
title="导出文件"
:visible.sync="dialogVisible2"
width="30%"
>
<el-form :model="formInlineOut">
<el-form-item label="名称">
<el-input v-model="formInlineOut.name" style="width:350px"></el-input>
<el-drawer
size="1000px"
:before-close="addDrawerClose"
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;"></div>
<el-form :model="addForm" inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
<el-form-item prop="unit" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.unit"
placeholder="请输入提报单位名称"
:maxlength="500"/>
</el-form-item>
<el-form-item label="序号">
<el-input v-model="formInlineOut.num" style="width:350px"></el-input>
<el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.scName"
placeholder="请输入协会名称-委员会"
:maxlength="500"/>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
<el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.sscName"
placeholder="请输入协会名称-分标委"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.wgName"
placeholder="请输入协会名称-工作组"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.role"
placeholder="请输入会员角色"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.attend"
placeholder="请输入参与人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="standard" label="标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.standard"
placeholder="请输入标准"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="charge" label="标准负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.charge"
placeholder="请输入标准负责人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="leader" label="责任领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.leader"
placeholder="请输入责任领导"
:maxlength="500"/>
</el-form-item>
<el-form-item label="初始入会时间" style="width: 100%; margin-right:10px" prop="iniTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-date-picker
v-model="addForm.iniTime"
:disabled="DrawerType === 'see'"
value-format="yyyy-MM-dd"
type="date"
placeholder="请选择初始入会时间">
</el-date-picker>
</el-form-item>
<el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-date-picker
v-model="addForm.curTime"
:disabled="DrawerType === 'see'"
value-format="yyyy-MM-dd"
type="date"
placeholder="请选择本届入会时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="costStandard" label="费用标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.costStandard"
placeholder="请输入费用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="costOutlay" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.costOutlay"
placeholder="请输入费用列支"
:maxlength="500"/>
</el-form-item>
<el-form-item label="上次缴纳时间" style="width: 100%; margin-right:10px" prop="lastPayTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-date-picker
v-model="addForm.lastPayTime"
:disabled="DrawerType === 'see'"
value-format="yyyy-MM-dd"
type="date"
placeholder="请选择上次缴纳时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="payPeriod" label="缴费年限" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.payPeriod"
placeholder="请输入缴费年限"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="handler" label="经办人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.handler"
placeholder="请输入经办人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="department" label="部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.department"
placeholder="请输入部门"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="asProper" label="协会性质" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.asProper"
placeholder="请输入协会性质"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="asStatus" label="协会状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.asStatus"
placeholder="请输入协会状态"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="asContact" label="协会联络人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.asContact"
placeholder="请输入协会联络人"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="tel" label="协会联络人电话" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.tel"
placeholder="请输入协会联络人电话"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="mail" label="协会联络人邮箱" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.mail"
placeholder="请输入协会联络人邮箱"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p17" label="2017缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p17"
placeholder="请输入2017缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p18" label="2018缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p18"
placeholder="请输入2018缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p19" label="2019缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p19"
placeholder="请输入2019缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p20" label="2020缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p20"
placeholder="请输入2020缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p21" label="2021缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p21"
placeholder="请输入2021缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p22" label="2022缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p22"
placeholder="请输入2022缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p23" label="2023缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p23"
placeholder="请输入2023缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p24" label="2024缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p24"
placeholder="请输入2024缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p25" label="2025缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p25"
placeholder="请输入2025缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p26" label="2026缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p26"
placeholder="请输入2026缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p27" label="2027缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p27"
placeholder="请输入2027缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p28" label="2028缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p28"
placeholder="请输入2028缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p29" label="2029缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p29"
placeholder="请输入2029缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p30" label="2030缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p30"
placeholder="请输入2030缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p31" label="2031缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p31"
placeholder="请输入2031缴费"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="p32" label="2032缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
:disabled="DrawerType === 'see'"
v-model="addForm.p32"
placeholder="请输入2032缴费"
:maxlength="500"/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible2 = false"> </el-button>
<el-button type="primary" @click="dialogVisible2 = false"> </el-button>
</span>
</el-dialog>-->
<!-- 删除提示弹框 -->
<div class="demo-drawer-footer">
<el-button size="small" @click="addDrawerClose">取消</el-button>
<el-button size="small" type="primary" @click="submit">提交</el-button>
</div>
</el-drawer>
</div>
@@ -279,49 +415,13 @@ export default {
drawer: false,
size: '600px',
// 新增的集合
formShowData: {
totalName: '',
branchName: '',
workName: '',
vipRole: '',
players: '',
standard: '',
standardLeader: '',
leader: '',
startTime: '',
thisTime: '',
costStandard: '',
cost: '',
lastTime: '',
costYears: '',
cost2017: '',
cost2018: '',
cost2019: '',
cost2020: '',
cost2021: '',
person: '',
partment: '',
nature: '',
state: '',
linkMan: '',
num: '',
email: '',
},
dialogVisible1: false,
dialogVisible2: false,
// 文件导入
formInlineOut: {
name: '',
num: '',
remarks: ''
},
dialogVisible3: false,
addForm: {},
// 新增,编辑框
drawerTitle: '',
drawerTable: false,
DrawerType: '',
formRules: {},
}
},
@@ -337,6 +437,7 @@ export default {
submit() {
},
addDrawerClose () {},
//删除方法
deleteDetail(index, rows) {
},
@@ -4,22 +4,28 @@
<!-- 第一第二行表单 -->
<el-form :inline="true" :model="formQuery">
<el-form-item label="标准号">
<el-input v-model="formQuery.standardId" size="small" placeholder="请输入标准号"></el-input>
<el-input v-model="formQuery.proId" size="small" placeholder="请输入标准号"></el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input v-model="formQuery.standardName" size="small" placeholder="请输入标准名称"></el-input>
<el-input v-model="formQuery.proName" size="small" placeholder="请输入标准名称"></el-input>
</el-form-item>
<el-form-item label="项目代号">
<el-input v-model="formQuery.codeNum" size="small" placeholder="根据项目代号搜索">
</el-input>
<el-form-item label="项目类型">
<el-select v-model="formQuery.type" size="small" placeholder="请选择类型">
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="">查询</el-button>
<el-button type="primary" size="small" @click="dataQuery">查询</el-button>
<el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
</el-form-item>
<el-divider/>
<div style="float: left;">
<el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
<el-button type="primary" size="small" @click="tableAdd">新增</el-button>
<el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
<el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
<el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -59,18 +65,18 @@
</el-table-column>
<el-table-column
align="center"
prop="num"
prop="proId"
label="项目编号">
</el-table-column>
<el-table-column
align="center"
prop="name"
prop="proName"
label="项目名称">
</el-table-column>
<el-table-column
align="center"
prop="costList"
prop="costOutlay"
label="费用列支项">
</el-table-column>
<el-table-column
@@ -109,22 +115,26 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-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-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编号">
<el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
<el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="formShowData.name" type="text" placeholder="请填写">
<el-input v-model="formShowData.proName" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="费用列支项">
<el-input v-model="formShowData.costList" placeholder="请选择">
<el-input v-model="formShowData.costOutlay" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="费用支出">
@@ -134,8 +144,8 @@
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
<el-button size="small" type="primary" @click="submit()">提交</el-button>
<el-button size="small" @click="drawerTable = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
</div>
</el-drawer>
@@ -155,15 +165,16 @@
</template>
<script>
import { reviseAll, reviseEdit, reviseAdd, reviseDel } from '@/api/statisticsApi'
export default {
name: "child3",
data() {
return {
loading: false,
formQuery: {
standardNum: '',
standardName: '',
codeNum: '',
proId: '',
proName: '',
type: '',
current: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
@@ -173,16 +184,23 @@ export default {
multipleSelection: [],
formShowData: {
id: '',
type: '',
num: '',
name: '',
costList: '',
proId: '',
proName: '',
costOutlay: '',
cost: ''
},
drawerTable: false,
drawerTitle: '',
formRules: {},
submitLoading: false,
typeOptions: [
{ label: '类型1', value: '0' },
{ label: '类型2', value: '1' },
{ label: '类型3', value: '2' },
]
}
},
@@ -191,17 +209,103 @@ export default {
},
methods: {
/** 查询数据 */
getTableData() {
reviseAll(this.formQuery).then(res=>{
this.tableData = res.data.list
this.tableTotal = res.data.count
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
//新增方法
tableAdd() {
this.drawerTitle = '新增'
this.formShowData = {}
this.drawerTable = true
},
// 提交按钮
submit() {
this.$refs['formShowData'].validate((valid) => {
if (valid) {
this.submitLoading = true
if (this.drawerTitle === '新增') {
reviseAdd(this.formShowData).then(res=>{
if (res.ok) {
this.$message.success('新增成功')
this.submitLoading = false
this.getTableData()
} else {
this.$message.warning('新增失败')
this.submitLoading = false
}
this.drawerTable = false
}, e => {
})
} else {
reviseEdit(this.formShowData).then(res => {
if (res.ok) {
this.$message.success('编辑成功')
this.submitLoading = false
this.getTableData()
} else {
this.$message.warning('编辑失败')
this.submitLoading = false
}
this.drawerTable = false
},e => {
})
}
}
})
},
//删除方法
deleteDetail() {
if (this.multipleSelection.length > 0) {
let msgIds = []
for (let i = 0; i < this.multipleSelection.length; i++) {
let msgId = this.multipleSelection[i].id
msgIds.push(msgId)
}
let delId = {
ids: msgIds.join(',')
}
this.$confirm('确定删除这些数据?', '提示', {
confirmButtonText: this.$t('m.determine'),
cancelButtonText: this.$t('m.cancel'),
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
reviseDel(delId).then(res => {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
this.multipleSelection = []
this.getTableData()
} else {
this.$message.warning('删除失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
} else {
this.$message.warning('请选择一条数据进行删除')
}
},
// 查询
dataQuery() {
this.getTableData()
},
//清空
resetForm() {
this.formQuery = {}
this.getTableData()
},
// 列表更多按钮
handleCommand(command) {
@@ -210,13 +314,49 @@ export default {
this.editRowOne(command[0]);
break;
case "删除":
this.deleteRowOne("delOne", command[0].id);
this.deleteRowOne(command[0].id);
break;
}
},
editRowOne() {
editRowOne(item) {
this.drawerTitle = '编辑'
this.formShowData = {
id: item.id,
type: item.type,
proId: item.proId,
proName: item.proName,
costOutlay: item.costOutlay,
cost: item.cost
}
this.drawerTable = true
},
deleteRowOne() {
deleteRowOne(res) {
let delId = {
ids: res
}
this.$confirm('确定删除这些数据?', '提示', {
confirmButtonText: this.$t('m.determine'),
cancelButtonText: this.$t('m.cancel'),
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
reviseDel(delId).then(res => {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
this.multipleSelection = ''
this.getTableData()
} else {
this.$message.warning('删除失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
/** 分页 */
pageChange(page) {
@@ -3,23 +3,39 @@
<div id="attendCost" class="child2">
<!-- 第一第二行表单 -->
<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 label="主办单位">
<el-input v-model="formQuery.unit" size="small" placeholder="请输入主办单位"></el-input>
</el-form-item>
<el-form-item label="标准代号">
<el-input v-model="formQuery.num" size="small" placeholder="请输入标准代号"></el-input>
<el-form-item label="会议名称">
<el-input v-model="formQuery.meetName" 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 label="费用列支">
<el-select size="small" v-model="formQuery.costOutlay">
<el-option
v-for="item in costOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会议时间">
<el-date-picker
size="small"
v-model="formQuery.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>
<el-button type="primary" size="small" onclick="">查询</el-button>
<el-button type="primary" size="small" @click="queryData">查询</el-button>
<el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
</el-form-item>
<el-divider/>
<div style="float: left">
<el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
<el-button type="primary" size="small" @click="tableAdd">新增</el-button>
<el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
<el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
<el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -47,52 +63,41 @@
align="center"
type="index"
width="50"
label="序号"
>
label="序号">
</el-table-column>
<el-table-column
align="center"
prop="holdUnit"
label="主办单位"
>
prop="unit"
label="主办单位">
</el-table-column>
<el-table-column
align="center"
prop="meetingName"
label="会议名称"
>
prop="meetName"
label="会议名称">
</el-table-column>
<el-table-column
align="center"
prop="meetingTime"
label="会议时间"
>
prop="meetTime"
label="会议时间">
<template slot-scope="scope">
{{ scope.row.meetTime ? $moment(scope.row.meetTime).format("YYYY-MM-DD HH:mm:ss") : '' }}
</template>
</el-table-column>
<el-table-column
align="center"
prop="costStandard"
label="会费标准"
>
prop="payStandard"
label="会费标准">
</el-table-column>
<el-table-column
align="center"
prop="reality"
label="实际发生"
>
prop="payReality"
label="实际发生">
</el-table-column>
<el-table-column
align="center"
prop="costList"
label="费用列支"
>
prop="costOutlay"
label="费用列支">
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope">
@@ -125,37 +130,42 @@
:title="drawerTitle"
:visible.sync="drawerTable">
<div style="margin: 10px;height: inherit">
<el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
<el-form-item label="主办单位">
<el-select v-model="formShowData.holdUnit" type="text" placeholder="请填写">
<el-select v-model="formShowData.unit" 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.meetingName" type="text" placeholder="请填写"></el-input>
<el-input v-model="formShowData.meetName" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="会议时间">
<el-input v-model="formShowData.meetingTime" type="text" placeholder="请填写">
</el-input>
<el-date-picker
v-model="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="会费标准">
<el-input v-model="formShowData.costStandard" type="text" placeholder="请填写">
<el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="实际发生">
<el-input v-model="formShowData.reality" placeholder="请选择">
<el-input v-model="formShowData.payReality" placeholder="请选择">
</el-input>
</el-form-item>
<el-form-item label="费用列支">
<el-input v-model="formShowData.costList" placeholder="请选择">
<el-input v-model="formShowData.costOutlay" placeholder="请选择">
</el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
<el-button size="small" type="primary" @click="submit()">提交</el-button>
<el-button size="small" @click="drawerTable = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
</div>
</el-drawer>
@@ -198,19 +208,21 @@
</template>
<script>
import { meetAll, meetEdit, meetAdd, meetDel } from '@/api/statisticsApi'
export default {
name: "child2",
data() {
return {
loading: false,
formQuery: {
type: '',
num: '',
name: '',
unit: '',
meetName: '',
meetTime: '',
current: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
},
submitLoading: false,
tableTotal: 0,
tableData: [],
multipleSelection: [],
@@ -218,7 +230,20 @@ export default {
drawerTable: false,
drawerTitle: '',
formRules: {},
formShowData: {}
formShowData: {
id: '',
unit: '',
meetName: '',
meetTime: '',
payStandard: '',
payReality: '',
costOutlay: ''
},
costOptions: [
{ label: '列支1', value: '0' },
{ label: '列支2', value: '1' },
{ label: '列支2', value: '3' },
]
}
},
@@ -227,17 +252,102 @@ export default {
},
methods: {
getTableData () {
meetAll(this.formQuery).then(res=>{
this.tableData = res.data.list
this.tableTotal = res.data.count
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
//新增方法
tableAdd() {
this.drawerTitle = '新增'
this.formShowData = {}
this.drawerTable = true
},
submit() {
this.$refs['formShowData'].validate((valid) => {
if (valid) {
this.submitLoading = true
if (this.drawerTitle === '新增') {
meetAdd(this.formShowData).then(res=>{
if (res.ok) {
this.$message.success('新增成功')
this.submitLoading = false
this.getTableData()
} else {
this.$message.warning('新增失败')
this.submitLoading = false
}
this.drawerTable = false
}, e => {
})
} else {
console.log(this.formShowData.meetTime)
meetEdit(this.formShowData).then(res => {
if (res.ok) {
this.$message.success('编辑成功')
this.submitLoading = false
this.getTableData()
} else {
this.$message.warning('编辑失败')
this.submitLoading = false
}
this.drawerTable = false
},e => {
})
}
}
})
},
//删除方法
deleteDetail() {
if (this.multipleSelection.length > 0) {
let msgIds = []
for (let i = 0; i < this.multipleSelection.length; i++) {
let msgId = this.multipleSelection[i].id
msgIds.push(msgId)
}
let delId = {
ids: msgIds.join(',')
}
this.$confirm('确定删除这些数据?', '提示', {
confirmButtonText: this.$t('m.determine'),
cancelButtonText: this.$t('m.cancel'),
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
meetDel(delId).then(res => {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
this.multipleSelection = []
this.getTableData()
} else {
this.$message.warning('删除失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
} else {
this.$message.warning('请选择一条数据进行删除')
}
},
// 查询
queryData() {
this.getTableData()
},
//清空
resetForm() {
this.formQuery = {}
this.getTableData()
},
// 列表更多按钮
@@ -247,12 +357,51 @@ export default {
this.editRowOne(command[0]);
break;
case "删除":
this.deleteRowOne("delOne", command[0].id);
this.deleteRowOne(command[0].id);
break;
}
},
editRowOne() {},
deleteRowOne() {},
editRowOne(item) {
this.drawerTitle = '编辑'
this.formShowData = {
id: item.id,
unit: item.unit,
meetName: item.meetName,
meetTime: this.$moment(item.meetTime).format('YYYY-MM-DD HH:mm:ss'),
payStandard: item.payStandard,
payReality: item.payReality,
costOutlay: item.costOutlay
}
this.drawerTable = true
},
deleteRowOne(res) {
let delId = {
ids: res
}
this.$confirm('确定删除这些数据?', '提示', {
confirmButtonText: this.$t('m.determine'),
cancelButtonText: this.$t('m.cancel'),
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
meetDel(delId).then(res => {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
this.multipleSelection = ''
this.getTableData()
} else {
this.$message.warning('删除失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
/** 分页 */
pageChange(page) {
this.formQuery.page = page
@@ -23,6 +23,7 @@
<el-button type="primary" size="small" @click="queryForm">查询</el-button>
<el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
</el-form-item>
<el-divider/>
<div style="float: left">
<el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
<el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
@@ -164,8 +165,7 @@
<script>
import {
statisticsAll,statisticsAdd,
statisticsEdit, delOnlyOne,
delMore,queryStatistics } from '@/api/statisticsApi'
statisticsEdit, delMore,queryStatistics } from '@/api/statisticsApi'
export default {
name: "child1",
@@ -241,6 +241,7 @@ export default {
this.getTableData()
} else {
this.$message.warning('新增失败')
this.submitLoading = false
}
this.drawerTable = false
}, e => {
@@ -253,6 +254,7 @@ export default {
this.getTableData()
} else {
this.$message.warning('编辑失败')
this.submitLoading = false
}
this.drawerTable = false
},e => {
@@ -284,7 +286,7 @@ export default {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
this.multipleSelection = ''
this.multipleSelection = []
this.getTableData()
} else {
this.$message.warning('删除失败')
@@ -327,7 +329,7 @@ export default {
this.editRowOne(command[0]);
break;
case "删除":
this.deleteRowOne("delOne", command[0].id);
this.deleteRowOne(command[0].id);
break;
}
},
@@ -349,7 +351,7 @@ export default {
// 行内删除
deleteRowOne(val) {
let delId = {
id: val
ids: val
}
this.$confirm('确定删除这些数据?', '提示', {
confirmButtonText: this.$t('m.determine'),
@@ -358,7 +360,7 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
delOnlyOne(delId).then(res => {
delMore(delId).then(res => {
if (res.ok) {
this.$message.success('删除成功')
this.pageNo = 1
@@ -171,6 +171,7 @@
</template>
</el-table-column>
</el-table>
<loading :loading="loading">加载中...</loading>
</div>
</div>
<div class="footer">
@@ -294,6 +295,7 @@
components: {},
data() {
return {
loading: false,
submitLoading: false,
addDrawerTitle: '',
addDrawer: false,
@@ -378,7 +380,7 @@
this.$message.success(tips + '成功')
this.getData()
} else {
this.$message.warning(tips + '添加失败')
this.$message.warning(tips + '失败')
}
})
} else {
@@ -449,8 +451,14 @@
this.form.reviseStatus = ''
this.getData()
},
pageChange (page) {},
pageSizeChange (pageSize) {},
pageChange (page) {
this.form.page = page
this.getData()
},
pageSizeChange (pageSize) {
this.form.pageSize = pageSize
this.getData()
},
handleCommand (command) {
switch (command[1]) {
case '编辑':
@@ -502,9 +510,11 @@
}
},
getData () {
this.loading = true
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.form, {
_this: this
}, res => {
this.loading = false
if (res.ok) {
this.data = res.data.list
this.total = res.data.count
@@ -530,8 +540,10 @@
height: calc(~'100% - 20px') !important;
}
}
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
.add-form-item {
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
}
}
display: flex;
flex-direction: column;