kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-10-24 16:13:18 +08:00
parent a9351c58d3 0d5ae1bf0c
commit f895172405
3 changed files with 296 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
project/hlj/app/AppRatingTask/components/Detail.vue
View File

@@ -9,11 +9,13 @@
<template #content>
<ai-wrapper
label-width="120px">
<ai-info-item label="任务名称" :value="info.name"></ai-info-item>
<ai-info-item label="任务名称" :value="info.title"></ai-info-item>
<ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
<ai-info-item label="更新时间" :value="info.idNumber"></ai-info-item>
<ai-info-item label="创建人" :value="info.phone"></ai-info-item>
<ai-info-item label="任务完成度" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
<ai-info-item label="更新时间" :value="info.updateTime"></ai-info-item>
<ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
<ai-info-item label="任务完成度" :value="dict.getLabel('tastStatus', info.status)">
<span :style="{color: dict.getColor('tastStatus', info.status)}">{{ dict.getLabel('tastStatus', info.status) }}</span>
</ai-info-item>
</ai-wrapper>
</template>
</ai-card>
@@ -24,24 +26,23 @@
<el-button type="primary" @click="isShow = true">添加表单</el-button>
</template>
<template #right>
<el-input
v-model="search.name"
size="small"
placeholder="请输入参评人姓名"
clearable
v-throttle="() => {search.current = 1, getList()}"
@clear="search.current = 1, search.name = '', getList()"
suffix-icon="iconfont iconSearch">
</el-input>
</template>
</ai-search-bar>
<ai-table
:isShowPagination="false"
tableSize="small"
border
:tableData="info.riskDisposalList"
:tableData="info.templateList"
:col-configs="colConfigs"
@getList="() => {}">
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
<el-button type="text" v-if="row.status === '1'" @click="changeStatus(row.id)">停止</el-button>
</div>
</template>
</el-table-column>
</ai-table>
</template>
</ai-card>
@@ -51,37 +52,38 @@
title="添加表单"
@onConfirm="onConfirm">
<el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
<el-form-item label="选择模板" style="width: 100%" prop="type" :rules="[{required: true, message: '请选择模板', trigger: 'blur'}]">
<el-form-item label="选择模板" style="width: 100%" prop="templateId" :rules="[{required: true, message: '请选择模板', trigger: 'change'}]">
<ai-select
v-model="form.type"
v-model="form.templateId"
clearable
:selectList="list"
placeholder="请选择模板">
</ai-select>
</el-form-item>
<el-form-item label="表单名称" style="width: 100%" prop="name" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
<el-input v-model="form.name" size="small" placeholder="请输入任务名称"></el-input>
<el-form-item label="表单名称" style="width: 100%" prop="templateName" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
<el-input v-model="form.templateName" size="small" placeholder="请输入任务名称"></el-input>
</el-form-item>
<el-form-item label="参评人员" style="width: 100%" prop="examinesName1" :rules="[{required: true, message: '请选择参评人员', trigger: 'change'}]">
<ai-user-selecter :instance="instance" v-model="form.examines" @change="e => onUserChange(e, 'examinesName1')">
<el-form-item label="参评人员" style="width: 100%" prop="evaluatorsNames" :rules="[{required: true, message: '请选择参评人员', trigger: 'change'}]">
<ai-user-selecter :instance="instance" v-model="form.evaluatorsList" @change="e => onUserChange(e, 'evaluatorsNames')">
<div class="AppAnnounceDetail-select">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName1"></el-input>
<div class="select-left" v-if="form.examines.length">
<span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span>
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.evaluatorsNames"></el-input>
<div class="select-left" v-if="form.evaluatorsList.length">
<span v-for="(item, index) in form.evaluatorsList" :key="index">{{ item.name }}</span>
</div>
<i v-if="!form.examines.length">请选择</i>
<div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
<i v-if="!form.evaluatorsList.length">请选择</i>
<div class="select-right">{{ form.evaluatorsList.length ? '重新选择' : '选择' }}</div>
</div>
</ai-user-selecter>
</el-form-item>
<el-form-item label="评分人员" style="width: 100%" prop="examinesName2" :rules="[{required: true, message: '请选择评分人员', trigger: 'change'}]">
<ai-user-selecter :instance="instance" v-model="form.examines1" @change="e => onUserChange(e, 'examinesName2')">
<el-form-item label="评分人员" style="width: 100%" prop="scorerNames" :rules="[{required: true, message: '请选择评分人员', trigger: 'change'}]">
<ai-user-selecter :instance="instance" v-model="form.scorerList" @change="e => onUserChange(e, 'scorerNames')">
<div class="AppAnnounceDetail-select">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName2"></el-input>
<div class="select-left" v-if="form.examines1.length">
<span v-for="(item, index) in form.examines1" :key="index">{{ item.name }}</span>
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.scorerNames"></el-input>
<div class="select-left" v-if="form.scorerList.length">
<span v-for="(item, index) in form.scorerList" :key="index">{{ item.name }}</span>
</div>
<i v-if="!form.examines1.length">请选择</i>
<div class="select-right">{{ form.examines1.length ? '重新选择' : '选择' }}</div>
<i v-if="!form.scorerList.length">请选择</i>
<div class="select-right">{{ form.scorerList.length ? '重新选择' : '选择' }}</div>
</div>
</ai-user-selecter>
</el-form-item>
@@ -91,6 +93,7 @@
type="daterange"
size="small"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
@@ -116,12 +119,12 @@
info: {},
form: {
date: '',
name: '',
type: '',
examines: [],
examines1: [],
examinesName2: '',
examinesName1: ''
templateId: '',
templateName: '',
evaluatorsList: [],
scorerList: [],
evaluatorsNames: '',
scorerNames: ''
},
search: {
current: 1,
@@ -133,10 +136,45 @@
isLoading: false,
tableData: [],
colConfigs: [
{prop: 'remarks', label: '异常记录', align: 'center' },
{prop: 'createTime', label: '创建时间', align: 'center'},
{prop: 'createUserName', label: '记录人', align: 'center' }
{prop: 'templateName', label: '表单名称', align: 'center', width: 220 },
{prop: 'createUserName', label: '添加人', align: 'center', width: 150 },
{
prop: 'status',
align: 'center',
label: '开始结束时间',
render: (h, {row}) => {
return h('span', {
}, `${row.beginTime.split(' ')[0]} - ${row.endTime.split(' ')[0]}`)
}
},
{
prop: 'status',
align: 'center',
width: 300,
label: '已填写/剩余份数',
render: (h, {row}) => {
return h('span', {
style: {
width: '300px'
}
}, `${row.overPhr}/${row.totalPhr}`)
}
},
{
prop: 'status',
align: 'center',
label: '任务状态',
width: 100,
render: (h, {row}) => {
return h('span', {
style: {
color: this.dict.getColor('formStatus', row.status)
}
}, this.dict.getLabel('formStatus', row.status))
}
}
],
list: [],
tabList: ['基本信息', '风险处置']
}
},
@@ -144,20 +182,19 @@
created () {
if (this.params && this.params.id) {
this.id = this.params.id
// this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => {
// this.getInfo(this.params.id)
// })
this.$dict.load(['tastStatus', 'formStatus']).then(() => {
this.getInfo()
})
}
this.getList()
},
methods: {
getInfo (id) {
this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
getInfo () {
this.instance.post(`/app/appassessmentscortask/queryDetailById?id=${this.params.id}`).then(res => {
if (res.code === 0) {
this.info = res.data
this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
return this.dict.getLabel('EP_travelType', v)
}).join('，')
}
this.isLoading = false
@@ -166,6 +203,40 @@
})
},
changeStatus (id) {
this.$confirm(`确定停用该表单？`).then(() => {
this.instance.post(`/app/appassessmentscortask/stopTaskTemplate?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success(`停用成功！`)
this.getList()
}
})
})
},
getList () {
this.instance.post(`/app/appassessmentscoretemplate/list?size=1000`).then(res => {
if (res.code == 0) {
this.list = res.data.records.map(v => {
return {
dictValue: v.id,
dictName: v.title
}
})
}
})
},
toDetail (formId) {
this.$emit('change', {
type: 'FormDetail',
params: {
id: this.params.id,
formId: formId || ''
}
})
},
onUserChange(e, type) {
if (e.length) {
this.form[type] = '1'
@@ -174,14 +245,34 @@
}
},
onConfirm (id) {
onClose () {
this.form.date = ''
this.form.name = ''
this.form.templateId = ''
this.form.templateName = ''
this.form.evaluatorsList = []
this.form.scorerList = []
this.form.evaluatorsNames = ''
this.form.scorerNames = ''
},
onConfirm () {
this.$refs.form.validate((valid) => {
if (valid) {
this.isShow = false
this.$emit('change', {
type: 'Detail',
params: {
id: id || ''
this.instance.post(`/app/appassessmentscortask/addTemplate`, {
...this.form,
beginTime: this.form.date[0] + ' 00:00:00',
endTime: this.form.date[1] + ' 23:59:59',
taskId: this.params.id,
evaluatorsNames: this.form.evaluatorsList.map(v => v.name).join(','),
scorerNames: this.form.scorerList.map(v => v.name).join(','),
date: ''
}).then(res => {
if (res.code == 0) {
this.$message.success('提交成功！')
this.isShow = false
this.getInfo()
}
})
}

251
project/hlj/app/AppRatingTask/components/FormDetail.vue
View File

@@ -8,10 +8,11 @@
<ai-card title="基础信息">
<template #content>
<ai-wrapper>
<ai-info-item label="任务名称" isLine :value="info.taskTitle"></ai-info-item>
<ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
<ai-info-item label="群发时间" :value="info.choiceTime"></ai-info-item>
<ai-info-item label="结束时间" :value="info.taskEndTime" v-if="info.sendChannel === '1'"></ai-info-item>
<ai-info-item label="表单名称" :value="info.templateName"></ai-info-item>
<ai-info-item label="参评人" :value="info.evaluatorsNames"></ai-info-item>
<ai-info-item label="开始时间" :value="info.beginTime"></ai-info-item>
<ai-info-item label="评分人" :value="info.scorerNames"></ai-info-item>
<ai-info-item label="结束时间" :value="info.endTime"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
@@ -27,11 +28,18 @@
<div class="bottom">
<ai-search-bar>
<template #left>
<el-button type="primary" @click="isShow = true">导出明细</el-button>
<ai-download
:instance="instance"
:url="`/app/appassessmentscortask/export?id=${params.formId}&type=0&name=${search1.name}&status=${search1.status}`"
fileName="填写统计"
:disabled="tableData1.length == 0">
<el-button size="small" type="primary">导出明细</el-button>
</ai-download>
<ai-select
v-model="search1.type"
v-model="search1.status"
clearable
placeholder="请选择完成情况">
placeholder="请选择完成情况"
:selectList="dictList">
</ai-select>
</template>
<template #right>
@@ -54,7 +62,7 @@
tableSize="small"
:current.sync="search1.current"
:size.sync="search1.size"
@getList="getMemberInfo">
@getList="getList1">
<el-table-column slot="user" label="成员" align="left">
<template slot-scope="{ row }">
<div class="userinfo">
@@ -70,11 +78,17 @@
<div class="bottom">
<ai-search-bar>
<template #left>
<el-button type="primary" @click="isShow = true">导出明细</el-button>
<ai-download
:instance="instance"
:url="`/app/appassessmentscortask/export?id=${params.formId}&type=1&name=${search1.name}`"
fileName="填写统计"
:disabled="tableData2.length == 0">
<el-button size="small" type="primary">导出列表</el-button>
</ai-download>
</template>
<template #right>
<el-input
v-model="search1.name"
v-model="search2.name"
size="small"
placeholder="请输入参评人姓名"
clearable
@@ -93,14 +107,6 @@
:current.sync="search2.current"
:size.sync="search2.size"
@getList="getGroupInfo">
<el-table-column slot="user" label="群主" align="center">
<template slot-scope="{ row }">
<div class="userinfo">
<span>{{ row.groupOwnerName }}</span>
<span style="color: #999">{{ row.mainDepartmentName }}</span>
</div>
</template>
</el-table-column>
</ai-table>
</div>
</div>
@@ -111,7 +117,6 @@
</template>
<script>
import { mapState } from 'vuex'
export default {
name: 'Detail',
@@ -124,141 +129,97 @@
data () {
return {
total1: 0,
isShowPhone: false,
total2: 0,
user1: [],
user2: [],
name1: '',
name2: '',
radio1: '未执行',
search1: {
current: 1,
size: 10,
deptartId: '',
type: 0,
sendStatus: '0'
name: '',
status: ''
},
search2: {
current: 1,
size: 10,
deptartId: '',
type: 1,
sendStatus: '0'
name: ''
},
memberInfo: {},
groupInfo: {},
tableData1: [],
fileList: [],
tableData2: [],
info: {},
content: '',
currIndex: 0,
colConfigs1: [
{ slot: 'user', label: '成员' },
{ prop: 'groupCount', label: '预计送达居民群', align: 'center' }
{ slot: 'user', label: '参评人' },
{ prop: 'groupCount', label: '评分人', align: 'center' },
{ prop: 'groupCount', label: '提交时间', align: 'center' },
{ prop: 'groupCount', label: '总分', align: 'center' }
],
colConfigs2: [
{ prop: 'groupName', label: '居民群' },
{ prop: 'memberCount', label: '群人数', align: 'center' },
{ slot: 'user', label: '群主', align: 'center' },
{ prop: 'groupName', label: '参评人' },
{ prop: 'memberCount', label: '评分人数', align: 'center' },
{ slot: 'user', label: '平均分', align: 'center' },
],
groups: [],
timer: null,
min: 60,
isDisabled: false,
rejecterId: ''
dictList: [
{
dictName: '未填报',
dictValue: '0'
},
{
dictName: '已填报',
dictValue: '1'
}
]
}
},
computed: {
...mapState(['user'])
},
created () {
this.getInfo(this.params.id)
this.getInfo(this.params.formId)
this.getList1()
},
methods: {
getMemberInfo () {
this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
params: {
...this.search1,
taskId: this.params.id
}
}).then(res => {
if (res.code === 0) {
this.tableData1 = res.data.executedList.records
this.total1 = res.data.executedList.total
this.memberInfo = res.data
}
})
},
getGroupInfo () {
this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
params: {
...this.search2,
taskId: this.params.id
}
}).then(res => {
if (res.code === 0) {
this.tableData2 = res.data.executedList.records.map(v => {
return {
...v,
groupName: v.groupName || '未命名群聊'
}
})
this.total2 = res.data.executedList.total
this.groupInfo = res.data
}
})
},
getInfo (id) {
this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => {
this.instance.post(`/app/appassessmentscortask/taskTemplateDetail?id=${id}`).then(res => {
if (res.code === 0) {
this.info = res.data
if (res.data.status === '4' && res.data.remindTime) {
this.countdown()
}
const content = res.data.contents.filter(v => v.msgType === '0')
if (content.length) {
this.content = content[0].content
}
this.fileList = res.data.contents.filter(v => v.msgType !== '0').map(v => {
return {
...v,
...v.sysFile
}
})
this.info.wxGroups = res.data.wxGroups.map(v => {
this.groups.push(...v.groupIds.split(','))
return {
...v,
groupIds: v.groupIds.split(',')
}
})
if (res.data.examines && res.data.examines.length) {
const user = res.data.examines.filter(v => v.examineStatus === '2')
if (user.length) {
this.rejecterId = user[0].examineUserId
}
}
}
})
},
cancel (isRefresh) {
getList1 () {
this.instance.post(`/app/appassessmentscortask/assessStatistics`, null, {
params: {
id: this.params.formId,
...this.search1
}
}).then(res => {
if (res.code === 0) {
this.tableData1 = res.data.records
this.total1 = res.data.total
}
})
},
getList2 () {
this.instance.post(`/app/appassessmentscortask/fillStatistics`, null, {
params: {
id: this.params.formId,
...this.search2
}
}).then(res => {
if (res.code === 0) {
this.tableData2 = res.data.records
this.total2 = res.data.total
}
})
},
cancel () {
this.$emit('change', {
type: 'List',
isRefresh: !!isRefresh
type: 'Detail',
isRefresh: false,
params: {
id: this.params.id
}
})
}
}
@@ -266,36 +227,36 @@
</script>
<style scoped lang="scss">
.AppAnnounceDetail {
::v-deep .AppAnnounceDetail-title {
display: flex;
align-items: center;
.AppAnnounceDetail {
::v-deep .AppAnnounceDetail-title {
display: flex;
align-items: center;
span {
height: 100%;
line-height: 56px;
margin-right: 32px;
color: #888888;
font-size: 16px;
font-weight: 600;
transition: all ease 0.3s;
border-bottom: 3px solid transparent;
cursor: pointer;
user-select: none;
span {
height: 100%;
line-height: 56px;
margin-right: 32px;
color: #888888;
font-size: 16px;
font-weight: 600;
transition: all ease 0.3s;
border-bottom: 3px solid transparent;
cursor: pointer;
user-select: none;
&:hover {
color: #222;
}
&:hover {
color: #222;
}
&:last-child {
margin-right: 0;
}
&:last-child {
margin-right: 0;
}
&.active {
color: #222222;
border-bottom: 3px solid #2266FF;
}
&.active {
color: #222222;
border-bottom: 3px solid #2266FF;
}
}
}
}
</style>

63
project/hlj/app/AppRatingTask/components/List.vue
View File

@@ -9,12 +9,12 @@
</template>
<template #right>
<el-input
v-model="search.name"
v-model="search.title"
size="small"
placeholder="请输入任务名称"
clearable
v-throttle="() => {search.current = 1, getList()}"
@clear="search.current = 1, search.name = '', getList()"
@clear="search.current = 1, search.title = '', getList()"
suffix-icon="iconfont iconSearch">
</el-input>
</template>
@@ -42,10 +42,11 @@
:visible.sync="isShow"
width="590px"
title="新建评分任务"
@close="onClose"
@onConfirm="onConfirm">
<el-form ref="form" :model="form" label-width="110px" label-position="right">
<el-form-item label="返乡登记" prop="name" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
<el-input v-model="form.name" size="small" placeholder="请输入任务名称"></el-input>
<el-form-item label="评分任务" prop="title" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
<el-input v-model="form.title" size="small" placeholder="请输入任务名称"></el-input>
</el-form-item>
</el-form>
</ai-dialog>
@@ -67,16 +68,27 @@
search: {
current: 1,
size: 10,
name: ''
title: ''
},
form: {
name: ''
title: ''
},
colConfigs: [
{ prop: 'name', label: '任务名称' },
{ prop: 'phone', align: 'center', label: '创建人' },
{ prop: 'startTime', align: 'center', label: '更新时间' },
{ prop: 'startAreaName', align: 'center', label: '任务状态' }
{ prop: 'title', label: '任务名称' },
{ prop: 'createUserName', align: 'center', label: '创建人' },
{ prop: 'createTime', align: 'center', label: '更新时间' },
{
prop: 'status',
align: 'center',
label: '任务状态',
render: (h, {row}) => {
return h('span', {
style: {
color: this.dict.getColor('tastStatus', row.status)
}
}, this.dict.getLabel('tastStatus', row.status))
}
}
],
ids: [],
tableData: [],
@@ -89,14 +101,14 @@
created () {
this.loading = true
this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
this.dict.load(['tastStatus']).then(() => {
this.getList()
})
},
methods: {
getList () {
this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
this.instance.post(`/app/appassessmentscortask/list`, null, {
params: {
...this.search
}
@@ -113,14 +125,27 @@
})
},
onConfirm (id) {
onClose () {
this.form.title = ''
},
toDetail (id) {
this.$emit('change', {
type: 'Detail',
params: {
id
}
})
},
onConfirm () {
this.$refs.form.validate((valid) => {
if (valid) {
this.isShow = false
this.$emit('change', {
type: 'FormDetail',
params: {
id: id || ''
this.instance.post(`/app/appassessmentscortask/addOrUpdate?title=${this.form.title}`).then(res => {
if (res.code == 0) {
this.$message.success('提交成功！')
this.getList()
this.isShow = false
}
})
}
@@ -129,7 +154,7 @@
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
this.instance.post(`/app/appassessmentscortask/delete?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.getList()