Browse Source

拉取代码

maotao 2 months ago
parent
commit
c2fdda9213
3 changed files with 21 additions and 15 deletions
  1. 7 7
      pages/myRepair/myRepair.vue
  2. 7 7
      pages/repair/home.vue
  3. 7 1
      pages/repair/rapidRepNext.vue

+ 7 - 7
pages/myRepair/myRepair.vue

@@ -662,13 +662,13 @@
662
 
662
 
663
 	// 快速报修
663
 	// 快速报修
664
 	function addRepairs(){
664
 	function addRepairs(){
665
-		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
666
-			uni.showToast({
667
-				icon: 'none',
668
-			  title: '请先开启科室报修或公共报修'
669
-			});
670
-			return
671
-		}
665
+		// if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
666
+		// 	uni.showToast({
667
+		// 		icon: 'none',
668
+		// 	  title: '请先开启科室报修或公共报修'
669
+		// 	});
670
+		// 	return
671
+		// }
672
 		uni.setStorageSync('repairsType','subpage')
672
 		uni.setStorageSync('repairsType','subpage')
673
 		uni.navigateTo({
673
 		uni.navigateTo({
674
 		  url: '/pages/repair/rapidRep'
674
 		  url: '/pages/repair/rapidRep'

+ 7 - 7
pages/repair/home.vue

@@ -125,13 +125,13 @@
125
 	
125
 	
126
 	// 快速报修
126
 	// 快速报修
127
 	function addRepairs(){
127
 	function addRepairs(){
128
-		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
129
-			uni.showToast({
130
-				icon: 'none',
131
-			  title: '请先开启科室报修或公共报修'
132
-			});
133
-			return
134
-		}
128
+		// if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
129
+		// 	uni.showToast({
130
+		// 		icon: 'none',
131
+		// 	  title: '请先开启科室报修或公共报修'
132
+		// 	});
133
+		// 	return
134
+		// }
135
 		uni.setStorageSync('repairsType','home')
135
 		uni.setStorageSync('repairsType','home')
136
 		uni.navigateTo({
136
 		uni.navigateTo({
137
 		  url: '/pages/repair/rapidRep'
137
 		  url: '/pages/repair/rapidRep'

+ 7 - 1
pages/repair/rapidRepNext.vue

@@ -354,8 +354,14 @@
354
 			]
354
 			]
355
 			dataInfo.tabActiveValue = 'overtime'
355
 			dataInfo.tabActiveValue = 'overtime'
356
 			getbuildingList()
356
 			getbuildingList()
357
+		} else if (isDept.value.valueconfig==0 && isRepair.value.valueconfig==0){
358
+			dataInfo.tabs = [
359
+				{id: 5, name: '科内报修', value: 'doing', num: ''},
360
+				{id: 6, name: '公共报修', value: 'overtime', num: ''},
361
+			]
362
+			dataInfo.tabActiveValue = 'doing'
357
 		}
363
 		}
358
-
364
+		
359
 
365
 
360
 		let postData = {
366
 		let postData = {
361
 		  "key": 'repair_incident_type',
367
 		  "key": 'repair_incident_type',