diff --git a/App.vue b/App.vue
index 5d2d6bc..b6c2016 100644
--- a/App.vue
+++ b/App.vue
@@ -80,7 +80,12 @@
showCancel: false,
success: function(res2) {
if (res2.confirm) {
- plus.runtime.openURL(res1.file)
+ if(res1.file.indexOf("http") == 0){
+ plus.runtime.openURL(res1.file)
+ }else{
+ plus.runtime.openURL(that.vuex_host + res1.file)
+ }
+
}
}
});
diff --git a/manifest.json b/manifest.json
index 3d2038d..20a904f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
- "versionName" : "1.00.08",
- "versionCode" : 10007,
+ "versionName" : "1.00.09",
+ "versionCode" : 10009,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue
index 7ef8ce6..9fafbba 100644
--- a/pages/home/detail/ticketHandle.vue
+++ b/pages/home/detail/ticketHandle.vue
@@ -216,72 +216,6 @@
-
-
-
- 作业名称
-
-
- {{oplDetail.operation_.name}}
-
-
-
-
- 具体地点
-
-
- {{oplDetail.operation_.place}}
-
-
-
-
- 作业状态
-
-
- {{state_[oplDetail.operation_.state]}}
-
-
-
-
- 生产状态
-
-
- {{oplDetail.operation_.state_work }}
-
-
-
-
- 作业区域
-
-
- {{oplDetail.operation_.area_.name}}
-
-
-
-
- 业务部门
-
-
- {{oplDetail.operation_.dept_bus_.name}}
-
-
-
-
- 属地部门
-
-
- {{oplDetail.operation_.dept_ter_.name}}
-
-
-
-
- 部门协调员
-
-
- {{oplDetail.operation_.coordinator_.name}}
-
-
-
@@ -289,7 +223,7 @@
开始时间
- {{oplDetail.start_time}}
+ {{oplDetail.start_time}}
@@ -350,6 +284,72 @@
+
+
+
+ 所属作业
+
+
+ {{oplDetail.operation_.name}}
+
+
+
+
+ 具体地点
+
+
+ {{oplDetail.operation_.place}}
+
+
+
+
+ 作业状态
+
+
+ {{state_[oplDetail.operation_.state]}}
+
+
+
+
+ 生产状态
+
+
+ {{oplDetail.operation_.state_work }}
+
+
+
+
+ 作业区域
+
+
+ {{oplDetail.operation_.area_.name}}
+
+
+
+
+ 业务部门
+
+
+ {{oplDetail.operation_.dept_bus_.name}}
+
+
+
+
+ 属地部门
+
+
+ {{oplDetail.operation_.dept_ter_.name}}
+
+
+
+
+ 部门协调员
+
+
+ {{oplDetail.operation_.coordinator_.name}}
+
+
+
@@ -361,10 +361,10 @@
-
+
@@ -673,12 +673,27 @@
params.ticket_data.close_dos = this.form.close_dos;
}
debugger;
- this.$u.api.ticketHandle(this.ticketId, params).then(res => {
- if (res.err_msg) {} else {
- this.$router.push("dutywork");
- }
+ uni.showLoading({
+ mask:true,
+ title:'正在提交...'
})
+ this.$u.api.ticketHandle(this.ticketId, params).then(res => {
+ uni.hideLoading()
+ uni.navigateBack()
+ }).catch(e=>{uni.hideLoading()})
},
+ goOp(){
+ uni.navigateTo({
+ url:'/pages/workSpace/operation/operationDetail?operationId='+this.oplDetail.operation
+ })
+
+ },
+ goOpl(){
+ uni.navigateTo({
+ url:'/pages/workSpace/operation/oplDetail?oplId='+this.oplDetail.id
+ })
+
+ }
}
}
diff --git a/pages/home/home_.vue b/pages/home/home_.vue
index ace45e3..c6132bc 100644
--- a/pages/home/home_.vue
+++ b/pages/home/home_.vue
@@ -54,7 +54,7 @@
- 暂无代办工单
+ 暂无待办工单
diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue
index 2f18915..7f82c69 100644
--- a/pages/home/list/ticket.vue
+++ b/pages/home/list/ticket.vue
@@ -1,6 +1,6 @@
-
@@ -15,7 +15,7 @@
- 代办
+ 待办
我的
已处理
抄送
diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue
index 06741d9..f30f2fd 100644
--- a/pages/workSpace/operation/oplDetail.vue
+++ b/pages/workSpace/operation/oplDetail.vue
@@ -110,7 +110,7 @@
检验结论
-
+ {{item1.check_place}}
@@ -184,14 +184,20 @@
},
mtaskStateChange(type){
let that = this;
+ uni.showLoading({
+ mask: true,
+ title: '正在处理...'
+ })
if(type==='start'){
that.$u.api.oplMtartMtask(that.oplId).then(res=>{
-
- })
+ uni.hideLoading()
+ that.formData.mtask_status='STARTED'
+ }).catch(e=>uni.hideLoading())
}else{
that.$u.api.oplStopMtask(that.oplId).then(res=>{
-
- })
+ uni.hideLoading()
+ that.formData.mtask_status='REVOKED'
+ }).catch(e=>uni.hideLoading())
}
},
//解绑卡
diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue
index 3c54747..2f2ef90 100644
--- a/pages/workSpace/visit/visitCreate.vue
+++ b/pages/workSpace/visit/visitCreate.vue
@@ -135,7 +135,7 @@
text: "开会",
value: 40
}, {
- text: "货车司机",
+ text: "拉送货",
value: 50
}],
levelRange: [{