fix：权限+其他优化

pages/setting/index.vue

@@ -73,46 +73,26 @@
 			handleSwitchRole(){
 					this.columns = [];
 					let roles = this.$store.state.user.availableRoles;
+					console.log(roles);
+					
 					let roleOptions = [];
-					const hasAdminRole = roles.some(role => role == 'admin');
+					
+					const hasAdminRole = roles.some(role => role.includes('admin'));
 					const hasCrmRole = roles.some(role => role.includes('CRM'));
-					const hasWarehouser = roles.some(role => role == 'WAREHOUSER');
-					const hasSalesman = roles.some(role => role == 'SALESMAN');
-
-					if(hasAdminRole){
-						roleOptions.push(
-							{ label: 'CRM权限', value: 'CRM' },
-							{ label: '仓库权限', value: 'WAREHOUSER' },
-							{ label: '销售权限', value: 'SALESMAN' },
-						);
-					}else if(hasWarehouser && hasSalesman && hasCrmRole){
-						roleOptions.push(
-							{ label: 'CRM权限', value: 'CRM' },
-							{ label: '仓库权限', value: 'WAREHOUSER' },
-							{ label: '销售权限', value: 'SALESMAN' }
-						);
-					}else if(hasCrmRole && hasWarehouser){
+					const hasWAREandSALE = roles.some(role => role.includes('WAREandSALE'));
+					if(hasAdminRole || (hasCrmRole && hasWAREandSALE) ){//管理员、crm+仓库、crm+销售、仓库+销售
 						roleOptions.push(
 							{ label: 'CRM权限', value: 'CRM' },
-							{ label: '仓库权限', value: 'WAREHOUSER' }
+							{ label: '仓库和销售权限', value: 'WAREandSALE' },
 						);
-					}else if(hasCrmRole && hasSalesman){
+					}else if(hasCrmRole){//只有crm	
 						roleOptions.push(
 							{ label: 'CRM权限', value: 'CRM' },
-							{ label: '仓库权限', value: 'WAREHOUSER' },
-							{ label: '销售权限', value: 'SALESMAN' }
 						);
-					}else if(hasWarehouser && hasSalesman){
+					}else if(hasWarehouser || hasSalesman){//只有仓库或销售
 						roleOptions.push(
-							{ label: '仓库权限', value: 'WAREHOUSER' },
-							{ label: '销售权限', value: 'SALESMAN' }
+							{ label: '仓库和销售权限', value: 'WAREandSALE' },
 						);
-					}else if(hasCrmRole){
-						roleOptions.push({ label: 'CRM权限', value: 'CRM' });
-					}else if(hasWarehouser){
-						roleOptions.push({ label: '仓库权限', value: 'WAREHOUSER' });
-					}else if(hasSalesman){
-						roleOptions.push({ label: '销售权限', value: 'SALESMAN' },{ label: '仓库权限', value: 'WAREHOUSER' });
 					}
 					
 					this.columns = [roleOptions];

pages/wareHouse/components/edit.vue

@@ -426,7 +426,7 @@ export default {
 实价：${res.data.actualPrice || '-'}
 型号：${res.data.model || '-'}
 编码：${res.data.indentifyCode || '-'}
-日期：${res.data.recycleTime || '-'}
+日期：${res.data.cardYear || '-'}
 备注：${res.data.productDesc || '-'}
 付款方式：${this.paymentTabList.find(item => item.value == res.data.payType)?.name || '-'}
 `
@@ -798,7 +798,7 @@ export default {
                     this.formData.indentifyCode = result['编码'];
                 }
                 if (result['日期']) {
-                    this.formData.recycleTime = result['日期'];
+                    this.formData.cardYear = result['日期'];
                 }
                 if (result['备注']) {
                     this.formData.productDesc = result['备注'];

pages/wareHouse/components/fakeRegistration.vue

@@ -12,30 +12,29 @@
             v-for="(item, index) in tableData" 
             :key="item.id || index"
             :class="{ 'selected': selectedIndex === index }"
-            @click="handleItemClick(index, item)"
+            @click="handleSwipeClick(item, index)"
             >
-            <u-swipe-action ref="swipeRef">
-              <u-swipe-action-item :options="swipeOptions" @click="(e) => handleSwipeClick(item, e, index)">
-                <view class="item_header">
-                  <view class="name">{{ item.name }}</view>
-                  <view class="phone">{{ item.phone }}</view>
+              <view class="item_header">
+                <view class="name">{{ item.name }}</view>
+              </view>
+              <view class="item_body">
+                <view class="info_item">
+                  <view class="label">手机号：</view>
+                  <view class="value">{{ item.phone }}</view>
                 </view>
-                <view class="item_body">
-                  <view class="info_item">
-                    <view class="label">身份证号：</view>
-                    <view class="value">{{ item.idCard }}</view>
-                  </view>
-                  <view class="info_item">
-                    <view class="label">物品：</view>
-                    <view class="value">{{ item.itemName }}</view>
-                  </view>
-                  <view class="info_item" v-if="item.remark">
-                    <view class="label">备注：</view>
-                    <view class="value">{{ item.remark }}</view>
-                  </view>
+                <view class="info_item">
+                  <view class="label">身份证号：</view>
+                  <view class="value">{{ item.idCard }}</view>
                 </view>
-              </u-swipe-action-item>
-            </u-swipe-action>
+                <view class="info_item">
+                  <view class="label">物品：</view>
+                  <view class="value">{{ item.itemName }}</view>
+                </view>
+                <view class="info_item" v-if="item.remark">
+                  <view class="label">备注：</view>
+                  <view class="value">{{ item.remark }}</view>
+                </view>
+              </view>
           </view>
         <u-loadmore :status="loadStatus" :loading-text="'加载中...'" :finished-text="'没有更多了'" @loadmore="handleLoadMore"></u-loadmore>
       </view>
@@ -70,6 +69,7 @@
 </template>
 
 <script>
+import { permissionCheck } from '../../../utils/util.js'
 export default {
   name: 'FakeRegistration',
   data() {
@@ -141,6 +141,7 @@ export default {
       })
     },
     handleAdd() {
+      if(!permissionCheck('WAREHOUSER')) return false
       this.isAdd = true
       this.currentEditItem = null
       this.formData = {
@@ -156,25 +157,22 @@ export default {
     handleItemClick(index, item) {
       this.selectedIndex = index;
     },
-    handleSwipeClick(item, e, index) {
-      if(e.index == 0){//编辑
-        setTimeout(() => {
-          this.selectedIndex = index;
-          this.isAdd = false
-          this.currentEditItem = item
-          this.formData = {
-            id: item.id,
-            name: item.name,
-            idCard: item.idCard,
-            phone: item.phone,
-            itemName: item.itemName,
-            remark: item.remark || ''
-          }
-          this.showEditDialog = true
-        }, 300);
+    handleSwipeClick(item,index) {
+      this.selectedIndex = index;
+      this.isAdd = false
+      this.currentEditItem = item
+      this.formData = {
+        id: item.id,
+        name: item.name,
+        idCard: item.idCard,
+        phone: item.phone,
+        itemName: item.itemName,
+        remark: item.remark || ''
       }
+      this.showEditDialog = true
     },
     handleSubmit() {
+      if(!permissionCheck('WAREHOUSER')) return false
       this.$refs.formRef.validate().then(() => {
         if (this.isAdd) {
           uni.$u.api.wareHouseFakeAdd(this.formData).then(res => {
@@ -189,7 +187,6 @@ export default {
           uni.$u.api.wareHouseFakeEdit(this.formData).then(res => {
             if (res.code == 200) {
               uni.$u.toast('编辑成功')
-              this.$refs.swipeRef[this.selectedIndex].closeOther()
               this.showEditDialog = false
               this.getWareHouseFakeList()
             }

pages/wareHouse/index.vue

@@ -310,6 +310,7 @@ export default {
 		handleSwipeClick(e, item,goodsIndex) {
 			if (e.index == 0) {//删除
 				this.isSwipeClick = true;
+				if(!permissionCheck('WAREHOUSER')) return false 
 				uni.$u.api.wareHouseDelete({
 					id: item.id
 				}).then(() => {

pages/wareHouse/styles/fakeRegistration.scss

@@ -20,6 +20,7 @@
 
                 &.selected {
                     box-shadow: 0 12rpx 32rpx rgba(71, 130, 241, 0.2);
+                    transform: scale(1.02);
                     border-color: #4782f1;
                     border-width: 2rpx;
                 }
@@ -36,20 +37,6 @@
                         font-size: 32rpx;
                         font-weight: 700;
                         color: #212529;
-                        position: relative;
-                        padding-left: 20rpx;
-
-                        &::before {
-                            content: '';
-                            position: absolute;
-                            left: 0;
-                            top: 50%;
-                            transform: translateY(-50%);
-                            width: 8rpx;
-                            height: 8rpx;
-                            border-radius: 50%;
-                            background-color: #4782f1;
-                        }
                     }
 
                     .phone {

store/modules/user.js

@@ -29,7 +29,7 @@ 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://crm.nanjingshiyu.com/prod-api/", // ip
 			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
@@ -65,41 +65,21 @@ export default {
 			const hasWarehouser = roles.some(role => role.roleKey === 'WAREHOUSER');
 			const hasSalesman = roles.some(role => role.roleKey === 'SALESMAN');
 
-			if (hasAdminRole) {//管理员
-				if (hasCrmRole) validRoles.push('CRM');
-				if (hasWarehouser) validRoles.push('WAREHOUSER');
-				if (hasSalesman) validRoles.push('SALESMAN');
+			if(hasAdminRole){//管理员
 				validRoles.push('admin');
 				state.showRoleSwitch = true;
-			} else if(hasWarehouser && hasSalesman && hasCrmRole) {//仓库和销售和crm
-				validRoles.push('CRM');
-				validRoles.push('WAREHOUSER');
-				validRoles.push('SALESMAN');
-				state.showRoleSwitch = true;
-			} else if (hasCrmRole && hasWarehouser) {//crm和仓库
-				validRoles.push('CRM');
-				validRoles.push('WAREHOUSER');
+			}else if( (hasCrmRole && hasWarehouser) || (hasCrmRole && hasSalesman)){//crm+仓库、crm+销售
+				validRoles.push('CRM','WAREandSALE');
 				state.showRoleSwitch = true;
-			} else if ((hasCrmRole && hasSalesman)) {//crm和销售
-				validRoles.push('CRM');
-				validRoles.push('WAREHOUSER');
-				validRoles.push('SALESMAN');
-				state.showRoleSwitch = true;
-			}else if(hasWarehouser && hasSalesman) {//只有仓库和销售
-				validRoles.push('WAREHOUSER');
-				validRoles.push('SALESMAN');
-				state.showRoleSwitch = true;
-			}
-			else if (hasCrmRole) {//只有crm
+			}else if(hasWarehouser && hasSalesman){
+				validRoles.push('WAREandSALE');
+				state.showRoleSwitch = false;
+			}else if(hasCrmRole){//只有crm
 				validRoles.push('CRM');
 				state.showRoleSwitch = false;
-			} else if(hasWarehouser){//只有仓库
-				validRoles.push('WAREHOUSER');
+			}else if(hasWarehouser || hasSalesman){//只有仓库或销售
+				validRoles.push('WAREandSALE');
 				state.showRoleSwitch = false;
-			}else if (hasSalesman) {//只有销售
-				if (hasWarehouser) validRoles.push('WAREHOUSER');
-				if (hasSalesman) validRoles.push('SALESMAN');
-				state.showRoleSwitch = true;
 			}
 
 			state.availableRoles = validRoles;
@@ -110,18 +90,20 @@ export default {
 				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 }); // 核价中心
+					case 'admin':
+						// 展示首页、线索公海、销售线索、接单中心、我的
+						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;
-					case 'WAREHOUSER':
-						// 展示仓库中心、我的
+					case 'WAREandSALE':
+						// 展示仓库、核价中心、询价中心、我的
 						uni.setTabBarItem({ index: 2, visible: true }); // 仓库
+						uni.setTabBarItem({ index: 3, visible: true }); // 询价中心
+						uni.setTabBarItem({ index: 4, visible: true }); // 核价中心
 						break;
 					case 'CRM':
 						// 展示首页、线索公海、销售线索、接单中心、我的
@@ -198,15 +180,12 @@ export default {
 					uni.setTabBarItem({ index, visible: false });
 				});
 				switch (role.value) {
-					case 'SALESMAN':
-						// 展示核价中心、询价中心、我的
+					case 'WAREandSALE':
+						// 展示仓库、核价中心、询价中心、我的
+						uni.setTabBarItem({ index: 2, visible: true }); // 仓库
 						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 }); // 首页
@@ -308,15 +287,12 @@ export function setupTabBar(userInfo, availableRoles, currentRoleIndex) {
 		
 		// 根据当前角色显示对应的tabbar
 		switch (currentRole) {
-			case 'SALESMAN':
-				// 展示核价中心、询价中心、我的
+			case 'WAREandSALE':
+				// 展示仓库、核价中心、询价中心、我的
+				uni.setTabBarItem({ index: 2, visible: true }); // 仓库
 				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 }); // 首页