Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -265,12 +265,12 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column align="center" header-align="center" label="上传时间" prop="hdsbsj"
|
||||
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="auditState" sortable>
|
||||
<template scope="scope">
|
||||
<span :style="'color:'+scope.row.statecolor">{{scope.row.statename}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>-->
|
||||
<!-- <el-table-column align="center" header-align="center" label="总点赞数"
|
||||
prop="dz_znum" sortable>
|
||||
<template scope="scope">
|
||||
|
||||
@@ -721,9 +721,9 @@ layout("/layouts/platform.html"){
|
||||
// this.getActivitybxAgenda();
|
||||
this.getDifficultAgenda();
|
||||
this.getCondolenceAgenda();
|
||||
this.getTaAgenda();
|
||||
// this.getTaAgenda();
|
||||
this.getRxdjAgenda();
|
||||
this.getMemberAgenda();
|
||||
// this.getMemberAgenda();
|
||||
this.getSyrAgenda();
|
||||
this.getOfferAdviceAgenda()
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -46,8 +46,16 @@ layout("/layouts/platform.html"){
|
||||
:prop="column.prop"
|
||||
:sortable="column.sortable"
|
||||
>
|
||||
<template v-if="column.prop==='sumDuration'" scope="{row}">
|
||||
{{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}
|
||||
<!-- <template v-if="column.prop==='sumDuration'" scope="{row}">-->
|
||||
<!-- {{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}-->
|
||||
<!-- </template>-->
|
||||
<template v-if="column.prop==='isQualified'" scope="{row}">
|
||||
<span v-if="row.watchCount>=row.qualifiedNum" class="text-success">
|
||||
是
|
||||
</span>
|
||||
<span v-else class="text-danger">
|
||||
否
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column align="center" header-align="center" label="操作" width="200">-->
|
||||
@@ -110,7 +118,8 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'unitname', label: '单位'},
|
||||
{prop: 'unionname', label: '分工会'},
|
||||
// {prop: 'studyDuration', label: '观看总时长'},
|
||||
{prop: 'watchCount', label: '学习总次数'}
|
||||
{prop: 'watchCount', label: '学习总次数'},
|
||||
{prop: 'isQualified', label: '是否达标'},
|
||||
],
|
||||
viewTableColumns: [
|
||||
{prop: 'username', label: '姓名'},
|
||||
@@ -118,7 +127,7 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'unitname', label: '单位'},
|
||||
{prop: 'unionname', label: '分工会'},
|
||||
// {prop: 'studyDuration', label: '观看总时长'},
|
||||
{prop: 'watchCount', label: '学习总次数'}
|
||||
{prop: 'watchCount', label: '学习总次数'},
|
||||
],
|
||||
viewPageForm: {
|
||||
pageNumber: 1,
|
||||
|
||||
@@ -140,6 +140,10 @@ layout("/layouts/platform.html"){
|
||||
<el-input-number :min="1" :max="100" v-model="formData.everyDayMaxWatchNum"></el-input-number>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="合格/达标次数" prop="qualifiedNum">
|
||||
<el-input-number :min="1" :max="1000" v-model="formData.qualifiedNum"></el-input-number>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="是否启用" prop="disabled">
|
||||
<el-switch
|
||||
v-model="formData.disabled"
|
||||
|
||||
@@ -187,7 +187,7 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="资料阅览" :visible.sync="viewDialogVisible">
|
||||
<el-dialog title="资料阅览" :visible.sync="viewDialogVisible" :modal-append-to-body="false">
|
||||
<el-descriptions class="margin-top" title="" :column="2" border>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">资料名称</template>
|
||||
|
||||
@@ -68,6 +68,10 @@ layout("/layouts/platform.html"){
|
||||
<el-form-item class="is-required" label="基层工会简况"
|
||||
prop="basicInformation">
|
||||
<text-editor v-model="formData.basicInformation"></text-editor>
|
||||
<div style="text-align: right">
|
||||
<span style="color: #0a84ff">当前字数：{{ formData.basicInformation ? (dd3s.html2txt(formData.basicInformation).length) : 0 }}</span>
|
||||
<span>{{ '；最多500字' }}</span>
|
||||
</div>
|
||||
<!-- <el-input type="textarea" v-model="formData.basicInformation" maxlength="500" show-word-limit :rows="10"></el-input>-->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -193,11 +193,11 @@ layout("/layouts/platform.html"){
|
||||
<el-col :lg="24" :sm="24">
|
||||
<el-form-item required label="附件上传" prop="files">
|
||||
<file-upload :files.sync="formData.files" card :max="10"
|
||||
:type="['doc','docx','xls','xlsx','pdf','ppt','mp4', 'jpg', 'png', 'jpeg']">
|
||||
:type="['doc','docx','xls','xlsx','pdf','ppt', 'jpg', 'png', 'jpeg']">
|
||||
<template #el-upload__tip>
|
||||
</template>
|
||||
</file-upload>
|
||||
<div class="el-upload__tip">可上传照片、视频、文档等资料,视频只能上传MP4格式</div>
|
||||
<div class="el-upload__tip">可上传照片、文档等资料</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -248,7 +248,7 @@ layout("/layouts/platform.html"){
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
setTimeout(() => {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/mine')
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/mine')
|
||||
}, 500)
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
@@ -270,7 +270,7 @@ layout("/layouts/platform.html"){
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
setTimeout(() => {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/mine')
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/mine')
|
||||
}, 500)
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
@@ -296,7 +296,7 @@ layout("/layouts/platform.html"){
|
||||
this.$set(this.formData, 'applyTime', moment().format('YYYY-MM-DD'))
|
||||
this.$set(this.formData, 'unionName', "${@shiro.getPrincipalProperty('union').getUnionname()}")
|
||||
} else {
|
||||
const resp = await $.get('/platform/wakeshome/declaration/mine/getInfoById',{id:this.id})
|
||||
const resp = await $.get('/platform/wakeshome/info/mine/getInfoById',{id:this.id})
|
||||
if (resp.code === 0){
|
||||
this.formData = {...resp.data}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ layout("/layouts/platform.html"){
|
||||
</el-button>
|
||||
<el-button @click="openEdit(row)"
|
||||
size="mini" type="primary"
|
||||
v-if="[8100].includes(row.state) || !row.state">编辑
|
||||
v-if="[8100,8125].includes(row.state) || !row.state">编辑
|
||||
</el-button>
|
||||
<el-button @click="doDelete(row)"
|
||||
size="mini" type="danger"
|
||||
@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
},
|
||||
openEdit(row) {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/apply?id=' + row.id)
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/apply?id=' + row.id)
|
||||
},
|
||||
async flushUnits() {
|
||||
this.$set(this.pageForm, "unitId", null)
|
||||
|
||||
@@ -70,7 +70,7 @@ layout("/layouts/platform.html"){
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="操作" fixed="right" width="150px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" v-if="![8120].includes(row.state) && row.state" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="openAudit(row)" v-if="[8120].includes(row.state) || !row.state" size="mini" type="primary">审核</el-button>
|
||||
<el-button @click="doRollBack(row.id)" v-if="[8125,8130].includes(row.state) || !row.state" size="mini" type="danger">撤回</el-button>
|
||||
</template>
|
||||
|
||||
@@ -164,7 +164,7 @@ layout("/layouts/platform.html"){
|
||||
align="center">
|
||||
<template scope="{row}">
|
||||
<el-input v-model="row.inspection"
|
||||
readonly></el-input>
|
||||
readonly type="textarea" rows="2"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -396,12 +396,15 @@ layout("/layouts/platform.html"){
|
||||
if (!this.formData.reviewResult) {
|
||||
await this.createdReviewResult()
|
||||
}
|
||||
this.formData.bzList = JSON.stringify(this.formData.bzList)
|
||||
const resp = await $.post('/mobile/wakeshome/review/appraisal/doSubmit',this.formData)
|
||||
if (resp.code === 0) {
|
||||
this.$message.success('提交成功')
|
||||
this.$refs.guava.index()
|
||||
this.formData = {}
|
||||
this.pageData()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -437,8 +440,6 @@ layout("/layouts/platform.html"){
|
||||
this.formData.evaluatedPersonName = user.username
|
||||
this.formData.evaluatedPersonType = user.evaluatedPersonType
|
||||
}
|
||||
|
||||
this.formData.bzList = JSON.stringify(this.formData.bzList)
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
|
||||
@@ -88,7 +88,6 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
|
||||
<union-comment-zb :data="viewData" :is_view="true"></union-comment-zb>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
@@ -81,8 +81,12 @@ layout("/layouts/platform.html"){
|
||||
width="240px" fixed="right">
|
||||
<template scope="{row}">
|
||||
<el-button size="mini" @click="openView(row)">查看</el-button>
|
||||
<el-tooltip :content="canDownload ? ('导出【'+ row.unionName +'】管理员自我评议的评议结果') : ('导出【'+ row.unionName +'】下所有评议结果的压缩包') " placement="top">
|
||||
<el-button v-if="canDownload" size="mini" type="primary" @click="doDownLoad(row,canDownload)">导出</el-button>
|
||||
<el-tooltip
|
||||
:content="canDownload ? ('导出【'+ row.unionName +'】管理员自我评议的评议结果') : ('导出【'+ row.unionName +'】下所有评议结果的压缩包') "
|
||||
placement="top">
|
||||
<el-button v-if="canDownload" size="mini" type="primary"
|
||||
@click="doDownLoad(row,canDownload)">导出
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<el-button size="mini" type="primary" @click="downloadFilesByUnion(row)">导出附件</el-button>
|
||||
</template>
|
||||
@@ -155,9 +159,10 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column prop="userOnline" align="center" header-align="center"
|
||||
label="操作" width="240px" fixed="right">
|
||||
<template scope="{row}">
|
||||
<el-button plain size="mini" @click="openUserView(row)">查看</el-button>
|
||||
<el-button plain size="mini" type="primary" @click="downloadByPeoId(row)">导出</el-button>
|
||||
<el-button plain size="mini" type="primary" @click="downloadFilesByPeoId(row)">导出附件</el-button>
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -237,7 +242,7 @@ layout("/layouts/platform.html"){
|
||||
'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
|
||||
},
|
||||
methods: {
|
||||
doDownLoad(row,flag){
|
||||
doDownLoad(row, flag) {
|
||||
if (flag) {
|
||||
// 为true，自我评议
|
||||
window.open(loc() + '/doDownLoadSingleByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
|
||||
@@ -246,15 +251,37 @@ layout("/layouts/platform.html"){
|
||||
window.open(loc() + '/doDownLoadZipByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
|
||||
}
|
||||
},
|
||||
downloadFilesByUnion(row){
|
||||
downloadFilesByUnion(row) {
|
||||
const result = this.validateHasFiles({unionId: row.id, zbId: this.pageForm.zbId})
|
||||
if (!result) {
|
||||
return
|
||||
}
|
||||
window.open(loc() + '/exportFilesByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
|
||||
},
|
||||
downloadByPeoId(row){
|
||||
downloadByPeoId(row) {
|
||||
window.open(loc() + '/exportByPeoId?peoId=' + row.id)
|
||||
},
|
||||
downloadFilesByPeoId(){
|
||||
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', {
|
||||
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
|
||||
}
|
||||
})
|
||||
},
|
||||
async getReviewResultNum(row) {
|
||||
const res = await $.post(loc() + "/getReviewResultNum", {
|
||||
zbId: this.userPageForm.zbId,
|
||||
@@ -318,8 +345,8 @@ 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
|
||||
const data = this.zbList.find(v => v.id === this.pageForm.zbId)
|
||||
return data.commentTarget === 3 && data.unionIds && data.unionIds.length > 0
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
|
||||
Reference in New Issue
Block a user