Commit f5bfcaef by 无尘

fix: 迭代增加优化

parent fa049a7c
...@@ -7,11 +7,11 @@ module.exports = { ...@@ -7,11 +7,11 @@ module.exports = {
'^/haoban-manage-web': '' '^/haoban-manage-web': ''
} }
}, },
'/api-admin/': { '/haoban-app-member-web/': {
target: 'http://gicdev.demogic.com/api-admin/', target: 'https://www.gicdev.com/haoban-app-member-web/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-admin': '' '^/haoban-app-member-web': ''
} }
}, },
'/api-plug/': { '/api-plug/': {
......
...@@ -32,10 +32,16 @@ ...@@ -32,10 +32,16 @@
<el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示开卡门店会员</el-checkbox> <el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示开卡门店会员</el-checkbox>
<span class="font-14 color-909399">注:保存勾选项后,门店导购和店长可查看本门店作为开卡门店名下会员</span> <span class="font-14 color-909399">注:保存勾选项后,门店导购和店长可查看本门店作为开卡门店名下会员</span>
</div> </div>
<div> <div class="m-b-20">
<el-checkbox class="w-195" v-model="myCustomData.clerkSeeOtherFlag">允许导购查看其他导购会员</el-checkbox> <el-checkbox class="w-195" v-model="myCustomData.clerkSeeOtherFlag">允许导购查看其他导购会员</el-checkbox>
<span class="font-14 color-909399">注:保存勾选项后,门店导购可查看本门店其他导购名下会员</span> <span class="font-14 color-909399">注:保存勾选项后,门店导购可查看本门店其他导购名下会员</span>
</div> </div>
<div class="m-b-20"><el-switch class="w-195" :disabled="!myCustomData.allowGuideMobile && !myCustomData.allowGuideMessage && !myCustomData.allowGuideOnlineChat" v-model="myCustomData.allowGuideContact" active-text="" inactive-text=""> </el-switch><span class="font-14 color-909399 p-l-6">注:开启后,可选择导购在 &lt; 我的顾客 &gt; 中是否通过以下方式联系会员</span></div>
<div>
<el-checkbox v-model="myCustomData.allowGuideMobile" @change="changeContact">电话</el-checkbox>
<el-checkbox v-model="myCustomData.allowGuideMessage" @change="changeContact">短信</el-checkbox>
<el-checkbox v-model="myCustomData.allowGuideOnlineChat" @change="changeContact">消息</el-checkbox>
</div>
<div class="m-t-46"> <div class="m-t-46">
<el-button type="primary" @click="submit('showFlag')">保 存</el-button> <el-button type="primary" @click="submit('showFlag')">保 存</el-button>
</div> </div>
...@@ -112,21 +118,26 @@ ...@@ -112,21 +118,26 @@
</div> </div>
</div> </div>
</div> </div>
<!--在线沟通-->
<div v-if="tabType == 2"> <div v-if="tabType == 2">
<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top> <!--<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top>
<div class="app-detail-pane border-box p-20"> <div class="app-detail-pane border-box p-20">
<el-checkbox v-model="myCustomData.chatFlag">在线沟通设置</el-checkbox> <el-checkbox v-model="myCustomData.chatFlag">在线沟通设置</el-checkbox>
<div class="m-t-46"> <div class="m-t-46">
<el-button type="primary" @click="submit('chatFlag')">保 存</el-button> <el-button type="primary" @click="submit('chatFlag')">保 存</el-button>
</div> </div>
</div>-->
<online-chat :brandId="brandId"></online-chat>
</div> </div>
</div> <!--聊天记录-->
<div v-if="tabType == 3"></div>
<vue-select-store ref="storeSelector" :currentBrand="activeGroup" :appScene="appScene" :treeSet="storeTreeSet" :selectType="'group-store'" :defaultList="defaultStoreList" @handleSelectedList="handleSelectedList"> </vue-select-store> <vue-select-store ref="storeSelector" :currentBrand="activeGroup" :appScene="appScene" :treeSet="storeTreeSet" :selectType="'group-store'" :defaultList="defaultStoreList" @handleSelectedList="handleSelectedList"> </vue-select-store>
</div> </div>
</template> </template>
<script> <script>
import commonDetailTop from '@/components/app/common-detail-top.vue'; import commonDetailTop from '@/components/app/common-detail-top.vue';
import vueSelectStore from 'components/common/vueSelectStore'; import vueSelectStore from 'components/common/vueSelectStore';
import onlineChat from '@/components/app/online-chat.vue';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
...@@ -164,7 +175,11 @@ export default { ...@@ -164,7 +175,11 @@ export default {
mainStoreFlag: false, // 服务门店显示,1显示0不现实 mainStoreFlag: false, // 服务门店显示,1显示0不现实
minorStoreFlag: false, // 协管门店显示,1显示0不显示 minorStoreFlag: false, // 协管门店显示,1显示0不显示
openCardStoreFlag: false, // 开卡门店显示,1显示0不显示 openCardStoreFlag: false, // 开卡门店显示,1显示0不显示
clerkSeeOtherFlag: false // 导购查看其他导购,1显示0不显示 clerkSeeOtherFlag: false, // 导购查看其他导购,1显示0不显示
allowGuideContact: false,
allowGuideMobile: false,
allowGuideMessage: false,
allowGuideOnlineChat: false
}, },
topMenuData: [ topMenuData: [
{ {
...@@ -475,6 +490,10 @@ export default { ...@@ -475,6 +490,10 @@ export default {
para['minorStoreFlag'] = !!that.myCustomData['minorStoreFlag'] ? 1 : 0; para['minorStoreFlag'] = !!that.myCustomData['minorStoreFlag'] ? 1 : 0;
para['openCardStoreFlag'] = !!that.myCustomData['openCardStoreFlag'] ? 1 : 0; para['openCardStoreFlag'] = !!that.myCustomData['openCardStoreFlag'] ? 1 : 0;
para['clerkSeeOtherFlag'] = !!that.myCustomData['clerkSeeOtherFlag'] ? 1 : 0; para['clerkSeeOtherFlag'] = !!that.myCustomData['clerkSeeOtherFlag'] ? 1 : 0;
para['allowGuideContact'] = !!that.myCustomData['allowGuideContact'] ? 1 : 0;
para['allowGuideMobile'] = !!that.myCustomData['allowGuideMobile'] ? 1 : 0;
para['allowGuideMessage'] = !!that.myCustomData['allowGuideMessage'] ? 1 : 0;
para['allowGuideOnlineChat'] = !!that.myCustomData['allowGuideOnlineChat'] ? 1 : 0;
url = '/haoban-app-member-web/customer/save-member-show-setting'; url = '/haoban-app-member-web/customer/save-member-show-setting';
} }
...@@ -496,6 +515,15 @@ export default { ...@@ -496,6 +515,15 @@ export default {
}, },
/** /**
* 改变联系
*/
changeContact() {
const that = this;
if(!that.myCustomData.allowGuideMobile && !that.myCustomData.allowGuideMessage && !that.myCustomData.allowGuideOnlineChat) {
that.myCustomData.allowGuideContact = false;
}
},
/**
* 获取全品牌搜索设置数据 * 获取全品牌搜索设置数据
*/ */
getCustomerSet(brandId) { getCustomerSet(brandId) {
...@@ -534,10 +562,14 @@ export default { ...@@ -534,10 +562,14 @@ export default {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
if (!!resData.result) { if (!!resData.result) {
that.myCustomData.mainStoreFlag = !!resData.result.mainStoreFlag ? true : false; that.myCustomData.mainStoreFlag = resData.result.mainStoreFlag == 1 ? true : false;
that.myCustomData.minorStoreFlag = !!resData.result.minorStoreFlag ? true : false; that.myCustomData.minorStoreFlag = resData.result.minorStoreFlag == 1 ? true : false;
that.myCustomData.openCardStoreFlag = !!resData.result.openCardStoreFlag ? true : false; that.myCustomData.openCardStoreFlag = resData.result.openCardStoreFlag == 1 ? true : false;
that.myCustomData.clerkSeeOtherFlag = !!resData.result.clerkSeeOtherFlag ? true : false; that.myCustomData.clerkSeeOtherFlag = resData.result.clerkSeeOtherFlag == 1 ? true : false;
that.myCustomData.allowGuideContact = resData.result.allowGuideContact == 1 ? true : false;
that.myCustomData.allowGuideMobile = resData.result.allowGuideMobile == 1 ? true : false;
that.myCustomData.allowGuideMessage = resData.result.allowGuideMessage == 1 ? true : false;
that.myCustomData.allowGuideOnlineChat = resData.result.allowGuideOnlineChat == 1 ? true : false;
} }
return; return;
} }
...@@ -619,7 +651,8 @@ export default { ...@@ -619,7 +651,8 @@ export default {
},*/ },*/
components: { components: {
commonDetailTop, commonDetailTop,
vueSelectStore vueSelectStore,
onlineChat
} }
}; };
</script> </script>
......
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
</div> </div>
<el-button class="border-radius-18 my-customer-return" @click="returnBack">返回</el-button> <el-button class="border-radius-18 my-customer-return" @click="returnBack">返回</el-button>
<div class="my-customer-brand"> <div class="my-customer-brand">
<el-select v-model="activeBrand" placeholder="请选择" @change="changeSelect"> <el-tooltip class="item" effect="dark" content="不同品牌的工作台可分别进行管理。点击后切换,可以管理不同品牌下的应用" placement="top-start">
<span class="font-14 color-606266" style="cursor: pointer;">品牌名称<span class="el-icon-info font-12 color-909399 p-l-6"></span> </span>
</el-tooltip>
<el-select class="p-l-10" v-model="activeBrand" placeholder="请选择" @change="changeSelect">
<el-option v-for="item in brandListData" :key="item.brandId" :label="item.name" :value="item.brandId"> </el-option> <el-option v-for="item in brandListData" :key="item.brandId" :label="item.name" :value="item.brandId"> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -142,7 +145,7 @@ export default { ...@@ -142,7 +145,7 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 18px; bottom: 18px;
width: 93px; // width: 93px;
height: 32px; height: 32px;
} }
......
<!--
<online-chat :brandId="brandId"></online-chat>
import onlineChat from '@/components/app/online-chat.vue';
components: {
onlineChat
}
-->
<template>
<div class="online-chat-content border-box">
<div class="online-chat-switch"><span class="font-14 color-606266">在线沟通</span><el-switch v-model="chatData.chatFlag" active-text="" inactive-text=""></el-switch></div>
<div class="online-chat-body">
<div class="flex">
<div class="online-chat-left">
<ul>
<template v-for="(item, index) in leftData">
<li :class="['online-chat-left_li', activeTab == item.tabId ? 'active-li' : '']" :key="index + 'left'" @click="changeTab(item)">{{ item.tabName }}</li>
</template>
</ul>
</div>
<div class="online-chat-right border-box">
<div class="online-chat-right_body">
<!--短信-->
<div v-if="activeTab == 1" class="online-chat-message"></div>
<!--模板-->
<div v-if="activeTab == 2" class="online-chat-template"></div>
<!--图文-->
<div v-if="activeTab == 3" class="online-chat-article"></div>
<!--商品-->
<div v-if="activeTab == 4" class="online-chat-goods"></div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { postRequest } from '@/api/api';
import errMsg from '@/common/js/error';
export default {
name: 'online-chat',
props: {
brandId: {
type: String,
default() {
return '';
}
}
},
data() {
return {
activeTab: '1',
leftData: [
{
tabId: '1',
tabName: '短信提醒'
},
{
tabId: '2',
tabName: '模板消息'
},
{
tabId: '3',
tabName: '图文'
},
{
tabId: '4',
tabName: '商品'
}
],
chatData: {
chatFlag: false // 总的
},
// 图文
articleList: [],
// 商品
goodsList: [],
// 积分商品
pointList: []
};
},
methods: {
/**
* 选择菜单
*/
changeTab(item) {
const that = this;
that.activeTab = item.tabId;
},
/**
* 获取商品列表
*/
getGoodsList(brandId) {
const that = this;
let para = {
brandId: brandId
};
postRequest('/haoban-app-member-web/customer/find_goods_list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.goodsList = resData.result.list || [];
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 获取积分商品列表
*/
getPointList(brandId) {
const that = this;
let para = {
brandId: brandId
};
postRequest('/haoban-app-member-web/customer/find_integal_goods_list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.pointList = resData.result.list || [];
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 获取图文列表
*/
getArticleList(brandId) {
const that = this;
let para = {
brandId: brandId
};
postRequest('/haoban-app-member-web/customer/find_img_list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.articleList = resData.result.list || [];
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 获取在线沟通设置数据
*/
getChatSet(brandId) {
const that = this;
let para = {
brandId: brandId
};
postRequest('/haoban-app-member-web/customer/find-online-chat-setting', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result) {
that.myCustomData.chatFlag = !!resData.result.chatFlag ? true : false;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}
},
watch: {
brandId: function(newData, oldData) {
const that = this;
if (newData != '') {
that.getChatSet(newData);
}
}
},
mounted() {
const that = this;
if (that.brandId != '') {
that.getChatSet(that.brandId);
}
}
};
</script>
<style lang="less" scoped>
.online-chat-content {
width: 100%;
padding: 20px;
.online-chat-switch {
padding: 18px 0 33px 0;
}
.online-chat-body {
width: 100%;
height: 492px;
border: 1px solid #dcdfe6;
.online-chat-left {
width: 172px;
min-width: 172px;
max-width: 172px;
height: 492px;
background: #f5f7fa;
.online-chat-left_li {
height: 40px;
line-height: 40px;
padding: 0 20px;
color: #303133;
font-size: 14px;
cursor: pointer;
&:hover {
color: #1890ff;
background: #fff;
}
&.active-li {
color: #1890ff;
background: #fff;
}
}
}
.online-chat-right {
width: calc(100% - 172px);
height: 492px;
padding: 40px;
overflow: hidden;
.online-chat-right_body {
height: 100%;
overflow-y: auto;
.online-chat-message {
}
.online-chat-template {
}
.online-chat-article {
}
.online-chat-goods {
}
}
}
}
}
</style>
...@@ -433,7 +433,7 @@ export default { ...@@ -433,7 +433,7 @@ export default {
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
if (parent.level != 0) { if (parent.level != 0) {
/* eslint-disable */ /* eslint-disable */
console.log(!!resData.result.list && !!flag, parent, parent.hasPression, that.selectType); // console.log(!!resData.result.list && !!flag, parent, parent.hasPression, that.selectType);
parent.disabled = (!!resData.result.list && !!resData.result.list.length && !!flag) || parent.hasPression != 1 || that.selectType == 'person' || that.selectType == 'store' ? true : false; parent.disabled = (!!resData.result.list && !!resData.result.list.length && !!flag) || parent.hasPression != 1 || that.selectType == 'person' || that.selectType == 'store' ? true : false;
} }
that.$forceUpdate(); that.$forceUpdate();
...@@ -464,7 +464,7 @@ export default { ...@@ -464,7 +464,7 @@ export default {
formatStoreList(list, parent) { formatStoreList(list, parent) {
let that = this; let that = this;
let type = this.selectType; let type = this.selectType;
console.log('处理获取门店列表的数据:' ,list, parent) // console.log('处理获取门店列表的数据:' ,list, parent)
list.forEach(li => { list.forEach(li => {
li.id = li.storeId; li.id = li.storeId;
li.label = li.storeName; li.label = li.storeName;
...@@ -508,7 +508,7 @@ export default { ...@@ -508,7 +508,7 @@ export default {
//that.$nextTick(() => { //that.$nextTick(() => {
// that.menuData = JSON.parse(JSON.stringify(that.menuData)); // that.menuData = JSON.parse(JSON.stringify(that.menuData));
//}); // this.renderDefault(); //}); // this.renderDefault();
console.log(that.menuData) // console.log(that.menuData)
}, },
/** /**
* 节点关闭时,取消复选框的禁用 * 节点关闭时,取消复选框的禁用
......
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
positionName: [{ required: true, message: '请输入店员职位', trigger: 'blur' }] positionName: [{ required: true, message: '请输入店员职位', trigger: 'blur' }]
}, },
clerkInfo: { clerkInfo: {
storeName: '', storeName: this.$route.query.storeName,
storeId: '', storeId: '',
managerMode: false, managerMode: false,
positionName: '职员', positionName: '职员',
...@@ -115,7 +115,12 @@ export default { ...@@ -115,7 +115,12 @@ export default {
storeType: '', storeType: '',
openNextBool: true // 展开下级不调用接口 openNextBool: true // 展开下级不调用接口
}, },
defaultList: [] defaultList: [
{
id: this.$route.query.storeId,
label: this.$route.query.storeName
}
]
}; };
}, },
methods: { methods: {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<p class="m-b-10">{{ scope.row.storeName }}</p> <p class="m-b-10">{{ scope.row.storeName }}</p>
<p><a class="a-href" @click="changeRouter('/addClerk?gicFlag=' + gicFlag + '&storeId=' + scope.row.storeId + '&firstLevelId=' + firstLevelId + '&type=addClerk')">新增店员</a></p> <p><a class="a-href" @click="changeRouter(`/addClerk?gicFlag=${gicFlag}&storeId=${scope.row.storeId}&storeName=${scope.row.storeName}&firstLevelId=${firstLevelId}&type=addClerk`)">新增店员</a></p>
<!--20190611 v-if="!gicFlag" --> <!--20190611 v-if="!gicFlag" -->
</div> </div>
</template> </template>
......
...@@ -41,6 +41,11 @@ export default { ...@@ -41,6 +41,11 @@ export default {
tabId: '2', tabId: '2',
tabName: '在线沟通设置', tabName: '在线沟通设置',
icon: 'icon-zaixiangoutong' icon: 'icon-zaixiangoutong'
},
{
tabId: '3',
tabName: '聊天记录',
icon: 'icon-liaotianjilu'
} }
], ],
activeBrand: '1', // 商户(品牌) id activeBrand: '1', // 商户(品牌) id
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': $store.state.bgHeight }"> <div class="right-box" :style="{ 'min-height': $store.state.bgHeight }">
<div class="reviewed-body-head"> <div class="reviewed-body-head">
<el-select class="w-130" v-model="filterValue" placeholder="全部状态" @change="getTableList"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-input class="w-250 m-l-10" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.enter.native="searchEnterFun"> </el-input> <el-select class="w-130" v-model="filterValue" placeholder="全部状态" @change="getTableList"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-select class="w-130 m-l-10" v-model="filterBrand" placeholder="全部品牌" @change="getTableList"> <el-option v-for="item in brandOptions" :key="item.brandId" :label="item.name" :value="item.brandId"> </el-option> </el-select><el-input class="w-250 m-l-10" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.enter.native="searchEnterFun"> </el-input>
</div> </div>
<div class="reviewed-body-content"> <div class="reviewed-body-content">
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"> <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%">
...@@ -101,7 +101,7 @@ import navCrumb from '@/components/nav/nav.vue'; ...@@ -101,7 +101,7 @@ import navCrumb from '@/components/nav/nav.vue';
import storeChange from '@/components/review/store-change.vue'; import storeChange from '@/components/review/store-change.vue';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { formatDate } from '@/common/js/public'; import { formatDate } from '@/common/js/public';
import { getRequest } from '@/api/api'; import { getRequest, postRequest } from '@/api/api';
export default { export default {
name: 'reviewed', name: 'reviewed',
data() { data() {
...@@ -124,6 +124,8 @@ export default { ...@@ -124,6 +124,8 @@ export default {
], ],
filterValue: '99', filterValue: '99',
filterBrand: '',
brandOptions: [], //品牌
filterOptions: [ filterOptions: [
// { // {
// label: '待审核', // label: '待审核',
...@@ -142,9 +144,7 @@ export default { ...@@ -142,9 +144,7 @@ export default {
value: '99' value: '99'
} }
], ],
searchValue: '', // 搜索 searchValue: '', // 搜索
tableData: [ tableData: [
// { // {
// enterpriseAuditingId: 1, // enterpriseAuditingId: 1,
...@@ -163,12 +163,10 @@ export default { ...@@ -163,12 +163,10 @@ export default {
// } // }
], ],
multipleSelection: [], multipleSelection: [],
// 分页参数 // 分页参数
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: 0, total: 0,
// info // info
applyInfo: { applyInfo: {
// photo: '', // photo: '',
...@@ -179,7 +177,6 @@ export default { ...@@ -179,7 +177,6 @@ export default {
// job: '店长', // job: '店长',
// store: '测试门店' // store: '测试门店'
}, },
// store // store
showStoreDialog: false, showStoreDialog: false,
storeChangeData: {} storeChangeData: {}
...@@ -279,7 +276,29 @@ export default { ...@@ -279,7 +276,29 @@ export default {
afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : [] afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : []
}; };
}, },
/**
* 获取品牌
*/
getBrandData() {
const that = this;
postRequest('/haoban-manage-web/application-brand-list', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
that.brandOptions = resData.result;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/** /**
* 获取列表数据 * 获取列表数据
*/ */
...@@ -293,7 +312,8 @@ export default { ...@@ -293,7 +312,8 @@ export default {
auditingStatus: that.filterValue, auditingStatus: that.filterValue,
search: that.searchValue || '', // 搜索字段 search: that.searchValue || '', // 搜索字段
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize // 一页显示个数 pageSize: that.pageSize, // 一页显示个数
brandId: that.filterBrand // 20190918新增品牌
}; };
getRequest('/haoban-manage-web/audit/auditing-list.json', para) getRequest('/haoban-manage-web/audit/auditing-list.json', para)
.then(res => { .then(res => {
...@@ -322,6 +342,7 @@ export default { ...@@ -322,6 +342,7 @@ export default {
}, },
mounted() { mounted() {
this.getTableList(); this.getTableList();
this.getBrandData();
}, },
components: { components: {
navCrumb, navCrumb,
......
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': $store.state.bgHeight }"> <div class="right-box" :style="{ 'min-height': $store.state.bgHeight }">
<div class="reviewed-body-head flex flex-space-between"> <div class="reviewed-body-head flex flex-space-between">
<el-select v-model="filterValue" placeholder="全部事项" @change="getTableList" class="w-130"> <div>
<el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-select v-model="filterValue" placeholder="全部事项" @change="getTableList" class="w-130"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select
><el-select v-model="filterBrand" placeholder="全部品牌" @change="getTableList" class="w-130 m-l-10">
<el-option v-for="item in brandOptions" :key="item.brandId" :label="item.name" :value="item.brandId"> </el-option>
</el-select> </el-select>
</div>
<el-button type="primary" @click="approveAll">批量同意</el-button> <el-button type="primary" @click="approveAll">批量同意</el-button>
</div> </div>
<div class="reviewed-body-content"> <div class="reviewed-body-content">
...@@ -149,6 +152,8 @@ export default { ...@@ -149,6 +152,8 @@ export default {
], ],
filterValue: '', filterValue: '',
filterBrand: '',
brandOptions: [], // 品牌
filterOptions: [ filterOptions: [
{ {
label: '全部事项', label: '全部事项',
...@@ -405,7 +410,29 @@ export default { ...@@ -405,7 +410,29 @@ export default {
afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : [] afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : []
}; };
}, },
/**
* 获取品牌
*/
getBrandData() {
const that = this;
postRequest('/haoban-manage-web/application-brand-list', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
that.brandOptions = resData.result;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/** /**
* 获取列表数据 * 获取列表数据
*/ */
...@@ -419,7 +446,8 @@ export default { ...@@ -419,7 +446,8 @@ export default {
auditingStatus: '0', auditingStatus: '0',
search: '', // 搜索字段 search: '', // 搜索字段
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize // 一页显示个数 pageSize: that.pageSize, // 一页显示个数
brandId: that.filterBrand // 20190918新增品牌
}; };
getRequest('/haoban-manage-web/audit/auditing-list.json', para) getRequest('/haoban-manage-web/audit/auditing-list.json', para)
.then(res => { .then(res => {
...@@ -448,6 +476,7 @@ export default { ...@@ -448,6 +476,7 @@ export default {
}, },
mounted() { mounted() {
this.getTableList(); this.getTableList();
this.getBrandData();
}, },
components: { components: {
navCrumb, navCrumb,
......
...@@ -468,6 +468,18 @@ ...@@ -468,6 +468,18 @@
<div class="code-name">&amp;#xe887;</div> <div class="code-name">&amp;#xe887;</div>
</li> </li>
<li class="dib">
<span class="icon iconfont">&#xe640;</span>
<div class="name">右收起</div>
<div class="code-name">&amp;#xe640;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe610;</span>
<div class="name">聊天记录</div>
<div class="code-name">&amp;#xe610;</div>
</li>
</ul> </ul>
<div class="article markdown"> <div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2> <h2 id="unicode-">Unicode 引用</h2>
...@@ -1175,6 +1187,24 @@ ...@@ -1175,6 +1187,24 @@
</div> </div>
</li> </li>
<li class="dib">
<span class="icon iconfont icon-youshouqi"></span>
<div class="name">
右收起
</div>
<div class="code-name">.icon-youshouqi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-liaotianjilu"></span>
<div class="name">
聊天记录
</div>
<div class="code-name">.icon-liaotianjilu
</div>
</li>
</ul> </ul>
<div class="article markdown"> <div class="article markdown">
<h2 id="font-class-">font-class 引用</h2> <h2 id="font-class-">font-class 引用</h2>
...@@ -1788,6 +1818,22 @@ ...@@ -1788,6 +1818,22 @@
<div class="code-name">#icon-paixu</div> <div class="code-name">#icon-paixu</div>
</li> </li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-youshouqi"></use>
</svg>
<div class="name">右收起</div>
<div class="code-name">#icon-youshouqi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-liaotianjilu"></use>
</svg>
<div class="name">聊天记录</div>
<div class="code-name">#icon-liaotianjilu</div>
</li>
</ul> </ul>
<div class="article markdown"> <div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2> <h2 id="symbol-">Symbol 引用</h2>
......
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -239,6 +239,12 @@ Created by iconfont ...@@ -239,6 +239,12 @@ Created by iconfont
<glyph glyph-name="paixu" unicode="&#59527;" d="M63.98 786.952v-89.545h895.45v89.545H63.98z m0-447.725h895.45v89.546H63.98v-89.546z m0-358.18h895.45v89.546H63.98v-89.545z" horiz-adv-x="1024" /> <glyph glyph-name="paixu" unicode="&#59527;" d="M63.98 786.952v-89.545h895.45v89.545H63.98z m0-447.725h895.45v89.546H63.98v-89.546z m0-358.18h895.45v89.546H63.98v-89.545z" horiz-adv-x="1024" />
<glyph glyph-name="youshouqi" unicode="&#58944;" d="M654.4 302.4V513.6c0 20.8 25.6 32 41.6 17.6l107.2-105.6c9.6-8 9.6-24 1.6-32l-1.6-1.6-107.2-105.6c-16-16-41.6-4.8-41.6 16z m140.8 313.6H228.8c-12.8 0-24 11.2-24 24s11.2 24 24 24h566.4c12.8 0 24-11.2 24-24s-11.2-24-24-24zM577.6 384H228.8c-12.8 0-24 11.2-24 24s11.2 24 24 24h348.8c12.8 0 24-11.2 24-24S592 384 577.6 384z m217.6-232H228.8c-12.8 0-24 11.2-24 24s11.2 24 24 24h566.4c12.8 0 24-11.2 24-24s-11.2-24-24-24z" horiz-adv-x="1024" />
<glyph glyph-name="liaotianjilu" unicode="&#58896;" d="M305.90869 55.249581H179.875229c-49.519834 0-59.169611 53.562916-59.169611 53.562916v621.351524c0 43.388183 48.213072 46.345538 48.213071 46.345538h493.100558c64.256466 0 61.298088-55.648414 61.298088-55.648415l0.827855-71.64883c0.12996-3.651157 1.304715-29.562293 26.172079-29.649274 25.216311 0 28.78151 27.649733 28.78151 27.649734s0.216941 12.347213-1.435699 97.384981c-1.520633 85.037768-93.603865 85.733617-93.603864 85.733616s-395.494543 0.782829-512.183172 0.78283c-116.732631 0-106.558921-107.297748-106.558921-107.297749s0.912789-551.095413 1.391696-630.306476c0.478907-79.214133 83.125209-94.342692 83.12521-94.342691l157.816328-0.261967s23.823592 0.957815 23.823592 27.912723c-0.001023 27.039843-25.565259 28.431539-25.565259 28.43154z m457.275631 116.428709l-93.383854 98.688673c-1.044796 1.043772-2.131547 2.086521-3.304255 3.043313-2.348488 1.913583-7.869225 7.913227-7.869225 22.955828 0 15.390525-0.261966 67.995627-0.261966 87.125313 0 7.652284-2.346441 15.303544-6.954389 21.47715-4.13211 5.390777-10.260691 10.259668-19.217691 10.259668-20.040429 0-28.650527-16.869203-28.867468-24.781406v-110.513999c0-7.131421 2.131547-14.086833 5.913687-20.086478 3.260254-5.042853 7.738241-11.216459 13.519921-17.216103 12.737092-13.217023 113.167432-114.515127 113.167433-114.515127s14.259772-14.08581 31.04097 2.696412c12.95608 12.95608 4.348028 29.476335-0.12996 36.258808-1.086751 1.650593-2.347464 3.12927-3.653203 4.607948zM234.001987 651.211854c-13.001105 0-23.476691-8.608052-23.476691-21.47715v-12.607132c0-13.043061 10.607592-21.042245 23.476691-21.042246h376.84581c12.866029 0 23.475667 7.999185 23.605628 21.042246v12.607132c0 12.95608-10.607592 21.47715-23.475668 21.47715h-376.97577zM659.800719 531.827837c-163.033144 0-295.199279-132.426055-295.199279-295.633161 0-163.206082 132.166135-295.633161 295.199279-295.633161s295.1563 132.427078 295.1563 295.633161c0 163.208129-132.25414 295.633161-295.1563 295.633161z m0-533.965268c-131.470287 0-237.899248 106.6019-237.899248 238.245126S528.331455 474.353844 659.800719 474.353844c131.426285 0 237.8532-106.6019 237.8532-238.246149 0-131.470287-106.426915-238.245126-237.8532-238.245126zM313.691957 474.093924H233.86998c-12.954033 0-23.476691-9.91379-23.476691-22.781866v-12.608155c0-12.955056 10.607592-22.693862 23.476691-22.693862h79.820954c12.82612 0 23.433712 9.738805 23.433711 22.693862v12.608155c0.001023 13.043061-10.606569 22.781866-23.432688 22.781866z" horiz-adv-x="1024" />
</font> </font>
......
No preview for this file type
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