From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例
---
src/views/eam/PredictiveWorkOrderList.vue | 189 +++++++++++++++++++++++++---------------------
1 files changed, 102 insertions(+), 87 deletions(-)
diff --git a/src/views/eam/PredictiveWorkOrderList.vue b/src/views/eam/PredictiveWorkOrderList.vue
index 251e261..450350b 100644
--- a/src/views/eam/PredictiveWorkOrderList.vue
+++ b/src/views/eam/PredictiveWorkOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="涓撲笟淇濆吇宸ュ崟"
+ title="棰勬祴缁存姢宸ュ崟"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -14,24 +14,49 @@
:md="6"
:sm="8"
>
- <a-form-item label="淇濆吇宸ュ崟缂栫爜">
+ <a-form-item label="宸ュ崟鐘舵��">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
+ :triggerChange="true"
+ dictCode="maintenance_order_status"
+ v-model="queryParam.status"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="缁存姢宸ュ崟缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鐮�"
+ placeholder="璇疯緭鍏ョ淮鎶ゅ伐鍗曠紪鐮�"
v-model="queryParam.num"
></a-input>
</a-form-item>
</a-col>
- <!-- <a-col
+ <a-col
:md="6"
:sm="8"
>
- <a-form-item label="鐐规鏂规硶鍚嶇О">
- <j-input
- placeholder="璇疯緭鍏ョ偣妫�鏂规硶鍚嶇О"
- v-model="queryParam.name"
- ></j-input>
+ <a-form-item label="璁惧缂栫爜">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ v-model="queryParam.equipmentNum"
+ ></a-input>
</a-form-item>
- </a-col> -->
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-model="queryParam.equipmentName"
+ ></a-input>
+ </a-form-item>
+ </a-col>
<a-col
:md="6"
:sm="8"
@@ -60,7 +85,7 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button
+ <!-- <a-button
@click="handleAdd"
type="primary"
icon="plus"
@@ -70,7 +95,7 @@
type="primary"
@click="batchAssign"
style="margin-left: 8px"
- >宸ュ崟娲惧伐</a-button>
+ >宸ュ崟娲惧伐</a-button> -->
</div>
<!-- table鍖哄煙-begin -->
@@ -107,6 +132,7 @@
<a-popconfirm
title="纭畾涓嬪彂宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '1'">涓嬪彂</a>
</a-popconfirm>
@@ -117,6 +143,7 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
@@ -127,6 +154,7 @@
<a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '7'">鎭㈠</a>
</a-popconfirm>
@@ -137,6 +165,7 @@
<a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '2'">浣滃簾</a>
</a-popconfirm>
@@ -147,20 +176,19 @@
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
+ v-has="'predictiveWorkOrder:get&do'"
>
<a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
<a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>娲惧伐</a>
<a
- v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null "
+ v-if="record.status == '2'&& record.assignMode == '3'&&record.maintenanceUserName!=null"
@click="handleAssignOrder(record)"
- >鏀规淳</a>
- <a
- v-if="record.status == '3'"
- @click="handleAssignOrder(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>鏀规淳</a>
<a-divider
v-if="record.status == '2'"
@@ -173,6 +201,7 @@
<a
v-if="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
+ v-has="'predictiveWorkOrder:get&do'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
@@ -181,6 +210,7 @@
<a
v-if="record.status === '1'"
@click="handleEdit(record)"
+ v-has="'predictiveWorkOrder:edit&delete'"
>缂栬緫</a>
<a-divider
v-if="record.status === '1'"
@@ -196,6 +226,7 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'predictiveWorkOrder:edit&delete'"
>
<a v-if="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
@@ -219,23 +250,20 @@
</a-table>
</div>
- <maintenance-order-modal
+ <predictive-work-order-model
ref="modalForm"
@ok="modalFormOk"
- ></maintenance-order-modal>
- <inspection-order-assign-modal
- ref="InspectionOrderAssignModal"
+ ></predictive-work-order-model>
+ <predictive-work-order-drawer
+ ref="PredictiveWorkOrderDrawer"
@ok="modalFormOk"
- ></inspection-order-assign-modal>
- <specialy-maintenance-order-exe-drawer
- ref="SpecialyMaintenanceOrderExeDrawer"
- @ok="modalFormOk"
- ></specialy-maintenance-order-exe-drawer>
- <specialty-maintenance-order-assign-modal
- ref="SpecialtyMaintenanceOrderAssignModal"
- @ok="modalFormOk"
+ ></predictive-work-order-drawer>
+ <order-assign-modal
+ ref="OrderAssign"
+ @ok="modalFormOk"
>
- </specialty-maintenance-order-assign-modal>
+
+ </order-assign-modal>
</a-card>
</template>
@@ -244,22 +272,17 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import MaintenanceOrderModal from './modules/specialtyMaintenanceOrder/MaintenanceOrderModal'
-import InspectionOrderAssignModal from './modules/specialtyMaintenanceOrder/InspectionOrderAssignModal'
-import SpecialyMaintenanceOrderExeDrawer from './modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
-import SpecialtyMaintenanceOrderAssignModal from './modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue'
-import SpecialtyInspectionOrderAssignModal from './modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue'
-
+import PredictiveWorkOrderModel from './modules/predictiveWorkOrder/PredictiveWorkOrderModel'
+import PredictiveWorkOrderDrawer from './modules/predictiveWorkOrder/PredictiveWorkOrderDrawer'
+import OrderAssignModal from './modules/predictiveWorkOrder/OrderAssignModal.vue'
export default {
name: 'PredictiveWorkOrderList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- MaintenanceOrderModal,
- InspectionOrderAssignModal,
- SpecialyMaintenanceOrderExeDrawer,
- SpecialtyMaintenanceOrderAssignModal,
- SpecialtyInspectionOrderAssignModal
+ PredictiveWorkOrderModel,
+ PredictiveWorkOrderDrawer,
+ OrderAssignModal
},
data() {
return {
@@ -279,7 +302,7 @@
{
title: '鐘舵��',
align: "center",
- dataIndex: 'statusName'
+ dataIndex: 'status_dictText'
},
{
title: '鍗曟嵁鍙�',
@@ -290,66 +313,66 @@
{
title: '鐩戞帶绫诲瀷',
align: "center",
- dataIndex: 'maintenanceMode'
+ dataIndex: 'monitorType_dictText'
},
{
title: '璁惧缂栫爜',
align: "center",
- dataIndex: 'departName',
+ dataIndex: 'equipmentNum',
},
{
title: '璁惧鍚嶇О',
align: "center",
- dataIndex: 'maintenanceTypeName',
+ dataIndex: 'equipmentName',
},
{
title: '鍨嬪彿',
align: "center",
- dataIndex: 'maintenanceCycleName',
+ dataIndex: 'model',
},
{
title: '鏍囧噯缂栫爜',
align: 'center',
- dataIndex: 'assignModeName',
+ dataIndex: 'planNum',
},
{
title: '鐗堟湰',
align: "center",
- dataIndex: 'specialtyMaintenancePlanNum',
+ dataIndex: 'version',
},
{
title: '浣跨敤閮ㄩ棬',
align: "center",
- dataIndex: 'teamName',
+ dataIndex: 'useId_dictText',
},
{
title: '娲惧伐鏂瑰紡',
align: "center",
- dataIndex: 'sumOfWorkingHourQuota',
+ dataIndex: 'assignMode_dictText',
},
{
title: '璐ｄ换鐝粍',
align: "center",
- dataIndex: 'planStartTime',
+ dataIndex: 'teamId_dictText',
width: 170
},
{
title: '璐ｄ换浜�',
align: "center",
- dataIndex: 'planEndTime',
+ dataIndex: 'maintenanceUserId_dictText',
width: 170
},
- {
- title: '宸ユ椂瀹氶锛堝皬鏃讹級',
- align: "center",
- dataIndex: 'planEndTime',
- width: 170
- },
+ // {
+ // title: '宸ユ椂瀹氶锛堝皬鏃讹級',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // width: 170
+ // },
{
title: '瀹為檯宸ユ椂',
align: "center",
- dataIndex: 'planEndTime',
+ dataIndex: 'actualWorkingHourQuota',
width: 170
},
{
@@ -390,8 +413,8 @@
deleteBatch: "/eam/specialtyMaintenanceOrder/deleteBatch",
exportXlsUrl: "/eam/specialtyMaintenanceOrder/exportXls",
importExcelUrl: "eam/specialtyMaintenanceOrder/importExcel",
- edit: "/eam/specialtyMaintenanceOrder/editStatus",
- orderGet: "/eam/specialtyMaintenanceOrder/orderGet",
+ edit: "/eam/predictiveworkorder/editStatus",
+ orderGet: "/eam/predictiveworkorder/orderGet",
},
}
},
@@ -418,38 +441,30 @@
},
methods: {
-
- batchAssign() {
- this.$refs.InspectionOrderAssignModal.visible = true
- this.$refs.InspectionOrderAssignModal.title = '宸ュ崟娲惧伐'
- this.$refs.InspectionOrderAssignModal.selectionRows
- this.$refs.InspectionOrderAssignModal.handleShow()
- this.$bus.$emit('selectionRows', this.selectionRows);
- },
onSelectChange(selectionRows) {
this.selectionRows = selectionRows;
},
handleOrderExe(record) {
- this.$refs.SpecialyMaintenanceOrderExeDrawer.visible = true
- this.$refs.SpecialyMaintenanceOrderExeDrawer.title = '涓撲笟淇濆吇宸ュ崟鎵ц'
- this.$refs.SpecialyMaintenanceOrderExeDrawer.handleShow(record)
+ this.$refs. PredictiveWorkOrderDrawer.visible = true
+ this.$refs. PredictiveWorkOrderDrawer.title = '涓撲笟淇濆吇宸ュ崟鎵ц'
+ this.$refs. PredictiveWorkOrderDrawer.handleShow(record)
if (record.status === '3') {
- this.$refs.SpecialyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
- this.$refs.SpecialyMaintenanceOrderExeDrawer.revocationDistable = true//鎾ら攢鎸夐挳
- this.$refs.SpecialyMaintenanceOrderExeDrawer.SWbuttonDistable = false//寮�宸ユ寜閽�
+ this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
+ this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true//鎾ら攢鎸夐挳
+ this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = false//寮�宸ユ寜閽�
} else if (record.status === '4') {
- this.$refs.SpecialyMaintenanceOrderExeDrawer.buttonDistable = false
- this.$refs.SpecialyMaintenanceOrderExeDrawer.revocationDistable = true
- this.$refs.SpecialyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.buttonDistable = false
+ this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
} else if (record.status === '5') {
- this.$refs.SpecialyMaintenanceOrderExeDrawer.buttonDistable = true
- this.$refs.SpecialyMaintenanceOrderExeDrawer.revocationDistable = false
- this.$refs.SpecialyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.revocationDistable = false
+ this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
} else if (record.status === '7') {
- this.$refs.SpecialyMaintenanceOrderExeDrawer.buttonDistable = true
- this.$refs.SpecialyMaintenanceOrderExeDrawer.revocationDistable = true
- this.$refs.SpecialyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
+ this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
}
},
@@ -513,9 +528,9 @@
})
},
handleAssignOrder: function (record) {
- this.$refs.SpecialtyMaintenanceOrderAssignModal.edit(record)
- this.$refs.SpecialtyMaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳'
- this.$refs.SpecialtyMaintenanceOrderAssignModal.disableSubmit = false
+ this.$refs.OrderAssign.edit(record)
+ this.$refs.OrderAssign.title = '宸ュ崟鏀规淳'
+ this.$refs.OrderAssign.disableSubmit = false
},
// modalFormOk() {
// alert(0)
--
Gitblit v1.9.3