2

pages/device/FileDetails/FileDetails.vue

@@ -205,7 +205,8 @@
 					</view>
 				</view>
 				<view class="filedetails_right" @click="EquipmentAddConfirm = true">
-					<u-icon name="file-text" color="#101010" size="22"></u-icon>
+					<!-- <u-icon name="file-text" color="#101010" size="22"></u-icon> -->
+					<view style="font-size: 30rpx; width: 150rpx; height: 44rpx; background-color: #FD4B09; border-radius:44rpx; color: #fff;" @click="EquipmentAddConfirm = true">+添加设备</view>
 				</view>
 				
 				

pages/device/RepairDetails/RepairDetails.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<!-- 状态 -->
-		<view class="label" v-if="(form.status == 2 || form.status == 3 || form.status == 4) && userInfoRoleName.indexOf('admin') == -1">
+		 <!-- && userInfoRoleName.indexOf('admin') == -1 -->
+		<view class="label" v-if="(form.status == 2 || form.status == 3 || form.status == 4)">
 			<view class="tab" ref="wx" :style="{'color':wxStyle,'height':'100%','border-right': '1rpx solid #f4f4f4'}" @click="tab('wx')">
 				<text>报修单</text>
 			</view>
@@ -439,7 +440,12 @@
 				maintenanceDetail({id:this.id}).then(res=>{
 					this.form = res.data
 					
-					if (this.form.status == 3) {
+					
+					
+					if (this.form.status == 4) {
+						this.gzStyle = "#fd4b09"
+						this.wxStyle = ""
+					} else if (this.form.status == 3) {
 						this.gzStyle = "#fd4b09"
 						this.wxStyle = ""
 					} else if (this.form.status == 2) {

pages/device/RepairReportList/RepairReportList.vue

@@ -126,6 +126,8 @@
 					this.Jumpfun(item.id,'FY')
 				} else if (item.status == 4 && this.userInfoRoleName.indexOf('admin') == -1) {
 					this.Jumpfun(item.id,'FY')
+				} else {
+					this.Jumpfun(item.id,'XQ')
 				}
 			},
 			tbafun(type){