From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/index.vue | 377 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 230 insertions(+), 147 deletions(-)
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 89c2400..63540aa 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -1,144 +1,148 @@
<template>
<!-- 工作台 -->
- <view class="container">
+ <view class="container" @click="isShow=false">
<!-- #ifndef H5 -->
<view class="status_bar"></view>
<!-- #endif -->
- <view class="header flex align-center justify-between">
- <text class="font-18">HIVE</text>
- <view>
- <text class="icon mr-15"></text>
- <text class="icon" @click.stop="isShow=!isShow"></text>
+ <view class="header">
+ <text class="font-16 dark-gray">{{userInfo.shopName}}</text>
+ <view class="flex align-center">
+ <text class="icon gray iconfont iconsousuo mr-15" @click="linkToMember"></text>
+ <text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
</view>
- <view class="popup-content" v-show="isShow">
- <view>
- <text class="icon mr-5"></text>
- <text>新增会员</text>
+ <popover class="popup-content" v-show="isShow">
+ <view class="popup-content-item">
+ <navigator url="../member/editMember" hover-class="none">
+ <text class="icon iconfont iconjia"></text>
+ <text class="text">新增会员</text>
+ </navigator>
</view>
- <view class="mt-10">
- <text class="icon mr-5"></text>
- <text>扫一扫</text>
+ <view class="popup-content-item">
+ <text class="icon iconfont iconsaomiao"></text>
+ <text class="text">扫一扫</text>
</view>
- </view>
+ </popover>
</view>
- <view class="condition flex justify-between mt-15">
- <view class="flex flex-v align-center">
- <text class="font-18 white">0</text>
- <text class="font-16 white">预约</text>
+ <view class="condition flex justify-around">
+ <view class="eyes">
+ <text class="iconfont"
+ :class="isShowAssets?'iconyanjing2':'iconbiyan'"
+ @click="toggleAssets">
+ </text>
</view>
<view class="flex flex-v align-center">
- <text class="font-18 white">2</text>
- <text class="font-16 white">进行中</text>
+ <text class="font-17">¥ {{handleAssets(userAchieve.orderCash)}}</text>
+ <text>今日订单</text>
</view>
<view class="flex flex-v align-center">
- <text class="font-18 white">5</text>
- <text class="font-16 white">代付款</text>
+ <text class="font-17">¥ {{handleAssets(userAchieve.hisConsume)}}</text>
+ <text>今日消耗</text>
</view>
<view class="flex flex-v align-center">
- <text class="font-18 white">15</text>
- <text class="font-16 white">欠款</text>
+ <text class="font-17">¥ {{handleAssets(userAchieve.projCommission)}}</text>
+ <text>手工提成</text>
</view>
+
</view>
- <view class="content-item mt-10">
- <text class="font-14 font-gray">订单</text>
+ <view class="content-item mt-10" v-if="this.$utils.hasPermission('ddgl,xfjl,linyong')">
+ <text class="title">订单</text>
<view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/order1.png"></image>
- <text class="font-12 mt-10 font-dark">新建订单</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('ddgl.add')">
+ <navigator url="./selectCustomer" hover-class="none">
+ <image class="icon" src="../../static/images/order1.png"></image>
+ <text>新建订单</text>
+ </navigator>
</view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/order2.png"></image>
- <text class="font-12 mt-10 font-dark">代付款</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/order3.png"></image>
- <text class="font-12 mt-10 font-dark">已付款</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/order4.png"></image>
- <text class="font-12 mt-10 font-dark">欠款</text>
+ <template v-if="$utils.hasPermission('xfjl')">
+ <view class="list-item">
+ <navigator url="./orderList?status=1" hover-class="none">
+ <image class="icon" src="../../static/images/order2.png"></image>
+ <text>待付款</text>
+ </navigator>
+ </view>
+ <view class="list-item">
+ <navigator url="./orderList?status=2" hover-class="none">
+ <image class="icon" src="../../static/images/order3.png"></image>
+ <text>已付款</text>
+ </navigator>
+ </view>
+ </template>
+ <view class="list-item" v-if="this.$utils.hasPermission('linyong')">
+ <navigator url="./receive" hover-class="none">
+ <image class="icon" src="../../static/images/order4.png"></image>
+ <text>领用</text>
+ </navigator>
</view>
</view>
</view>
- <view class="content-item mt-10">
- <text class="font-14 font-gray">项目/服务</text>
+ <view class="content-item mt-10" v-if="this.$utils.hasPermission('fwdgl,fwjl')">
+ <text class="title">项目/服务</text>
<view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/sever1.png"></image>
- <text class="font-12 mt-10 font-dark">新建预约</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('fwdgl.add')">
+ <navigator url="./selectCustomer?type=2" hover-class="none">
+ <image class="icon" src="../../static/images/order1.png"></image>
+ <text>新建服务单</text>
+ </navigator>
</view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/sever2.png"></image>
- <text class="font-12 mt-10 font-dark">看板</text>
+ <template v-if="$utils.hasPermission('fwjl')">
+ <view class="list-item">
+ <navigator url="./serviceOrderList?status=1" hover-class="none">
+ <image class="icon" src="../../static/images/sever1.png"></image>
+ <text>待确定</text>
+ </navigator>
+ </view>
+ <view class="list-item">
+ <navigator url="./serviceOrderList?status=4" hover-class="none">
+ <image class="icon" src="../../static/images/sever2.png"></image>
+ <text>待服务</text>
+ </navigator>
+ </view>
+ <view class="list-item">
+ <navigator url="./serviceOrderList?status=5" hover-class="none">
+ <image class="icon" src="../../static/images/sever3.png"></image>
+ <text>服务中</text>
+ </navigator>
+ </view>
+ </template>
+ </view>
+ </view>
+ <view class="content-item mt-10" v-if="this.$utils.hasPermission('appKanban')">
+ <text class="title">待办</text>
+ <view class="flex align-center mt-10">
+ <view class="list-item" v-if="this.$utils.hasPermission('appKanban,gjjl,notice')">
+ <navigator url="./board" hover-class="none">
+ <image class="icon" src="../../static/images/commission1.png"></image>
+ <text>看板</text>
+ </navigator>
</view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/sever3.png"></image>
- <text class="font-12 mt-10 font-dark">待服务</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('gjjl')">
+ <navigator url="./followRecords/index" hover-class="none">
+ <image class="icon" src="../../static/images/commission2.png"></image>
+ <text>跟进记录</text>
+ </navigator>
</view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/sever4.png"></image>
- <text class="font-12 mt-10 font-dark">服务完成</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('notice')">
+ <navigator url="./" hover-class="none">
+ <image class="icon" src="../../static/images/commission3.png"></image>
+ <text>通知</text>
+ </navigator>
</view>
</view>
</view>
- <view class="content-item mt-10">
- <text class="font-14 font-gray">代办</text>
+ <view class="content-item mt-10" v-if="this.$utils.hasPermission('kccx,pandian')">
+ <text class="title">仓库</text>
<view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/commission1.png"></image>
- <text class="font-12 mt-10 font-dark">跟进</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('kccx')">
+ <navigator url="./stockSearch" hover-class="none">
+ <image class="icon" src="../../static/images/warehouse1.png"></image>
+ <text>库存查询</text>
+ </navigator>
</view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/commission2.png"></image>
- <text class="font-12 mt-10 font-dark">日报</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/commission3.png"></image>
- <text class="font-12 mt-10 font-dark">通知</text>
- </view>
- </view>
- </view>
- <view class="content-item mt-10">
- <text class="font-14 font-gray">仓库</text>
- <view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/warehouse1.png"></image>
- <text class="font-12 mt-10 font-dark">库存查询</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/warehouse2.png"></image>
- <text class="font-12 mt-10 font-dark">盘点</text>
- </view>
- </view>
- </view>
- <view class="content-item">
- <text class="font-14 font-gray">报表</text>
- <view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement1.png"></image>
- <text class="font-12 mt-10 font-dark">排行榜</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement2.png"></image>
- <text class="font-12 mt-10 font-dark">员工业绩</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement3.png"></image>
- <text class="font-12 mt-10 font-dark">门店业绩</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement4.png"></image>
- <text class="font-12 mt-10 font-dark">产品报表</text>
- </view>
- </view>
- <view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement5.png"></image>
- <text class="font-12 mt-10 font-dark">库存预警</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement6.png"></image>
- <text class="font-12 mt-10 font-dark">客户流失预警</text>
+ <view class="list-item" v-if="this.$utils.hasPermission('pandian')">
+ <navigator url="./check/index" hover-class="none">
+ <image class="icon" src="../../static/images/warehouse2.png"></image>
+ <text>盘点</text>
+ </navigator>
</view>
</view>
</view>
@@ -146,73 +150,152 @@
</template>
<script>
+ import popover from "../../components/popover/index.vue"
export default{
+ components:{
+ popover
+ },
data(){
return{
- isShow:false
+ userInfo: {},
+ userAchieve: {},
+ isShow:false,
+ isShowAssets: false
}
},
- onLoad() {
- document.addEventListener('click', () => {
- this.isShow = false
- }, false)
+ onShow() {
+ this.getUserAchieve();
+ this.getUserInfo();
+ },
+ onHide() {
+ this.isShow = false;
},
methods:{
- appear(){
-
+ linkToMember(){
+ getApp().globalData.isFocus = true;
+ uni.switchTab({
+ url: '../member/index'
+ });
+ },
+ getUserInfo(){
+ let roleInfo = this.$httpUtils.getRoleInfo();
+ this.userInfo = roleInfo || {};
+ },
+ getUserAchieve(){
+ this.$httpUtils.request('/api/user/findUserAchieve/1').then((res) => {
+ if(res.status == 200){
+ let {achieve} = res.mapInfo;
+ this.userAchieve = achieve || {};
+ }else{
+ this.userAchieve = {};
+ }
+ })
+ },
+ // 显示隐藏业绩
+ toggleAssets(){
+ this.isShowAssets = !this.isShowAssets;
+ },
+ handleAssets(val){
+ if(this.isShowAssets){
+ return this.$filters.formatNum(val);
+ }
+ return '***';
+ },
+ linkTo(val){
+ uni.navigateTo({
+ url:val
+ })
}
}
}
</script>
<style>
- @font-face {
- font-family: texticons;
- font-weight: normal;
- font-style: normal;
- src: url('//at.alicdn.com/t/font_2263696_lohq5qfkgkq.ttf') format('truetype');
+ page{
+ background: #F6F6F8;
+ height: 100%;
}
- .icon {
- width: 20px;
- height: 20px;
- color: #000000;
+
+ .container{
+ padding: 0 10px;
+ min-height: 100%;
+ }
+ .header{
+ position: relative;
+ padding: 0 5px 10px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .header .icon {
+ font-size: 16px;
text-align: center;
font-family: texticons;
}
- page{
- background: #F8F8F8;
- }
- .container{
- padding: 0 10px;
- }
- .header{
- padding: 10px 5px;
- }
.condition{
- background-color: #518EFF;
- padding: 16px 30px;
+ position: relative;
+ background: #518EFF;
+ padding: 15px 20px;
border-radius: 4px;
+ font-size: 14px;
+ color: #FFFFFF;
+ line-height: 30px;
+ }
+ .condition .eyes{
+ position: absolute;
+ right: 10px;
+ top: 10px;
+ }
+ .condition .eyes .iconfont{
+ font-size: 18px;
}
.content-item{
background: #FFFFFF;
- padding:16px;
+ padding: 15px 0;
border-radius: 4px;
margin: 10px 0;
}
- .content-icon{
- width: 32px;
- height: 32px;
+ .title{
+ font-size: 14px;
+ color: #666666;
+ padding-left: 15px;
+ padding-bottom: 10px;
}
.list-item{
width: 25%;
+ text-align: center;
+ font-size: 12px;
+ color: #111111;
}
+ .list-item .icon{
+ width: 26px;
+ height: 26px;
+ display: block;
+ margin: 0 auto 10px;
+ }
+
.popup-content{
- background: #FFFFFF;
- border: 1px solid #ABB1CC;
- padding: 10px;
- border-radius: 4px;
position: absolute;
- right: 10px;
- top: 35px;
+ z-index: 999;
+ right: 0;
+ top: 32px;
+ padding: 5px 0;
+ }
+ .popup-content-item{
+ padding: 0 10px;
+ color: #FFFFFF;
+ font-size: 14px;
+ }
+ .popup-content-item .icon{
+ font-size: 14px;
+ margin-right: 10px;
+ }
+ .popup-content-item .text{
+ border-bottom: 1px solid gray;
+ line-height: 32px;
+ display: inline-block;
+ }
+ .popup-content-item:nth-last-of-type(1) .text{
+ border-bottom: 0;
}
</style>
--
Gitblit v1.9.1