c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2024-09-23 15:11:10 +08:00
parent 335d2603ba 42bf0ea0e5
commit 3847865cc5
32 changed files with 842 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/hd/wmhd/hdMange.html
+27
View File
@@ -626,6 +626,28 @@ layout("/layouts/platform.html"){
</el-form-item>
</template>
<vi-title title="上传压缩包设置"></vi-title>
<el-form-item label="是否上传压缩包">
<el-radio :label="true" border v-model="currentZplb.isUploadZip">上传</el-radio>
<el-radio :label="false" border v-model="currentZplb.isUploadZip">不上传</el-radio>
</el-form-item>
<template v-if="currentZplb.isUploadZip === true">
<el-form-item label="文件上传数量">
<el-input-number :max="5" :min="1" style="width: 100%"
v-model="currentZplb.zipNum"></el-input-number>
</el-form-item>
<el-form-item label="上传文件格式">
<el-checkbox-group v-model="currentZplb.zipType">
<el-checkbox border key="zip" label="zip">zip</el-checkbox>
<el-checkbox border key="rar" label="rar">rar</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="每个文件大小">
<el-input placeholder="请填写每个文件大小" type="number" v-model="currentZplb.zipSize">
<template slot="append">Mb</template>
</el-input>
</el-form-item>
</template>
</el-form>
<el-row class="mt20" justify="end" type="flex">
@@ -1046,6 +1068,11 @@ layout("/layouts/platform.html"){
this.$set(zplb, 'otherType', zplb.otherType ? zplb.otherType : ['mp4', 'docx'])
this.$set(zplb, 'otherFileNum', zplb.otherFileNum ? zplb.otherFileNum : 1)
this.$set(zplb, 'otherSize', zplb.otherSize ? zplb.otherSize : 2)
this.$set(zplb, 'isUploadZip', zplb.isUploadZip ? zplb.isUploadZip : false)
this.$set(zplb, 'zipType', zplb.zipType ? zplb.zipType : ['rar', 'zip'])
this.$set(zplb, 'zipNum', zplb.zipNum ? zplb.zipNum : 1)
this.$set(zplb, 'zipSize', zplb.zipSize ? zplb.zipSize : 2)
},
doSearch() {
this.pageForm.pageNumber = 1;
src/main/resources/views/platform/hd/wmhd/zpMange.html
+54 -1
View File
@@ -370,7 +370,7 @@ layout("/layouts/platform.html"){
<el-input :maxlength="zplb2Config.maxWordCount" show-word-limit
type="textarea" v-model="AddFormData.hdsbzpms"></el-input>
</el-form-item>
<div v-if="zplb2Config.isUploadPhoto||zplb2Config.isUploadOther">
<div v-if="zplb2Config.isUploadPhoto||zplb2Config.isUploadOther||zplb2Config.isUploadZip">
<el-divider content-position="left">作品信息</el-divider>
<el-form-item label="照片" required v-if="zplb2Config.isUploadPhoto">
<el-upload
@@ -397,6 +397,18 @@ layout("/layouts/platform.html"){
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item label="压缩包" v-if="zplb2Config.isUploadZip">
<el-upload
:auto-upload="false"
:file-list="ziplist"
:limit="zplb2Config.zipNum"
:on-change="zipChange"
:on-exceed="zipExceed"
action=""
name="zipfile">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
</div>
</el-form>
@@ -495,6 +507,20 @@ layout("/layouts/platform.html"){
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item label="压缩包" v-if="zplb2Config.isUploadZip">
<el-upload
:auto-upload="false"
:file-list="ziplist"
:limit="zplb2Config.zipNum"
:on-change="zipChange"
:on-exceed="zipRemove"
action=""
name="zipfile">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
</div>
</el-form>
@@ -576,6 +602,9 @@ layout("/layouts/platform.html"){
formhdxxlist: [],
yearActivityList: [],
zplb2Config: {},
ziplist:[]
}
},
components: {
@@ -671,6 +700,30 @@ layout("/layouts/platform.html"){
this.vadlist = this.vadlist.filter(v => v.urlId !== file.url.substring(length))
}
},
zipChange(file, fileList){
const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1).toLowerCase();
const whiteList = this.zplb2Config.zipType
if (!whiteList.includes(fileSuffix)) {
this.ziplist = []
this.$message.warning('上传文件只能是' + whiteList.join(',') + '格式')
return false
}
this.ziplist = fileList;
},
zipRemove(file, fileList){
if (file.status === 'success') {
const length = file.url.lastIndexOf("=") + 1
this.readytodelfile.push(file.url.substring(length));
this.ziplist.map(v => {
const length = v.url.lastIndexOf("=") + 1
v.urlId = v.url.substring(length);
})
this.ziplist = this.ziplist.filter(v => v.urlId !== file.url.substring(length))
}
},
zipExceed(){
this.$message.warning('文件最多上传' + this.zplb2Config.zipNum + '个');
},
openAdd() {
this.AddFormData = {}
this.zplb2Config = {}
src/main/resources/views/platform/jf/Funds/apply.html
+279 -266
View File
@@ -22,284 +22,281 @@ layout("/layouts/platform.html"){
</style>
<div id="app" style="padding: 20px 40px" v-cloak>
<div id="app" v-cloak>
<guava>
<el-card class="box-card" shadow="never">
<template #header>
<h3 style="color: rgb(24, 103, 176);">填写申报信息</h3>
</template>
<el-form :model="formData" :rules="formRules" label-suffix=":" label-width="120px"
ref="form">
<el-row gutter="20">
<el-col :span="12">
<el-form-item label="申请人姓名" prop="user_name">
<el-input disabled type="text" v-model="formData.user_name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申报时间" prop="apply_time">
<el-input disabled type="text" v-model="formData.apply_time"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式" prop="mobile">
<el-input placeholder="请输入联系方式" type="number"
v-model="formData.mobile"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动主体类型" prop="activity_type">
<el-select @change="getProjectCodeChange" placeholder="请选择活动主体类型"
style="width: 100%"
v-model="formData.activity_type">
<el-option
:key="item.id"
:label="item.name+' ('+item.code+')'"
:value="item.code"
v-for="item in activityType">
</el-option>
<!-- <span>
<el-card class="box-card">
<div class="clearfix" slot="header">
<span style="color: #409EFF;font-size: 18px">填写申报信息</span>
</div>
&lt;!&ndash;#if(@shiro.hasRole('H04') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="基层工会活动" value="1"></el-option>
&lt;!&ndash;#}#&ndash;&gt; &lt;!&ndash;#if(@shiro.hasRole('H02') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="协会(社团)活动" value="2"></el-option>
&lt;!&ndash;#}#&ndash;&gt;
&lt;!&ndash;#if(@shiro.hasRole('A06') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="校工会活动" value="3"></el-option>
&lt;!&ndash;#}#&ndash;&gt;
<el-form :model="formData" :rules="formRules" label-suffix=":" label-width="120px"
ref="form">
<el-row gutter="20">
<el-col :span="12">
<el-form-item label="申请人姓名" prop="user_name">
<el-input disabled type="text" v-model="formData.user_name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申报时间" prop="apply_time">
<el-input disabled type="text" v-model="formData.apply_time"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式" prop="mobile">
<el-input placeholder="请输入联系方式" type="number"
v-model="formData.mobile"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动主体类型" prop="activity_type">
<el-select @change="getProjectCodeChange" placeholder="请选择活动主体类型"
style="width: 100%"
v-model="formData.activity_type">
<el-option
:key="item.id"
:label="item.name+' ('+item.code+')'"
:value="item.code"
v-for="item in activityType">
</el-option>
<!-- <span>
&lt;!&ndash;#if(@shiro.hasRole('H04') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="基层工会活动" value="1"></el-option>
&lt;!&ndash;#}#&ndash;&gt; &lt;!&ndash;#if(@shiro.hasRole('H02') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="协会(社团)活动" value="2"></el-option>
&lt;!&ndash;#}#&ndash;&gt;
&lt;!&ndash;#if(@shiro.hasRole('A06') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="校工会活动" value="3"></el-option>
&lt;!&ndash;#}#&ndash;&gt;
</span>-->
</el-select>
</el-form-item>
</el-col>
</span>-->
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" prop="activity_name">
<!-- <el-autocomplete :fetch-suggestions="querySearchAsync"
@input="activityChange"
@select="handleSelect"
placeholder="请输入内容"
style="width: 100%"
v-model="formData.activity_name"
></el-autocomplete>-->
<el-input placeholder="请输入活动名称"
v-model="formData.activity_name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" prop="activity_name">
<!-- <el-autocomplete :fetch-suggestions="querySearchAsync"
@input="activityChange"
@select="handleSelect"
placeholder="请输入内容"
style="width: 100%"
v-model="formData.activity_name"
></el-autocomplete>-->
<el-input placeholder="请输入活动名称"
v-model="formData.activity_name"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="项目编号" prop="projectCode">
<el-input disabled placeholder="选择活动类型自动生成"
v-model="formData.projectCode"></el-input>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="活动项目类型" prop="projectTypeCode">
<el-select placeholder="请选择活动类型" style="width: 100%;"
v-model="formData.projectTypeCode">
<el-option
:key="item.id"
:label="item.name+' ('+item.code+')'"
:value="item.code"
v-for="item in projectType">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申报(承办)单位" prop="fundsUnitName"
v-show="formData.activity_type!=40003">
<el-input placeholder="请输入申报(承办)单位" type="text"
v-model="formData.fundsUnitName"></el-input>
</el-form-item>
<el-form-item label="申报(承办)单位" prop="fundsUnitName"
v-show="formData.activity_type==40003">
<el-select placeholder="请选择申报(承办)单位"
style="width: 100%;"
v-model="formData.fundsUnitName">
<el-option
:key="item.name"
:label="item.name+' ('+item.code+')'"
:value="item.name"
v-for="item in fundsUnitNameOption">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item prop="time" label="活动时间">
<el-date-picker
style="width: 100%"
v-model="formData.time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="活动计划时间" prop="plannedDate">
<el-date-picker
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 100%"
type="daterange"
v-model="formData.plannedDate"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动地址" prop="venue">
<el-input maxlength="50" placeholder="请填写活动地址" type="text"
v-model="formData.venue"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动人数" prop="activity_number">
<el-input maxlength="50" placeholder="请填写活动人数"
type="number"
v-model="formData.activity_number"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申报金额" prop="funds_money">
<el-input disabled placeholder="输入物品单价自动计算" type="number"
v-model="formData.funds_money"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item prop="payeeId" label="收款人">
<el-select v-model="formData.payeeId" placeholder="请选择联系人"
filterable
remote
clearable
reserve-keyword
:remote-method="remoteMethod"
:loading="selectLoading"
style="width: 100%">
<el-option
v-for="item in userList"
:key="item.id"
:label="item.username+'-'+item.loginname+'-'+item.unitname"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="activity_card_number" label="报销卡号">
<el-input v-model="formData.activity_card_number" type="number"></el-input>
<!-- <el-col :span="12">
<el-form-item label="项目编号" prop="projectCode">
<el-input disabled placeholder="选择活动类型自动生成"
v-model="formData.projectCode"></el-input>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="活动项目类型" prop="projectTypeCode">
<el-select placeholder="请选择活动类型" style="width: 100%;"
v-model="formData.projectTypeCode">
<el-option
:key="item.id"
:label="item.name+' ('+item.code+')'"
:value="item.code"
v-for="item in projectType">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-col :span="12">
<el-form-item label="申报(承办)单位" prop="fundsUnitName"
v-show="formData.activity_type!=40003">
<el-input placeholder="请输入申报(承办)单位" type="text"
v-model="formData.fundsUnitName"></el-input>
</el-form-item>
<el-form-item label="申报(承办)单位" prop="fundsUnitName"
v-show="formData.activity_type==40003">
<el-select placeholder="请选择申报(承办)单位"
style="width: 100%;"
v-model="formData.fundsUnitName">
<el-option
:key="item.name"
:label="item.name+' ('+item.code+')'"
:value="item.name"
v-for="item in fundsUnitNameOption">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item prop="time" label="活动时间">
<el-date-picker
style="width: 100%"
v-model="formData.time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-col>-->
<div style="display: flex;margin: 20px 0">
<el-divider content-position="left">购置物品及价格</el-divider>
<el-col :span="12">
<el-form-item label="活动计划时间" prop="plannedDate">
<el-date-picker
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 100%"
type="daterange"
v-model="formData.plannedDate"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<div style="padding-left: 10px;padding-top: 20px">
<el-tooltip class="item" content="点击添加购置物品及价格" effect="dark" placement="top">
<el-button @click="formData.goods.push({})" circle icon="el-icon-plus"
type="primary"></el-button>
</el-tooltip>
</div>
<el-col :span="12">
<el-form-item label="活动地址" prop="venue">
<el-input maxlength="50" placeholder="请填写活动地址" type="text"
v-model="formData.venue"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动人数" prop="activity_number">
<el-input maxlength="50" placeholder="请填写活动人数"
type="number"
v-model="formData.activity_number"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="申报金额" prop="funds_money">-->
<!-- <el-input disabled placeholder="输入物品单价自动计算" type="number"-->
<!-- v-model="formData.funds_money"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">
<el-form-item prop="payeeId" label="收款人">
<el-select v-model="formData.payeeId" placeholder="请选择联系人"
filterable
remote
clearable
reserve-keyword
:remote-method="remoteMethod"
:loading="selectLoading"
style="width: 100%">
<el-option
v-for="item in userList"
:key="item.id"
:label="item.username+'-'+item.loginname+'-'+item.unitname"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="activity_card_number" label="报销卡号">
<el-input v-model="formData.activity_card_number" type="number"></el-input>
</el-form-item>
</el-col>-->
</el-row>
<el-form-item label="活动费用预算">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
<el-table-column label="序号" sortable type="index" width="100"></el-table-column>
<el-table-column label="费用项目名称" prop="name">
<template scope="{row,$index}">
<el-form-item label-width="0"
:prop="'budgets.'+$index+'.name'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-input v-model="row.name" maxlength="50"
placeholder="请输入费用项目名称"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="单价（元）" prop="unitPrice">
<template scope="{row,$index}">
<el-form-item label-width="0"
:prop="'budgets.'+$index+'.unitPrice'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-input-number placeholder="单价（元）" v-model="row.unitPrice" :precision="2"
:min="1"></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="数量" prop="num">
<template scope="{row,$index}">
<el-form-item label-width="0"
:prop="'budgets.'+$index+'.num'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-input-number placeholder="数量" v-model="row.num" :precision="0"
:min="1"></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="合计(元)" prop="total">
<template slot-scope="{row}">
{{isNaN(row.unitPrice * row.num) ? '输入单价和数量自动计算' : (row.unitPrice *
row.num).toFixed(2)}}
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作" width="150px">
<template slot="header" slot-scope="scope">
<el-button @click="formData.budgets.push({})" icon="el-icon-plus" type="primary"
size="mini">添加
</el-button>
</template>
<template slot-scope="scope">
<el-button :disabled="formData.budgets.length==1"
@click="formData.budgets.splice(scope.$index,1)"
size="mini"
icon="el-icon-delete"
type="danger"></el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="活动方案">
<text-editor v-model="formData.activity_content"></text-editor>
</el-form-item>
<el-form-item label="活动安排">
<text-editor v-model="formData.activity_arrange"></text-editor>
</el-form-item>
<!-- <el-divider class="dia" content-position="left"><span style="color: #3ea1ec;">附件</span>
</el-divider>
<el-row :gutter="40">
<el-col :span="24" class="mb25">
<el-form-item label="附件" prop="files">
<file-upload :files.sync="formData.files" card></file-upload>
</el-form-item>
</el-col>
</el-row>-->
<!--<el-divider class="dia" content-position="left"><span style="color: #3ea1ec;">签&emsp;&emsp;字</span>
</el-divider>
<el-form-item prop="sign">
<sign :qz.sync="formData.sign" prefix="medicalAid"></sign>
</el-form-item>-->
</el-form>
<div style="float: right;margin: 20px 0">
<el-button @click="doAdd()" type="primary">确 定</el-button>
</div>
<el-form-item>
<el-table :data="formData.goods" border height="200" size="mini"
style="width: 100%">
<el-table-column align="center" header-align="center" label="序号" sortable
type="index" width="100">
</el-table-column>
<el-table-column align="center" header-align="center" label="物品名称"
prop="name">
<template slot-scope="{row}">
<el-input maxlength="50" placeholder="物品名称" type="text"
v-model="row.name"></el-input>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="预算费用"
prop="price">
<template slot-scope="{row}">
<el-input @input="blur1" maxlength="50" placeholder="预算费用"
type="number" v-model="row.price"></el-input>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" fixed="right"
header-align="center"
label="操作"
width="80px">
<template slot-scope="scope">
<el-button :disabled="formData.goods.length==0"
@click="delNotesItem(scope)" circle
icon="el-icon-delete"
type="danger"></el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-divider class="dia" content-position="left"><span
style="color: #3ea1ec;">活动方案</span>
</el-divider>
<el-form-item class="is-required" prop="activity_content">
<text-editor v-model="formData.activity_content"></text-editor>
</el-form-item>
<el-divider class="dia" content-position="left"><span
style="color: #3ea1ec;">活动安排</span>
</el-divider>
<el-form-item class="is-required" prop="activity_arrange">
<text-editor v-model="formData.activity_arrange"></text-editor>
</el-form-item>
<!-- <el-divider class="dia" content-position="left"><span style="color: #3ea1ec;">附件</span>
</el-divider>
<el-row :gutter="40">
<el-col :span="24" class="mb25">
<el-form-item label="附件" prop="files">
<file-upload :files.sync="formData.files" card></file-upload>
</el-form-item>
</el-col>
</el-row>-->
<!--<el-divider class="dia" content-position="left"><span style="color: #3ea1ec;">签&emsp;&emsp;字</span>
</el-divider>
<el-form-item prop="sign">
<sign :qz.sync="formData.sign" prefix="medicalAid"></sign>
</el-form-item>-->
</el-form>
<div style="float: right;margin: 20px 0">
<el-button @click="doAdd()" type="primary">确 定</el-button>
</div>
</el-card>
</el-card>
</guava>
</div>
<script>
@@ -324,6 +321,9 @@ layout("/layouts/platform.html"){
venue: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activity_number: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
formData: {
budgets: []
}
}
},
@@ -433,6 +433,12 @@ layout("/layouts/platform.html"){
formData.endTime = formData.plannedDate[1]
formData.plannedDate = undefined
}
if (formData.budgets) {
formData.budgets.forEach(v => {
v.total = (v.unitPrice * v.num).toFixed(2)
})
}
const url = "/platform/jf/activity_bx/apply"
const resp = await $.post(url + (formData.id ? "/doEdit" : "/doAdd"), {
activityBx: JSON.stringify(formData)
@@ -451,6 +457,9 @@ layout("/layouts/platform.html"){
this.delNotesList = []
this.formData = {
apply_type: 1,
budgets: [
{}
],
goods: [],
files: [],
time: [],
@@ -466,10 +475,14 @@ layout("/layouts/platform.html"){
},
async findOne(id) {
const resp = await $.get("/platform/jf/activity_bx/reimbursement/findOne", {id})
if (resp.code === 0) {
resp.data.activity_type = resp.data.activity_type + ""
resp.data.plannedDate = [resp.data.startPlannedDate, resp.data.endPlannedDate]
if(resp.data.budgets){
resp.data.budgets = JSON.parse(resp.data.budgets)
}else{
resp.data.budgets = []
}
this.formData = resp.data
}
}
src/main/resources/views/platform/question/question.html
+16 -1
View File
@@ -368,7 +368,6 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
<el-form-item label="抽奖规则" prop="raffleRule" v-if="formData.isRaffle">
<el-table :data="formData.raffleRule" border size="small">
<el-table-column label="开始答题时间" prop="startAnswerDate">
@@ -457,6 +456,22 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
<vi-title2 title="计时设置"></vi-title2>
<el-form-item label="是否开启计时" prop="enableTimer" :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">
<el-radio-group v-model="formData.enableTimer" size="small">
<el-radio :label="true" border>是</el-radio>
<el-radio :label="false" border>否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formData.enableTimer"
label="计时分钟"
prop="timerMinute"
:rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">
<el-input-number v-model="formData.timerMinute" :min="0.1" :precision="1"></el-input-number>
</el-form-item>
<!-- <el-form-item label="抽奖时间" prop="raffleTime"-->
<!-- v-if="formData.isRaffle"-->
<!-- :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">-->
src/main/resources/views/platform/question/ranking.html
+15
View File
@@ -128,6 +128,12 @@ layout("/layouts/platform.html"){
<el-table-column label="每轮得分" prop="everyRandomScore"
v-if="questionCtMode==2 && isSameDay"></el-table-column>
<el-table-column label="答题用时" prop="takeTime" v-if="enableTimer">
<template scope="scope">
{{moment.utc(moment.duration(scope.row.takeTime,"seconds").asMilliseconds()).format("HH时mm分ss秒")}}
</template>
</el-table-column>
</el-table>
<!--# include("/layouts/pagination.html"){}#-->
@@ -207,6 +213,15 @@ layout("/layouts/platform.html"){
return null
}
return null
},
enableTimer(){
if(this.pageForm.questionId){
const currentQuestion = this.questions.find(v => v.qid === this.pageForm.questionId)
if (currentQuestion) {
return currentQuestion.enableTimer
}
return null
}
}
},
methods: {
src/main/resources/views/platform/wakeshome/review/doReview.html
+27 -9
View File
@@ -200,21 +200,21 @@ layout("/layouts/platform.html"){
</el-table>
</el-row>
<div v-if="formData.scoringMode===1">
<el-divider content-position="left">备注填写</el-divider>
<el-divider content-position="left">简述工作情况</el-divider>
<el-row>
<el-col :span="24">
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit
v-model="o.remark" placeholder="请输入备注"></el-input>
v-model="o.remark" placeholder="请简述工作情况"></el-input>
</el-col>
</el-row>
</div>
</el-form-item>
<template v-if="formData.scoringMode===2">
<vi-title title="备注填写"></vi-title>
<vi-title title="简述工作情况"></vi-title>
<el-form-item prop="options" label-width="0px">
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit
v-model="presidentOpinions" placeholder="请输入备注"></el-input>
v-model="presidentOpinions" placeholder="请简述工作情况"></el-input>
</el-form-item>
</template>
@@ -408,7 +408,6 @@ layout("/layouts/platform.html"){
this.$message.warning(resp.msg)
}
})
},
async createdReviewResult(){
if (this.formData.assessmentMode === 1) {
@@ -419,24 +418,43 @@ layout("/layouts/platform.html"){
resultScore += Number(v.resultScore)
})
const result = (resultScore / source) * 100
if (result >= 80) {
if (result > 95) {
this.formData.reviewResult = '非常满意'
} else if (result > 80 && result <= 94) {
this.formData.reviewResult = '满意'
} else if (result > 60 && result <= 79) {
this.formData.reviewResult = '良好'
} else {
this.formData.reviewResult = '一般'
}
/*if (result >= 80) {
this.formData.reviewResult = '满意'
} else if (result >= 60 && result <= 79) {
this.formData.reviewResult = '基本满意'
} else {
this.formData.reviewResult = '不满意'
}
}*/
} else if (this.formData.assessmentMode === 2) {
const result = this.formData.bzList.filter(v => v.resultScore === '满意' || v.resultScore === '基本满意')
const satisfactionPercentage = (result.length / this.formData.bzList.length) * 100;
if (satisfactionPercentage >= 80) {
if (satisfactionPercentage > 95) {
this.formData.reviewResult = '非常满意'
} else if (satisfactionPercentage > 80 && satisfactionPercentage <= 94) {
this.formData.reviewResult = '满意'
} else if (satisfactionPercentage > 60 && satisfactionPercentage <= 79) {
this.formData.reviewResult = '良好'
} else {
this.formData.reviewResult = '一般'
}
/*if (satisfactionPercentage >= 80) {
this.formData.reviewResult = '满意'
} else if (satisfactionPercentage >= 60 && satisfactionPercentage <= 79) {
this.formData.reviewResult = '基本满意'
} else {
this.formData.reviewResult = '不满意'
}
}*/
const user = this.userList.find(v=> v.id === this.president)
this.formData.evaluatedPersonName = user.username
this.formData.evaluatedPersonType = user.evaluatedPersonType
src/main/resources/views/platform/wakeshome/review/khzb.html
+11 -4
View File
@@ -103,7 +103,9 @@ layout("/layouts/platform.html"){
loading: true,
activeName: '1',
tableData: [],
formData: {},
formData: {
applyTime: []
},
viewData: {
nrs: [{
bzs: [{}]
@@ -131,8 +133,9 @@ layout("/layouts/platform.html"){
const {code, data, msg} = await $.get(loc() + '/edit', {id})
if (code === 0) {
this.formData = data
if (this.formData.startTime && this.formData.endTime) {
this.formData.applyTime = [this.formData.startTime, this.formData.endTime]
if (data.startTime && data.endTime) {
this.$set(this.formData, 'applyTime', [data.startTime, data.endTime])
// this.formData.applyTime = [this.formData.startTime, this.formData.endTime]
}
this.$refs.guava.edit()
}
@@ -189,8 +192,12 @@ layout("/layouts/platform.html"){
this.$refs.guava.view()
this.loading = true;
const {code, data, msg} = await $.get(loc() + '/edit', {id})
if (code == 0) {
if (code === 0) {
this.viewData = data
if (data.startTime && data.endTime) {
this.$set(this.viewData, 'applyTime', [data.startTime, data.endTime])
// this.formData.applyTime = [this.formData.startTime, this.formData.endTime]
}
}
this.loading = false;
},
src/main/resources/views/platform/wakeshome/review/statistics.html
+22 -21
View File
@@ -98,7 +98,7 @@ layout("/layouts/platform.html"){
<el-tooltip
:content="canDownload ? ('导出【'+ row.unionName +'】管理员自我评议的评议结果') : ('导出【'+ row.unionName +'】下所有评议结果的压缩包') "
placement="top">
<el-button v-if="canDownload" size="mini" type="primary"
<el-button v-if="canDownload && row.num > 0" size="mini" type="primary"
@click="doDownLoad(row,canDownload)">导出
</el-button>
</el-tooltip>
@@ -119,24 +119,27 @@ layout("/layouts/platform.html"){
</el-input>
</div>
</div>
<div class="search-item">
<div class="search-item" style="width: 480px !important;">
<div class="search-item-option">
<el-radio-group v-model="userPageForm.reviewResult"
@change="doUserSearch">
<el-radio-button label="">
全部
<span class="ml2">
{{reviewResultData.bmy+reviewResultData.jbmy+reviewResultData.my}}
{{reviewResultData.fcmy + reviewResultData.my + reviewResultData.lh + reviewResultData.yb}}
</span>
</el-radio-button>
<el-radio-button label="非常满意">非常满意
<span class="ml2">{{reviewResultData.fcmy || 0}}</span>
</el-radio-button>
<el-radio-button label="满意">满意
<span class="ml2">{{reviewResultData.my || 0}}</span>
</el-radio-button>
<el-radio-button label="基本满意">基本满意
<span class="ml2">{{reviewResultData.jbmy || 0}}</span>
<el-radio-button label="良好">良好
<span class="ml2">{{reviewResultData.lh || 0}}</span>
</el-radio-button>
<el-radio-button label="不满意">不满意
<span class="ml2">{{reviewResultData.bmy || 0}}</span>
<el-radio-button label="一般">一般
<span class="ml2">{{reviewResultData.yb || 0}}</span>
</el-radio-button>
</el-radio-group>
</div>
@@ -174,9 +177,8 @@ layout("/layouts/platform.html"){
label="操作" width="240px" fixed="right">
<template scope="{row}">
<el-button size="mini" @click="openUserView(row)">查看</el-button>
<el-button size="mini" type="primary" @click="downloadByPeoId(row)">导出</el-button>
<el-button size="mini" type="primary" @click="downloadFilesByPeoId(row)">导出附件
</el-button>
<el-button v-if="canDownload" size="mini" type="primary" @click="downloadByPeoId(row)">导出</el-button>
<el-button v-if="canDownload" size="mini" type="primary" @click="downloadFilesByPeoId(row)">导出附件</el-button>
</template>
</el-table-column>
</el-table>
@@ -337,26 +339,25 @@ layout("/layouts/platform.html"){
downloadByPeoId(row) {
window.open(loc() + '/exportByPeoId?peoId=' + row.id)
},
downloadFilesByPeoId(row) {
async downloadFilesByPeoId(row) {
const result = this.validateHasFiles({peoId: row.id})
if (!result) {
return
}
window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id)
},
validateHasFiles(data) {
$.post('/platform/wakeshome/review/statistics/validateHasFiles', {
async validateHasFiles(data) {
const res = await $.post('/platform/wakeshome/review/statistics/validateHasFiles', {
peoId: data.peoId ? data.peoId : '',
zbId: data.zbId ? data.zbId : '',
unionId: data.unionId ? data.unionId : ''
}).then(res => {
if (res.code === 0) {
return true
} else {
this.$message.warning("未上传附件，无法导出")
return false
}
})
if (res.code === 0) {
return true
} else {
this.$message.warning("未上传附件，无法导出")
return false
}
},
async getReviewResultNum(row) {
const res = await $.post(loc() + "/getReviewResultNum", {
@@ -422,7 +423,7 @@ layout("/layouts/platform.html"){
computed: {
canDownload() {
const data = this.zbList.find(v => v.id === this.pageForm.zbId)
return data.commentTarget === 3 && data.unionIds && data.unionIds.length > 0
return data.scoringMode == 1
}
},
async created() {
src/main/resources/views/platform/zgfw/lxy/HdMange.html
+25 -25
View File
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
</div>
<div class="btn-group tool-button mt5">
<el-select class="d-select" clearable filterable
placeholder="请选择活动"
placeholder="请选择休养"
v-model="pageForm.pastQuota"
width="300px">
<el-option
@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
type="primary"></el-button>
</div>
<div class="pull-right offscreen-right mt5">
<el-button @click="openAdd" icon="el-icon-plus">创建活动</el-button>
<el-button @click="openAdd" icon="el-icon-plus">创建休养</el-button>
</div>
</el-card>
@@ -97,7 +97,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="活动名称"
<el-table-column align="center" header-align="center" label="休养名称"
prop="name"
width="300px">
<template scope="scope">
@@ -107,11 +107,11 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="活动场地"
<el-table-column align="center" header-align="center" label="休养场地"
prop="hdcd"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" header-align="center" label="活动时间"
<el-table-column align="center" header-align="center" label="休养时间"
prop="hdkssj"
sortable>
<template scope="scope">
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
<el-row style="padding: 0 10%;" v-loading="loading">
<el-steps :active="stepActive" finish-status="success" simple>
<el-step description="" title="活动信息">
<el-step description="" title="休养信息">
</el-step>
<el-step description="" title="名额分配">
@@ -192,11 +192,11 @@ layout("/layouts/platform.html"){
<el-form :model="formData" :rules="formRules"
label-width="120px"
ref="form">
<el-form-item class="view-header" label="填写活动信息&emsp;"
<el-form-item class="view-header" label="填写休养信息&emsp;"
label-width="135px">
</el-form-item>
<el-form-item label="活动名称" prop="name">
<el-input maxlength="100" placeholder="请填写活动名称"
<el-form-item label="休养名称" prop="name">
<el-input maxlength="100" placeholder="请填写休养名称"
type="text"
v-model="formData.name"></el-input>
</el-form-item>
@@ -216,7 +216,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动时间" prop="hdsj">
<el-form-item label="休养时间" prop="hdsj">
<el-date-picker
align="right"
end-placeholder="结束日期"
@@ -230,8 +230,8 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-form-item label="活动场地" prop="hdcd">
<el-input maxlength="100" placeholder="请填写活动场地"
<el-form-item label="休养场地" prop="hdcd">
<el-input maxlength="100" placeholder="请填写休养场地"
type="text"
v-model="formData.hdcd"></el-input>
</el-form-item>
@@ -419,13 +419,13 @@ layout("/layouts/platform.html"){
<el-row style="padding: 0 10%;" v-loading="loading">
<el-tabs stretch v-model="tabs_active">
<el-tab-pane label="活动信息" name="1">
<el-tab-pane label="休养信息" name="1">
<el-form :model="formData" :rules="formRules"
label-width="120px"
ref="form">
<vi-title title="修改活动信息"></vi-title>
<el-form-item label="活动名称" prop="name">
<el-input maxlength="100" placeholder="请填写活动名称"
<vi-title title="修改休养信息"></vi-title>
<el-form-item label="休养名称" prop="name">
<el-input maxlength="100" placeholder="请填写休养名称"
type="text"
v-model="formData.name"></el-input>
</el-form-item>
@@ -445,7 +445,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动时间" prop="hdsj">
<el-form-item label="休养时间" prop="hdsj">
<el-date-picker
align="right"
end-placeholder="结束日期"
@@ -459,8 +459,8 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-form-item label="活动场地" prop="hdcd">
<el-input maxlength="100" placeholder="请填写活动场地"
<el-form-item label="休养场地" prop="hdcd">
<el-input maxlength="100" placeholder="请填写休养场地"
type="text"
v-model="formData.hdcd"></el-input>
</el-form-item>
@@ -471,7 +471,7 @@ layout("/layouts/platform.html"){
v-model="formData.hdzysx"></el-input>
</el-form-item>
<el-form-item label="活动内容" prop="hdnr">
<el-form-item label="休养内容" prop="hdnr">
<div id="lrEditor" v-if="v=='edit'"></div>
</el-form-item>
@@ -606,7 +606,7 @@ layout("/layouts/platform.html"){
data() {
let validHdnr = (rule, value, callback) => {
if (!this.formData.hdnr || !dd3s.html2txt(this.formData.hdnr)) {
callback(new Error('请填写活动内容'));
callback(new Error('请填写休养内容'));
} else {
callback();
}
@@ -643,11 +643,11 @@ layout("/layouts/platform.html"){
pageOrderBy: ""
},
formRules: {
name: [{required: true, message: '请填写活动名称', trigger: ['blur', 'change']}],
name: [{required: true, message: '请填写休养名称', trigger: ['blur', 'change']}],
bmsj: [{required: true, message: '请选择报名时间', trigger: ['blur', 'change']}],
hdsj: [{required: true, message: '请选择活动时间', trigger: ['blur', 'change']}],
hdcd: [{required: true, message: '请填写活动场地', trigger: ['blur', 'change']}],
hdzysx: [{required: true, message: '请填写活动场地', trigger: ['blur', 'change']}],
hdsj: [{required: true, message: '请选择休养时间', trigger: ['blur', 'change']}],
hdcd: [{required: true, message: '请填写休养场地', trigger: ['blur', 'change']}],
hdzysx: [{required: true, message: '请填写休养场地', trigger: ['blur', 'change']}],
hdnr: [{validator: validHdnr, trigger: ['blur', 'change']}],
},
subDis: false,