Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app into dengfei

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.19",
+    "versionName" : "V1.0.3.20",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/maintenanceWorkorder/detail/detail.vue

@@ -72,7 +72,7 @@
 					<PreviewPhoto type="view" :imageList="worksheetInfo.workOrderImg" />
 				</view>
 
-				<view class="zxpg-wrap" v-if="orderType == 1 && repairInfo.repairUserId == userId && ParentIndex !=4">
+				<view class="zxpg-wrap" v-if="orderType == 1  && ParentIndex !=4">
 					<template v-if="repairInfo.orderStatus == 0">
 						<!-- <view class="zx-btn btns" @click="handleExecute">开始执行</view> -->
 						<view class="zp-btn btns" @click="handlbpbj">申请备品备件</view>