动火流程图

pull/5/head
fangjiakai 2024-01-25 13:36:15 +08:00
parent e5d97b6027
commit 841fc02538
5 changed files with 121 additions and 151 deletions

View File

@ -220,32 +220,43 @@ export default {
});
return;
}
uni.uploadFile({
url: basePath+'/app/eightwork/saveFile',
filePath: this.signImgList[0].filePath,
name: 'file',
formData: {
CORPINFO_ID:loginUser.CORPINFO_ID,
},
success: ({data}) => {
this.signImgList[0].filePath = JSON.parse(data).FILE_PATH;
this.buttonloading = true;
setMeasures("")
uni.$emit('dangerous_options_submit', {
imgList: this.imgList,
signImgList: this.signImgList,
index: this.currentIndex,
STATUS: this.STATUS
});
this.goback()
},
fail: (err) => {
uni.showModal({
content: "图片上传失败",
showCancel: false
});
}
})
if(this.signImgList[0].filePath.indexOf('uploadFiles') > -1){
uni.$emit('dangerous_options_submit', {
imgList: this.imgList,
signImgList: this.signImgList,
index: this.currentIndex,
STATUS: this.STATUS
});
this.goback()
}else{
uni.uploadFile({
url: basePath+'/app/eightwork/saveFile',
filePath: this.signImgList[0].filePath,
name: 'file',
formData: {
CORPINFO_ID:loginUser.CORPINFO_ID,
},
success: ({data}) => {
this.signImgList[0].filePath = JSON.parse(data).FILE_PATH;
this.buttonloading = true;
setMeasures("")
uni.$emit('dangerous_options_submit', {
imgList: this.imgList,
signImgList: this.signImgList,
index: this.currentIndex,
STATUS: this.STATUS
});
this.goback()
},
fail: (err) => {
uni.showModal({
content: "图片上传失败",
showCancel: false
});
}
})
}
},
goback(){
uni.navigateBack({delta: 1});

View File

@ -77,7 +77,7 @@
</view>
</view>
<view class="wui-form-list" style="padding-top: 20upx;" v-if="measuresList.length > 0">
<view class="wui-form-list" style="padding-top: 20upx;" v-if="showMeasures && measuresList.length > 0">
<view class="wui-title" style="margin-left: 20upx;">
<text class="text-semi">安全防护措施</text>
</view>
@ -136,7 +136,7 @@
</view>
</view>
<view class="wui-form-list" style="padding-top: 20upx;" v-if="signs.MEASURES_CONFIRM">
<view class="wui-form-list" style="padding-top: 20upx;" v-if="showMeasures && signs.MEASURES_CONFIRM">
<view class="wui-title" style="margin-left: 20upx;">
<text class="text-semi">其他安全防护措施</text>
</view>
@ -381,6 +381,10 @@ export default {
type: String,
default: ""
},
showMeasures: {
type: Boolean,
default: true
},
},
data() {
return {
@ -466,7 +470,6 @@ export default {
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = this.hotworkId;
this.getData();
},
methods: {
//

View File

@ -64,13 +64,13 @@
<template v-if="item.STEP_ID==0"></template>
<template v-else-if="item.STATUS==-2">气体检测打回</template>
<template v-else-if="item.STEP_ID!=-1">{{ item.NEXT_STEP_NAME }}</template>
<template v-else>{{ item.NEXT_STEP_NAME }}</template>
<template v-else>{{ item.STEP_NAME }}</template>
</text>
<text v-if="item.STEP_ID<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)"></button></text>
</view>
<view class="dy-subtitle-flex">
<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
@click="showDrawer('showRight',item)">查看流程图</button></text>
@click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图</button></text>
</view>
</view>
</view>
@ -85,6 +85,30 @@
</view>
<view class="cu-tabbar-height"></view>
</scroll-view>
<!-- 右侧抽屉 -->
<uni-drawer ref="showRight" mode="right" :mask-click="true" @change="change($event,'showRight')">
<scroll-view scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
<view class="step-top ">
查看流程图
</view>
<view class="step-item-container">
<view class="step-item">
<view class="step-item-wrap" v-for="(item,key) of flowList" :key="key"
:class="getShowStatus(item)">
<view class="step-item-wrap-doter">
<view class="step-item-wrap-dot"></view>
</view>
<view class="step-item-wrap-right">
<view class="step-item-wrap-right-title">{{item.STEP_NAME}}</view>
<view class="step-item-wrap-right-title">{{item.ACT_USER_NAME || item.SIGN_USER}}</view>
<view class="step-item-wrap-right-title">{{item.ACT_TIME}}</view>
</view>
</view>
</view>
</view>
</scroll-view>
</uni-drawer>
</view>
</template>
@ -99,7 +123,7 @@
},
data() {
return {
flow:"",
flow:"",
showRight: false,
dataFlag:'noData',
sTop:0,
@ -115,6 +139,7 @@
stepList:[],
sindex:-1,
STEP_ID:'',
flowList:[],
}
},
onReady() {
@ -233,11 +258,7 @@
_this.getData();
},
//
change(e, type) {
console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
this[type] = e
},
//
scrolltolower(){
var _this = this;
@ -359,6 +380,49 @@
}
})
},
//
showDrawer(e,HOTWORK_ID) {
uni.showLoading({
title:"加载中..."
});//
uni.request({
url: basePath +'/app/hotwork/getFlowList' ,
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID
},
success: (res) => {
uni.hideLoading();//
this.flowList = res.data.flowList
this.$refs[e].open()
}
})
},
getShowStatus(work) {
if(work.STATUS === 1){
return 'success'
}else if(work.STATUS < 0){
return 'erroractive'
}else if(work.CURRENT_STEP){
return 'active'
}
},
//
closeDrawer(e) {
this.$refs[e].close()
},
//
change(e, type) {
console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
this[type] = e
},
}
}
</script>

