feat:1.权限挪到我的页面 2.组织架构放到仓库列表页 3.用户退出软件在本地存储当前tab 4.版本1.3.3

manifest.json

@@ -2,8 +2,8 @@
     "name" : "小葫芦",
     "appid" : "__UNI__DDAE2E0",
     "description" : "",
-    "versionName" : "1.3.2",
-    "versionCode" : 132,
+    "versionName" : "1.3.3",
+    "versionCode" : 133,
     "transformPx" : false,
     "app-plus" : {
         "webView" : {

pages/person/index.vue

@@ -21,6 +21,8 @@
 								<u-switch v-model="onlineStatus" active-value='0' inactive-value='1'
 									:loading="onlineLoading" @change="changeOnlineStatus"></u-switch>
 								<text class="identity">{{ onlineStatus === '0' ? '上线' : '下线' }}</text>
+								<!-- 只有当showRoleSwitch为true时才显示切换权限按钮 -->
+								<view class="identity" v-if="$store.state.user.showRoleSwitch" @click="handleSwitchRole">切换权限</view>
 							</view>
 							<view class="info_bottom">
 								<text>{{ userInfo.phonenumber }}</text>
@@ -60,6 +62,7 @@
 			</view>
 		</template>
 		<u-loading-page :loading="true" v-else></u-loading-page>
+		<u-picker :show="showSwitchRole" :columns="columns" keyName="label" :defaultIndex="defaultIndex" @confirm="confirmSwitchRole" @cancel="showSwitchRole = false"></u-picker>
 	</view>
 </template>
 
@@ -80,6 +83,13 @@ export default {
 			navbarInitTop: 0, //导航栏初始化距顶部的距离
 			isFixedTop: true, //是否固定顶部
 			background: "", // 为了实现渐变背景颜色
+			showModal: false,
+			showSwitchRole: false,
+			columns: [],
+			defaultIndex: [this.$store.state.user.currentRoleIndex],
+			isHaveCRM: false,
+			isHaveSalesman: false,
+			isHaveWarehouse: false,
 		};
 	},
 	computed: {
@@ -155,6 +165,39 @@ export default {
 		},
 	},
 	methods: {
+		handleSwitchRole(){
+			this.columns = [];
+			let roles = this.$store.state.user.availableRoles;
+			let roleOptions = [];
+			
+			const hasAdminRole = roles.some(role => role.includes('admin'));
+			const hasCrmRole = roles.some(role => role.includes('CRM'));
+			const hasWAREandSALE = roles.some(role => role.includes('WAREandSALE'));
+			if(hasAdminRole || (hasCrmRole && hasWAREandSALE) ){//管理员、crm+仓库、crm+销售、仓库+销售
+				roleOptions.push(
+					{ label: 'CRM权限', value: 'CRM' },
+					{ label: '仓库和销售权限', value: 'WAREandSALE' },
+				);
+			}else if(hasCrmRole){//只有crm	
+				roleOptions.push(
+					{ label: 'CRM权限', value: 'CRM' },
+				);
+			}else if(hasWAREandSALE){//只有仓库或销售
+				roleOptions.push(
+					{ label: '仓库和销售权限', value: 'WAREandSALE' },
+				);
+			}
+			
+			this.columns = [roleOptions];
+			this.showSwitchRole = true;
+		},
+		confirmSwitchRole(e) {
+			this.showSwitchRole = false;
+			this.$store.commit('user/SET_CURRENT_ROLE_INDEX', e.indexs[0]);
+			setTimeout(()=>{
+				this.$store.commit('user/SWITCH_ROLE', e.value[0]);
+			},50)
+		},
 		changeOnlineStatus(val) {
 			this.onlineLoading = true;
 			uni.$u.api.changeOnlineStatus({ userId: this.$store.state.user.userInfo.userId, onlineStatus: val });

pages/setting/index.vue

@@ -2,16 +2,6 @@
 	<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>
@@ -37,7 +27,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" 
@@ -60,44 +50,11 @@
 		},
 		data() {
 			return {
-				showModal: false,
-				showSwitchRole: false,
-				columns: [],
-				defaultIndex: [this.$store.state.user.currentRoleIndex],
-				isHaveCRM: false,
-				isHaveSalesman: false,
-				isHaveWarehouse: false,
+				
 			}
 		},
 		methods: {
-			handleSwitchRole(){
-					this.columns = [];
-					let roles = this.$store.state.user.availableRoles;
-					console.log(roles);
-					
-					let roleOptions = [];
-					
-					const hasAdminRole = roles.some(role => role.includes('admin'));
-					const hasCrmRole = roles.some(role => role.includes('CRM'));
-					const hasWAREandSALE = roles.some(role => role.includes('WAREandSALE'));
-					if(hasAdminRole || (hasCrmRole && hasWAREandSALE) ){//管理员、crm+仓库、crm+销售、仓库+销售
-						roleOptions.push(
-							{ label: 'CRM权限', value: 'CRM' },
-							{ label: '仓库和销售权限', value: 'WAREandSALE' },
-						);
-					}else if(hasCrmRole){//只有crm	
-						roleOptions.push(
-							{ label: 'CRM权限', value: 'CRM' },
-						);
-					}else if(hasWarehouser || hasSalesman){//只有仓库或销售
-						roleOptions.push(
-							{ label: '仓库和销售权限', value: 'WAREandSALE' },
-						);
-					}
-					
-					this.columns = [roleOptions];
-					this.showSwitchRole = true;
-				},
+			
 			handleEditPassword(){
 				uni.navigateTo({
 					url : "/pages/changePw/index"
@@ -129,17 +86,7 @@
 					},1000)
 				})
 			},
-			confirmSwitchRole(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]);
-					},50)
-				})
-			}
+			
 		}
 	}
 </script>

pages/wareHouse/components/searchFilter.vue

@@ -15,19 +15,12 @@
             </u-form-item>
             <u-form-item label="回收时间" labelWidth="70" @click="openTimePicker">
                 <Cell :val="time" :isDelete="true" :border="true" @handleClear="clear('time')">  </Cell>
-                <jtimePickerPopup :isShowShortTimeList="true" shortTimeTitle="快捷时间" :shortTimeList="shortTimeList"
+                <JTimePicker :isShowShortTimeList="true" shortTimeTitle="快捷时间" :shortTimeList="shortTimeList"
                     :isShowSeletTimeTitle="true" seletTimeTitle="时间选择" cancelText="取消" confirmText="确认"
                     :endSelectMonth="-1" :endSelectDay="-1" beginTimePlaceHolder='开始时间' endTimePlaceHolder="结束时间"
                     :isDateTypeRange="true" :isShowSelectedTimeEcho="true" @confirm="getSelectTime" :defaultSelect="0"
                     ref="jtimePickerPopupRef">
-                </jtimePickerPopup>
-            </u-form-item>
-            <u-form-item label="机构部门" labelWidth="70" @click="recycleDeptClick">
-                <Cell :val="formData.deptName" :isDelete="true" :border="true" @handleClear="clear('dept')"></Cell>
-                <ba-tree-picker :selectParent="true" v-if="deptList.length > 0" ref="recycleDeptRef" :multiple='false'
-							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
-							textKey="deptName" childrenKey="children" :selectedValues="formData.deptId"
-							:personNames="formData.deptName" />
+                </JTimePicker>
             </u-form-item>
             <u-form-item label="回收人员" labelWidth="70" @click="recyclePersonClick">
                 <Cell :val="formData.recyclePerson" :isDelete="true" :border="true" @handleClear="clear('recyclePerson')"></Cell>
@@ -56,15 +49,15 @@ import Cell from '@/components/custom-cell/index.vue'
 import BrandList from '@/components/brand-list/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import TabSelect from '@/components/custom-tab-select/index.vue'
+import JTimePicker from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue'
 import { productAttributeList, stockStatusListAll,shortTimeList } from '../js/public.js'
-import jtimePickerPopup from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue';
 export default {
     components: {
         Cell,
         BrandList,
         PersonPicker,
         TabSelect,
-        jtimePickerPopup,
+        JTimePicker,
     },
     name: 'searchFilter',
     emits: ['confirm'],
@@ -79,8 +72,6 @@ export default {
                 location: '',
                 startTime: '',
                 endTime: '',
-                deptId:'',
-                deptName:'',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -94,32 +85,13 @@ export default {
             // 将导入的变量在data中重新定义，确保模板能够访问
             productAttributeList: productAttributeList,
             stockStatusListAll: stockStatusListAll,
-            deptList: [],
+           
         }
     },
     props: {
     },
     emits: [],
-    mounted() {
-        this.getDeptListAll();
-    },
     methods: {
-        getDeptListAll() {
-            const params = {
-                isDept:2
-            }
-            uni.$u.api.getDeptListAll(params).then(res => {
-                if(res.data.length > 0){
-                    this.deptList = res.data;
-                }else{
-                    uni.$u.toast('暂无机构部门');
-                }
-            })
-        },
-        deptSeletchang(ids, names) {
-            this.formData.deptId = ids[0] || '';
-            this.formData.deptName = names[0] || '';
-        },
         handleSearch() {
             this.$emit('confirm', this.formData);
             this.close();
@@ -133,8 +105,6 @@ export default {
                 location: '',
                 startTime: '',
                 endTime: '',
-                deptId:'',
-                deptName:'',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -145,12 +115,14 @@ export default {
         },
         open() {
             this.show = true
-            this.$nextTick(() => {
+            setTimeout(() => {
                 this.$refs.jtimePickerPopupRef.handleInit();
-            })
+            }, 300)
         },
         openTimePicker() {
-            this.$refs.jtimePickerPopupRef.pickerShow();
+            this.$nextTick(()=>{
+                this.$refs.jtimePickerPopupRef.pickerShow();
+            })
         },
         close() {
             this.show = false
@@ -189,13 +161,6 @@ export default {
                 this.formData.endTime = '';
                 return;
             }
-            // 机构部门
-            if(field == 'dept'){
-                this.formData.deptId = '';
-                this.formData.deptName = '';
-                this.$refs.recycleDeptRef._clear();
-                return;
-            }
             this.formData[field] = '';
         },
         getSelectTime(val) {
@@ -203,9 +168,7 @@ export default {
             this.formData.endTime = this.$dayjs(val.endTime).format('YYYY-MM-DD');
             this.time = this.$dayjs(val.beginTime).format('YYYY-MM-DD') + ' 至 ' + this.$dayjs(val.endTime).format('YYYY-MM-DD');
         },
-        recycleDeptClick() {
-            this.$refs.recycleDeptRef._show();
-        },
+        
         recyclePersonClick() {
             this.$refs.recyclePersonPickerRef.open();
         },

pages/wareHouse/index.vue

@@ -58,6 +58,13 @@
 							class="price-icon"></u-icon>
 						<text class="price-text">价格可见</text>
 					</view>
+					<view class="dept-btn" @click="recycleDeptClick">
+						<image src="/static/icons/dept.png" mode="aspectFill"></image>
+					</view>
+					<ba-tree-picker :selectParent="true" v-if="deptList.length > 0" ref="recycleDeptRef" :multiple='false'
+							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
+							textKey="deptName" childrenKey="children" :selectedValues="deptId"
+							:personNames="deptName" />
 					<view class="layout-btn" type="text" size="mini" @click="openSearchFilter">
 						<u-icon name="grid" size="20" color="#666666"></u-icon>
 						<!-- 筛选列 品牌、价格范围、位置、回收时间、回收人员、鉴定人员、商品属性 -->
@@ -156,11 +163,13 @@ import searchFilter from './components/searchFilter.vue'
 import moreInfo from './components/moreInfo.vue'
 import { permissionCheck } from '../../utils/util.js'
 import orderList from './components/orderList/index.vue'
+import jtimePickerPopup from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue';
 export default {
 	components: {
 		searchFilter,
 		moreInfo,
 		orderList,
+		jtimePickerPopup
 	},
 	data() {
 		return {
@@ -240,12 +249,36 @@ export default {
 				},
 			],
 			isSwipeClick: false,
+			deptList: [],
+			deptId: '',
+			deptName: '',
 		};
 	},
 	onLoad() {
 		this.getTypeList();
+		this.getDeptListAll();
 	},
 	methods: {
+		getDeptListAll() {
+            const params = {
+                isDept:2
+            }
+            uni.$u.api.getDeptListAll(params).then(res => {
+                if(res.data.length > 0){
+                    this.deptList = res.data;
+                }else{
+                    uni.$u.toast('暂无机构部门');
+                }
+            })
+        },
+		deptSeletchang(ids, names) {
+            this.deptId = ids[0] || '';
+			this.deptName = names[0] || '';
+			this.handleSearch();
+        },
+		recycleDeptClick() {
+            this.$refs.recycleDeptRef._show();
+        },
 		showMoreOptions(goods) {
 			this.moreOptions = goods;
 			this.$refs.moreInfoRef.showMoreInfo();
@@ -268,6 +301,8 @@ export default {
 					searchString: this.searchString,
 					sortType: this.curSortType.id,
 					type: this.type,
+					deptId: this.deptId,
+					deptName: this.deptName,
 					...this.searchInfo
 				}).then(res => {
 					if (this.pageNum == 1) {

pages/wareHouse/styles/index.scss

@@ -243,6 +243,13 @@
       justify-content: center;
       flex-shrink: 0;
     }
+    .dept-btn{
+      margin-left:18rpx;
+      image{
+        width: 30rpx;
+        height: 30rpx;
+      }
+    }
   }
 }
 

store/modules/user.js

@@ -29,8 +29,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip
@@ -61,7 +61,6 @@ export default {
 			const validRoles = [];
 			
 			const hasAdminRole = roles.some(role => role.roleKey && role.roleKey.includes('admin' || 'ADMIN'));
-			console.log('hasAdminRole',hasAdminRole);
 			const hasCrmRole = roles.some(role => role.roleKey && role.roleKey.includes('CRM'));
 			const hasWarehouser = roles.some(role => role.roleKey === 'WAREHOUSER');
 			const hasSalesman = roles.some(role => role.roleKey === 'SALESMAN');
@@ -84,15 +83,15 @@ export default {
 			}
 
 			state.availableRoles = validRoles;
-			state.currentRoleIndex = 0;
-			
+			state.currentRoleIndex = validRoles.indexOf(uni.getStorageSync('activeTab') || '') || 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) {
+				const activeTab = uni.getStorageSync('activeTab') || currentRole;
+				switch (activeTab) {
 					case 'admin':
 						// 展示首页、线索公海、销售线索、接单中心、我的
 						uni.setTabBarItem({ index: 0, visible: true }); // 首页
@@ -180,6 +179,7 @@ export default {
 				allIndices.forEach(index => {
 					uni.setTabBarItem({ index, visible: false });
 				});
+				uni.setStorageSync('activeTab', role.value || '');
 				switch (role.value) {
 					case 'WAREandSALE':
 						// 展示仓库、核价中心、询价中心、我的
@@ -285,9 +285,9 @@ export function setupTabBar(userInfo, availableRoles, currentRoleIndex) {
 		
 		// 获取当前角色
 		const currentRole = availableRoles[currentRoleIndex] || '';
-		
+		const activeTab = uni.getStorageSync('activeTab') || currentRole;
 		// 根据当前角色显示对应的tabbar
-		switch (currentRole) {
+		switch (activeTab) {
 			case 'WAREandSALE':
 				// 展示仓库、核价中心、询价中心、我的
 				uni.setTabBarItem({ index: 2, visible: true }); // 仓库