|
@@ -4,53 +4,55 @@
|
|
|
<div class="info">
|
|
<div class="info">
|
|
|
<div class="item">
|
|
<div class="item">
|
|
|
<view class="name">上报人</view>
|
|
<view class="name">上报人</view>
|
|
|
- <view class="cont">上报人</view>
|
|
|
|
|
|
|
+ <view class="cont">{{item.curAccountName}}</view>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="item">
|
|
<div class="item">
|
|
|
<view class="name">所属部门</view>
|
|
<view class="name">所属部门</view>
|
|
|
- <view class="cont">所属部门</view>
|
|
|
|
|
|
|
+ <view class="cont">{{item.curGroupName}}</view>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="item">
|
|
<div class="item">
|
|
|
<view class="name">发布时间</view>
|
|
<view class="name">发布时间</view>
|
|
|
- <view class="cont">{{parseTime(new Date())}}</view>
|
|
|
|
|
|
|
+ <view class="cont">{{parseTime(item.curActivityBeginTime)}}</view>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="status">
|
|
|
|
|
|
|
+ <div class="status" v-if="flowData">
|
|
|
<div class="head">整改过程</div>
|
|
<div class="head">整改过程</div>
|
|
|
<template>
|
|
<template>
|
|
|
<view class="flow-head">
|
|
<view class="flow-head">
|
|
|
- <span class="flow-user">质量安全管理科-{{flow.user||'***'}}</span>
|
|
|
|
|
- <view class="flow-time">{{parseTime(flow.time)}}</view>
|
|
|
|
|
|
|
+ <span class="flow-user">{{flowData.groupName}}-{{flowData.accountName||'***'}}</span>
|
|
|
|
|
+ <view class="flow-time">{{parseTime(flowData.actionTime)}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <div class="desc">{{flow.desc}}</div>
|
|
|
|
|
|
|
+ <div class="desc">{{flowData.actionRemark}}</div>
|
|
|
<div class="attach">
|
|
<div class="attach">
|
|
|
- <view class="attach-item" v-for="(attach,index) in flow.attachList" :key="'attach-'+index">
|
|
|
|
|
- <image class="image" :src="attach.url" mode="widthFix"></image>
|
|
|
|
|
|
|
+ <view class="attach-item" v-for="(attach,index) in flowData.attachList" :key="'attach-'+index">
|
|
|
|
|
+ <image class="image" :src="attach.fileUrl" mode="widthFix"></image>
|
|
|
</view>
|
|
</view>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="check status" :class="check.status===0?'reject':(check.status===1?'pass':'')" v-if="check.status!==''">
|
|
|
|
|
|
|
+<!-- <div class="check status" :class="check.status===0?'reject':(check.status===1?'pass':'')" v-if="check.status!==''"> -->
|
|
|
|
|
+<!-- <div class="check status pass">
|
|
|
<div class="head">验收过程</div>
|
|
<div class="head">验收过程</div>
|
|
|
- <template>
|
|
|
|
|
|
|
+ <template v-if="flowData">
|
|
|
<view class="flow-head">
|
|
<view class="flow-head">
|
|
|
- <span class="flow-user">质量安全管理科-{{check.user||'***'}}</span>
|
|
|
|
|
|
|
+ <span class="flow-user">{flowData.groupName}}-{{flowData.accountName||'***'}}</span>
|
|
|
<view class="flow-time">{{parseTime(check.time)}}</view>
|
|
<view class="flow-time">{{parseTime(check.time)}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <div class="desc">{{check.desc}}</div>
|
|
|
|
|
|
|
+ <div class="desc">{{check.actionRemark}}</div>
|
|
|
<div class="attach">
|
|
<div class="attach">
|
|
|
- <view class="attach-item" v-for="(attach,index) in check.attachList" :key="'attach-'+index">
|
|
|
|
|
- <image class="image" :src="attach.url" mode="widthFix"></image>
|
|
|
|
|
|
|
+ <view class="attach-item" v-for="(attach,index) in actionRemark.attachList" :key="'attach-'+index">
|
|
|
|
|
+ <image class="image" :src="attach.fileUrl" mode="widthFix"></image>
|
|
|
</view>
|
|
</view>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
- </div>
|
|
|
|
|
- <view class="footer" @click="onSubmit" v-if="check.status===''">验收</view>
|
|
|
|
|
- <view class="footer" @click="onRectify" v-if="check.status===0">二次整改</view>
|
|
|
|
|
|
|
+ </div> -->
|
|
|
|
|
+ <view class="footer" @click="onSubmit">验收</view>
|
|
|
|
|
+<!-- <view class="footer" @click="onRectify" v-if="check.status===0">二次整改</view> -->
|
|
|
</view>
|
|
</view>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
|
|
+ import { getWorkflowById } from '@/api/system/wfApi'
|
|
|
import {parseTime} from '@/libs/index.js'
|
|
import {parseTime} from '@/libs/index.js'
|
|
|
export default {
|
|
export default {
|
|
|
data() {
|
|
data() {
|
|
@@ -58,7 +60,7 @@
|
|
|
item:{
|
|
item:{
|
|
|
title:"水位预{2号-770-32002}:采空区封堵完好,无渗水情况。"
|
|
title:"水位预{2号-770-32002}:采空区封堵完好,无渗水情况。"
|
|
|
},
|
|
},
|
|
|
- flow:{
|
|
|
|
|
|
|
+ flowData:{
|
|
|
status:"",
|
|
status:"",
|
|
|
time:"",
|
|
time:"",
|
|
|
desc:"",
|
|
desc:"",
|
|
@@ -78,44 +80,55 @@
|
|
|
methods: {
|
|
methods: {
|
|
|
parseTime,
|
|
parseTime,
|
|
|
init(){
|
|
init(){
|
|
|
- let title="待验收"
|
|
|
|
|
- this.flow={
|
|
|
|
|
- status:-1,
|
|
|
|
|
- user:"王麻子",
|
|
|
|
|
- time:new Date(),
|
|
|
|
|
- desc:"处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
|
|
|
|
|
- attachList:[
|
|
|
|
|
- {url:"/static/preview/1.png"},
|
|
|
|
|
- {url:"/static/preview/2.png"},
|
|
|
|
|
- {url:"/static/preview/3.png"}
|
|
|
|
|
- ]
|
|
|
|
|
- }
|
|
|
|
|
- /*已经验收 未通过*/
|
|
|
|
|
- this.check={
|
|
|
|
|
- status:0,
|
|
|
|
|
- user:"王麻子",
|
|
|
|
|
- time:new Date(),
|
|
|
|
|
- desc:"处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
|
|
|
|
|
- attachList:[
|
|
|
|
|
- {url:"/static/preview/1.png"},
|
|
|
|
|
- {url:"/static/preview/2.png"},
|
|
|
|
|
- {url:"/static/preview/3.png"}
|
|
|
|
|
- ]
|
|
|
|
|
- }
|
|
|
|
|
- // 验收完成
|
|
|
|
|
- if(this.check.status===1){
|
|
|
|
|
- uni.setNavigationBarTitle({
|
|
|
|
|
- title: '已完成'
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- if(this.check.status===0){
|
|
|
|
|
- uni.setNavigationBarTitle({
|
|
|
|
|
- title: '待验收'
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ this.getTask()
|
|
|
|
|
+ // let title="待验收"
|
|
|
|
|
+ // this.flow={
|
|
|
|
|
+ // status:-1,
|
|
|
|
|
+ // user:"王麻子",
|
|
|
|
|
+ // time:new Date(),
|
|
|
|
|
+ // desc:"处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
|
|
|
|
|
+ // attachList:[
|
|
|
|
|
+ // {url:"/static/preview/1.png"},
|
|
|
|
|
+ // {url:"/static/preview/2.png"},
|
|
|
|
|
+ // {url:"/static/preview/3.png"}
|
|
|
|
|
+ // ]
|
|
|
|
|
+ // }
|
|
|
|
|
+ // /*已经验收 未通过*/
|
|
|
|
|
+ // this.check={
|
|
|
|
|
+ // status:0,
|
|
|
|
|
+ // user:"王麻子",
|
|
|
|
|
+ // time:new Date(),
|
|
|
|
|
+ // desc:"处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
|
|
|
|
|
+ // attachList:[
|
|
|
|
|
+ // {url:"/static/preview/1.png"},
|
|
|
|
|
+ // {url:"/static/preview/2.png"},
|
|
|
|
|
+ // {url:"/static/preview/3.png"}
|
|
|
|
|
+ // ]
|
|
|
|
|
+ // }
|
|
|
|
|
+ // // 验收完成
|
|
|
|
|
+ // if(this.check.status===1){
|
|
|
|
|
+ // uni.setNavigationBarTitle({
|
|
|
|
|
+ // title: '已完成'
|
|
|
|
|
+ // });
|
|
|
|
|
+ // }
|
|
|
|
|
+ // if(this.check.status===0){
|
|
|
|
|
+ // uni.setNavigationBarTitle({
|
|
|
|
|
+ // title: '待验收'
|
|
|
|
|
+ // });
|
|
|
|
|
+ // }
|
|
|
},
|
|
},
|
|
|
getTask(){
|
|
getTask(){
|
|
|
- this.item=uni.getStorageSync('task-item')
|
|
|
|
|
|
|
+ let data=uni.getStorageSync('danger-info')
|
|
|
|
|
+ this.item=data
|
|
|
|
|
+ getWorkflowById(data.wfInsId).then((resp) => {
|
|
|
|
|
+ this.listLoading = false
|
|
|
|
|
+ const { code, data, msg } = resp
|
|
|
|
|
+ if (code === 0) {
|
|
|
|
|
+ this.flowData = data.activityInsRecordList.filter(item=>item.formCode==='rectify')[0]
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$message.error(msg)
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
onSubmit(){
|
|
onSubmit(){
|
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
@@ -138,6 +151,8 @@
|
|
|
.task-page{
|
|
.task-page{
|
|
|
background-color: #F3F5FB;
|
|
background-color: #F3F5FB;
|
|
|
padding-bottom: 120rpx;
|
|
padding-bottom: 120rpx;
|
|
|
|
|
+ height: 100vh;
|
|
|
|
|
+ overflow-y: auto;
|
|
|
.title{
|
|
.title{
|
|
|
font-family: 'Source Han Sans CN';
|
|
font-family: 'Source Han Sans CN';
|
|
|
font-style: normal;
|
|
font-style: normal;
|
|
@@ -256,6 +271,7 @@
|
|
|
font-size: 32upx;
|
|
font-size: 32upx;
|
|
|
padding-top: 20upx;
|
|
padding-top: 20upx;
|
|
|
letter-spacing: 2px;
|
|
letter-spacing: 2px;
|
|
|
|
|
+ border: 1px solid #eaeaea;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|