Skip to content

O
office-web
Commit 432a8946 by 无尘
Options

feat: 增加公告新内容

parent 802420ee
Showing with 345 additions and 91 deletions
config/proxyList.js
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2018-10-10 14:44:45 * @LastEditTime: 2019-10-22 14:02:25
*/ */
module.exports = { module.exports = {
proxyList: { proxyList: {
...@@ -29,6 +29,13 @@ module.exports = { ...@@ -29,6 +29,13 @@ module.exports = {
'^/haoban-app-announcement-web': '' '^/haoban-app-announcement-web': ''
} }
}, },
'/haoban-app-tel-task-web/': {
target: 'https://www.gicdev.com/haoban-app-tel-task-web/',
changeOrigin: true,
pathRewrite: {
'^/haoban-app-tel-task-web': ''
}
},
'/api-mall/': { '/api-mall/': {
target: 'http://gicdev.demogic.com/api-mall/', target: 'http://gicdev.demogic.com/api-mall/',
changeOrigin: true, changeOrigin: true,
......
src/components/app/app-detail.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-21 17:56:57 * @LastEditTime: 2019-10-23 15:07:48
--> -->
<!-- <!--
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<span class="font-14 color-909399">注：保存勾选项后，门店导购和店长可查看本门店作为开卡门店名下会员</span> <span class="font-14 color-909399">注：保存勾选项后，门店导购和店长可查看本门店作为开卡门店名下会员</span>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
<el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示已认证会员</el-checkbox> <el-checkbox class="w-195" v-model="myCustomData.isSeeAuthMember">展示已认证会员</el-checkbox>
<span class="font-14 color-909399">注：保存勾选项后，门店导购和店长可查看本门店已认证会员</span> <span class="font-14 color-909399">注：保存勾选项后，门店导购和店长可查看本门店已认证会员</span>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
...@@ -195,6 +195,7 @@ export default { ...@@ -195,6 +195,7 @@ export default {
minorStoreFlag: false, // 协管门店显示，1显示0不显示 minorStoreFlag: false, // 协管门店显示，1显示0不显示
openCardStoreFlag: false, // 开卡门店显示，1显示0不显示 openCardStoreFlag: false, // 开卡门店显示，1显示0不显示
clerkSeeOtherFlag: false, // 导购查看其他导购，1显示0不显示 clerkSeeOtherFlag: false, // 导购查看其他导购，1显示0不显示
isSeeAuthMember: false,
allowGuideContact: false, allowGuideContact: false,
allowGuideMobile: false, allowGuideMobile: false,
allowGuideMessage: false, allowGuideMessage: false,
...@@ -547,6 +548,7 @@ export default { ...@@ -547,6 +548,7 @@ export default {
para['allowGuideMobile'] = !!that.myCustomData['allowGuideMobile'] ? 1 : 0; para['allowGuideMobile'] = !!that.myCustomData['allowGuideMobile'] ? 1 : 0;
para['allowGuideMessage'] = !!that.myCustomData['allowGuideMessage'] ? 1 : 0; para['allowGuideMessage'] = !!that.myCustomData['allowGuideMessage'] ? 1 : 0;
para['allowGuideOnlineChat'] = !!that.myCustomData['allowGuideOnlineChat'] ? 1 : 0; para['allowGuideOnlineChat'] = !!that.myCustomData['allowGuideOnlineChat'] ? 1 : 0;
para['isSeeAuthMember'] = !!that.myCustomData['isSeeAuthMember'] ? 1 : 0;
para.chatFlag = that.myCustomData.chatFlag; // 总的 para.chatFlag = that.myCustomData.chatFlag; // 总的
para.isMessageRemind = that.myCustomData.isMessageRemind; // 短信 para.isMessageRemind = that.myCustomData.isMessageRemind; // 短信
para.messageRemindTime = that.myCustomData.messageRemindTime; para.messageRemindTime = that.myCustomData.messageRemindTime;
...@@ -556,7 +558,6 @@ export default { ...@@ -556,7 +558,6 @@ export default {
para.isIntegralGoodMessage = that.myCustomData.isIntegralGoodMessage; para.isIntegralGoodMessage = that.myCustomData.isIntegralGoodMessage;
url = '/haoban-app-member-web/customer/save-member-show-setting'; url = '/haoban-app-member-web/customer/save-member-show-setting';
} }
postRequest(url, para) postRequest(url, para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
...@@ -640,6 +641,7 @@ export default { ...@@ -640,6 +641,7 @@ export default {
resData.result.allowGuideMobile = resData.result.allowGuideMobile == 1 ? true : false; resData.result.allowGuideMobile = resData.result.allowGuideMobile == 1 ? true : false;
resData.result.allowGuideMessage = resData.result.allowGuideMessage == 1 ? true : false; resData.result.allowGuideMessage = resData.result.allowGuideMessage == 1 ? true : false;
resData.result.allowGuideOnlineChat = resData.result.allowGuideOnlineChat == 1 ? true : false; resData.result.allowGuideOnlineChat = resData.result.allowGuideOnlineChat == 1 ? true : false;
resData.result.isSeeAuthMember = resData.result.isSeeAuthMember == 1 ? true : false;
resData.result.searchFlag = resData.result.searchFlag == 1 ? true : false; resData.result.searchFlag = resData.result.searchFlag == 1 ? true : false;
that.myCustomData = resData.result; that.myCustomData = resData.result;
} }
......
src/components/app/notice-preview.vue 0 → 100644
<!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-10-22 15:12:41
* @LastEditors: 无尘
* @LastEditTime: 2019-10-23 12:12:32
-->
<!--
<notice-preview ref="noticePreview" v-model="previewVisible"></notice-preview>
import noticePreview from '@/components/app/notice-preview.vue';
components: {
noticePreview
}
previewVisible: false,
-->
<template>
<div class="qr-dialog-content" style="opacity: 1;" v-show="value">
<div class="qr-mask" @click.stop="closeDialog"></div>
<div class="qr-dialog border-box">
<div class="qr-dialog-body border-box">
<h2 class="font-20 color-222">{{ noticeData.title }}</h2>
<div class="notice-date flex flex-space-between">
<div class="notice-date-left font-10 color-88949C">{{ noticeData.announcementId ? noticeData.sendTime : new Date().getTime() | formatTimeYmdHms }}</div>
<div class="notice-date-right font-10 color-4d7fd0">
<span>未读 {{ noticeData.announcementId ? noticeData.sendCount - noticeData.readCount : 0 }}</span
><span class="p-lr-5 color-a5afb8">|</span><span>已读 {{ noticeData.announcementId ? noticeData.readCount : 0 }}</span>
</div>
</div>
<div class="notice-body border-box color-222" v-htmlContent="noticeData.content"></div>
</div>
</div>
<!-- 关闭 -->
<div class="qr-dialog__hd">
<i class="el-icon-plus" @click.stop="closeDialog"></i>
</div>
</div>
</template>
<script>
export default {
name: 'notice-preview',
props: {
value: {
type: Boolean,
default() {
return false;
}
},
noticePreviewData: {
type: Object,
default() {
return {
announcementId: '',
sendTime: '',
sendCount: 0,
readCount: 0,
adminCheck: false,
stroreCheck: false,
adminStructor: [],
storeStructor: [],
receiveType: '0',
labelId: '',
title: '',
img: '',
content: '',
sendType: '0',
attachment: [],
pageTop: false
};
}
}
},
directives: {
htmlContent: {
// 指令的定义
bind: function(el, param) {
el.innerHTML = param.value;
},
update: function(el, param) {
el.innerHTML = param.value;
}
}
},
data() {
return {
noticeData: {
announcementId: '',
sendCount: 0,
readCount: 0,
title: '',
content: ''
}
};
},
methods: {
/**
* 关闭预览窗口
*/
closeDialog() {
const that = this;
that.$emit('input', false);
}
},
watch: {
noticePreviewData(newData, oldData) {
const that = this;
that.noticeData = newData;
}
},
mounted() {
const that = this;
that.noticeData = that.noticePreviewData;
}
};
</script>
<style type="text/scss" lang="scss" scoped>
.font-10 {
font-size: 10px;
}
.color-222 {
color: #222222;
}
.color-88949C {
color: #88949c;
}
.color-4d7fd0 {
color: #4d7fd0;
}
.color-a5afb8 {
color: #a5afb8;
}
.p-lr-5 {
padding: 0 5px;
}
.qr-mask {
position: fixed;
z-index: 1000;
top: 0;
right: 0;
left: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.6);
cursor: pointer;
}
.qr-dialog {
position: fixed;
z-index: 5000;
width: 220px;
height: 440px;
padding: 58px 12px 30px 12px;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
background-color: #fff;
text-align: center;
border-radius: 3px;
overflow: hidden;
background: url('../../assets/iPhone_preview.png') no-repeat;
.qr-dialog-body {
position: relative;
width: 100%;
height: 100%;
padding: 15px 8px;
// background: #ccc;
overflow-y: auto;
.notice-body {
padding: 20px 0;
}
}
.qr-dialog__bd {
padding: 0 1.6em 0.8em;
min-height: 40px;
font-size: 15px;
line-height: 1.3;
word-wrap: break-word;
word-break: break-all;
color: #808080;
#qrcode {
display: -webkit-flex;
display: flex;
justify-content: center;
align-items: center;
}
.qr-dialog__p {
padding: 20px 0;
font-size: 14px;
color: #606266;
}
}
}
.qr-dialog__hd {
position: fixed;
width: 45px;
height: 45px;
border: 1px solid rgba(255, 255, 255, 1);
border-radius: 50%;
bottom: 15%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
z-index: 5001;
i {
position: absolute;
top: 0;
right: 0;
display: block;
width: 45px;
height: 45px;
line-height: 45px;
text-align: center;
color: #fff;
font-size: 20px;
cursor: pointer;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
}
</style>
src/components/app/online-chat.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-09-18 15:24:50 * @Date: 2019-09-18 15:24:50
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-16 00:13:15 * @LastEditTime: 2019-10-23 15:10:17
--> -->
<!-- <!--
...@@ -104,7 +104,7 @@ components: { ...@@ -104,7 +104,7 @@ components: {
<div v-if="activeTab == 4" class="online-chat-goods"> <div v-if="activeTab == 4" class="online-chat-goods">
<div role="alert" class="el-alert el-alert--info"> <div role="alert" class="el-alert el-alert--info">
<i class="el-alert__icon el-icon-info font-12 color-1890ff"></i> <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
<div class="el-alert__content"><span class="el-alert__title color-606266 font-14">配置说明：选取达摩微商城及积分商城中的图文，配置后，导购可以选择对应的商品发送给会员</span></div> <div class="el-alert__content"><span class="el-alert__title color-606266 font-14">配置说明：选取达摩微商城及积分商城中的商品，配置后，导购可以选择对应的商品发送给会员</span></div>
</div> </div>
<div class="m-t-20"><span class="font-14 color-303133">达摩微商城</span><el-switch class="m-l-10" v-model="chatData.isGoodMessage" active-text="" inactive-text="" @change="postSave(brandId)"> </el-switch><span class="font-14 color-303133 p-l-40">积分商城</span><el-switch class="m-l-10" v-model="chatData.isIntegralGoodMessage" active-text="" inactive-text="" @change="postSave(brandId)"> </el-switch></div> <div class="m-t-20"><span class="font-14 color-303133">达摩微商城</span><el-switch class="m-l-10" v-model="chatData.isGoodMessage" active-text="" inactive-text="" @change="postSave(brandId)"> </el-switch><span class="font-14 color-303133 p-l-40">积分商城</span><el-switch class="m-l-10" v-model="chatData.isIntegralGoodMessage" active-text="" inactive-text="" @change="postSave(brandId)"> </el-switch></div>
<div v-if="chatData.isGoodMessage || chatData.isIntegralGoodMessage" class="m-t-20"> <div v-if="chatData.isGoodMessage || chatData.isIntegralGoodMessage" class="m-t-20">
...@@ -319,7 +319,8 @@ export default { ...@@ -319,7 +319,8 @@ export default {
allowGuideContact: that.chatData.allowGuideContact, allowGuideContact: that.chatData.allowGuideContact,
allowGuideMobile: that.chatData.allowGuideMobile, allowGuideMobile: that.chatData.allowGuideMobile,
allowGuideMessage: that.chatData.allowGuideMessage, allowGuideMessage: that.chatData.allowGuideMessage,
allowGuideOnlineChat: that.chatData.allowGuideOnlineChat allowGuideOnlineChat: that.chatData.allowGuideOnlineChat,
isSeeAuthMember: that.chatData.isSeeAuthMember
}; };
postRequest('/haoban-app-member-web/customer/save-member-show-setting', para) postRequest('/haoban-app-member-web/customer/save-member-show-setting', para)
.then(res => { .then(res => {
......
src/components/review/review-result-detail.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-10-21 14:27:29 * @Date: 2019-10-21 14:27:29
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-21 16:30:48 * @LastEditTime: 2019-10-23 14:16:57
--> -->
<!-- <!--
...@@ -19,7 +19,7 @@ import reviewResultDetail from '@/components/review/review-result-detail.vue' ...@@ -19,7 +19,7 @@ import reviewResultDetail from '@/components/review/review-result-detail.vue'
<div v-show="customDialog"> <div v-show="customDialog">
<el-dialog class="edit-dialog" title="审核详情" :visible.sync="customDialog" width="600px" :before-close="handleClose"> <el-dialog class="edit-dialog" title="审核详情" :visible.sync="customDialog" width="600px" :before-close="handleClose">
<div class="edit-dialog-body"> <div class="edit-dialog-body">
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" height="250">
<el-table-column prop="publishRecordId" label="审核事项" show-overflow-tooltip> </el-table-column> <el-table-column prop="publishRecordId" label="审核事项" show-overflow-tooltip> </el-table-column>
<el-table-column label="品牌" show-overflow-tooltip> <el-table-column label="品牌" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -52,22 +52,23 @@ import reviewResultDetail from '@/components/review/review-result-detail.vue' ...@@ -52,22 +52,23 @@ import reviewResultDetail from '@/components/review/review-result-detail.vue'
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination text-right m-t-14" v-if="!!totalCount">
<el-pagination small :page-size="pageSize" :current-page="currentPage" layout="prev, pager, next" :total="totalCount" @size-change="handleSizeChange" @current-change="handleCurrentChange"> </el-pagination>
</div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error';
export default { export default {
name: 'record-list', name: 'record-list',
props: { props: {
detailShow: { detailShow: {
type: Boolean, type: Boolean,
default: false default: false
},
tableListData: {
type: Object,
default() {
return [];
}
} }
}, },
data() { data() {
...@@ -80,10 +81,7 @@ export default { ...@@ -80,10 +81,7 @@ export default {
remark: '描述内容', remark: '描述内容',
createTime: 1564455643252 createTime: 1564455643252
} */ } */
], ]
pageSize: 5,
currentPage: 1,
totalCount: 0
}; };
}, },
methods: { methods: {
...@@ -108,60 +106,16 @@ export default { ...@@ -108,60 +106,16 @@ export default {
const that = this; const that = this;
that.customDialog = false; that.customDialog = false;
that.$emit('hideDetailDialog'); that.$emit('hideDetailDialog');
},
/**
* 分页
*/
handleSizeChange(val) {
this.pageSize = val;
this.getData();
},
handleCurrentChange(val) {
this.currentPage = val;
this.getData();
},
/**
* 查看定义详情页
*/
handleShow(index, row) {
const that = this;
that.$router.push(`/apiListManageShow?editFlag=0&interfaceId=${row.interfaceId}&interfaceName=${row.interfaceName}&interfaceVersionId=${row.interfaceVersionId}&publishRecordId=${row.publishRecordId}&projectId=${row.projectId}&projectName=${that.$route.query.projectName}&interfaceGroupId=${row.interfaceGroupId}&interfaceGroupName=${that.$route.query.interfaceGroupName}`);
},
/**
* 获取数据
*/
getData() {
const that = this;
let para = {
pageNum: that.currentPage,
pageSize: that.pageSize,
version: that.formData.version,
sceneCode: that.formData.sceneCode,
interfaceId: that.formData.interfaceId
};
getRequest('/gateway-manage/page-api-publish-record', para)
.then(res => {
let resData = res.data;
if (resData.code == '0000') {
that.tableData = resData.result.result || [];
that.totalCount = resData.result.totalCount;
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
} }
}, },
watch: { watch: {
detailShow: function(newData, oldData) { detailShow: function(newData, oldData) {
const that = this; const that = this;
that.customDialog = newData; that.customDialog = newData;
},
tableListData: function(newData, oldData) {
const that = this;
that.tableData = newData;
} }
}, },
...@@ -169,6 +123,7 @@ export default { ...@@ -169,6 +123,7 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
that.customDialog = that.detailShow; that.customDialog = that.detailShow;
that.tableData = that.tableListData;
} }
}; };
</script> </script>
......
src/components/tinymce-edit.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-06-11 17:29:53 * @Date: 2019-06-11 17:29:53
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-18 10:36:44 * @LastEditTime: 2019-10-22 14:56:51
--> -->
<!-- <!--
备注：由于使用拖拽上传图片，超过限制的图片不上传不显示，暂时修改了源码的的方法，增加了一个判断， 备注：由于使用拖拽上传图片，超过限制的图片不上传不显示，暂时修改了源码的的方法，增加了一个判断，
...@@ -61,6 +61,7 @@ export const postForm = (url, params) => { ...@@ -61,6 +61,7 @@ export const postForm = (url, params) => {
</div> </div>
</template> </template>
<script> <script>
/* eslint-disable */
import { postForm } from '@/api/api'; import { postForm } from '@/api/api';
import tinymce from 'tinymce/tinymce'; import tinymce from 'tinymce/tinymce';
...@@ -77,7 +78,7 @@ import 'tinymce/plugins/wordcount'; ...@@ -77,7 +78,7 @@ import 'tinymce/plugins/wordcount';
import 'tinymce/plugins/colorpicker'; import 'tinymce/plugins/colorpicker';
import 'tinymce/plugins/textcolor'; import 'tinymce/plugins/textcolor';
import 'tinymce/plugins/media'; import 'tinymce/plugins/media';
import 'tinymce/plugins/preview'; // import 'tinymce/plugins/preview';
export default { export default {
name: 'tinymce-edit', name: 'tinymce-edit',
props: { props: {
...@@ -114,8 +115,8 @@ export default { ...@@ -114,8 +115,8 @@ export default {
this.handleImgUpload(blobInfo, success, failure); this.handleImgUpload(blobInfo, success, failure);
}, },
// 添加插件 // 添加插件
plugins: 'preview link image colorpicker textcolor paste media ', // paste media plugins: 'link image colorpicker textcolor paste media ', // paste media preview
toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent blockquote | undo redo | link unlink image code media | removeformat | preview', toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent blockquote | undo redo | link unlink image code media | removeformat',
branding: false, branding: false,
paste_data_images: true, paste_data_images: true,
paste_image_maxsize: 5, paste_image_maxsize: 5,
......
src/views/enterpriseApp/appcenter.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-02-25 17:24:09 * @Date: 2019-02-25 17:24:09
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-21 14:12:05 * @LastEditTime: 2019-10-22 12:41:08
--> -->
<template> <template>
<div class="apps-wrap common-set-wrap"> <div class="apps-wrap common-set-wrap">
...@@ -20,7 +20,10 @@ ...@@ -20,7 +20,10 @@
<!-- <i :class="['iconfont', item.appIcon]"></i> --> <!-- <i :class="['iconfont', item.appIcon]"></i> -->
<img :src="item.appIcon" alt="" :class="[item.status == 1 ? '' : 'filter-grayscale']" /> <img :src="item.appIcon" alt="" :class="[item.status == 1 ? '' : 'filter-grayscale']" />
</span> </span>
<span class="color-303133 font-16 p-l-8" @click.self="toAppDetail(item)">{{ item.appName }}</span> <div class="color-303133 font-16 p-l-8" @click.stop="toAppDetail(item)">
<div>{{ item.appName }}</div>
<div v-if="!item.appUrl" class="font-12 color-909399 m-t-5">里面什么也没有～</div>
</div>
<div class="cell-arrow-down"> <div class="cell-arrow-down">
<el-dropdown class="app-cell-dropdown" trigger="hover"> <el-dropdown class="app-cell-dropdown" trigger="hover">
<span class="el-dropdown-link"><i class="el-icon-more el-icon--right color-909399" style="cursor: pointer;"></i> </span> <span class="el-dropdown-link"><i class="el-icon-more el-icon--right color-909399" style="cursor: pointer;"></i> </span>
...@@ -32,7 +35,7 @@ ...@@ -32,7 +35,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<div v-if="item.appUrl" class="app-detail-txt font-12 color-1890ff"><span>详情</span><i class="el-icon-arrow-right"></i></div> <!-- <div v-if="item.appUrl" class="app-detail-txt font-12 color-1890ff"><span>详情</span><i class="el-icon-arrow-right"></i></div> -->
</li> </li>
</ul> </ul>
</div> </div>
...@@ -230,6 +233,10 @@ export default { ...@@ -230,6 +233,10 @@ export default {
line-height: 18px; line-height: 18px;
} }
.m-t-5 {
margin-top: 5px;
}
.tooltip-text { .tooltip-text {
width: 100%; width: 100%;
white-space: pre-wrap; white-space: pre-wrap;
......
src/views/enterpriseApp/notice/noticeList.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-04-12 17:56:45 * @Date: 2019-04-12 17:56:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-21 15:16:56 * @LastEditTime: 2019-10-22 17:57:14
--> -->
<template> <template>
<div class="notice-list-wrap"> <div class="notice-list-wrap">
...@@ -699,6 +699,7 @@ export default { ...@@ -699,6 +699,7 @@ export default {
// 查看 // 查看
handleShow(id) { handleShow(id) {
const that = this; const that = this;
that.$router.push(`/addNotice?announcementId=${id}&appIcon=${this.$route.query.appIcon}`);
}, },
// 新建公告 // 新建公告
addNotice() { addNotice() {
......
src/views/enterpriseApp/trafficTask/taskDetail.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-09-25 17:04:24 * @LastEditTime: 2019-10-23 15:00:51
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="daily-set-content boder-box"> <div class="daily-set-content boder-box">
<div class="table-condition flex flex-space-between m-b-23"> <div class="table-condition flex flex-space-between m-b-23">
<div class="table-condition-left"> <div class="table-condition-left">
<el-select v-model="conditionObj.completed" placeholder="请选择" class="w-105" @change="changeSelect"> <el-option v-for="item in completedOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-select v-model="conditionObj.overdue" placeholder="请选择" class="w-105 m-l-10" @change="changeSelect"> <el-option v-for="item in overOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select <el-select v-model="conditionObj.completed" placeholder="请选择" class="w-135" @change="changeSelect"> <el-option v-for="item in completedOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-select v-model="conditionObj.overdue" placeholder="请选择" class="w-135 m-l-10" @change="changeSelect"> <el-option v-for="item in overOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select
><el-select v-model="conditionObj.taskType" placeholder="请选择" class="w-105 m-l-10" @change="changeSelect"> ><el-select v-model="conditionObj.taskType" placeholder="请选择" class="w-105 m-l-10" @change="changeSelect">
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select>
...@@ -70,7 +70,15 @@ ...@@ -70,7 +70,15 @@
<template slot-scope="scope">{{ scope.row.isOverTime }}</template> <template slot-scope="scope">{{ scope.row.isOverTime }}</template>
</el-table-column> </el-table-column>
<el-table-column label="完成情况"> <el-table-column label="完成情况">
<template slot-scope="scope">{{ scope.row.isCompleted }}</template> <template slot="header" slot-scope="scope">
<el-tooltip class="item" effect="light" placement="right">
<div slot="content">完成情况包含3种<br />1.完成拨打任务；<br />2.完成拨打后放弃任务；<br />3.特殊完成，包含已通知或客人回拨等情况，<br />可通过app端点击&lt;客人未接后回拨&gt;完成任务</div>
<span style="cursor: pointer">完成情况<i class="el-icon-info font-12 color-606266"></i></span>
</el-tooltip>
</template>
<template slot-scope="scope">
{{ scope.row.isCompleted }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="完成时间"> <el-table-column label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -163,21 +171,29 @@ export default { ...@@ -163,21 +171,29 @@ export default {
}, },
completedOptions: [ completedOptions: [
{ {
label: '所有', label: '所有完成情况',
value: '' value: ''
}, },
{ {
label: '已完成', label: '已完成(已拨通)',
value: '1' value: '1'
}, },
{ {
label: '已完成(放弃)',
value: '2'
},
{
label: '已完成(特殊完成)',
value: '3'
},
{
label: '未完成', label: '未完成',
value: '0' value: '0'
} }
], ],
overOptions: [ overOptions: [
{ {
label: '所有', label: '所有逾期情况',
value: '' value: ''
}, },
{ {
...@@ -191,7 +207,7 @@ export default { ...@@ -191,7 +207,7 @@ export default {
], ],
typeOptions: [ typeOptions: [
{ {
label: '所有', label: '所有类型',
value: '' value: ''
}, },
{ {
...@@ -443,6 +459,9 @@ export default { ...@@ -443,6 +459,9 @@ export default {
}; };
</script> </script>
<style type="text/scss" lang="scss" scoped> <style type="text/scss" lang="scss" scoped>
.w-135 {
width: 135px;
}
.task-imgs { .task-imgs {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
......
src/views/enterpriseApp/trafficTask/taskRecord.vue
...@@ -4,15 +4,21 @@ ...@@ -4,15 +4,21 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-09-25 17:04:17 * @LastEditTime: 2019-10-23 18:17:34
--> -->
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top> <!--<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top>-->
<div class="daily-set-content boder-box"> <div class="common-detail-tab">
<el-tabs v-model="conditionObj.tableType" class="daily-set-tab" @tab-click="changeTable">
<el-tab-pane label="门店视图" name="1"></el-tab-pane>
<el-tab-pane label="话务任务视图" name="2"></el-tab-pane>
</el-tabs>
</div>
<div v-if="conditionObj.tableType == 1" class="daily-set-content boder-box">
<div class="table-condition flex flex-space-between m-b-23"> <div class="table-condition flex flex-space-between m-b-23">
<div class="table-condition-left"> <div class="table-condition-left">
<el-input placeholder="请输入门店名称" v-model="conditionObj.searchInput" class="w-264 m-l-10" style="width: 264px;" @keyup.native="value => toInput(value, conditionObj.searchInput)"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> <el-input placeholder="请输入门店名称" v-model="conditionObj.searchInput" class="w-264" style="width: 264px;" @keyup.native="value => toInput(value, conditionObj.searchInput)"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
<div class="flex-column item-cell-select inline-block m-l-10"> <div class="flex-column item-cell-select inline-block m-l-10">
<div class="depart-item-wrap"> <div class="depart-item-wrap">
<div style="width:213px" class="el-select el-select--large depart-item-content" @click="showDialogLayer('store', conditionObj.storeGroup)"> <div style="width:213px" class="el-select el-select--large depart-item-content" @click="showDialogLayer('store', conditionObj.storeGroup)">
...@@ -40,6 +46,12 @@ ...@@ -40,6 +46,12 @@
<el-button type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出</el-button> <el-button type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出</el-button>
</div> </div>
</div> </div>
<!--<div class="view-classify m-b-20">
<el-radio-group v-model="conditionObj.tableType" @change="changeTable">
<el-radio-button label="1" name="门店视图">门店视图</el-radio-button>
<el-radio-button label="2" name="话务任务视图">话务任务视图</el-radio-button>
</el-radio-group>
</div>-->
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange"> <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="35"> </el-table-column> <el-table-column type="selection" width="35"> </el-table-column>
<el-table-column width="25"> <el-table-column width="25">
...@@ -82,6 +94,7 @@ ...@@ -82,6 +94,7 @@
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </el-pagination> <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </el-pagination>
</div> </div>
</div> </div>
<taskView v-if="conditionObj.tableType == 2" :brandId="brandId" :activeGroupId="activeGroupId"></taskView>
<multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog"> </multiple-del> <multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog"> </multiple-del>
<vue-select-store ref="storeSelector" :currentBrand="activeGroup" :appScene="appScene" :treeSet="storeTreeSet" :selectType="'group'" :defaultList="defaultStoreList" @handleSelectedList="handleSelectedList"> </vue-select-store> <vue-select-store ref="storeSelector" :currentBrand="activeGroup" :appScene="appScene" :treeSet="storeTreeSet" :selectType="'group'" :defaultList="defaultStoreList" @handleSelectedList="handleSelectedList"> </vue-select-store>
</div> </div>
...@@ -91,6 +104,7 @@ ...@@ -91,6 +104,7 @@
import appDetail from '@/components/app/app-detail.vue'; import appDetail from '@/components/app/app-detail.vue';
import vueSelectStore from 'components/common/vueSelectStore'; import vueSelectStore from 'components/common/vueSelectStore';
import commonDetailTop from '@/components/app/common-detail-top.vue'; import commonDetailTop from '@/components/app/common-detail-top.vue';
import taskView from '@/components/app/taskView.vue';
import multipleDel from '@/components/app/cloudDaily/multiple-del.vue'; import multipleDel from '@/components/app/cloudDaily/multiple-del.vue';
import { getRequest, postRequest, postExcel } from '@/api/api'; import { getRequest, postRequest, postExcel } from '@/api/api';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
...@@ -128,6 +142,7 @@ export default { ...@@ -128,6 +142,7 @@ export default {
showDialog: false, showDialog: false,
// 条件 // 条件
conditionObj: { conditionObj: {
tableType: '1',
searchInput: '', searchInput: '',
storeGroup: [], storeGroup: [],
storeType: '', storeType: '',
...@@ -192,6 +207,14 @@ export default { ...@@ -192,6 +207,14 @@ export default {
computed: {}, computed: {},
methods: { methods: {
/** /**
* 改变视图
*/
changeTable(e) {
const that = this;
that.currentPage = 1;
that.getTableList();
},
/**
* 显示选择本页/全部 * 显示选择本页/全部
*/ */
handleCommand(command) { handleCommand(command) {
...@@ -463,7 +486,7 @@ export default { ...@@ -463,7 +486,7 @@ export default {
brandId: that.activeBrand brandId: that.activeBrand
// taskType: 1 //0不良评价，1话务任务 // taskType: 1 //0不良评价，1话务任务
}; };
getRequest('/haoban-app-tel-task-web/task/store-task-list', para) getRequest(that.conditionObj.tableType == 1 ? '/haoban-app-tel-task-web/task/store-task-list' : '/haoban-app-tel-task-web/task/store-task-list-view', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -529,7 +552,8 @@ export default { ...@@ -529,7 +552,8 @@ export default {
appDetail, appDetail,
commonDetailTop, commonDetailTop,
vueSelectStore, vueSelectStore,
multipleDel multipleDel,
taskView
} }
}; };
</script> </script>
......
src/views/reviewCenter/unreview.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-21 17:54:24 * @LastEditTime: 2019-10-23 14:16:33
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button> <el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<review-result-detail :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail> <review-result-detail :tableListData="tableListData" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
<review-result :resultShow="resultShow" @showResultDetail="showResultDetail" @hideResultDialog="hideResultDialog"> </review-result> <review-result :resultShow="resultShow" @showResultDetail="showResultDetail" @hideResultDialog="hideResultDialog"> </review-result>
</div> </div>
</template> </template>
...@@ -238,7 +238,8 @@ export default { ...@@ -238,7 +238,8 @@ export default {
refuseVisible: false, refuseVisible: false,
detailShow: false, detailShow: false,
resultShow: false resultShow: false,
tableListData: [] //审核详情的数据
}; };
}, },
computed: {}, computed: {},
...@@ -258,6 +259,7 @@ export default { ...@@ -258,6 +259,7 @@ export default {
hideResultDialog() { hideResultDialog() {
const that = this; const that = this;
that.resultShow = false; that.resultShow = false;
that.getTableList();
}, },
/** /**
* 显示详情 * 显示详情
...@@ -369,8 +371,17 @@ export default { ...@@ -369,8 +371,17 @@ export default {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
showMsg.showmsg('操作成功', 'success'); showMsg.showmsg('操作成功', 'success');
let resultList = resData.result.list;
that.tableListData = [];
that.tableData.forEach(ele => {
resultList.forEach(key => {
if (key.enterpriseAuditingId == ele.enterpriseAuditingId) {
ele.auditStatus = key.auditStatus == 1 ? '成功' : '失败';
that.tableListData.push(ele);
}
});
});
that.resultShow = true; that.resultShow = true;
that.getTableList();
return; return;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
......
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