Skip to content

M
marketing
Commit b01dec02 by liuchenxi
Options

update: 9月遗留ui

parent 25af1b25
Showing with 72 additions and 26 deletions
src/views/ecm/batch-dialog.vue
......@@ -70,7 +70,7 @@ export default {
{
label: '提交状态',
prop: 'errCode',
width: '100',
minWidth: '100',
align: 'left',
formatter(row) {
return row.errCode === '0' ? '提交成功' : '提交失败';
......
src/views/ecm/batch-list.vue
......@@ -24,12 +24,14 @@
<span>{{ v.label }}</span>
<el-tooltip v-if="v.prop == 'successCount'" placement="top" :open-delay="200">
<i class="iconfont icon-xinxixianshi" style="color:#909399;font-size:14px"></i>
<div slot="content">
<div>指的是GIC系统成功提交针对这些用户的营销行为，并不是指的实际触达成功，如：</div>
成功通过服务号接口进行消息群发；<br />
成功向短信运营商提交需要发送短信的用户名单；<br />
成功通过企微群发接口下发群发任务；<br />
成功通过话务任务接口下发话务任务；<br />
<div slot="content" style="line-height: 18px">
<div style="line-height: 18px">
指的是GIC系统成功提交针对这些用户的营销行为，并不是指的实际触达成功，如：<br />
成功通过服务号接口进行消息群发；<br />
成功向短信运营商提交需要发送短信的用户名单；<br />
成功通过企微群发接口下发群发任务；<br />
成功通过话务任务接口下发话务任务；<br />
</div>
</div>
</el-tooltip>
</span>
......@@ -40,7 +42,7 @@
<span v-else>{{ scope.row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column label="批次时间" align="left" width="120" prop="execTime">
<el-table-column label="批次时间" align="left" min-width="120" prop="execTime">
<template slot-scope="scope">
<p class="cell-time">
{{ formatDateTimeByType(scope.row.execTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
......@@ -48,7 +50,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="220" fixed="right">
<el-table-column label="操作" align="left" min-width="120" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="toDialog(scope.row)">批次人数</el-button>
</template>
......
src/views/ecm/current-list.vue
......@@ -29,7 +29,7 @@
<el-table-column v-for="(v, i) in infoHeader" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
<template slot="header" slot-scope="scope">
<span>
<span>{{ v.label }}</span>
<span style="font-weight: 500">{{ v.label }}</span>
<el-tooltip v-if="v.prop == 'successCount'" placement="top" :open-delay="200">
<i class="iconfont icon-xinxixianshi" style="color:#909399;font-size:14px"></i>
<div slot="content">
......@@ -76,11 +76,11 @@
<template slot-scope="scope">
<span v-if="v.formatter" v-html="v.formatter(scope.row)"></span>
<component v-else-if="v.component" :is="v.component" :row="scope.row"></component>
<span v-else>{{ scope.row[v.prop] }}</span>
<span v-else>{{ scope.row[v.prop] || '--' }}</span>
</template>
</el-table-column>
</el-table>
<dm-pagination v-show="infoList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
<dm-pagination hide-on-single-page background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section>
......@@ -175,7 +175,7 @@ export default {
{
label: '提交状态',
prop: 'errCode',
width: '100',
minWidth: '120',
align: 'left',
formatter(row) {
return row.errCode === '0' ? '<span class="dm-status--success">提交成功</span>' : '<span class="dm-status--erroe">提交失败</span>';
......
src/views/game/common/share.vue
......@@ -8,10 +8,10 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.shareFlag === 1" label="分享图" prop="shareImg.imgUrl" class="width50" :rules="{ required: true, message: '请上传分享图片', trigger: 'blur' }">
<dm-upload-avatar :limit="{ maxSize: 1 }" name="H5分享图" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
<dm-upload-avatar style="white-space: nowrap" :limit="{ maxSize: 1 }" name="H5分享图" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
</el-form-item>
<el-form-item v-if="form.shareFlag === 1" prop="shareAppImg.imgUrl" class="width50">
<dm-upload-avatar :limit="{ maxSize: 1 }" name="小程序分享图" :model.sync="form.shareAppImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：320*240，格式为jpg/png。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
<dm-upload-avatar style="white-space: nowrap" :limit="{ maxSize: 1 }" name="小程序分享图" :model.sync="form.shareAppImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：320*240，格式为jpg/png。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
</el-form-item>
<el-form-item v-if="form.shareFlag === 1" label="分享标题" prop="shareTitle" class="width50" :rules="{ required: true, message: '标题不能为空', trigger: 'blur' }">
<dm-input v-model="form.shareTitle" class="w400" placeholder="请输入分享标题" :disabled="isInfo" :maxlength="20"></dm-input>
......
src/views/message/detail.vue
......@@ -87,7 +87,12 @@
</div>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in messageHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
<el-table-column v-for="(v, i) in messageHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
<template slot-scope="{ row }">
<div v-if="v.formatter" v-html="v.formatter(row)"></div>
<span v-else>{{ row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column :min-width="80" align="left" label="错误码" prop="errorMsg">
<template slot-scope="scope">
<span v-if="scope.row.errorMsg == -1">--</span>
......@@ -97,9 +102,10 @@
</el-table-column>
<el-table-column :min-width="120" align="left" label="上报时间" prop="backTime">
<template slot-scope="scope">
<p class="cell-time">
<p class="cell-time" v-if="scope.row.backTime">
{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br /><span>{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span>
</p>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
......@@ -111,7 +117,7 @@
</template>
</el-table-column>
</el-table>
<dm-pagination v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
<dm-pagination hide-on-single-page v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</section>
<error-code-dialog :show.sync="errorCodeShow"></error-code-dialog>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="messageList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......@@ -143,7 +149,23 @@ export default {
minWidth: '80',
align: 'left',
formatter: function(row) {
return row.sendStatus === 0 ? '提交成功' : row.sendStatus === 1 ? '未提交' : '提交失败';
let statucClass;
let text;
switch (row.sendStatus) {
case 0:
statucClass = 'dm-status--success';
text = '提交成功';
break;
case 1:
statucClass = 'dm-status--info';
text = '未提交';
break;
default:
statucClass = 'dm-status--error';
text = '提交失败';
break;
}
return `<span class='${statucClass}'><span class="vertical-middle">${text}</span></span>`;
}
}
// {
......
src/views/message/importSendDetail.vue
......@@ -68,7 +68,12 @@
</div>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in messageHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
<el-table-column v-for="(v, i) in messageHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
<template slot-scope="{ row }">
<div v-if="v.formatter" v-html="v.formatter(row)"></div>
<span v-else>{{ row[v.prop] || '--' }}</span>
</template>
</el-table-column>
<el-table-column :min-width="80" align="left" label="错误码" prop="errorMsg" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.errorMsg == -1">--</span>
......@@ -78,9 +83,10 @@
</el-table-column>
<el-table-column :min-width="100" align="left" label="上报时间" prop="backTime">
<template slot-scope="scope">
<p class="cell-time">
<p v-if="scope.row.backTime" class="cell-time">
{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br /><span>{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span>
</p>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
......@@ -92,7 +98,7 @@
</template>
</el-table-column>
</el-table>
<dm-pagination v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
<dm-pagination hide-on-single-page v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</section>
<error-code-dialog :show.sync="errorCodeShow"></error-code-dialog>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="messageList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......@@ -116,20 +122,36 @@ export default {
messageList: [],
messageLoading: false,
messageHeader: [
{ label: '手机号码', prop: 'telephone', width: '120', align: 'left' },
{ label: '手机号码', prop: 'telephone', minWidth: '120', align: 'left' },
{
label: '提交状态',
prop: 'sendStatus',
width: '80',
minWidth: '80',
align: 'left',
formatter: function(row) {
return row.sendStatus === 0 ? '提交成功' : row.sendStatus === 1 ? '未提交' : '提交失败';
let statucClass;
let text;
switch (row.sendStatus) {
case 0:
statucClass = 'dm-status--success';
text = '提交成功';
break;
case 1:
statucClass = 'dm-status--info';
text = '未提交';
break;
default:
statucClass = 'dm-status--error';
text = '提交失败';
break;
}
return `<span class='${statucClass}'><span class="vertical-middle">${text}</span></span>`;
}
},
{
label: '回执状态',
prop: 'backStatus',
width: '80',
minWidth: '80',
align: 'left',
formatter: function(row) {
// eslint-disable-next-line
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment