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 | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index 127a6b9..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> @@ -274,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"> @@ -300,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"> @@ -463,6 +471,8 @@ }, ywHandleList: [], ywAuditingList: [], + beforeReportMsg: '', + afterReportMsg: '', reportFormRules: { reportContent: [ { required: true, message: '鎶ュ鍐呭涓嶈兘涓虹┖', trigger: 'blur' } @@ -577,6 +587,12 @@ this.getList() }, methods: { + getTitle1() { + return '浜х敓宸ュ崟' + (this.beforeReportMsg ? '(' + this.beforeReportMsg + ')' : '') + }, + getTitle2() { + return '杩愮淮澶勭悊' + (this.afterReportMsg ? '(' + this.afterReportMsg + ')' : '') + }, openDrawer(item) { this.ywData = { content: '', @@ -620,6 +636,10 @@ } }) }, + // 璇︽儏 + handleDetail(item) { + this.$router.push({name: '/work-order-center/maintenance/detail', query: {workOrderNo: item.workOrderNo}}) + }, // 浜嬪悗鎶ュ鎸夐挳 handleReport(row) { this.reportForm.pointId = row.serialNumber @@ -658,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 } }) @@ -905,6 +927,9 @@ } .work-order-item { margin-bottom: 5px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .time { -- Gitblit v1.8.0