zcdsj
/
factory_mp_old
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级功能/ticket跳转业务详情功能

This commit is contained in:
曹前明 2022-09-19 17:50:16 +08:00
parent 9937240a37
commit e9d998a0b6
7 changed files with 111 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
App.vue
View File

@ -80,7 +80,12 @@
showCancel: false, showCancel: false,
success: function(res2) { success: function(res2) {
if (res2.confirm) { if (res2.confirm) {
if(res1.file.indexOf("http") == 0){
plus.runtime.openURL(res1.file) plus.runtime.openURL(res1.file)
}else{
plus.runtime.openURL(that.vuex_host + res1.file)
}
} }
} }
}); });

4
manifest.json
View File

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

161
pages/home/detail/ticketHandle.vue
View File

@ -216,72 +216,6 @@
</view> </view>
</view> </view>
</view> </view>
<view class="ticket-info">
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">作业名称</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">具体地点</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.place}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">作业状态</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{state_[oplDetail.operation_.state]}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">生产状态</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.state_work }}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">作业区域</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.area_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">业务部门</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.dept_bus_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">属地部门</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.dept_ter_.name}}</view>
</view>
</view>
<view class="form-item ">
<view class="form-left">
<text class="form-left-text">部门协调员</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.coordinator_.name}}</view>
</view>
</view>
</view>
<view class="ticket-info"> <view class="ticket-info">
<view class="form-content "> <view class="form-content ">
<view class="form-item border-bottom"> <view class="form-item border-bottom">
@ -289,7 +223,7 @@
<text class="form-left-text">开始时间</text> <text class="form-left-text">开始时间</text>
</view> </view>
<view class="form-right form-date"> <view class="form-right form-date">
<view>{{oplDetail.start_time}}</view> <view style="color:blue" @click="goOpl">{{oplDetail.start_time}}</view>
</view> </view>
</view> </view>
<view class="form-item border-bottom"> <view class="form-item border-bottom">
@ -350,6 +284,72 @@
</view> </view>
</view> </view>
</view> </view>
<view class="ticket-info">
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">所属作业</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_" style="color:blue" @click="goOp">{{oplDetail.operation_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">具体地点</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.place}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">作业状态</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{state_[oplDetail.operation_.state]}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">生产状态</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.state_work }}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">作业区域</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.area_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">业务部门</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.dept_bus_.name}}</view>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">属地部门</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.dept_ter_.name}}</view>
</view>
</view>
<view class="form-item ">
<view class="form-left">
<text class="form-left-text">部门协调员</text>
</view>
<view class="form-right">
<view v-if="oplDetail.operation_">{{oplDetail.operation_.coordinator_.name}}</view>
</view>
</view>
</view>
</block> </block>
<block v-if="type=='handle'"> <block v-if="type=='handle'">
<view class="ticket-info"> <view class="ticket-info">
@ -361,10 +361,10 @@
<uni-data-select v-model="form.close_note" :localdata="noteOption" label="选择关闭原因"></uni-data-select> <uni-data-select v-model="form.close_note" :localdata="noteOption" label="选择关闭原因"></uni-data-select>
</view> </view>
<view class="form-item" v-if="ticketDetail.state_&&ticketDetail.state_.key==='opl_close'"> <view class="form-item" v-if="ticketDetail.state_&&ticketDetail.state_.key==='opl_close'">
<view class="form-left-text"> <!-- <view class="form-left-text">
<text class="star">*</text> <text class="star">*</text>
<text>关闭处理</text> <text>关闭处理</text>
</view> </view> -->
<uni-data-select v-model="form.close_dos" :localdata="dosOption" label="关闭处理"></uni-data-select> <uni-data-select v-model="form.close_dos" :localdata="dosOption" label="关闭处理"></uni-data-select>
</view> </view>
<view class="form-item" style="height: 300rpx;"> <view class="form-item" style="height: 300rpx;">
@ -673,12 +673,27 @@
params.ticket_data.close_dos = this.form.close_dos; params.ticket_data.close_dos = this.form.close_dos;
} }
debugger; debugger;
this.$u.api.ticketHandle(this.ticketId, params).then(res => { uni.showLoading({
if (res.err_msg) {} else { mask:true,
this.$router.push("dutywork"); 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
})
}
} }
} }

2
pages/home/home_.vue
View File

@ -54,7 +54,7 @@
</view> </view>
</view> </view>
<view class="listWrap" v-else> <view class="listWrap" v-else>
<view class="emptyList">暂无代办工单</view> <view class="emptyList">暂无待办工单</view>
</view> </view>
</view> </view>
</view> </view>

4
pages/home/list/ticket.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="my_duty"> <view class="my_duty">
<uni-nav-bar @clickLeft="goBack()" height="110rpx" leftWidth="200rpx" leftText="我的代办" leftIcon="left" border <uni-nav-bar @clickLeft="goBack()" height="110rpx" leftWidth="200rpx" leftText="我的待办" leftIcon="left" border
backgroundColor="#2cade8" color="#fff" fixed statusBar shadow></uni-nav-bar> backgroundColor="#2cade8" color="#fff" fixed statusBar shadow></uni-nav-bar>
<view class="my-top-search-nav"> <view class="my-top-search-nav">
<view class="search-wrap"> <view class="search-wrap">
@ -15,7 +15,7 @@
</view> </view>
<!-- 主体 导航栏 --> <!-- 主体 导航栏 -->
<view class="tabbar-title"> <view class="tabbar-title">
<view :class="{'text-title':true, 'active':ticketTypye==='duty'}" @click="changeList('duty')">代办</view> <view :class="{'text-title':true, 'active':ticketTypye==='duty'}" @click="changeList('duty')">待办</view>
<view :class="{'text-title':true, 'active':ticketTypye==='owner'}" @click="changeList('owner')">我的</view> <view :class="{'text-title':true, 'active':ticketTypye==='owner'}" @click="changeList('owner')">我的</view>
<view :class="{'text-title':true, 'active':ticketTypye==='worked'}" @click="changeList('worked')">已处理</view> <view :class="{'text-title':true, 'active':ticketTypye==='worked'}" @click="changeList('worked')">已处理</view>
<view :class="{'text-title':true, 'active':ticketTypye==='cc'}" @click="changeList('cc')">抄送</view> <view :class="{'text-title':true, 'active':ticketTypye==='cc'}" @click="changeList('cc')">抄送</view>

16
pages/workSpace/operation/oplDetail.vue
View File

@ -110,7 +110,7 @@
<text class="visitorCell">检验结论</text> <text class="visitorCell">检验结论</text>
</view> </view>
<view class="visitorsItem" v-for="item1 in gasList" :key="item1.id"> <view class="visitorsItem" v-for="item1 in gasList" :key="item1.id">
<text class="visitorCell"></text> <text class="visitorCell">{{item1.check_place}}</text>
<text class="visitorCell"></text> <text class="visitorCell"></text>
<text class="visitorCell"> <text class="visitorCell">
@ -184,14 +184,20 @@
}, },
mtaskStateChange(type){ mtaskStateChange(type){
let that = this; let that = this;
uni.showLoading({
mask: true,
title: '正在处理...'
})
if(type==='start'){ if(type==='start'){
that.$u.api.oplMtartMtask(that.oplId).then(res=>{ that.$u.api.oplMtartMtask(that.oplId).then(res=>{
uni.hideLoading()
}) that.formData.mtask_status='STARTED'
}).catch(e=>uni.hideLoading())
}else{ }else{
that.$u.api.oplStopMtask(that.oplId).then(res=>{ that.$u.api.oplStopMtask(that.oplId).then(res=>{
uni.hideLoading()
}) that.formData.mtask_status='REVOKED'
}).catch(e=>uni.hideLoading())
} }
}, },
//解绑卡 //解绑卡

2
pages/workSpace/visit/visitCreate.vue
View File

@ -135,7 +135,7 @@
text: "开会", text: "开会",
value: 40 value: 40
}, { }, {
text: "货车司机", text: "拉送货",
value: 50 value: 50
}], }],
levelRange: [{ levelRange: [{