From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/Daily3MaintenanceOrderList.vue | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index fe515cf..a93be15 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -97,25 +97,40 @@
style="margin-left: 8px"
>閲嶇疆</a-button>
<a-button
- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status === '5' && selectionRows[0].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters == '1' "
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status === '5'"
@click="handlePrintCheck(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>楠屾敹鍗曟墦鍗�
</a-button>
+ <!-- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" -->
<a-button
v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绉讳氦鍗曟墦鍗�
+ </a-button>
+ <a-button
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters != '1'"
+ @click="handlePrintTechnology(selectionRows[0])"
+ type="primary"
+ style="margin-left: 8px"
+ >鎶�鏈姸鎬侀壌瀹氭墦鍗�
+ </a-button>
+ <a-button
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == true"
+ @click="handlePrintStove(selectionRows[0])"
+ type="primary"
+ style="margin-left: 8px"
+ >鐐夌被妫�娴嬫墦鍗�
</a-button>
<!-- <a-button
v-if="selectedRowKeys.length > 0"
@@ -579,12 +594,12 @@
// align: "center",
// dataIndex: 'workingHourQuota'
// },
- // {
- // title: '璁″垝寮�濮嬫椂闂�',
- // align: "center",
- // dataIndex: 'planStartTime',
- // //width: '120px',
- // },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'planStartTime',
+ //width: '120px',
+ },
// {
// title: '璁″垝缁撴潫鏃堕棿',
// align: "center",
@@ -700,6 +715,15 @@
window.open(href, "_blank");
},
+ handlePrintTechnology(record) {
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/932475014657814528?id=` + record.id; //缃戠珯閾炬帴
+ window.open(href, "_blank");
+ },
+
+ handlePrintStove(record) {
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/932491838782910464?id=` + record.id; //缃戠珯閾炬帴
+ window.open(href, "_blank");
+ },
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
@@ -839,6 +863,7 @@
},
searchReset() {
+ this.onClearSelected();
this.queryParam = { maintenanceType: '3' }
this.loadData(1);
this.finishTime = []
--
Gitblit v1.9.3