feat:切换权限

pages/person/index.vue

@@ -31,7 +31,7 @@
 						<u-icon name="arrow-right" color="#aaa"></u-icon>
 					</view>
 				</view>
-				<view class="parson_menu_wrap">
+				<view class="parson_menu_wrap" v-if="isCrmRole">
 					<view class="parson_menu_list">
 						<navigator url="/pages/publicClue/index" open-type="switchTab" class="menu_item"
 							hover-class="none">
@@ -67,6 +67,7 @@
 import cards from "./cards/index.vue"
 // import optionList from "./option/index.vue"
 import permision from "@/js_sdk/wa-permission/permission.js";
+import { getRoles } from '@/utils/util.js'
 export default {
 	components: {
 		// optionList,
@@ -82,6 +83,9 @@ export default {
 		};
 	},
 	computed: {
+		isCrmRole(){
+			return getRoles().some(v => v.includes('CRM'))
+		},
 		userInfo() {
 			return this.$store.state.user.userInfo;
 		},

pages/setting/index.vue

@@ -2,6 +2,16 @@
 	<view class="setting_wrap">
 		<u-navbar title="我的设置" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="option_list">
+			<!-- 只有当showRoleSwitch为true时才显示切换权限按钮 -->
+			<view v-if="$store.state.user.showRoleSwitch" class="option_item" @click="handleSwitchRole">
+				<view class="item_left" >
+					<image src="@/static/parson/permission.png" mode=""></image>
+					<text class="label">切换权限</text>
+				</view>
+				<view class="item-right">
+					<u-icon name="arrow-right" color="#aaa"></u-icon>
+				</view>
+			</view>
 			<view class="option_item" @click="toPersonal">
 				<view class="item_left">
 					<image src="@/static/parson/icon-gezl.png" mode=""></image>
@@ -27,6 +37,7 @@
 		<view class="logout_btn">
 			<u-button type="warning" :plain="true" text="退出账号" size="large" @click="handleShowModal"></u-button>
 		</view>
+		<u-picker :show="showSwitchRole" :columns="columns" keyName="label" :defaultIndex="defaultIndex" @confirm="confirmSwitchRole" @cancel="showSwitchRole = false"></u-picker>
 		<u-modal :show="showModal" 
 			@confirm="confirm" 
 			ref="uModal" 
@@ -49,13 +60,36 @@
 		},
 		data() {
 			return {
-				showModal: false
+				showModal: false,
+				showSwitchRole: false,
+				columns: [],
+				defaultIndex: [this.$store.state.user.currentRoleIndex],
+				isHaveCRM: false,
+				isHaveSalesman: false,
+				isHaveWarehouse: false,
 			}
 		},
-		onLoad: function(opt) {
-
-		},
 		methods: {
+			handleSwitchRole(){
+				this.columns = [];
+				const availableRoles = this.$store.state.user.availableRoles;
+				const roleOptions = [];
+				availableRoles.forEach(role => {
+					switch (role) {
+						case 'SALESMAN':
+							roleOptions.push({ label: '销售权限', value: 'SALESMAN' });
+							break;
+						case 'WAREHOUSER':
+							roleOptions.push({ label: '仓库权限', value: 'WAREHOUSER' });
+							break;
+						case 'CRM':
+							roleOptions.push({ label: 'CRM权限', value: 'CRM' });
+							break;
+					}
+				});
+				this.columns = [roleOptions];
+				this.showSwitchRole = true;
+			},
 			handleEditPassword(){
 				uni.navigateTo({
 					url : "/pages/changePw/index"
@@ -84,6 +118,18 @@
 						})
 					},1000)
 				})
+			},
+			confirmSwitchRole(e) {
+				console.log(e);
+				uni.navigateBack({
+					delta: 1
+				}).then(()=>{
+					this.showSwitchRole = false;
+					this.$store.commit('user/SET_CURRENT_ROLE_INDEX', e.indexs[0]);
+					setTimeout(()=>{
+						this.$store.commit('user/SWITCH_ROLE', e.value[0]);
+					},100)
+				})
 			}
 		}
 	}

pages/wareHouse/components/detail.vue

@@ -213,7 +213,7 @@
                     <text class="bar_text">确认入库</text>
                 </view>
             </view>
-            <view :class="['bar_item', { 'disabled': lockStatus === '1' ||  globalEditMode}]" @click="handleOpenOrder">
+            <view :class="['bar_item', { 'disabled': lockStatus === '1' ||  globalEditMode || downStatus == '0'}]" @click="handleOpenOrder">
                 <view class="primary orange">
                     <u-icon name="bag" size="44rpx" color="#fff"></u-icon>
                     <text class="bar_text">开单</text>
@@ -397,6 +397,13 @@ export default {
                 })
                 return
             }
+            if(this.downStatus === '0'){
+                uni.showToast({
+                    title: '已下架，不能开单',
+                    icon: 'none'
+                })
+                return
+            }
             const params = {
                 id: this.goodsId,
                 url: this.imgsUrl[0]?.url,

pages/wareHouse/components/edit.vue

@@ -11,14 +11,14 @@
             <view class="form_list">
                 <u--form labelPosition="top" :model="formData" :rules="rules" ref="addForm" labelWidth="100%">
                     <u-form-item borderBottom class="u-form-item-col">
-                        <u--textarea v-model="recognitionContent" placeholder='品牌：浪琴
-来源：【麒麟】私信-杰3-3
-实价：6500
-型号：L2.257.5.89.7
-编码：52356065
-日期：2021-11-09
-备注：全套
-付款方式：微信/支付宝/银行卡/现金/数字货币/挂账' confirmType="done" height="170" :maxlength="-1">
+                        <u--textarea v-model="recognitionContent" placeholder='品牌：-
+来源：-
+实价：-
+型号：-
+编码：-
+日期：-
+备注：-
+付款方式：-' confirmType="done" height="170" :maxlength="-1">
                         </u--textarea>
                         <view class="btn_group_recognition">
                             <u-button text="清除" @click="clearRecognitionContent()"></u-button>
@@ -155,12 +155,12 @@
                             @tabChange="handleTabChangeStockStatus"></TabSelect>
                     </u-form-item>
                     <u-form-item label="回收类型" borderBottom>
-                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single" :isClear="recycleTypeIsClear"
+                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single" :isClear="recycleTypeIsClear" :echoInfo="echoInfoRecycleType"
                             @tabChange="handleTabChangeRecycleType">
                         </TabSelect>
                     </u-form-item>
                     <u-form-item label="标签" borderBottom>
-                        <TabSelect :tabList="labelList" :colNum="5" mode="single" :isClear="labelIsClear"
+                        <TabSelect :tabList="labelList" :colNum="5" mode="single" :isClear="labelIsClear" :echoInfo="echoInfoLabel"
                             @tabChange="handleTabChangeLabel">
                         </TabSelect>
                     </u-form-item>
@@ -246,7 +246,7 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="付款方式">
-                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single"
+                        <TabSelect :tabList="paymentTabList" :echoInfo="echoInfoPayType" :colNum="4" mode="single"
                             :isClear="payTypeIsClear" @tabChange="handlePayTypeTabChange">
                         </TabSelect>
                     </u-form-item>
@@ -442,27 +442,27 @@ export default {
             paymentTabList: [
                 {
                     name: '微信',
-                    value: 1,
+                    value: "1",
                 },
                 {
                     name: '支付宝',
-                    value: 2,
+                    value: "2",
                 },
                 {
                     name: '银行卡',
-                    value: 3,
+                    value: "3",
                 },
                 {
                     name: '现金',
-                    value: 4,
+                    value: "4",
                 },
                 {
                     name: '数字货币',
-                    value: 5,
+                    value: "5",
                 },
                 {
                     name: '挂账',
-                    value: 6,
+                    value: "6",
                 },
             ],
             typeIsClear: false,//商品分类是否清空
@@ -472,17 +472,21 @@ export default {
             stockStatusIsClear: false,//是否入库是否清空
             labelIsClear: false,//商品标签是否清空
             payTypeIsClear: false,//付款方式是否清空
-            payTypeEcho: '',//付款方式识别回显
+            echoInfoPayType: '',//付款方式识别回显
+            echoInfoRecycleType:'',//入库回显的时候 回收类型回显
+            echoInfoLabel:'',//入库回显的时候 商品标签回显
             echoInfoType:'',//入库回显的时候 类型回显
             echoInfoProductAttribute:'',//入库回显的时候 商品属性回显
             echoInfoProductCondition:'',//入库回显的时候 商品成色回显
             echoInfoStockStatus:'',//入库回显的时候 是否入库回显
             isWareHouser: permissionCheck('WAREHOUSER',false),
+            formType: '',//表单类型 add：新增 edit：编辑
         }
     },
     onLoad(options) {
         this.getTypeList();
         this.$nextTick(async()=>{
+            this.formType = options.formType
             if(options.formType == 'add'){
                 this.clearForm()
             }else if(options.formType == 'edit'){
@@ -492,16 +496,27 @@ export default {
                 })
                 this.formData = res.data
                 this.formData.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
-                this.echoInfoType = res.data.type || '1'
-                this.formData.type = res.data.type || '1'
-                this.echoInfoProductAttribute = res.data.productAttribute || '1'
-                this.formData.productAttribute = res.data.productAttribute || '1'
-                this.echoInfoProductCondition = res.data.productCondition || '1'
-                this.formData.productCondition = res.data.productCondition || '1'
-                this.echoInfoStockStatus = res.data.stockStatus || '0'
-                this.formData.stockStatus = res.data.stockStatus || '0'
-                this.formData.stock = res.data.stock ? res.data.stock : 1
-                
+                this.echoInfoType = res.data.type || '1'//商品分类回显
+                this.formData.type = res.data.type || '1'//商品分类校验
+                this.echoInfoProductAttribute = res.data.productAttribute || '1'//商品属性回显
+                this.formData.productAttribute = res.data.productAttribute || '1'//商品属性校验
+                this.echoInfoProductCondition = res.data.productCondition || '1'//商品成色回显
+                this.formData.productCondition = res.data.productCondition || '1'//商品成色校验
+                this.echoInfoStockStatus = res.data.stockStatus || '0'//是否入库回显
+                this.formData.stockStatus = res.data.stockStatus || '0'//是否入库校验
+                this.formData.stock = res.data.stock ? res.data.stock : 1//入库数量校验
+                this.echoInfoPayType = res.data.payType//付款方式回显
+                this.echoInfoRecycleType = res.data.recycleType//回收类型回显
+                this.echoInfoLabel = res.data.label//商品标签回显
+                this.recognitionContent = `品牌：${res.data.dictLabel || '-'}
+来源：${res.data.origin || '-'}
+实价：${res.data.costPrice || '-'}
+型号：${res.data.model || '-'}
+编码：${res.data.indentifyCode || '-'}
+日期：${res.data.recycleTime || '-'}
+备注：${res.data.productDesc || '-'}
+付款方式：${this.paymentTabList.find(item => item.value == res.data.payType)?.name || '-'}
+`
             }
         })
     },
