From 547aab154e85a9a89f1e320f92bd43854d10faeb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 14 十二月 2023 14:12:45 +0800
Subject: [PATCH] 1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格，内容为出现此报警号的设备ID以及报警时间等 3、报警分析页面表格请求数据设置加载中动画 4、调整设备参数阈值管理页面添加或编辑阈值上下限输入框为数字输入框，避免上下限数字比较大小时出现问题
---
src/views/eam/Daily3MaintenanceOrderList.vue | 209 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 142 insertions(+), 67 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 994a4fa..2e19354 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -53,24 +53,24 @@
@click="handleAdd"
type="primary"
icon="plus"
- v-has="'dailyMaintenanceOrder:add'"
+ v-has="'daily3MaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintCheck(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>楠屾敹鍗曟墦鍗�
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
@@ -147,12 +147,12 @@
<a-popconfirm
title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<!-- <a
@@ -166,15 +166,15 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
- <a-popconfirm
+ <!-- <a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -184,8 +184,8 @@
<a-divider
v-if="record.status == '7'"
type="vertical"
- />
- <a-popconfirm
+ /> -->
+ <!-- <a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -195,15 +195,15 @@
<a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
- v-has="'dailyMaintenanceOrder:get'"
+ v-has="'daily3MaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
+ <!-- <a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
@@ -212,35 +212,35 @@
v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a>
+ >鏀规淳</a> -->
<!-- <a
v-if="record.status == '3'"
@click="handleAssignOrder(record)"
>鏀规淳</a> -->
- <a-divider
+ <!-- <a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ />-->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '2'"
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
- v-has="'dailyMaintenanceOrder:exe'"
+ v-has="'daily3MaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
- v-has="'dailyMaintenanceOrder:edit'"
+ v-has="'daily3MaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<!-- <a
@@ -251,36 +251,85 @@
v-if="record.status === '5'"
type="vertical"
/> -->
+ <!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 -->
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:precisionInspectionUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:repairDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:useUnitDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 绮惧害妫�楠屽崟 鏌ョ湅 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')"
@click="handlePrecisionCheckOrder(record)"
>绮惧害妫�楠�</a>
+ <!--绠＄悊鍛樻搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:admin'"
+ >绮惧害妫�楠�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' "
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
@click="handleStoveDetection(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ @click="handleStoveReport(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
+ >鐐夌被鎶ュ憡</a>
+ <a-divider
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ type="vertical"
+ />
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'"
@click="handleTechnologyStatus(record)"
+ v-has="'daily3MaintenanceOrder:TechnologyStatus'"
>鎶�鏈姸鎬侀壌瀹�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'"
type="vertical"
/>
<a
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
@click="handleMaintenance3Receipt(record)"
+ v-has="'daily3MaintenanceOrder:Receipt'"
>楠屾敹鍗�</a>
<a-divider
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
type="vertical"
/>
<a-dropdown>
@@ -293,9 +342,9 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-has="'dailyMaintenanceOrder:delete'"
+ v-has="'daily3MaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -327,10 +376,10 @@
</a-table>
</div>
- <maintenance-order-modal
+ <maintenance-order3-modal
ref="modalForm"
@ok="modalFormOk"
- ></maintenance-order-modal>
+ ></maintenance-order3-modal>
<finish-devolution-modal
ref="FinishDevolutionModal"
@ok="modalFormOk"
@@ -347,6 +396,10 @@
ref="StoveCategoryModal"
@ok="modalFormOk"
></stove-category-modal>
+ <stove-category-report-modal
+ ref="StoveCategoryReportModal"
+ @ok="modalFormOk"
+ ></stove-category-report-modal>
<maintenance-order-assign-modal
ref="MaintenanceOrderAssignModal"
@ok="modalFormOk"
@@ -359,6 +412,10 @@
ref="EquipmentTechnologyStatusModal"
@ok="modalFormOk"
></equipment-technology-status-modal>
+ <technology-status-authenticate-modal
+ ref="TechnologyStatusAuthenticateModal"
+ @ok="modalFormOk"
+ ></technology-status-authenticate-modal>
<maintenance-3-receipt-modal
ref="Maintenance3ReceiptModal"
@ok="modalFormOk"
@@ -371,14 +428,16 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import MaintenanceOrderModal from './modules/dailyMaintenanceOrder/MaintenanceOrderModal'
+import MaintenanceOrder3Modal from './modules/daily3MaintenanceOrder/MaintenanceOrder3Modal'
import FinishDevolutionModal from './modules/dailyMaintenanceOrder/FinishDevolutionModal'
import MaintenanceOrderChangeModal from './modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal'
import EquipmentPrecisionCheckOrderModal from './modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal'
import StoveCategoryModal from './modules/daily3MaintenanceOrder/StoveCategoryModal'
+import StoveCategoryReportModal from './modules/daily3MaintenanceOrder/StoveCategoryReportModal'
import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
import DailyMaintenanceOrderExeDrawer from './modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer'
import EquipmentTechnologyStatusModal from './modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal'
+import TechnologyStatusAuthenticateModal from './modules/daily3MaintenanceOrder/TechnologyStatusAuthenticateModal'
import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
import { getAction, postAction, requestPut } from '@/api/manage'
import JEllipsis from "@/components/jeecg/JEllipsis";
@@ -387,14 +446,16 @@
name: 'DailyMaintenanceOrderList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- MaintenanceOrderModal,
+ MaintenanceOrder3Modal,
FinishDevolutionModal,
MaintenanceOrderAssignModal,
EquipmentPrecisionCheckOrderModal,
DailyMaintenanceOrderExeDrawer,
MaintenanceOrderChangeModal,
StoveCategoryModal,
+ StoveCategoryReportModal,
EquipmentTechnologyStatusModal,
+ TechnologyStatusAuthenticateModal,
Maintenance3ReceiptModal,
JEllipsis
},
@@ -423,18 +484,21 @@
{
title: '鐘舵��',
align: "center",
- dataIndex: 'statusName'
+ dataIndex: 'statusName',
+ width: 100,
},
{
title: '淇濆吇鍛ㄦ湡',
align: "center",
dataIndex: 'maintenanceCycleName',
+ width: 100,
},
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
- },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
title: '缁熶竴缂栫爜',
align: "center",
@@ -456,7 +520,7 @@
dataIndex: 'checkStatusName',
},
{
- title: '鏈�氳繃鍘熷洜',
+ title: '楠屾敹鏈�氳繃鍘熷洜',
align: "center",
dataIndex: 'notPassReason',
scopedSlots: { customRender: 'notPassReason' }
@@ -477,23 +541,23 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota'
- },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota'
+ // },
{
title: '璁″垝寮�濮嬫椂闂�',
align: "center",
dataIndex: 'planStartTime',
//width: '120px',
},
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime',
- //width: '120px',
- },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // //width: '120px',
+ // },
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
@@ -506,11 +570,11 @@
dataIndex: 'actualEndTime',
//width: '120px',
},
- {
- title: '瀹為檯鐢ㄦ椂',
- align: "center",
- dataIndex: 'actualWorkingHourQuota',
- },
+ // {
+ // title: '瀹為檯鐢ㄦ椂',
+ // align: "center",
+ // dataIndex: 'actualWorkingHourQuota',
+ // },
{
title: '鎵ц浜�',
align: "center",
@@ -606,7 +670,7 @@
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
- this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+ this.$refs.DailyMaintenanceOrderExeDrawer.title = '涓夌骇淇濆吇宸ュ崟鎵ц'
this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
if (record.status === '3') {
this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
@@ -640,9 +704,13 @@
},
handleTechnologyStatus: function (record) {
- this.$refs.EquipmentTechnologyStatusModal.edit(record);
- this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�";
- this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+ // this.$refs.EquipmentTechnologyStatusModal.edit(record);
+ // this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�";
+ // this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+ this.$refs.TechnologyStatusAuthenticateModal.edit(record);
+ this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�";
+ this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;
+
},
handleStoveDetection: function (record) {
@@ -650,6 +718,13 @@
this.$refs.StoveCategoryModal.title = "娓╁害鍧囧寑鎬ф娴嬫潯浠剁‘璁よ〃";
this.$refs.StoveCategoryModal.disableSubmit = false;
},
+ handleStoveReport: function (record) {
+ this.$refs.StoveCategoryReportModal.add();
+ this.$refs.StoveCategoryReportModal.title = "鐐夌被璁惧鎶ュ憡涓婁紶";
+ this.$refs.StoveCategoryReportModal.disableSubmit = false;
+ this.$refs.StoveCategoryReportModal.maintenanceStandardId = record.id
+ this.$refs.StoveCategoryReportModal.equipmentId = record.equipmentId
+ },
handleOrderChange: function (record) {
this.$refs.MaintenanceOrderChangeModal.edit(record);
--
Gitblit v1.9.3