From ef98bcf76c6265b66005ebed8a7b6f059db21ad0 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 十二月 2023 13:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/DailyMaintenanceOrderList.vue | 206 +++++++++++++++++++++++++++------------------------
1 files changed, 109 insertions(+), 97 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index d438244..bf01a53 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="鏃ュ父淇濆吇宸ュ崟"
+ title="浜岀骇淇濆吇"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -67,14 +67,14 @@
v-has="'dailyMaintenanceOrder:add'"
>鏂板</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"
- >鎵撳嵃
+ >绉讳氦鍗曟墦鍗�
</a-button>
<!-- <a-button
- v-if="selectedRowKeys.length > 0"
+ v-show="selectedRowKeys.length > 0"
type="primary"
@click="batchAssign"
style="margin-left: 8px"
@@ -97,7 +97,7 @@
icon="import"
>瀵煎叆</a-button>
</a-upload> -->
- <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <!-- <a-dropdown v-show="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item
key="1"
@@ -142,14 +142,14 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder: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-popconfirm
@@ -157,32 +157,14 @@
@confirm="() => handleOrderReset(record)"
v-has="'dailyMaintenanceOrder: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
- title="纭畾鎭㈠宸ュ崟鍚�?"
- @confirm="() => handleOrderRecover(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '7'">鎭㈠</a>
- </a-popconfirm>
<a-divider
- v-if="record.status == '7'"
- type="vertical"
- />
- <a-popconfirm
- title="纭畾浣滃簾宸ュ崟鍚�?"
- @confirm="() => handleOrderCancel(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '2'">浣滃簾</a>
- </a-popconfirm>
- <a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
<a-popconfirm
@@ -190,54 +172,66 @@
@confirm="() => handleOrderGet(record)"
v-has="'dailyMaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
- v-if="record.status == '2' && record.assignMode == '2' "
+ <!-- <a
+ v-show="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
>娲惧伐</a>
- <a
- v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
- @click="handleAssignOrder(record)"
- v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a>
- <!-- <a
- v-if="record.status == '3'"
- @click="handleAssignOrder(record)"
- >鏀规淳</a> -->
+
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
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'"
>鎵ц</a>
<a-divider
- v-if="record.status === '3' || record.status === '4' "
+ v-show="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'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<a
- v-if="record.status === '5'"
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '0' || record.confirmStatus === '2')"
@click="handleFinish(record)"
- >纭</a>
+ v-has="'dailyMaintenanceOrder:operateUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '1' || record.confirmStatus === '4')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '3' || record.confirmStatus === '6')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairDirectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '5')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:equipmentInspectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '7')"
+ @click="handleFinish(record)"
+ >瀹屽伐绉讳氦鍗�</a>
<a-divider
- v-if="record.status === '5'"
+ v-show="record.status === '5' || record.status === '8'"
type="vertical"
/>
<a-dropdown>
@@ -252,7 +246,7 @@
@confirm="() => handleDelete(record.id)"
v-has="'dailyMaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -264,7 +258,7 @@
slot-scope="text, record"
>
<a
- v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
+ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' ||record.status === '8'"
class="lot"
@click="handleOrderExe(record)"
>{{record.num}}</a>
@@ -315,7 +309,8 @@
},
data() {
return {
- description: '鏃ュ父淇濆吇宸ュ崟',
+ description: '浜岀骇淇濆吇宸ュ崟',
+ queryParam: { maintenanceType: '2' },
// 琛ㄥご
columns: [
{
@@ -329,28 +324,40 @@
}
},
{
- title: '鐘舵��',
- align: "center",
- dataIndex: 'statusName'
- },
- {
title: '淇濆吇宸ュ崟鍙�',
align: "center",
dataIndex: 'num',
scopedSlots: { customRender: 'num' }
},
{
- title: '淇濆吇鍛ㄦ湡',
+ title: '鐘舵��',
align: "center",
- dataIndex: 'maintenanceCycleName',
+ width: 100,
+ dataIndex: 'statusName'
+ },
+ // {
+ // title: '淇濆吇绫诲瀷',
+ // align: "center",
+ // dataIndex: 'maintenanceTypeName',
+ // },
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: "center",
+ // dataIndex: 'maintenanceCycleName',
+ // },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
+ {
+ title: '绉讳氦鍗曠‘璁ょ姸鎬�',
+ align: "center",
+ dataIndex: 'confirmStatusName'
},
{
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
- },
- {
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum',
},
@@ -364,11 +371,11 @@
align: "center",
dataIndex: 'equipmentModel',
},
- {
- title: '淇濆吇鏍囧噯缂栫爜',
- align: "center",
- dataIndex: 'maintenanceStandardNum',
- },
+ // {
+ // title: '淇濆吇鏍囧噯缂栫爜',
+ // align: "center",
+ // dataIndex: 'maintenanceStandardNum',
+ // },
{
title: '浣跨敤閮ㄩ棬',
@@ -380,23 +387,23 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota'
- },
- {
- title: '璁″垝寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'planStartTime',
- //width: '120px',
- },
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime',
- //width: '120px',
- },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota'
+ // },
+ // {
+ // title: '璁″垝寮�濮嬫椂闂�',
+ // align: "center",
+ // dataIndex: 'planStartTime',
+ // //width: '120px',
+ // },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // //width: '120px',
+ // },
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
@@ -409,11 +416,11 @@
dataIndex: 'actualEndTime',
//width: '120px',
},
- {
- title: '瀹為檯鐢ㄦ椂',
- align: "center",
- dataIndex: 'actualWorkingHourQuota',
- },
+ // {
+ // title: '瀹為檯鐢ㄦ椂',
+ // align: "center",
+ // dataIndex: 'actualWorkingHourQuota',
+ // },
{
title: '鎵ц浜�',
align: "center",
@@ -491,13 +498,13 @@
},
handlePrintInfo(record) {
- let href = `${window._CONFIG['domianURL']}/jmreport/view/857408393168490496?id=`+record.id; //缃戠珯閾炬帴
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/857408393168490496?id=` + record.id; //缃戠珯閾炬帴
window.open(href, "_blank");
},
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//淇濆瓨銆佹殏瀛樸�佹姤宸�
@@ -590,6 +597,11 @@
this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳'
this.$refs.MaintenanceOrderAssignModal.disableSubmit = false
},
+
+ searchReset() {
+ this.queryParam = { maintenanceType: '2' }
+ this.loadData(1);
+ },
// modalFormOk() {
// alert(0)
// // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
@@ -627,7 +639,7 @@
font-weight: bold;
}
.yellow {
- color: yellow;
+ color: rgba(255, 255, 0, 0.443);
font-weight: bold;
}
.fontweight {
--
Gitblit v1.9.3