@@ -525,20 +540,37 @@ export default {
                         submitType: submitType, //提交类型 onlyIn：仅入库/暂存入库 inAndUp：入库并上架
                         continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1：是 0：否
                     }
-                    uni.$u.api.wareHouseAdd(data).then(res => {
-                        uni.$u.toast('操作成功');
-                        if (data.continuousWarehousing == '0') {
-                            setTimeout(() => {
-                                uni.navigateBack({
-                                    delta: 1
-                                });
-                            }, 1000);
-                        } else {
-                            this.clearForm();
-                        }
-                    }).catch(err => {
-                        uni.$u.toast(err);
-                    })
+                    if(this.formType == 'add'){
+                        uni.$u.api.wareHouseAdd(data).then(res => {
+                            uni.$u.toast('操作成功');
+                            if (data.continuousWarehousing == '0') {
+                                setTimeout(() => {
+                                    uni.navigateBack({
+                                        delta: 1
+                                    });
+                                }, 1000);
+                            } else {
+                                this.clearForm();
+                            }
+                        }).catch(err => {
+                            uni.$u.toast(err);
+                        })
+                    }else if(this.formType == 'edit'){
+                        uni.$u.api.wareHouseUpdate(data).then(res => {
+                            uni.$u.toast('操作成功');
+                            if (data.continuousWarehousing == '0') {
+                                setTimeout(() => {
+                                    uni.navigateBack({
+                                        delta: 1
+                                    });
+                                }, 1000);
+                            } else {
+                                this.clearForm();
+                            }
+                        }).catch(err => {
+                            uni.$u.toast(err);
+                        })
+                    }
                 } else {
                     console.log('表单校验不通过');
                 }
