From c78e4ef0b98443e3568024b26b23c2a298f7970d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 15:48:27 +0800
Subject: [PATCH] 工单审核页面优化
---
src/views/system/work-order/index.vue | 219 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 143 insertions(+), 76 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 401bf4b..7e250c5 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
<el-input
v-model="queryParams.workOrderNo"
@@ -12,14 +12,13 @@
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="workOrderNo">
<el-select v-model="queryParams.errorType" placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
- <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"></el-option>
- <el-option label="璁惧閬楀け" value="璁惧閬楀け"></el-option>
+ <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="瀹℃牳鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="瀹℃牳鐘舵��" clearable @clear="handleQuery">
- <el-option label="宸蹭笅鍙�" value="DISTRIBUTED"></el-option>
- <el-option label="杩愮淮宸插鐞�" value="YW_HANDLE"></el-option>
+ <el-form-item label="宸ュ崟鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="宸ュ崟鐘舵��" @change="handleQuery">
+ <el-option label="寰呭鐞�" value="DISTRIBUTED"></el-option>
+ <el-option label="寰呭鏍�" value="YW_HANDLE"></el-option>
<el-option label="瀹℃牳閫氳繃" value="AUDITING_SUCCESS"></el-option>
<el-option label="瀹℃牳涓嶉�氳繃" value="AUDITING_FAIL"></el-option>
</el-select>
@@ -43,13 +42,25 @@
</el-form-item>
</el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ size="mini"
+ @click="batchAuditingVisible = true; batchAuditingWorkOrder = {}"
+ v-hasPermi="['work:order:audit']"
+ >鎵归噺瀹℃牳</el-button>
+ </el-col>
+ </el-row>
+
<el-row :gutter="20">
- <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item" style="margin-bottom: 20px;">
+ <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id" style="margin-bottom: 20px;">
<el-card :body-style="{ padding: '0px',display: 'flex' }">
<el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
<div style="padding-right: 10px;padding-top: 10px;">
<el-row>
- <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">甯傛斂鏂藉伐</el-tag></el-col>
+ <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">{{ item.errorType }}</el-tag></el-col>
</el-row>
<el-row class="work-order-item">
<el-col class="time" :span="24">杩愮淮浜哄憳锛歿{ item.ywPeopleName }}</el-col>
@@ -68,7 +79,6 @@
size="mini"
type="text"
@click="handleAuditing(item)"
- v-hasPermi="['work:order:audit']"
>瀹℃牳</el-button>
<el-button
size="mini"
@@ -129,31 +139,37 @@
</div>
</el-dialog>
- <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
- <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
- <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
- <el-input v-model="auditingForm.workOrderNo" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
- <el-input v-model="auditingForm.unitName" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
- <el-input v-model="auditingForm.ywPeopleName" disabled />
- </el-form-item>
- <el-form-item label="鐜板満鎯呭喌" v-if="auditingForm.condition">
- <el-input type="textarea" v-html="auditingForm.condition" disabled />
- </el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡" v-if="auditingForm.proofMaterials">
- <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
- </el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
- </el-form-item>
- <el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">
- <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
- </el-form-item>
- </el-form>
+ <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="1000px" append-to-body>
+ <el-row :gutter="20">
+ <el-col :span="10">
+ <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input v-model="auditingForm.workOrderNo" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
+ <el-input v-model="auditingForm.unitName" disabled />
+ </el-form-item>
+ <el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
+ <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
+ <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
+ </el-form-item>
+ <el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">
+ <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
+ </el-form-item>
+ </el-form>
+ </el-col>
+ <el-col :span="14" style="max-height: 500px; overflow-y: scroll">
+ <el-timeline>
+ <el-timeline-item v-for="(condition, index) in ywConditions" :key="index" :timestamp="condition.commitUserName + '___' + condition.createTime" placement="top">
+ <el-card>
+ <div v-html="condition.ywCondition"></div>
+ <el-link type="primary" v-for="item in condition.ywProofMaterials != null ? condition.ywProofMaterials.split(',') : condition.ywProofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </el-col>
+ </el-row>
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
<el-button @click="cancelAuditing">鍙� 娑�</el-button>
@@ -184,9 +200,26 @@
</div>
</el-dialog>
+ <el-dialog title="杩愮淮鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
+ <el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px" :rules="batchAuditingRules">
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+ <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="鏁呴殰绫诲瀷">
+ <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹℃牳璇存槑" prop="auditingRemark">
+ <el-input v-model="batchAuditingWorkOrder.auditingRemark" type="textarea" maxlength="30" show-word-limit />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')" size="small">閫� 杩�</el-button>
+ <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')" size="small">椹� 鍥�</el-button>
+ </div>
+ </el-dialog>
+
<!-- 杩囩▼鍥� -->
- <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
+ <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" append-to-body>
<div>
<el-steps :active="ywAuditingList.length != 0 ? 3 : ywHandleList.length != 0 ? 2 : 1" :space="500">
<el-step title="浜х敓宸ュ崟">
@@ -212,46 +245,50 @@
</el-step>
<el-step title="杩愮淮澶勭悊">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywHandleList">
- <div class="y-item-1">
- <div class="flow-item-x">
- 鐜板満鎯呭喌锛�
- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top">
- <el-tag size="small" class="line-limit-length">{{ item.ywCondition }}</el-tag>
- </el-tooltip>
+ <div style="max-height: 450px;overflow-y: scroll">
+ <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
+ <div class="y-item-1">
+ <div class="flow-item-x">
+ 鐜板満鎯呭喌锛�
+ <!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top"> -->
+ <span v-html="item.ywCondition"></span>
+ <!-- </el-tooltip> -->
+ </div>
+ <!-- <div class="flow-item-x">
+ <el-tag size="small" v-for="file in item.ywProofMaterials != null ? item.ywProofMaterials.split(',') : item.ywProofMaterials" :key="file" @click="handleDownload(file)">{{ file.substring(file.lastIndexOf("/") + 1) }}</el-tag>
+ </div> -->
</div>
- <!-- <div class="flow-item-x">
- <el-tag size="small" v-for="file in item.ywProofMaterials != null ? item.ywProofMaterials.split(',') : item.ywProofMaterials" :key="file" @click="handleDownload(file)">{{ file.substring(file.lastIndexOf("/") + 1) }}</el-tag>
- </div> -->
- </div>
- <div class="y-item-2">
- <div >
- {{ parseTime(item.createTime) }}
- </div>
- <div >
- 绗嚑娆★細{{ index + 1 }}
+ <div class="y-item-2">
+ <div >
+ {{ parseTime(item.createTime) }}
+ </div>
+ <div >
+ 绗瑊{ index + 1 }}娆�
+ </div>
</div>
</div>
</div>
</template>
</el-step>
- <el-step title="缁撴灉瀹℃牳">
+ <el-step title="瀹℃牳缁撴灉">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywAuditingList">
- <div class="y-item-1">
- <div class="flow-item-x">
- 瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
+ <div style="max-height: 450px;overflow-y: scroll">
+ <div class="y-item" v-for="(item, index) in ywAuditingList" :key="index">
+ <div class="y-item-1">
+ <div class="flow-item-x">
+ 瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
+ </div>
+ <div class="flow-item-x">
+ 瀹℃牳璇存槑锛�<span v-html="item.remark"></span>
+ </div>
</div>
- <div class="flow-item-x">
- 瀹℃牳璇存槑锛�<el-tag size="small" v-if="item.remark">{{ item.remark }}</el-tag>
- </div>
- </div>
- <div class="y-item-2">
- <div >
- {{ parseTime(item.createTime) }}
- </div>
- <div >
- 绗嚑娆★細{{ index + 1 }}
+ <div class="y-item-2">
+ <div >
+ {{ parseTime(item.createTime) }}
+ </div>
+ <div >
+ 绗瑊{ index + 1 }}娆�
+ </div>
</div>
</div>
</div>
@@ -283,14 +320,23 @@
}
</style>
<script>
-import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
+import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder, auditing, batchAuditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
import { addReport } from "@/api/platform/report";
+import { getDicts } from "@/api/system/dict/data";
export default {
name: "Work-order",
components: {
},
data() {
return {
+ errorTypeOptions: [],
+ ywConditions: [],
+ batchAuditingVisible: false,
+ batchAuditingWorkOrder: {
+ errorTypes: [],
+ auditingRemark: '',
+ auditingResult: ''
+ },
ywHandleList: [],
ywAuditingList: [],
reportFormRules: {
@@ -388,12 +434,32 @@
{ required: true, message: "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", trigger: "blur" }
],
},
+ // 鎵归噺瀹℃牳鏍￠獙
+ batchAuditingRules: {
+ errorTypes: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "change" }
+ ],
+ }
};
},
created() {
this.getList();
},
methods: {
+ // 鎵归噺瀹℃牳
+ batchAuditing(result) {
+ this.batchAuditingWorkOrder.auditingResult = result;
+ this.$refs["batchAuditingWorkOrder"].validate(valid => {
+ if (valid) {
+ batchAuditing(this.batchAuditingWorkOrder).then(res => {
+ this.batchAuditingWorkOrder = {};
+ this.batchAuditingVisible = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ })
+ }
+ })
+ },
/** 涓嬭浇鎸夐挳鎿嶄綔 */
handleDownload (data) {
this.$download.resource(data);
@@ -420,10 +486,7 @@
handleAuditing(row) {
this.auditingForm = row;
getYwCondition(row.id).then(response => {
- if (response.data) {
- this.auditingForm.condition = response.data.ywCondition;
- this.auditingForm.proofMaterials = response.data.ywProofMaterials;
- }
+ this.ywConditions = response.data;
this.auditingOpen = true;
});
},
@@ -452,7 +515,7 @@
this.ywAuditingList = response.data;
}
});
- getYwConditionList(row.id).then(response => {
+ getYwCondition(row.id).then(response => {
if (response.data) {
this.ywHandleList = response.data;
}
@@ -538,14 +601,18 @@
getList() {
this.loading = true;
this.queryParams.params = {};
- this.queryParams["start"] = this.daterangeYwHandleTime[0];
- this.queryParams["end"] = this.daterangeYwHandleTime[1];
+ this.queryParams["start"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null;
+ this.queryParams["end"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null;
if (this.queryParams["status"] == "") { this.queryParams["status"] = "DISTRIBUTED"; }
listWorkOrder(this.queryParams).then(response => {
this.workOrderList = response.data;
this.total = response.total;
this.loading = false;
});
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0