BUG 26973

This commit is contained in:
aixianling
2022-01-25 17:06:41 +08:00
parent 2a43a20531
commit 48fa10a21b
11 changed files with 2160 additions and 2130 deletions

View File

@@ -37,7 +37,8 @@
<div class="list-item" v-for="(item, index) in list" :key="index"> <div class="list-item" v-for="(item, index) in list" :key="index">
<div> <div>
<div class="list-item__title"> <div class="list-item__title">
<h2 :style="{color: dict.getColor('questionnaireStatus', item.status)}">{{ dict.getLabel('questionnaireStatus', item.status) }}</h2> <h2 :style="{color: dict.getColor('questionnaireStatus', item.status)}">
{{ dict.getLabel('questionnaireStatus', item.status) }}</h2>
<span :class="'type-' + item.type">{{ dict.getLabel('questionnaireType', item.type) }}</span> <span :class="'type-' + item.type">{{ dict.getLabel('questionnaireType', item.type) }}</span>
</div> </div>
<p>{{ item.title }}</p> <p>{{ item.title }}</p>
@@ -349,7 +350,7 @@
this.loading = false this.loading = false
this.$nextTick(() => { this.$nextTick(() => {
this.$initWxOpenData()
}) })
} else { } else {
this.loading = false this.loading = false
@@ -630,6 +631,7 @@
color: #FF4466; color: #FF4466;
font-size: 14px; font-size: 14px;
} }
h2 { h2 {
color: #222222; color: #222222;
font-size: 14px; font-size: 14px;
@@ -654,6 +656,7 @@
width: 100%; width: 100%;
padding: 0; padding: 0;
} }
::v-deep .el-pager li.active { ::v-deep .el-pager li.active {
background-color: #fff !important; background-color: #fff !important;
color: #2266FF !important; color: #2266FF !important;
@@ -780,6 +783,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
&:last-child { &:last-child {
img { img {
width: 120px; width: 120px;
@@ -809,7 +813,7 @@
height: 130px; height: 130px;
padding: 5px; padding: 5px;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08); box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.08);
border-radius: 4px; border-radius: 4px;
border: 1px solid #E4E8EF; border: 1px solid #E4E8EF;
} }
@@ -949,6 +953,7 @@
::v-deep .el-button { ::v-deep .el-button {
margin-left: 0; margin-left: 0;
padding: 0; padding: 0;
i { i {
color: #8899BB; color: #8899BB;
font-size: 14px; font-size: 14px;
@@ -1072,7 +1077,7 @@
height: 196px; height: 196px;
margin: 0 20px 20px 0; margin: 0 20px 20px 0;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.05); box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.05);
border-radius: 2px; border-radius: 2px;
&:nth-of-type(4n) { &:nth-of-type(4n) {

View File

@@ -8,10 +8,12 @@
<template #content> <template #content>
<ai-wrapper label-width="90px"> <ai-wrapper label-width="90px">
<ai-info-item label="表单名称" :value="info.title" isLine></ai-info-item> <ai-info-item label="表单名称" :value="info.title" isLine></ai-info-item>
<ai-info-item label="发布状态"><span :style="{color: dict.getColor('questionnaireStatus', info.status)}">已发布</span></ai-info-item> <ai-info-item label="发布状态"><span
:style="{color: dict.getColor('questionnaireStatus', info.status)}">已发布</span></ai-info-item>
<ai-info-item label="创建人" :value="info.createUserName"></ai-info-item> <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
<ai-info-item label="创建时间" :value="info.createTime"></ai-info-item> <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
<ai-info-item label="截止时间" :value="info.periodValidityEndTime ? info.periodValidityEndTime : '永久有效'"></ai-info-item> <ai-info-item label="截止时间"
:value="info.periodValidityEndTime ? info.periodValidityEndTime : '永久有效'"></ai-info-item>
<ai-info-item label="提交次数限制" :value="info.commitType === '1' ? '限提交一次' : '不限次数' "></ai-info-item> <ai-info-item label="提交次数限制" :value="info.commitType === '1' ? '限提交一次' : '不限次数' "></ai-info-item>
</ai-wrapper> </ai-wrapper>
</template> </template>
@@ -33,7 +35,8 @@
</div> </div>
<div class="statistics-wrapper__body--list"> <div class="statistics-wrapper__body--list">
<div class="statistics-wrapper__body--item" v-for="(item, index) in subjectList" :key="index"> <div class="statistics-wrapper__body--item" v-for="(item, index) in subjectList" :key="index">
<div class="statistics-wrapper__body--top" :style="{borderBottom: ['input', 'textarea', 'upload'].indexOf(item.type) > -1 ? 'none' : '1px solid #DDDDDD'}"> <div class="statistics-wrapper__body--top"
:style="{borderBottom: ['input', 'textarea', 'upload'].indexOf(item.type) > -1 ? 'none' : '1px solid #DDDDDD'}">
<div class="left"> <div class="left">
<h2>{{ item.fieldName }}{{ item.fixedLabel }}</h2> <h2>{{ item.fieldName }}{{ item.fixedLabel }}</h2>
</div> </div>
@@ -43,7 +46,8 @@
<span>条数据</span> <span>条数据</span>
</div> </div>
</div> </div>
<div class="statistics-wrapper__body--bottom" v-if="['radio', 'checkbox', 'select'].indexOf(item.type) > -1"> <div class="statistics-wrapper__body--bottom"
v-if="['radio', 'checkbox', 'select'].indexOf(item.type) > -1">
<div class="statistics-wrapper__body--select" v-for="(item, i) in item.options" :key="i"> <div class="statistics-wrapper__body--select" v-for="(item, i) in item.options" :key="i">
<div class="left"> <div class="left">
<h2>{{ item.label }}</h2> <h2>{{ item.label }}</h2>
@@ -51,7 +55,8 @@
</div> </div>
<div class="right"> <div class="right">
<div class="progress"> <div class="progress">
<div :style="{width: `${(((item.c || 0) / fieldDataCount[`field_${index}`]) * 100).toFixed(2)}%`}"></div> <div
:style="{width: `${(((item.c || 0) / fieldDataCount[`field_${index}`]) * 100).toFixed(2)}%`}"></div>
</div> </div>
<i>{{ (((item.c || 0) / fieldDataCount[`field_${index}`]) * 100).toFixed(2) }}%</i> <i>{{ (((item.c || 0) / fieldDataCount[`field_${index}`]) * 100).toFixed(2) }}%</i>
</div> </div>
@@ -90,7 +95,9 @@
<div class="userinfo"> <div class="userinfo">
<img :src="row.avatarUrl || 'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'"> <img :src="row.avatarUrl || 'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'">
<!-- <h3>{{ row.nickName }}</h3> --> <!-- <h3>{{ row.nickName }}</h3> -->
<el-tooltip effect="dark" :content="row.corpName ? row.nickName + '@' + row.corpFullName : row.nickName + ''" placement="top"> <el-tooltip effect="dark"
:content="row.corpName ? row.nickName + '@' + row.corpFullName : row.nickName + ''"
placement="top">
<div class="userinfo-right__top"> <div class="userinfo-right__top">
<h3>{{ row.corpName ? row.nickName : row.nickName }}</h3> <h3>{{ row.corpName ? row.nickName : row.nickName }}</h3>
<span class="ellipsis">{{ row.corpName ? '@' + row.corpName : '' }}</span> <span class="ellipsis">{{ row.corpName ? '@' + row.corpName : '' }}</span>
@@ -102,7 +109,9 @@
<el-table-column slot="tags" label="标签" align="center" width="240px"> <el-table-column slot="tags" label="标签" align="center" width="240px">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-tags" v-if="row.tagNames"> <div class="table-tags" v-if="row.tagNames">
<el-tag type="info" v-for="(item, index) in row.tagNames.split(',')" size="medium" :key="index">{{ item }}</el-tag> <el-tag type="info" v-for="(item, index) in row.tagNames.split(',')" size="medium" :key="index">
{{ item }}
</el-tag>
</div> </div>
<span v-else></span> <span v-else></span>
</template> </template>
@@ -160,7 +169,8 @@
</div> </div>
</template> </template>
<template v-if="item.type === 'select'"> <template v-if="item.type === 'select'">
<el-input resize="none" class="preview" type="textarea" style="color: #333" :placeholder="item.placeholder" v-model="formInfo[`field_${i}`]" disabled></el-input> <el-input resize="none" class="preview" type="textarea" style="color: #333"
:placeholder="item.placeholder" v-model="formInfo[`field_${i}`]" disabled></el-input>
<!-- <span>{{ formInfo[`field_${i}`] }}</span> --> <!-- <span>{{ formInfo[`field_${i}`] }}</span> -->
<!-- <textarea :placeholder="item.placeholder" v-model="formInfo[`field_${i}`]" disabled></textarea> --> <!-- <textarea :placeholder="item.placeholder" v-model="formInfo[`field_${i}`]" disabled></textarea> -->
<!-- <el-select placeholder="请选择" disabled v-model="formInfo[`field_${i}`]" style="width: 100%;"> <!-- <el-select placeholder="请选择" disabled v-model="formInfo[`field_${i}`]" style="width: 100%;">
@@ -235,7 +245,13 @@
{slot: 'userinfo'}, {slot: 'userinfo'},
{prop: 'residentName', label: '真实姓名', align: 'center', width: '100px'}, {prop: 'residentName', label: '真实姓名', align: 'center', width: '100px'},
{prop: 'commitTime', label: '提交时间', align: 'center', width: '160px'}, {prop: 'commitTime', label: '提交时间', align: 'center', width: '160px'},
{prop: 'userType', label: '微信类型', align: 'center', width: '100px', formart: v => this.dict.getLabel('wxUserType', v) }, {
prop: 'userType',
label: '微信类型',
align: 'center',
width: '100px',
formart: v => this.dict.getLabel('wxUserType', v)
},
{prop: 'wxUserNames', label: '所属员工', align: 'center', width: '100px'}, {prop: 'wxUserNames', label: '所属员工', align: 'center', width: '100px'},
{slot: 'tags', label: '标签', align: 'center', width: '268px'}, {slot: 'tags', label: '标签', align: 'center', width: '268px'},
{prop: 'totalScore', label: '分值', align: 'center'} {prop: 'totalScore', label: '分值', align: 'center'}
@@ -261,7 +277,7 @@
if (res.code == 0) { if (res.code == 0) {
this.tableData = res.data.records this.tableData = res.data.records
this.total = res.data.total this.total = res.data.total
this.$initWxOpenData()
} }
}) })
}, },
@@ -336,7 +352,7 @@
this.targetList = res.data.fields.map(item => { this.targetList = res.data.fields.map(item => {
return JSON.parse(item.fieldInfo) return JSON.parse(item.fieldInfo)
}) })
this.$initWxOpenData()
} }
}) })
}, },
@@ -585,7 +601,7 @@
.statistics-wrapper { .statistics-wrapper {
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15); box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
border-radius: 2px; border-radius: 2px;
.statistics-wrapper__title { .statistics-wrapper__title {
@@ -693,7 +709,7 @@
height: 70px; height: 70px;
padding: 0 20px; padding: 0 20px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0 0;
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD;
& > div { & > div {
@@ -704,6 +720,7 @@
.left { .left {
flex: 1; flex: 1;
h2 { h2 {
color: #222222; color: #222222;
font-size: 14px; font-size: 14px;

View File

@@ -142,7 +142,7 @@
if (res.code == 0) { if (res.code == 0) {
this.tableData = res.data.records this.tableData = res.data.records
this.total = res.data.total this.total = res.data.total
this.$initWxOpenData()
} }
}) })
}, },
@@ -223,7 +223,6 @@
height: 64px; height: 64px;
margin-right: 20px; margin-right: 20px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 2px;
// box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08); // box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08);
border-radius: 2px; border-radius: 2px;
cursor: pointer; cursor: pointer;

View File

@@ -246,7 +246,7 @@ export default {
if (res?.data) { if (res?.data) {
this.info.attendees = res.data.records; this.info.attendees = res.data.records;
this.total = res.data.total; this.total = res.data.total;
this.$initWxOpenData()
} }
}); });
}, },

