project_management-vue.git

			@@ -88,6 +88,7 @@
			<el-button v-if="scope.row.taskStatus !== '未开始'" @click="goToProcessDetail(scope.row)" type="text" size="small">查看</el-button>
			<el-button v-if="showHandle(scope.row)" @click="goToDo(scope.row)" type="text" size="small">办理</el-button>
			<el-button v-if = "scope.row.taskStatus === '待办'" @click="openSupervise(scope.row)" type="text" size="small">督办</el-button>
			<el-button v-if = "scope.row.taskStatus === '已完成' \|\| scope.row.taskStatus === '跳过' \|\| scope.row.taskStatus === '容缺'" v-hasPermi="['task:edit']" @click="openEditTask(scope.row)" type="text" size="small">修改</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -127,62 +128,6 @@
			<log-view style="padding: 10px 20px" :log-list="logList"/>
			</el-drawer>

			<!-- <el-dialog-->
			<!-- :title="`${this.queryParams.processName}：流转记录`"-->
			<!-- :visible.sync="processRecordShow"-->
			<!-- :fullscreen="true"-->
			<!-- :close-on-click-modal="false"-->
			<!-- :destroy-on-close="true"-->
			<!-- >-->
			<!-- <div>-->
			<!-- <log-view :log-list="logList"/>-->
			<!--<!– <div class="block">–>-->
			<!--<!– <el-timeline>–>-->
			<!--<!– <el-timeline-item–>-->
			<!--<!– v-for="(item,index ) in flowRecordList"–>-->
			<!--<!– :key="index"–>-->
			<!--<!– :icon="setIcon(item.finishTime)"–>-->
			<!--<!– :color="setColor(item.finishTime)"–>-->
			<!--<!– >–>-->
			<!--<!– <p style="font-weight: 700">{{item.taskName}}–>-->
			<!--<!– <span v-if="item.comment && item.comment.type === '3'" style="color: red">(执行了驳回)</span>–>-->
			<!--<!– <span v-if="item.overtime && item.overtime==='red'" style="color: red">(已超时)</span>–>-->
			<!--<!– <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(即将超时)</span>–>-->
			<!--<!– </p>–>-->
			<!--<!– <el-card :body-style="{ padding: '10px' }">–>-->
			<!--<!– <el-descriptions class="margin-top" :column="1" size="small" border>–>-->
			<!--<!– <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-user"></i>办理人</template>–>-->
			<!--<!– {{item.assigneeName}}–>-->
			<!--<!– <el-tag type="info" size="mini">{{item.deptName}}</el-tag>–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– <el-descriptions-item v-if="item.candidate" label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-user"></i>候选办理</template>–>-->
			<!--<!– {{item.candidate}}–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– <el-descriptions-item label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-date"></i>接收时间</template>–>-->
			<!--<!– {{item.createTime}}–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-date"></i>处理时间</template>–>-->
			<!--<!– {{item.finishTime}}–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– <el-descriptions-item v-if="item.duration" label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-time"></i>耗时</template>–>-->
			<!--<!– {{item.duration}}–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– <el-descriptions-item v-if="item.comment" label-class-name="my-label">–>-->
			<!--<!– <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>–>-->
			<!--<!– {{item.comment.comment}}–>-->
			<!--<!– </el-descriptions-item>–>-->
			<!--<!– </el-descriptions>–>-->
			<!--<!– </el-card>–>-->
			<!--<!– </el-timeline-item>–>-->
			<!--<!– </el-timeline>–>-->
			<!--<!– </div>–>-->
			<!-- </div>-->
			<!-- </el-dialog>-->
			<el-dialog :visible.sync="superviseShow" width="1000px" title="督办" append-to-body>
			<el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="80px">
			<el-form-item label="督办内容" prop="content">
			@@ -194,6 +139,8 @@
			<el-button type="primary" @click="submitSupervise">确定</el-button>
			</div>
			</el-dialog>

			<edit-task :task-id="editTaskId" :open="editTaskOpen" @close="editTaskOpen = false; editTaskId = ''"/>
			</div>
			</template>

			@@ -206,6 +153,7 @@
			import {flowXmlAndNode} from "@/api/flowable/definition";
			import BpmnViewer from '@/components/Process/viewer';
			import LogView from "@/views/projectProcess/components/LogView";
			import EditTask from "@/views/projectProcess/components/EditTask";
			import {flowRecord} from "@/api/flowable/finished";
			import {editProject} from "@/api/projectEngineering/projectInfo";
			import {getProjectProcessLog} from "@/api/flowLog/flowLog";
			@@ -214,10 +162,13 @@
			name: "Detail",
			components: {
			BpmnViewer,
			LogView
			LogView,
			EditTask
			},
			data() {
			return {
			editTaskId: '',
			editTaskOpen: false,
			logList: [], // 流程日志
			processRecordShow: false, // 流转记录显示
			flowRecordList: [], // 流程流转数据
			@@ -280,6 +231,11 @@
			this.getProjectProcessInfo()
			},
			methods: {
			// 打开编辑任务
			openEditTask(row) {
			this.editTaskOpen = true
			this.editTaskId = row.taskId
			},
			transEventType(selectTabId) {
			if (selectTabId == 1) {
			return "all"