@@ -855,7 +887,7 @@ export default {
                 if (item.name == val) arr.push(item.value)
             })
             if (arr.length > 0) {
-                this.payTypeEcho = arr[0]
+                this.echoInfoPayType = arr[0]
             }
         }
     }

pages/wareHouse/components/openOrder.vue

@@ -57,8 +57,8 @@
             </view>
             <view class="card_item">
                <u-form-item label="收款方式">
-                  <TabSelect :tabList="payTypeTabList" mode="single" :colNum="4" :defaultIndex="1"
-                     @tabChange="changepayTypeTab">
+                  <TabSelect :tabList="payTypeList" mode="single" :colNum="4" :defaultIndex="1"
+                     @tabChange="changepayType">
                   </tabSelect>
                </u-form-item>
             </view>
@@ -127,13 +127,13 @@ export default {
             recyclePersonId: '',
             orderType: '',
             orderDate: this.$dayjs().format('YYYY-MM-DD'),
-            payTypeTab: 1,
+            payType: 1,
             afterSaleTab: [],
             remark: '',
             address: '',
          },
          orderTypeList: [],
-         payTypeTabList: [
+         payTypeList: [
             {
                name: '微信',
                value: 1,
@@ -211,8 +211,8 @@ export default {
       changeOrderType(val) {
          this.openOrderForm.orderType = val
       },
-      changepayTypeTab(val) {
-         this.openOrderForm.payTypeTab = val
+      changepayType(val) {
+         this.openOrderForm.payType = val
       },
       changeAfterSaleTab(val) {
          this.openOrderForm.afterSaleTab = val

pages/wareHouse/styles/index.scss

@@ -256,7 +256,7 @@
     padding: 20rpx;
     box-sizing: border-box;
     display: flex;
-    align-items: flex-start;
+    align-items: stretch;
     gap: 20rpx;
 
     .goods-img-container {
@@ -351,8 +351,8 @@
     .more{
       display: flex;
       flex-direction: column;
-      height: auto;
       align-items: flex-end;
+      justify-content: space-between;
       gap: 20rpx;
       .goods-stock {
         font-size: 24rpx;

store/modules/user.js

@@ -42,6 +42,9 @@ export default {
 		systemList: [],
 
 		redirectUrl: null,
+		availableRoles: [], // 可用的角色列表
+		currentRoleIndex: 0, // 当前选中的角色索引
+		showRoleSwitch: false, // 是否显示切换权限按钮
 	},
 	mutations: {
 		SET_REDIRECTURL(state, data) {
@@ -52,11 +55,61 @@ export default {
 		},
 		SET_USERINFO: (state, data) => {
 			state.userInfo = data;
-			// 动态设置 tabBar
-				setTimeout(() => {
-					setupTabBar(data);
-				}, 100);
+			const roles = data.roles || [];
+			
+			const validRoles = [];
+			
+			const hasWarehouser = roles.some(role => role.roleKey === 'WAREHOUSER');
+			if (hasWarehouser) {
+				validRoles.push('WAREHOUSER');
+			}
+			
+			const hasSalesman = roles.some(role => role.roleKey === 'SALESMAN');
+			if (hasSalesman) {
+				validRoles.push('SALESMAN');
+			}
+			
+			const hasCrmRole = roles.some(role => role.roleKey && role.roleKey.includes('CRM'));
+			if (hasCrmRole) {
+				validRoles.push('CRM');
+			}
+			
+			const showSwitch = validRoles.length >= 2;
+			state.showRoleSwitch = showSwitch;
+			state.availableRoles = validRoles;
+			state.currentRoleIndex = 0;
+			
+			setTimeout(() => {
+				const allIndices = [0, 1, 2, 3, 4, 5, 6];
+				allIndices.forEach(index => {
+					uni.setTabBarItem({ index, visible: false });
+				});
+				
+				const currentRole = validRoles[0] || '';
+				
+				switch (currentRole) {
+					case 'SALESMAN':
+						// 展示核价中心、询价中心、我的
+						uni.setTabBarItem({ index: 3, visible: true }); // 询价中心
+						uni.setTabBarItem({ index: 4, visible: true }); // 核价中心
+						break;
+					case 'WAREHOUSER':
+						// 展示仓库中心、我的
+						uni.setTabBarItem({ index: 2, visible: true }); // 仓库
+						break;
+					case 'CRM':
+						// 展示首页、线索公海、销售线索、接单中心、我的
+						uni.setTabBarItem({ index: 0, visible: true }); // 首页
+						uni.setTabBarItem({ index: 1, visible: true }); // 线索公海
+						uni.setTabBarItem({ index: 5, visible: true }); // 销售线索
+						uni.setTabBarItem({ index: 6, visible: true }); // 接单中心
+						break;
+				}
+				
+				uni.setTabBarItem({ index: 7, visible: true }); // 我的
+			}, 100);
 		},
+
 		SET_TOKEN: (state, data) => {
 			state.token = data;
 		},
@@ -98,6 +151,44 @@ export default {
 		},
 		SET_SYSTEM_LIST(state, data) {
 			state.systemList = data;
+		},
+		// 权限相关mutations
+		SET_AVAILABLE_ROLES(state, roles) {
+			state.availableRoles = roles;
+		},
+		SET_CURRENT_ROLE_INDEX(state, index) {
+			state.currentRoleIndex = index;
+		},
+		SET_SHOW_ROLE_SWITCH(state, show) {
+			state.showRoleSwitch = show;
+		},
+		SWITCH_ROLE({}, role) {
+			setTimeout(() => {
+				const allIndices = [0, 1, 2, 3, 4, 5, 6];
+				allIndices.forEach(index => {
+					uni.setTabBarItem({ index, visible: false });
+				});
+				switch (role.value) {
+					case 'SALESMAN':
+						// 展示核价中心、询价中心、我的
+						uni.setTabBarItem({ index: 3, visible: true }); // 询价中心
+						uni.setTabBarItem({ index: 4, visible: true }); // 核价中心
+						break;
+					case 'WAREHOUSER':
+						// 展示仓库中心、我的
+						uni.setTabBarItem({ index: 2, visible: true }); // 仓库
+						break;
+					case 'CRM':
+						// 展示首页、线索公海、销售线索、接单中心、我的
+						uni.setTabBarItem({ index: 0, visible: true }); // 首页
+						uni.setTabBarItem({ index: 1, visible: true }); // 线索公海
+						uni.setTabBarItem({ index: 5, visible: true }); // 销售线索
+						uni.setTabBarItem({ index: 6, visible: true }); // 接单中心
+						break;
+				}
+				
+				uni.setTabBarItem({ index: 7, visible: true }); // 我的
+			}, 100);
 		}
 	},
 	actions: {
@@ -168,30 +259,51 @@ export default {
 	}
 }
 
-function setupTabBar(userInfo) {
-		const roles = userInfo.roles;
-		// 我的 是所有用户都有的
-		// 如果是销售经理SALESMAN，则也展示询价中心、核价中心、仓库
-		// 如果是其他角色，则也展示首页、线索公海、销售线索、接单中心
+export function setupTabBar(userInfo, availableRoles, currentRoleIndex) {
+		// 隐藏所有tabbar项，然后根据当前角色显示对应的项
 		// 下标index从0开始
-		const hasSalesmanRole = roles.some(role => role.roleKey === 'SALESMAN');
-		if (hasSalesmanRole) {
-			uni.setTabBarItem({ index: 2,visible: true });//仓库
-			uni.setTabBarItem({ index: 3,visible: true });//询价中心
-			uni.setTabBarItem({ index: 4,visible: true });//核价中心
-
-			uni.setTabBarItem({ index: 0,visible: false });//首页
-			uni.setTabBarItem({ index: 1,visible: false });//线索公海
-			uni.setTabBarItem({ index: 5,visible: false });//销售线索
-			uni.setTabBarItem({ index: 6,visible: false });//接单中心
-		}else{
-			uni.setTabBarItem({ index: 0,visible: true });//首页
-			uni.setTabBarItem({ index: 1,visible: true });//线索公海
-			uni.setTabBarItem({ index: 5,visible: true });//销售线索
-			uni.setTabBarItem({ index: 6,visible: true });//接单中心
-
-			uni.setTabBarItem({ index: 2,visible: false });//仓库
-			uni.setTabBarItem({ index: 3,visible: false });//询价中心
-			uni.setTabBarItem({ index: 4,visible: false });//核价中心
+		const allIndices = [0, 1, 2, 3, 4, 5, 6];
+		allIndices.forEach(index => {
+			uni.setTabBarItem({ index, visible: false });
+		});
+		
+		// 获取当前角色
+		const currentRole = availableRoles[currentRoleIndex] || '';
+		
+		// 根据当前角色显示对应的tabbar
+		switch (currentRole) {
+			case 'SALESMAN':
+				// 展示核价中心、询价中心、我的
+				uni.setTabBarItem({ index: 3, visible: true }); // 询价中心
+				uni.setTabBarItem({ index: 4, visible: true }); // 核价中心
+				break;
+			case 'WAREHOUSER':
+				// 展示仓库中心、我的
+				uni.setTabBarItem({ index: 2, visible: true }); // 仓库
+				break;
+			case 'CRM':
+				// 展示首页、线索公海、销售线索、接单中心、我的
+				uni.setTabBarItem({ index: 0, visible: true }); // 首页
+				uni.setTabBarItem({ index: 1, visible: true }); // 线索公海
+				uni.setTabBarItem({ index: 5, visible: true }); // 销售线索
+				uni.setTabBarItem({ index: 6, visible: true }); // 接单中心
+				break;
+			default:
+				// 默认情况，显示CRM相关的tabbar
+				uni.setTabBarItem({ index: 0, visible: true }); // 首页
+				uni.setTabBarItem({ index: 1, visible: true }); // 线索公海
+				uni.setTabBarItem({ index: 5, visible: true }); // 销售线索
+				uni.setTabBarItem({ index: 6, visible: true }); // 接单中心
+				break;
 		}
+		
+		// "我的"tab默认都展示（假设我的tab是index为7的位置）
+		// 注意：这里需要根据实际的tabbar配置来调整index
+		// 如果"我的"tab的index不是7，请修改下面的代码
+		uni.setTabBarItem({ index: 7, visible: true }); // 我的
+}
+
+// 导出切换权限的action
+export function switchRole({ commit, state }, currentRole) {
+	commit('SWITCH_ROLE', currentRole);
 }