View File

@@ -133,7 +133,7 @@ export default {
if (res && res.data) { if (res && res.data) {
this.tableData = res.data.records; this.tableData = res.data.records;
this.total = res.data.total; this.total = res.data.total;
this.$initWxOpenData()
} }
}); });
}, },

View File

@@ -114,7 +114,7 @@ export default {
if (res?.data) { if (res?.data) {
this.tableData = res.data.records this.tableData = res.data.records
this.page.total = res.data.total this.page.total = res.data.total
this.$initWxOpenData()
} }
}) })
}, },

View File

@@ -1,7 +1,8 @@
<template> <template>
<ai-detail> <ai-detail>
<template slot="title"> <template slot="title">
<ai-title :title="detail.id ? '编辑公告' : '创建公告'" isShowBack isShowBottomBorder @onBackClick="$parent.goBack"></ai-title> <ai-title :title="detail.id ? '编辑公告' : '创建公告'" isShowBack isShowBottomBorder
@onBackClick="$parent.goBack"></ai-title>
</template> </template>
<template #content> <template #content>
<ai-card title="基本信息"> <ai-card title="基本信息">
@@ -133,7 +134,7 @@
if (res && res.data) { if (res && res.data) {
Object.keys(this.form).map(e => this.form[e] = res.data[e]); Object.keys(this.form).map(e => this.form[e] = res.data[e]);
this.form.type = res.data.releaseTime ? 1 : 0; this.form.type = res.data.releaseTime ? 1 : 0;
this.$initWxOpenData()
} }
}) })
}, },
@@ -173,9 +174,11 @@
::v-deep .AiOpenData { ::v-deep .AiOpenData {
height: auto !important; height: auto !important;
&:after { &:after {
content: "、"; content: "、";
} }
&:nth-child(2):after { &:nth-child(2):after {
content: ""; content: "";
} }

View File

@@ -20,7 +20,8 @@
</ai-card> </ai-card>
<ai-card title="附件" v-if="detailObj.files && detailObj.files.length"> <ai-card title="附件" v-if="detailObj.files && detailObj.files.length">
<template #content> <template #content>
<el-row type="flex" justify="space-between" class="file" v-for="(item,index) in detailObj.files" :key="index" @click.native="open(item)"> <el-row type="flex" justify="space-between" class="file" v-for="(item,index) in detailObj.files" :key="index"
@click.native="open(item)">
<span>{{ item.fileName }}</span> <span>{{ item.fileName }}</span>
<span>{{ (item.size / 1024).toFixed(2) }}KB</span> <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
</el-row> </el-row>
@@ -56,7 +57,7 @@
}).then(res => { }).then(res => {
if (res && res.data) { if (res && res.data) {
this.detailObj = res.data; this.detailObj = res.data;
this.$initWxOpenData()
} }
}) })
} }

View File

@@ -43,7 +43,8 @@
</template> </template>
<template #right> <template #right>
<el-input v-model="search.readUserName" @keyup.enter.native="getList()" placeholder="姓名" <el-input v-model="search.readUserName" @keyup.enter.native="getList()" placeholder="姓名"
size="small" suffix-icon="iconfont iconSearch" clearable @clear="search.current=1,getList()"></el-input> size="small" suffix-icon="iconfont iconSearch" clearable
@clear="search.current=1,getList()"></el-input>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-table <ai-table
@@ -102,7 +103,8 @@
{slot: "unitName"}, {slot: "unitName"},
{ {
prop: "readStatus", label: "查阅状态", align: "center", prop: "readStatus", label: "查阅状态", align: "center",
render:(h,{row})=>[<span style={{color:this.dict.getColor("announcementReadStatus",row.readStatus)}}>{this.dict.getLabel("announcementReadStatus",row.readStatus)}</span>] render: (h, {row}) => [<span
style={{color: this.dict.getColor("announcementReadStatus", row.readStatus)}}>{this.dict.getLabel("announcementReadStatus", row.readStatus)}</span>]
}, },
]; ];
} }
@@ -148,7 +150,7 @@
}).then(res => { }).then(res => {
if (res && res.data) { if (res && res.data) {
this.detailObj = res.data; this.detailObj = res.data;
this.$initWxOpenData()
} }
}) })
}, },