View File

@ -6,62 +6,7 @@
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">
<view class="wui-form-list">
<view class="cu-form-group bb-default" >
<view class="title">申请单位</view>
{{pd.APPLY_DEPARTMENT_NAME}}
</view>
<view class="cu-form-group bb-default" >
<view class="title">申请人</view>
{{pd.APPLY_USER_NAME}}
</view>
<view class="cu-form-group bb-default">
<view class="title">编号</view>
{{pd.CHECK_NO}}
</view>
<view class="cu-form-group bb-default">
<view class="title">作业内容</view>
{{pd.WORK_CONTENT}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火地点及动火部位</view>
{{pd.WORK_PLACE}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火作业级别</view>
{{pd.WORK_LEVEL}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火方式</view>
{{pd.WORK_FUNCTION}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火人及证书编号</view>
{{pd.WORK_USER}}
</view>
<view class="cu-form-group bb-default">
<view class="title">关联的其他特殊作业及安全作业票编号</view>
{{pd.SPECIAL_WORK}}
</view>
<view class="cu-form-group bb-default">
<view class="title">风险辨识结果</view>
{{pd.RISK_IDENTIFICATION}}
</view>
<view class="cu-form-group bb-default">
<text class="title">分析人</text>
<text>{{pd.ANALYZE_USER_NAME}}</text>
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)"></button>
</view>
</view>
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID" :showMeasures="false"></detail>
<view class="wui-form-list" style="padding-top: 20upx;">
<view class="wui-title" style="margin-left: 20upx;">
@ -146,9 +91,10 @@
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
import { setMeasures } from '@/pages/application/dangerous_options/index.js';
import detail from '@/pages/application/hotwork/hotwork-detail/index'
export default {
components: {
tkiTree,ruiDatePicker,writingBoard
tkiTree,ruiDatePicker,writingBoard,detail
},
data() {
return {

View File

@ -6,62 +6,7 @@
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">
<view class="wui-form-list">
<view class="cu-form-group bb-default" >
<view class="title">申请单位</view>
{{pd.APPLY_DEPARTMENT_NAME}}
</view>
<view class="cu-form-group bb-default" >
<view class="title">申请人</view>
{{pd.APPLY_USER_NAME}}
</view>
<view class="cu-form-group bb-default">
<view class="title">编号</view>
{{pd.CHECK_NO}}
</view>
<view class="cu-form-group bb-default">
<view class="title">作业内容</view>
{{pd.WORK_CONTENT}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火地点及动火部位</view>
{{pd.WORK_PLACE}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火作业级别</view>
{{pd.WORK_LEVEL}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火方式</view>
{{pd.WORK_FUNCTION}}
</view>
<view class="cu-form-group bb-default">
<view class="title">动火人及证书编号</view>
{{pd.WORK_USER}}
</view>
<view class="cu-form-group bb-default">
<view class="title">关联的其他特殊作业及安全作业票编号</view>
{{pd.SPECIAL_WORK}}
</view>
<view class="cu-form-group bb-default">
<view class="title">风险辨识结果</view>
{{pd.RISK_IDENTIFICATION}}
</view>
<view class="cu-form-group bb-default">
<text class="title">分析人</text>
<text>{{pd.ANALYZE_USER_NAME}}</text>
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)"></button>
</view>
</view>
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID" :showMeasures="false"></detail>
<view class="wui-form-list" style="padding-top: 20upx;">
<view class="wui-title" style="margin-left: 20upx;">
@ -144,9 +89,10 @@
import writingBoard from "@/components/writing-board/writing-board.vue"
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
import detail from '@/pages/application/hotwork/hotwork-detail/index'
export default {
components: {
tkiTree,ruiDatePicker,writingBoard
tkiTree,ruiDatePicker,writingBoard,detail
},
data() {
return {