工单处理跳转详情页

manifest.json

@@ -2,8 +2,8 @@
     "name" : "曲阳金隅EHS",
     "appid" : "__UNI__B00D419",
     "description" : "曲阳金隅EHS",
-    "versionName" : "1.01.01",
+    "versionName" : "1.01.02",
-    "versionCode" : 10101,
+    "versionCode" : 10102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/detail/ticketHandle.vue

@@ -16,7 +16,7 @@
 						<text class="form-left-text">工单名称</text>
 					</view>
 					<view class="form-right">
-						<view v-if="oplDetail.ticket_">{{oplDetail.ticket_.title}}</view>
+						<view>{{ticketDetail.title}}</view>
 					</view>
 				</view>
 				<view class="form-item" @click="logView">
@@ -24,7 +24,7 @@
 						<text class="form-left-text">工单状态</text>
 					</view>
 					<view class="form-right" style="color:blue">
-						<view v-if="oplDetail.ticket_">{{oplDetail.ticket_.state_.name}}</view>
+						<view>{{ticketDetail.state_.name}}</view>
 					</view>
 				</view>
 			</view>
@@ -36,7 +36,7 @@
 							<text class="form-left-text">来访概述</text>
 						</view>
 						<view class="form-right">
-							<view>{{visitDetail.name }}</view>
+							<view style="color:blue" @click="goVisit">{{visitDetail.name }}</view>
 						</view>
 					</view>
 					<view class="form-item border-bottom">
@@ -115,7 +115,7 @@
 							<text class="form-left-text">相关方</text>
 						</view>
 						<view class="form-right">
-							<view>{{rpjDetail.rparty_name }}</view>
+							<view style="color:blue" @click="goRpj">{{rpjDetail.rparty_name }}</view>
 						</view>
 					</view>
 					<view class="form-item border-bottom">
@@ -362,7 +362,7 @@
 						</view>
 						<view class="right-time">
 							<button v-for="item in operationBtn" :key="item.id" class="mini-btn" size="mini"
-								:type="item.attribute_type===2?'warn':'primary'" @click="operationSubmit(item.id)">
+								:type="item.attribute_type===2?'warn':'primary'" @click="operationSubmit(item.id)" style="margin-left:8upx">
 								{{item.name}}
 							</button>
 						</view>
@@ -712,6 +712,16 @@
 					url:'/pages/workSpace/operation/oplDetail?oplId='+this.oplDetail.id
 				})
 				
+			},
+			goVisit(){
+				uni.navigateTo({
+					url:'/pages/workSpace/visit/visitDetail?visit='+that.projectId
+				})
+			},
+			goRpj(){
+				uni.navigateTo({
+					url:'/pages/workSpace/rpj/rpjDetail?rpjId='+that.projectId
+				})
 			}
 
 		}

pages/workSpace/operation/oplDetail.vue

@@ -71,7 +71,8 @@
 			<view class="item">
 				<view class="title">监控状态</view>
 				<view class="content contentFlex">
-					<text v-if="formData.mtask_status" style="width: 200upx;">{{msOptions[formData.mtask_status]}}</text>
+					<text v-if="formData.mtask_uid" style="width: 200upx;">进行中</text>
+					<text v-else style="width: 200upx;">未进行</text>
 					<text class="bindBtn" @click="mtaskStateChange('start')">开始</text>
 					<text class="bindBtn2" @click="mtaskStateChange('end')">停止</text>
 				</view>
@@ -133,7 +134,8 @@
 					charger_:{},
 					monitor_:{},
 					risks_checked_:{},
-					measures_checked_:{}
+					measures_checked_:{},
+					mtask_uid:null
 				},
 				msOptions:{
 					"REVOKED": "已停止",
@@ -193,12 +195,12 @@
 				if(type==='start'){
 					that.$u.api.oplMtartMtask(that.oplId).then(res=>{
 						uni.hideLoading()
-						that.formData.mtask_status='STARTED'
+						that.formData.mtask_uid=res.mtask_uid
 					}).catch(e=>uni.hideLoading())
 				}else{
 					that.$u.api.oplStopMtask(that.oplId).then(res=>{
 						uni.hideLoading()
-						that.formData.mtask_status='REVOKED'
+						that.formData.mtask_uid=null
 					}).catch(e=>uni.hideLoading())
 				}
 			},

pages/workSpace/visit/visitCreate.vue

@@ -62,10 +62,12 @@
 						<text class="form-left-text">接待人</text>
 					</view>
 					<view class="form-right" style="position: relative;">
-						<ba-tree-picker ref="dcoordinator_Picker" :multiple='false' @select-change="select_coordinator_Change" title="选择部门协调员"
+						<ba-tree-picker ref="dcoordinator_Picker" :multiple='false' @select-change="select_coordinator_Change" title="选择接待人"
 								:localdata="vuex_userRange" valueKey="id" textKey="name" childrenKey="children"  :selectParent='false'/>
-						<text type="text">{{dcoordinator_name}}</text>
+						<view  @click="showDcoordinatorPicker"  style="position: relative;display: flex;">
-						<uni-icons style="position: absolute; right: 0;" @click="showDcoordinatorPicker" type="arrowright" color="#999999"/>
+						<text type="text" >{{formData.receptionist_name}}</text>
+						<uni-icons style="position: absolute; right: 0;" type="arrowright" color="#999999"/>
+						</view>
 					</view>
 					<!-- <view class="form-right">
 						<uni-data-select v-model="formData.receptionist" :localdata="userRange">
@@ -166,7 +168,6 @@
 					value: 20
 				}],
 				userRange: [],
-				dcoordinator_name:'请选择接待人',
 			}
 		},
 		watch: {
@@ -201,7 +202,7 @@
 			},
 			select_coordinator_Change(ids, names){
 				this.formData.receptionist = ids[0];
-				this.dcoordinator_name = names;
+				this.formData.receptionist_name = names;
 			},
 			//获取用户
 			getUserRange() {

store/index.js

@@ -38,13 +38,13 @@ const store = new Vuex.Store({
 		vuex_appid: 'wxf7d6140f507466be',
 		vuex_login: 'http://qyjy.ctc-zc.com/h5/',
 		vuex_version: '1.00.08',
-		vuex_host: 'http://222.222.144.147:6013',
+		// vuex_host: 'http://222.222.144.147:6013',
-		vuex_api: 'http://222.222.144.147:6013/api',
+		// vuex_api: 'http://222.222.144.147:6013/api',
-		vuex_apifile: 'http://222.222.144.147:6013/api/file/',
+		// vuex_apifile: 'http://222.222.144.147:6013/api/file/',
 		// vuex_api: 'http://127.0.0.1:8000/api',
-		// vuex_host: 'http://10.99.5.79:20309',
+		vuex_host: 'http://10.99.5.79:20309',
-		// vuex_api: 'http://10.99.5.79:20309/api',
+		vuex_api: 'http://10.99.5.79:20309/api',
-		// vuex_apifile: 'http://10.99.5.79:20309/api/file/',
+		vuex_apifile: 'http://10.99.5.79:20309/api/file/',
 	},
 	mutations: {
 		$uStore(state, payload) {