Merge pull request 'fix : 完善详情页面细节' (#122) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/122
This commit is contained in:
@@ -1,41 +1,58 @@
|
||||
<template>
|
||||
<div class="detail-block">
|
||||
<el-row gutter="20">
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
|
||||
<div class="left-info">
|
||||
<el-form :model="form" label-width="auto">
|
||||
<el-row gutter="20">
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
|
||||
<baseTitle title="需求征集详情"></baseTitle>
|
||||
<div class="info">
|
||||
<div v-for="item in list">
|
||||
<span>{{ item.title }}:</span>
|
||||
<span>{{ item.text }}</span>
|
||||
<div class="left-info">
|
||||
<el-row>
|
||||
<el-col :span="12" v-for="item in list">
|
||||
<el-form-item :label="item.title">
|
||||
<span>{{ item.text }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<baseTitle title="征集说明"></baseTitle>
|
||||
<el-col :span="24">
|
||||
<el-form-item>
|
||||
<el-card style="width: 100%">
|
||||
{{ instructions }}
|
||||
</el-card>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<baseTitle title="申请文件"></baseTitle>
|
||||
<el-col :span="24">
|
||||
<el-form-item>
|
||||
<fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
|
||||
@headBtnClick="headBtnClick"
|
||||
:pagination="false"></fvTable>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<baseTitle title="审核意见"></baseTitle>
|
||||
<el-col :span="24">
|
||||
<el-form-item>
|
||||
<el-input
|
||||
v-model="auditOpinion"
|
||||
:rows="3"
|
||||
type="textarea"
|
||||
placeholder="请输入审核意见"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
|
||||
<div class="approval-record">
|
||||
<baseTitle title="审批记录"></baseTitle>
|
||||
<div class="process" id="approvalRecord">
|
||||
<process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
|
||||
</div>
|
||||
</div>
|
||||
<baseTitle title="征集说明"></baseTitle>
|
||||
<el-card>
|
||||
{{ instructions }}
|
||||
</el-card>
|
||||
<baseTitle title="申请文件"></baseTitle>
|
||||
<fvTable ref="tableIns" style="max-height: 200px" :tableConfig="tableConfig" @headBtnClick="headBtnClick" :pagination="false"></fvTable>
|
||||
<baseTitle title="审核意见"></baseTitle>
|
||||
<el-input
|
||||
v-model="auditOpinion"
|
||||
:rows="3"
|
||||
type="textarea"
|
||||
placeholder="请输入审核意见"
|
||||
/>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
|
||||
<div class="approval-record" >
|
||||
<baseTitle title="审批记录"></baseTitle>
|
||||
<div class="process" id="approvalRecord">
|
||||
<process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div class="oper-page-btn">
|
||||
<el-button @click="handleSubmit">驳回</el-button>
|
||||
<el-button @click="handleSubmit">驳回</el-button>
|
||||
<el-button color="#DED0B2" @click="handleBack">同意</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -46,6 +63,8 @@ import {getInitiateInfo} from "@/api/workflow/process-definition.js";
|
||||
import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
|
||||
import {useProcessStore} from '@/stores/processStore.js';
|
||||
import {ElMessage} from "element-plus";
|
||||
|
||||
const form = ref();
|
||||
const processStore = useProcessStore()
|
||||
const list = ref([
|
||||
{
|
||||
@@ -81,7 +100,7 @@ const tableConfig = reactive({
|
||||
prop: 'oper',
|
||||
label: '操作',
|
||||
align: 'center',
|
||||
width:'200px',
|
||||
width: '200px',
|
||||
showOverflowTooltip: false,
|
||||
currentRender: ({row, index}) => {
|
||||
return (
|
||||
@@ -95,9 +114,9 @@ const tableConfig = reactive({
|
||||
],
|
||||
api: ''
|
||||
})
|
||||
const getTree=async()=>{
|
||||
getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
|
||||
console.log('res11',res)
|
||||
const getTree = async () => {
|
||||
getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
|
||||
console.log('res11', res)
|
||||
// processDefinition.value = res.data;
|
||||
//构建表单及校验规则
|
||||
processStore.setDesign(res.data)
|
||||
@@ -143,10 +162,11 @@ getTree()
|
||||
flex: 0.4;
|
||||
|
||||
|
||||
.process{
|
||||
.process {
|
||||
//max-height: calc(100vh - 96px);
|
||||
height: calc(100vh - 250px);
|
||||
overflow: auto;
|
||||
|
||||
&::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
|
||||
Reference in New Issue
Block a user