|
@@ -47,7 +47,7 @@
|
|
|
style="width: 100%">
|
|
|
<el-table-column type="index" label="序号" width="60" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="实施项目名称" prop="name" width="150" align="center">
|
|
|
+ <el-table-column label="实施项目名称" prop="name" width="180" align="center" :show-overflow-tooltip="true">
|
|
|
</el-table-column>
|
|
|
<el-table-column label="实施内容" prop="content" align="center" :show-overflow-tooltip="true"></el-table-column>
|
|
|
<el-table-column label="实施负责人" prop="enforcer" width="90" align="center">
|
|
@@ -56,10 +56,10 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="实施日期" prop="time" width="180" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
|
|
|
+ <div>{{ scope.row.beginTime }}至{{ scope.row.endTime }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="hsytem" label="所属系统" align="center">
|
|
|
+ <el-table-column prop="hsytem" label="所属系统" align="center" width="210">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="createTime" label="创建时间" width="130" align="center" v-if="false">
|
|
|
<template slot-scope="scope">
|
|
@@ -441,7 +441,6 @@
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.startTime"
|
|
|
type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
format="yyyy-MM-dd"
|
|
|
placeholder="请选择开始时间">
|
|
|
</el-date-picker>
|
|
@@ -452,7 +451,6 @@
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.termTime"
|
|
|
type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
format="yyyy-MM-dd"
|
|
|
placeholder="请选择可配置灵活时间">
|
|
|
</el-date-picker>
|
|
@@ -553,9 +551,9 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!--处理实施工作任务--->
|
|
|
- <el-dialog title="审批处理" :visible.sync="editEnforceFormVisible1" width="75%" :close-on-click-modal="false">
|
|
|
+ <el-dialog title="审批处理" :visible.sync="editEnforceFormVisible1" width="70%" :close-on-click-modal="false">
|
|
|
<el-form label-width="120px" :model="enforceForm" size="mini">
|
|
|
- <el-descriptions title="" :column="2" border size="mini">
|
|
|
+ <el-descriptions title="" :column="3" border size="mini">
|
|
|
<el-descriptions-item>
|
|
|
<template slot="label">
|
|
|
项目名称
|
|
@@ -594,19 +592,19 @@
|
|
|
<span style="color: green" v-else-if="enforceFlow.status===1">进行中</span>
|
|
|
<span style="color: darkblue" v-else="enforceFlow.status===2">已结束</span>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+ <el-descriptions-item >
|
|
|
<template slot="label">
|
|
|
当前任务
|
|
|
</template>
|
|
|
- {{ enforceFlow.flowType }}
|
|
|
+ <el-tag> {{ enforceFlow.flowType }}</el-tag>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+ <el-descriptions-item>
|
|
|
<template slot="label">
|
|
|
- 实施内容
|
|
|
+ 下个步骤
|
|
|
</template>
|
|
|
- {{ enforceFlow.content }}
|
|
|
+ <el-tag type="warning"> {{ enforceForm.nextStepName }}</el-tag>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+ <el-descriptions-item>
|
|
|
<template slot="label">
|
|
|
下个步骤负责人
|
|
|
</template>
|
|
@@ -614,14 +612,21 @@
|
|
|
<el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
|
|
|
</el-input>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+
|
|
|
+ <el-descriptions-item :span="3">
|
|
|
+ <template slot="label">
|
|
|
+ 实施内容
|
|
|
+ </template>
|
|
|
+ {{ enforceFlow.content }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item :span="3">
|
|
|
<template slot="label">
|
|
|
备注说明
|
|
|
</template>
|
|
|
- <el-input size="small" v-model="enforceForm.remark" type="textarea" :rows="4"></el-input>
|
|
|
+ <el-input size="small" v-model="enforceForm.remark" type="textarea" :rows="3"></el-input>
|
|
|
</el-descriptions-item>
|
|
|
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+ <el-descriptions-item :span="3">
|
|
|
<template slot="label">
|
|
|
文件列表
|
|
|
</template>
|
|
@@ -637,7 +642,7 @@
|
|
|
<el-button slot="trigger" size="mini" type="primary">选取文件</el-button>
|
|
|
</el-upload>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item :span="2">
|
|
|
+ <el-descriptions-item :span="3">
|
|
|
<template slot="label">
|
|
|
其他说明
|
|
|
</template>
|
|
@@ -795,7 +800,8 @@ export default {
|
|
|
taskId: null,
|
|
|
currentStep: null,
|
|
|
filess: [],
|
|
|
- content: null
|
|
|
+ content: null,
|
|
|
+ nextStepName:null
|
|
|
},
|
|
|
enforceFlow: {
|
|
|
name: '',
|
|
@@ -1142,7 +1148,7 @@ export default {
|
|
|
},
|
|
|
createeditorElem1Editor() {
|
|
|
editorElem1 = new E('#editorElem1');
|
|
|
- editorElem1.config.height = 300
|
|
|
+ editorElem1.config.height = 250
|
|
|
editorElem1.create()
|
|
|
editorElem1.txt.html(this.enforceForm.content)
|
|
|
editorElem1.config.onchange = (html) => {
|
|
@@ -1477,6 +1483,7 @@ export default {
|
|
|
this.enforceForm.remark = ''
|
|
|
this.enforceForm.filess = []
|
|
|
this.enforceForm.content = ''
|
|
|
+ this.enforceForm.nextStepName=row.nextStepName
|
|
|
this.uploadFileList = []
|
|
|
|
|
|
this.$nextTick(() => {
|