From 3629dde86000f6412b35aea04399983921df7099 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 17:50:08 +0800
Subject: [PATCH] 1、OEE报表计算功能 选择时间添加限制，禁止选择选今天及未来日期 2、解决车间布局图点击设备详细弹窗展示异常问题（删除车间看板页面独立的详情弹窗组件，沿用设备监控页面详情弹窗组件）
---
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
index 7569df5..ba99918 100644
--- a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -28,16 +28,28 @@
v-model="queryParam.maintenanceStatus"/>
</a-form-item>
</a-col>
- <a-col :xl="3" :lg="4" :md="8" :sm="24">
- <a-form-item label="鎶芥鏍囪">
- <j-dict-select-tag placeholder="璇烽�夋嫨鎶芥鏍囪" dict-code="yn"
- v-model="queryParam.randomInspectionFlag"/>
- </a-form-item>
- </a-col>
- <a-col :xl="3" :lg="4" :md="8" :sm="24">
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="4" :lg="4" :md="8" :sm="24">
+ <a-form-item label="鍒濋獙鏀舵娊妫�">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鎶芥鏍囪" dict-code="yn"
+ v-model="queryParam.randomInspectionFlag"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="4" :md="8" :sm="24">
+ <a-form-item label="缁堥獙鏀舵娊妫�">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鎶芥鏍囪" dict-code="yn"
+ v-model="queryParam.finalRandomInspectionFlag"/>
+ </a-form-item>
+ </a-col>
+ </template>
+ <a-col :xl="4" :lg="4" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
</span>
</a-col>
@@ -86,7 +98,12 @@
:scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
-
+ <span slot="randomInspectionFlag" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
+ </span>
+ <span slot="finalRandomInspectionFlag" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
+ </span>
<span slot="action" slot-scope="text, record">
<template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:edit')">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -269,6 +286,13 @@
width: 60
},
{
+ title: '鍒濋獙鏀舵娊妫�',
+ align: 'center',
+ dataIndex: 'randomInspectionFlag',
+ width: 60,
+ scopedSlots: { customRender: 'randomInspectionFlag' }
+ },
+ {
title: '缁堥獙鏀朵汉',
align: 'center',
dataIndex: 'finalAcceptanceUser_dictText',
@@ -287,6 +311,13 @@
width: 60
},
{
+ title: '缁堥獙鏀舵娊妫�',
+ align: 'center',
+ dataIndex: 'finalRandomInspectionFlag',
+ width: 60,
+ scopedSlots: { customRender: 'finalRandomInspectionFlag' }
+ },
+ {
title: '澶囨敞',
align: 'center',
dataIndex: 'remark',
--
Gitblit v1.9.3