diff --git a/manifest.json b/manifest.json
index 851b52f..03f7ca4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
- "versionName" : "1.01.01",
- "versionCode" : 10101,
+ "versionName" : "1.01.02",
+ "versionCode" : 10102,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue
index 5ee8138..c89bb3e 100644
--- a/pages/home/detail/ticketHandle.vue
+++ b/pages/home/detail/ticketHandle.vue
@@ -16,7 +16,7 @@
工单名称
- {{oplDetail.ticket_.title}}
+ {{ticketDetail.title}}
@@ -24,7 +24,7 @@
工单状态
- {{oplDetail.ticket_.state_.name}}
+ {{ticketDetail.state_.name}}
@@ -36,7 +36,7 @@
来访概述
- {{visitDetail.name }}
+ {{visitDetail.name }}
@@ -115,7 +115,7 @@
相关方
- {{rpjDetail.rparty_name }}
+ {{rpjDetail.rparty_name }}
@@ -362,7 +362,7 @@
@@ -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
+ })
}
}
diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue
index 435c20a..5ca29d1 100644
--- a/pages/workSpace/operation/oplDetail.vue
+++ b/pages/workSpace/operation/oplDetail.vue
@@ -71,7 +71,8 @@
监控状态
- {{msOptions[formData.mtask_status]}}
+ 进行中
+ 未进行
开始
停止
@@ -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())
}
},
diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue
index 246115e..3f09f7f 100644
--- a/pages/workSpace/visit/visitCreate.vue
+++ b/pages/workSpace/visit/visitCreate.vue
@@ -62,10 +62,12 @@
接待人
-
- {{dcoordinator_name}}
-
+
+ {{formData.receptionist_name}}
+
+