Przeglądaj źródła

首页增加自定义菜单,工单待办增加权限

liujt 15 godzin temu
rodzic
commit
389c5ac601
2 zmienionych plików z 31 dodań i 14 usunięć
  1. 1 1
      manifest.json
  2. 30 13
      pages/home/myTicket/myTicket.vue

+ 1 - 1
manifest.json

@@ -2,7 +2,7 @@
     "name" : "AiMil工业互联网平台",
     "name" : "AiMil工业互联网平台",
     "appid" : "__UNI__45B3907",
     "appid" : "__UNI__45B3907",
     "description" : "",
     "description" : "",
-    "versionName" : "V1.0.4.25",
+    "versionName" : "V1.0.4.26",
     "versionCode" : "100",
     "versionCode" : "100",
     "transformPx" : false,
     "transformPx" : false,
     "h5" : {
     "h5" : {

+ 30 - 13
pages/home/myTicket/myTicket.vue

@@ -7,9 +7,9 @@
 			</view>
 			</view>
 		</uni-nav-bar>
 		</uni-nav-bar>
 
 
-		<view class="top-wrapper">
+		<view v-if="filteredTabs.length > 0" class="top-wrapper">
 			<view class="tab_box rx-sc">
 			<view class="tab_box rx-sc">
-				<view class="tab_item" :class="{active: activeIndex == item.index}" v-for="(item,index) in tabList"
+				<view class="tab_item" :class="{active: activeIndex == item.index}" v-for="(item,index) in filteredTabs"
 					:key="index">
 					:key="index">
 					<view @click="handleTabChange(item)" class="badge-c">
 					<view @click="handleTabChange(item)" class="badge-c">
 						{{item.name}}
 						{{item.name}}
@@ -156,7 +156,8 @@
 						url: `/pages/maintenance/detail/detail?`,
 						url: `/pages/maintenance/detail/detail?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:bygd',
 					},
 					},
 					{
 					{
 						name: '巡点检工单',
 						name: '巡点检工单',
@@ -166,7 +167,8 @@
 						url: `/pages/tour_tally/detail/detail?`,
 						url: `/pages/tour_tally/detail/detail?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:xdjgd',
 					},
 					},
 					{
 					{
 						name: '检修',
 						name: '检修',
@@ -176,7 +178,8 @@
 						url: `/pages/maintenance/detail/detail?`,
 						url: `/pages/maintenance/detail/detail?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:jx',
 					},
 					},
 					// {
 					// {
 					// 	name: '量具送检工单',
 					// 	name: '量具送检工单',
@@ -197,7 +200,8 @@
 						url: `/pages/maintenanceWorkorder/detail/detail?`,
 						url: `/pages/maintenanceWorkorder/detail/detail?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:wxgd',
 					},
 					},
 					{
 					{
 						name: '生产工单',
 						name: '生产工单',
@@ -208,7 +212,8 @@
 						url: `/pages/pda/workOrder/extrusionMolding/index?`,
 						url: `/pages/pda/workOrder/extrusionMolding/index?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:scgd',
 					},
 					},
 					{
 					{
 						name: '质检工单',
 						name: '质检工单',
@@ -219,7 +224,8 @@
 						url: ``,
 						url: ``,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:zjgd',
 					},
 					},
 					{
 					{
 						name: '盘点工单',
 						name: '盘点工单',
@@ -230,10 +236,11 @@
 						url: `/pages/warehouse/workOrder/inventory/inventory?`,
 						url: `/pages/warehouse/workOrder/inventory/inventory?`,
 						badge: {
 						badge: {
 							value: 0
 							value: 0
-						}
+						},
+						permittedTabs: 'pda:ticketstab:pdgd',
 					}
 					}
 				],
 				],
-				activeType: 'maintenance',
+				activeType: '',
 				activeIndex: 0,
 				activeIndex: 0,
 				dataList: [],
 				dataList: [],
 				searchShow: false,
 				searchShow: false,
@@ -407,7 +414,17 @@
 				],
 				],
 			}
 			}
 		},
 		},
+		computed: {
+			filteredTabs() {
+				return this.tabList.filter(tab => this.$isAuthorities(tab.permittedTabs))
+			}
+		},
 		created() {
 		created() {
+			console.log('filteredTabs~~~', this.filteredTabs)
+			if (this.filteredTabs.length > 0) {
+				this.activeType = this.filteredTabs[0].type
+			}
+			
 			uni.$off('successInit')
 			uni.$off('successInit')
 			uni.$on('successInit', (data) => {
 			uni.$on('successInit', (data) => {
 				this.$nextTick(() => {
 				this.$nextTick(() => {
@@ -426,7 +443,7 @@
 					if (this.orderType == 1) {
 					if (this.orderType == 1) {
 						await this.getCount()
 						await this.getCount()
 					}
 					}
-					const targetTab = this.tabList[this.tabsCurrent]
+					const targetTab = this.filteredTabs[this.tabsCurrent]
 					if (targetTab) {
 					if (targetTab) {
 						this.handleTabChange(targetTab)
 						this.handleTabChange(targetTab)
 					}
 					}
@@ -586,9 +603,9 @@
 				statistics().then(data => {
 				statistics().then(data => {
 					console.log('onsole.log(data)-----------')
 					console.log('onsole.log(data)-----------')
 					console.log(data)
 					console.log(data)
-					console.log('this.tabList~~~', this.tabList)
+					// console.log('this.tabList~~~', this.tabList)
 					this.tabList = this.tabList.map(item => {
 					this.tabList = this.tabList.map(item => {
-						console.log('item~~~', item)
+						// console.log('item~~~', item)
 						let badgeValue = 0
 						let badgeValue = 0
 						switch (item.type) {
 						switch (item.type) {
 							case 'maintenance':
 							case 'maintenance':