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 | 110 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 40f96f9..63540aa 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -7,9 +7,7 @@
<view class="header">
<text class="font-16 dark-gray">{{userInfo.shopName}}</text>
<view class="flex align-center">
- <navigator url="../member/index" open-type="switchTab" hover-class="none">
- <text class="icon gray iconfont iconsousuo mr-15"></text>
- </navigator>
+ <text class="icon gray iconfont iconsousuo mr-15" @click="linkToMember"></text>
<text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
</view>
<popover class="popup-content" v-show="isShow">
@@ -46,28 +44,30 @@
</view>
</view>
- <view class="content-item mt-10">
+ <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="list-item">
+ <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="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>
- <view class="list-item">
+ <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>
@@ -75,57 +75,53 @@
</view>
</view>
</view>
- <view class="content-item mt-10">
+ <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="list-item">
+ <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="list-item">
- <navigator url="./serviceOrderList?status=3" hover-class="none">
- <image class="icon" src="../../static/images/sever2.png"></image>
- <text>待服务</text>
- </navigator>
- </view>
- <view class="list-item">
- <navigator url="./serviceOrderList?status=4" hover-class="none">
- <image class="icon" src="../../static/images/sever3.png"></image>
- <text>服务中</text>
- </navigator>
- </view>
- <view class="list-item">
- <navigator url="./serviceOrderList?status=5" hover-class="none">
- <image class="icon" src="../../static/images/sever4.png"></image>
- <text>服务完成</text>
- </navigator>
- </view>
+ <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">
+ <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">
- <navigator url="./" hover-class="none">
+ <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="list-item">
- <navigator url="./" hover-class="none">
- <image class="icon" src="../../static/images/sever1.png"></image>
- <text>客户预约</text>
- </navigator>
- </view>
- <view class="list-item">
- <navigator url="./" hover-class="none">
+ <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="list-item">
+ <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>
@@ -133,17 +129,17 @@
</view>
</view>
</view>
- <view class="content-item mt-10">
+ <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="list-item">
+ <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="list-item">
- <navigator url="./" hover-class="none">
+ <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>
@@ -175,6 +171,12 @@
this.isShow = false;
},
methods:{
+ linkToMember(){
+ getApp().globalData.isFocus = true;
+ uni.switchTab({
+ url: '../member/index'
+ });
+ },
getUserInfo(){
let roleInfo = this.$httpUtils.getRoleInfo();
this.userInfo = roleInfo || {};
--
Gitblit v1.9.1