From 5f6abeedb7ce43853ad486731a5e99b340ec6392 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 17 九月 2024 18:55:39 +0800
Subject: [PATCH] 新大屏数据对接
---
src/views/system/work-order/index.vue | 77 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index b32aaaa..23a5fff 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-form-item label="鍏抽敭璇�" prop="keyword">
<el-input
- v-model="queryParams.workOrderNo"
- placeholder="璇疯緭鍏ュ伐鍗曞彿"
+ v-model="queryParams.keyword"
+ placeholder="宸ュ崟鍙�/鐐逛綅鍚嶇О鎼滅储"
clearable
@clear="handleQuery"
@keyup.enter.native="handleQuery"
@@ -88,7 +88,7 @@
<el-col :span="24" class="time">鏁呴殰鏃堕棿锛歿{ item.createTime }}</el-col>
</el-row>
<el-row class="work-order-item">
- <el-col class="time" :span="24" style="display: flex;flex-direction: row"><div style="min-width: 66px">鏁呴殰鐐逛綅锛�</div><div style="word-break: break-word">{{ item.source }}</div></el-col>
+ <el-col class="time" :span="24"><div>鏁呴殰鐐逛綅锛�</div><div>{{ item.source }}</div></el-col>
</el-row>
<el-row style="position: absolute;bottom: 10px">
<el-button
@@ -107,7 +107,7 @@
v-hasPermi="['work:order:condition:add']"
v-show="item.status !== 'AUDITING_SUCCESS'"
@click="handleYwCondition(item)"
- >杩愮淮鎯呭喌
+ >澶勭悊涓婃姤
</el-button>
<el-button
class="my-button"
@@ -124,6 +124,14 @@
v-hasPermi="['system:report:add']"
v-show="item.status !== 'AUDITING_SUCCESS'"
>浜嬪悗鎶ュ
+ </el-button>
+ <el-button
+ class="my-button"
+ size="mini"
+ type="text"
+ @click="handleDetail(item)"
+ v-hasPermi="['system:workorder:detail']"
+ >璇︽儏
</el-button>
</el-row>
</div>
@@ -162,12 +170,15 @@
<el-form-item label="鎶ュ绫诲瀷">
<el-input v-model="reportForm.reportType" disabled/>
</el-form-item>
- <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
- <el-select v-model="reportForm.errorType">
- <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
- <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
- <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
+ <el-select v-model="reportForm.errorTypeList" multiple>
+ <el-option v-for="dict in dict.type.report_error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
+ </el-form-item>
+ <el-form-item label="鎶ュ鏃堕棿" prop="daterangeCreateTime">
+ <el-date-picker v-model="reportForm.daterangeCreateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="鎶ュ鍐呭" prop="reportContent">
<editor v-model="reportForm.reportContent" :min-height="192"/>
@@ -178,7 +189,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="reportOpen = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitReportForm">鎻� 浜�</el-button>
+ <el-button type="primary" @click="submitReportForm">鎻愪氦瀹℃牳</el-button>
</div>
</el-dialog>
@@ -271,7 +282,7 @@
<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="浜х敓宸ュ崟">
+ <el-step :title="getTitle1()">
<template slot="description">
<div>
<div class="row flow-item-x">
@@ -297,7 +308,7 @@
</div>
</template>
</el-step>
- <el-step title="杩愮淮澶勭悊">
+ <el-step :title="getTitle2()">
<template slot="description">
<div style="max-height: 450px;overflow-y: scroll">
<div v-for="(item, index) in ywHandleList" :key="index">
@@ -444,7 +455,7 @@
export default {
name: 'Work-order',
- dicts: ['error_type'],
+ dicts: ['error_type', 'report_error_type'],
components: {},
data() {
return {
@@ -460,21 +471,32 @@
},
ywHandleList: [],
ywAuditingList: [],
+ beforeReportMsg: '',
+ afterReportMsg: '',
reportFormRules: {
reportContent: [
{ required: true, message: '鎶ュ鍐呭涓嶈兘涓虹┖', trigger: 'blur' }
],
reportMaterials: [
{ required: true, message: '鎶ュ鏉愭枡涓嶈兘涓虹┖', trigger: 'blur' }
- ]
+ ],
+ errorTypeList: [
+ { required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷', trigger: 'change' }
+ ],
+ daterangeCreateTime: [
+ { required: true, message: '璇烽�夋嫨鎶ュ鏃堕棿', trigger: 'change' }
+ ],
},
reportOpen: false,
reportForm: {
reportType: '浜嬪悗鎶ュ',
pointId: '',
- errorType: '',
+ errorTypeList: [],
reportContent: '',
- reportMaterials: ''
+ reportMaterials: '',
+ daterangeCreateTime: [],
+ beginCreateTime: null,
+ endCreateTime: null
},
// 杩囩▼鍥�
flowOpen: false,
@@ -565,6 +587,12 @@
this.getList()
},
methods: {
+ getTitle1() {
+ return '浜х敓宸ュ崟' + (this.beforeReportMsg ? '(' + this.beforeReportMsg + ')' : '')
+ },
+ getTitle2() {
+ return '杩愮淮澶勭悊' + (this.afterReportMsg ? '(' + this.afterReportMsg + ')' : '')
+ },
openDrawer(item) {
this.ywData = {
content: '',
@@ -596,6 +624,10 @@
submitReportForm() {
this.$refs['reportForm'].validate(valid => {
if (valid) {
+ if (this.reportForm.daterangeCreateTime && this.reportForm.daterangeCreateTime.length > 0) {
+ this.reportForm.beginCreateTime = this.reportForm.daterangeCreateTime[0]
+ this.reportForm.endCreateTime = this.reportForm.daterangeCreateTime[1]
+ }
addReport(this.reportForm).then(response => {
this.$modal.msgSuccess('鎴愬姛鎻愪氦鎶ュ')
this.reportOpen = false
@@ -604,9 +636,13 @@
}
})
},
+ // 璇︽儏
+ handleDetail(item) {
+ this.$router.push({name: '/work-order-center/maintenance/detail', query: {workOrderNo: item.workOrderNo}})
+ },
// 浜嬪悗鎶ュ鎸夐挳
handleReport(row) {
- this.reportForm.pointId = row.pointId
+ this.reportForm.pointId = row.serialNumber
this.reportForm.source = row.source
this.reportOpen = true
},
@@ -642,6 +678,8 @@
if (response.data) {
this.ywAuditingList = response.data.auditingList
this.ywHandleList = response.data.ywList
+ this.afterReportMsg = response.data.afterReportMsg
+ this.beforeReportMsg = response.data.beforeReportMsg
this.flowOpen = true
}
})
@@ -889,6 +927,9 @@
}
.work-order-item {
margin-bottom: 5px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.time {
--
Gitblit v1.8.0