View File

@@ -123,14 +123,17 @@
{prop: 'title', label: '标题'}, {prop: 'title', label: '标题'},
{ {
prop: 'readNum', label: '查询状态', align: 'center', prop: 'readNum', label: '查询状态', align: 'center',
render:(h,{row})=>[<span class='status' onClick={this.showDialog.bind(this,row)}>{row.readNum}人已读</span>,<span class='status' onClick={this.showDialog.bind(this,row)}>{row.unReadNum}人未读</span>] render: (h, {row}) => [<span class='status'
onClick={this.showDialog.bind(this, row)}>{row.readNum}人已读</span>,
<span class='status' onClick={this.showDialog.bind(this, row)}>{row.unReadNum}人未读</span>]
}, },
{slot: 'releaseUserName'}, {slot: 'releaseUserName'},
{slot: 'unitName'}, {slot: 'unitName'},
{prop: 'releaseTime', label: '发布时间', align: 'center'}, {prop: 'releaseTime', label: '发布时间', align: 'center'},
{ {
prop: 'status', label: '发布状态', align: 'center', prop: 'status', label: '发布状态', align: 'center',
render:(h,{row})=>[<span style={{color:this.dict.getColor("announcementStatus",row.status)}}>{this.dict.getLabel("announcementStatus",row.status)}</span>] render: (h, {row}) => [<span
style={{color: this.dict.getColor("announcementStatus", row.status)}}>{this.dict.getLabel("announcementStatus", row.status)}</span>]
}, },
{slot: 'options'}, {slot: 'options'},
]; ];
@@ -197,7 +200,7 @@
if (res && res.data) { if (res && res.data) {
this.readObj = res.data; this.readObj = res.data;
this.visible = true; this.visible = true;
this.$initWxOpenData()
} }
}) })
}, },
@@ -212,7 +215,7 @@
if (res && res.data) { if (res && res.data) {
this.tableData = res.data.records; this.tableData = res.data.records;
this.total = res.data.total; this.total = res.data.total;
this.$initWxOpenData()
} }
}) })
} }

View File

@@ -112,7 +112,7 @@
if (res && res.data) { if (res && res.data) {
this.tableData = res.data.records; this.tableData = res.data.records;
this.total = res.data.total; this.total = res.data.total;
this.$initWxOpenData()
} }
}); });
}, },