From 886748a39efb188d8008d41f2718eb78f3006ddd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamRepairDepartList.vue | 5 --
src/views/eam/base/EamMaintenanceStandardList.vue | 4 +-
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 86 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index 13e9c2a..be2b0cd 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -102,8 +102,8 @@
<a-divider v-has="'standard:edit'" type="vertical"/>
- <a-popconfirm title="纭畾鍙戣捣娴佺▼鍚�?" @confirm="() => startProcess(record.id)">
- <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">鍙戣捣娴佺▼</a>
+ <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => startProcess(record.id)">
+ <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">鎻愪氦</a>
</a-popconfirm>
diff --git a/src/views/eam/base/EamRepairDepartList.vue b/src/views/eam/base/EamRepairDepartList.vue
index 43ff9d5..f367a6b 100644
--- a/src/views/eam/base/EamRepairDepartList.vue
+++ b/src/views/eam/base/EamRepairDepartList.vue
@@ -7,11 +7,6 @@
<a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">娣诲姞缁翠慨閮ㄩ棬</a-button>
<a-button @click="handleAdd(2)" type="primary">娣诲姞涓嬬骇</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨閮ㄩ棬淇℃伅')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
- :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
<a-button @click="handleDelete" v-if="selectedKeys.length>0">鍒犻櫎</a-button>
<a-button title="鍒犻櫎澶氭潯鏁版嵁" @click="batchDel" v-if="checkedKeys.length>0">鎵归噺鍒犻櫎</a-button>
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">鍒锋柊</a-button>-->
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index 53bbd7c..dd20db6 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -50,6 +50,10 @@
<a-icon type="form"/>
棰嗗彇
</a-menu-item>
+ <a-menu-item key="3" @click="handlerBatchRestore">
+ <a-icon type="form"/>
+ 杩樺師
+ </a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
<a-icon type="down"/>
@@ -98,6 +102,14 @@
<template v-else>
<a @click="handleDetail(record)">璇︽儏</a>
+
+
+ <a-divider v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>
+
+ <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="纭畾杩樺師鍚�?" @confirm="() => handlerRestore(record.id)">
+ <a>杩樺師</a>
+ </a-popconfirm>
+
<a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
<a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
</template>
@@ -251,8 +263,10 @@
list: '/eam/secondMaintenanceOrder/list',
abolish: '/eam/secondMaintenanceOrder/abolish',
collect: '/eam/secondMaintenanceOrder/collect',
+ restore:'/eam/secondMaintenanceOrder/restore',
abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
- collectBatch: '/eam/secondMaintenanceOrder/collectBatch'
+ collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
+ restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
}
}
},
@@ -373,6 +387,76 @@
}
})
},
+ //杩樺師
+ handlerRestore(id){
+ let that = this
+ this.loading = true
+ getAction(that.url.restore, { id })
+ .then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.loading = false
+ }
+ })
+ },
+ //鎵归噺杩樺師
+ handlerBatchRestore(){
+ if (!this.url.restoreBatch) {
+ this.$message.error('璇疯缃畊rl.restoreBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨涓�鏉¤褰�'
+ })
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ var that = this
+ this.$confirm({
+ title: '纭杩樺師',
+ content: '鏄惁杩樺師閫変腑鏁版嵁锛屽彧鏈変綔搴熺姸鎬佺殑鏁版嵁鎵嶅彲杩樺師鎴愬姛?',
+ onOk: function() {
+ that.loading = true
+ deleteAction(that.url.restoreBatch, { ids: ids }).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ that.onClearSelected()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
+ }
+ },
//鎵归噺棰嗗彇
handlerBatchCollect() {
if (!this.url.collectBatch) {
--
Gitblit v1.9.3