From ca18425f8cb3b9e09cc1a1df31d7b91f77bb7566 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:44:11 +0800
Subject: [PATCH] 过程图优化
---
src/api/platform/work-order.js | 4 ++--
src/views/system/work-order/index.vue | 49 +++++++++++++++++++++++--------------------------
2 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/api/platform/work-order.js b/src/api/platform/work-order.js
index 700cd9b..7b57622 100644
--- a/src/api/platform/work-order.js
+++ b/src/api/platform/work-order.js
@@ -106,9 +106,9 @@
}
// 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
-export function getYwAuditingList(data) {
+export function process(data) {
return request({
- url: '/work-order/yw-auditing-list/' + data,
+ url: '/work-order/process/' + data,
method: 'get'
})
}
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 9a3801c..c731f2a 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -289,7 +289,7 @@
<template slot="description">
<div style="max-height: 450px;overflow-y: scroll">
<div v-for="(item, index) in ywHandleList" :key="index">
- <div v-if="item.sysMsg" class="row flow-item-x">
+ <div v-if="item.sysMsg === true" class="row flow-item-x">
<div class="cflex1">绯荤粺娑堟伅锛�</div>
<div class="cflex2">{{item.ywCondition}}</div>
<div class="cflex3">{{item.createTime}}</div>
@@ -305,20 +305,24 @@
:visible.sync="drawer"
direction="rtl"
:modal="false"
- :before-close="drawerClose">
- <div style="padding: 20px">
+ >
+ <div style="padding: 20px;font-size: 14px">
<div class="row flow-item-x">
- <div class="flex1">涓婃姤鍐呭锛�</div>
- <div class="flex2" v-html="ywData.content"></div>
+ <div class="flex1"><p>涓婃姤鍐呭锛�</p></div>
+ <div class="flex2">
+ <div v-html="ywData.content"></div>
+ </div>
</div>
<div class="row flow-item-x">
- <div class="flex1">浣愯瘉鏉愭枡锛�</div>
+ <div class="flex1"><p>浣愯瘉鏉愭枡锛�</p></div>
<div class="flex2">
- <el-link type="primary"
- v-for="item in ywData.fileList != null ? ywData.fileList.split(',') : ywData.fileList"
- :underline="false" :key="item.id" @click="handleDownload(item)"
- >{{ item.substring(item.lastIndexOf('/') + 1) }}
- </el-link>
+ <p>
+ <el-link type="primary"
+ v-for="item in ywData.fileList != null ? ywData.fileList.split(',') : ywData.fileList"
+ :underline="false" :key="item.id" @click="handleDownload(item)"
+ >{{ item.substring(item.lastIndexOf('/') + 1) }}
+ </el-link>
+ </p>
</div>
</div>
@@ -422,8 +426,7 @@
batchAuditing,
ywCondition,
getYwCondition,
- getYwConditionList,
- getYwAuditingList
+ process
} from '@/api/platform/work-order'
import { addReport } from '@/api/platform/report'
@@ -551,15 +554,13 @@
},
methods: {
openDrawer(item) {
- this.ywData.content = item.ywCondition
- this.ywData.fileList = item.ywProofMaterials
- this.drawer = true
- },
- drawerClose() {
this.ywData = {
content: '',
fileList: ''
}
+ this.ywData.content = item.ywCondition
+ this.ywData.fileList = item.ywProofMaterials
+ this.drawer = true
},
// 鎵归噺瀹℃牳
batchAuditing(result) {
@@ -625,16 +626,12 @@
// 杩囩▼鍥炬煡鐪�
handleFlow(row) {
this.flowForm = row
- getYwAuditingList(row.workOrderNo).then(response => {
+ process(row.workOrderNo).then(response => {
if (response.data) {
- this.ywAuditingList = response.data
+ this.ywAuditingList = response.data.auditingList
+ this.ywHandleList = response.data.ywList
+ this.flowOpen = true
}
- })
- getYwCondition(row.workOrderNo).then(response => {
- if (response.data) {
- this.ywHandleList = response.data
- }
- this.flowOpen = true
})
},
// 鎻愪氦瀹℃牳
--
Gitblit v1.8.0