Commit b46fdbf1 by lanyulei Committed by GitHub

Merge pull request #78 from lanyulei/dev

fix: 修复工单处理页面忽闪的问题。
parents b5b9f575 045229c2
Showing with 151 additions and 146 deletions
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <div v-if="isLoadingStatus" />
<div class="text item"> <div v-else>
<el-steps v-if="currentNode.clazz !== undefined && currentNode.clazz !== null && currentNode.clazz !== ''" :active="activeIndex" finish-status="success"> <el-card class="box-card">
<template v-for="(item, index) in nodeStepList"> <div class="text item">
<el-step <el-steps v-if="currentNode.clazz !== undefined && currentNode.clazz !== null && currentNode.clazz !== ''" :active="activeIndex" finish-status="success">
v-if="item.isHideNode === false || <template v-for="(item, index) in nodeStepList">
item.isHideNode === undefined || <el-step
item.isHideNode == null || v-if="item.isHideNode === false ||
item.id === processStructureValue.workOrder.current_state" item.isHideNode === undefined ||
:key="index" item.isHideNode == null ||
:title="item.label" item.id === processStructureValue.workOrder.current_state"
:key="index"
:title="item.label"
/>
</template>
</el-steps>
<div v-else>
<el-alert
show-icon
title="未找到当前工单流程信息,请确认当前工单绑定的流程是否存在。"
type="warning"
/> />
</template> </div>
</el-steps>
<div v-else>
<el-alert
show-icon
title="未找到当前工单流程信息,请确认当前工单绑定的流程是否存在。"
type="warning"
/>
</div> </div>
</div> </el-card>
</el-card>
<el-alert <el-alert
v-if="activeIndex !== nodeStepList.length && processStructureValue.workOrder.is_end===1" v-if="activeIndex !== nodeStepList.length && processStructureValue.workOrder.is_end===1"
style="margin-top: 15px" style="margin-top: 15px"
:title="alertMessage" :title="alertMessage"
type="error" type="error"
:closable="false" :closable="false"
/> />
<el-card class="box-card" style="margin-top: 15px"> <el-card class="box-card" style="margin-top: 15px">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>公共信息</span> <span>公共信息</span>
</div> </div>
<div class="text item"> <div class="text item">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标题:" style="margin-bottom: 5px"> <el-form-item label="标题:" style="margin-bottom: 5px">
<span>{{ processStructureValue.workOrder.title }}</span> <span>{{ processStructureValue.workOrder.title }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="优先级:" style="margin-bottom: 0"> <el-form-item label="优先级:" style="margin-bottom: 0">
<span v-if="processStructureValue.workOrder.priority===2"> <span v-if="processStructureValue.workOrder.priority===2">
<el-tag type="warning">紧急</el-tag> <el-tag type="warning">紧急</el-tag>
</span> </span>
<span v-else-if="processStructureValue.workOrder.priority===3"> <span v-else-if="processStructureValue.workOrder.priority===3">
<el-tag type="danger">非常紧急</el-tag> <el-tag type="danger">非常紧急</el-tag>
</span> </span>
<span v-else> <span v-else>
<el-tag type="success">一般</el-tag> <el-tag type="success">一般</el-tag>
</span> </span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
<el-card class="box-card" style="margin-top: 15px;"> <el-card class="box-card" style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>表单信息</span> <span>表单信息</span>
</div>
<div class="text item">
<template v-for="(tplItem, tplIndex) in processStructureValue.tpls">
<fm-generate-form
v-show="currentNode.hideTpls===undefined ||
currentNode.hideTpls===null ||
currentNode.hideTpls.indexOf(tplItem.form_structure.id)===-1"
:key="tplIndex"
:ref="'generateForm-'+tplItem.id"
:preview="(currentNode.hideTpls!==undefined &&
currentNode.hideTpls!==null &&
currentNode.hideTpls.indexOf(tplItem.form_structure.id)!==-1) ||
(currentNode.writeTpls===undefined ||
currentNode.writeTpls===null ||
currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1)||
(isActiveProcessing && currentNode.activeOrder)?true:false"
:remote="remoteFunc"
:value="tplItem.form_data"
:data="tplItem.form_structure"
/>
</template>
</div>
<div v-if="processStructureValue.userAuthority">
<hr style="background-color: #d9d9d9; border:0; height:1px; margin-bottom: 15px">
<div>
<el-input
v-model="remarks"
type="textarea"
placeholder="请输入备注信息"
maxlength="200"
:autosize="{ minRows: 3, maxRows: 99}"
show-word-limit
/>
</div> </div>
<div class="text item" style="text-align: center;margin-top:18px"> <div class="text item">
<div <template v-for="(tplItem, tplIndex) in processStructureValue.tpls">
v-if="isActiveProcessing && currentNode.activeOrder" <fm-generate-form
> v-show="currentNode.hideTpls===undefined ||
<el-button currentNode.hideTpls===null ||
v-permisaction="['process:list:handle:active']" currentNode.hideTpls.indexOf(tplItem.form_structure.id)===-1"
type="primary" :key="tplIndex"
@click="activeOrderActive" :ref="'generateForm-'+tplItem.id"
> :preview="(currentNode.hideTpls!==undefined &&
主动接单 currentNode.hideTpls!==null &&
</el-button> currentNode.hideTpls.indexOf(tplItem.form_structure.id)!==-1) ||
(currentNode.writeTpls===undefined ||
currentNode.writeTpls===null ||
currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1)||
(isActiveProcessing && currentNode.activeOrder)?true:false"
:remote="remoteFunc"
:value="tplItem.form_data"
:data="tplItem.form_structure"
/>
</template>
</div>
<div v-if="processStructureValue.userAuthority">
<hr style="background-color: #d9d9d9; border:0; height:1px; margin-bottom: 15px">
<div>
<el-input
v-model="remarks"
type="textarea"
placeholder="请输入备注信息"
maxlength="200"
:autosize="{ minRows: 3, maxRows: 99}"
show-word-limit
/>
</div> </div>
<div v-else> <div class="text item" style="text-align: center;margin-top:18px">
<template v-for="(item, index) in processStructureValue.edges"> <div
v-if="isActiveProcessing && currentNode.activeOrder"
>
<el-button <el-button
v-if="processStructureValue.workOrder.is_end===0 && item.source===currentNode.id" v-permisaction="['process:list:handle:active']"
:key="index"
type="primary" type="primary"
@click="submitAction(item)" @click="activeOrderActive"
> >
{{ item.label }} 主动接单
</el-button> </el-button>
</template> </div>
<div v-else>
<template v-for="(item, index) in processStructureValue.edges">
<el-button
v-if="processStructureValue.workOrder.is_end===0 && item.source===currentNode.id"
:key="index"
type="primary"
@click="submitAction(item)"
>
{{ item.label }}
</el-button>
</template>
</div>
</div> </div>
</div> </div>
</div> </el-card>
</el-card>
<el-card class="box-card" style="margin-top: 15px"> <el-card class="box-card" style="margin-top: 15px">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>工单流转历史</span> <span>工单流转历史</span>
</div> </div>
<div class="text item"> <div class="text item">
<el-table <el-table
:data="circulationHistoryList" :data="circulationHistoryList"
border border
style="width: 100%" style="width: 100%"
> >
<el-table-column <el-table-column
prop="state" prop="state"
label="节点" label="节点"
/> />
<el-table-column <el-table-column
prop="circulation" prop="circulation"
label="流转" label="流转"
/> />
<el-table-column <el-table-column
prop="processor" prop="processor"
label="处理人" label="处理人"
/> />
<el-table-column <el-table-column
prop="create_time" prop="create_time"
label="处理时间" label="处理时间"
/> />
<el-table-column <el-table-column
prop="remarks" prop="remarks"
label="备注" label="备注"
/> />
</el-table> </el-table>
</div> </div>
</el-card> </el-card>
</div>
</div> </div>
</template> </template>
...@@ -183,6 +186,7 @@ import { mapGetters } from 'vuex' ...@@ -183,6 +186,7 @@ import { mapGetters } from 'vuex'
export default { export default {
data() { data() {
return { return {
isLoadingStatus: true,
currentNode: { currentNode: {
hideTpls: null, hideTpls: null,
writeTpls: null writeTpls: null
...@@ -271,6 +275,7 @@ export default { ...@@ -271,6 +275,7 @@ export default {
break break
} }
} }
this.isLoadingStatus = false
this.getAlertMessage() this.getAlertMessage()
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment