From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
index 7726223..1809fa2 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -14,7 +14,7 @@
width="70"></el-table-column>
<el-table-column label="骞翠唤" min-width="80" prop="planYear"></el-table-column>
<el-table-column label="缂栧埗浜�" min-width="120" prop="compiler"></el-table-column>
- <el-table-column label="缂栧埗鏃堕棿" min-width="150" prop="datePreparation"></el-table-column>
+ <el-table-column label="缂栧埗鏃堕棿" min-width="160" prop="datePreparation"></el-table-column>
<el-table-column label="瀹℃牳浜�" min-width="150" prop="audit"></el-table-column>
<el-table-column label="瀹℃牳鏃堕棿" min-width="180" prop="auditDate"></el-table-column>
<el-table-column label="瀹℃牳鐘舵��" min-width="180" prop="status">
@@ -24,10 +24,11 @@
</template>
</el-table-column>
<!-- 鎿嶄綔鎸夐挳 -->
- <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="240">
+ <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="260">
<template slot-scope="scope">
<el-button :disabled="scope.row.status === 1" size="small" type="text"
@click="handleForm('edit', scope.row)">缂栬緫</el-button>
+ <el-button size="small" type="text" @click="handleForm('view', scope.row)">鏌ョ湅</el-button>
<el-button :disabled="scope.row.status === 1" size="small" type="text"
@click="tellApprove(scope.row.maintenancePlanId)">瀹℃牳閫氱煡</el-button>
<el-button :disabled="scope.row.status === 1 || userId != scope.row.auditId" size="small" type="text"
@@ -39,7 +40,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+ :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
</div>
@@ -47,54 +48,54 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="applicationForm"
title="璁惧淇濆吇璁″垝琛�" width="80%" @close="closeDialog">
<div style="display: flex;align-items: center;">
- <el-button v-if="operationType !== 'check'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
- <span style="width: 60px">骞翠唤锛�</span>
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
+ <span style="width: 60px;margin-left: 10px">骞翠唤锛�</span>
<el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy"
- placeholder="閫夋嫨骞�">
+ placeholder="閫夋嫨骞�" :disabled="operationType !== 'edit' && operationType !== 'add'">
</el-date-picker>
</div>
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="deviceMaintenancePlanDetails" id="templateParamTable" row-key="deviceId"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- height="300px" border style="width: 100% ;">
+ height="560px" style="width: 100% ;">
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceName">
<template slot-scope="scope">
- <el-input v-model="scope.row.deviceName" :disabled="operationType === 'check'" clearable
+ <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="璁惧缂栧彿" min-width="140" prop="deviceNumber">
<template slot-scope="scope">
- <el-input v-model="scope.row.deviceNumber" :disabled="operationType === 'check'" clearable
+ <el-input v-model="scope.row.deviceNumber" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="褰掑睘瀹為獙瀹�" min-width="120" prop="storagePoint">
<template slot-scope="scope">
- <el-input v-model="scope.row.storagePoint" :disabled="operationType === 'check'" clearable
+ <el-input v-model="scope.row.storagePoint" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="淇濆吇鍏抽敭閮ㄤ綅" min-width="120" prop="maintenanceSite">
<template slot-scope="scope">
- <el-input v-model="scope.row.maintenanceSite" :disabled="operationType === 'check'" clearable size="small"
+ <el-input v-model="scope.row.maintenanceSite" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"
type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="淇濆吇鍐呭" min-width="120" prop="maintenanceContent">
<template slot-scope="scope">
- <el-input v-model="scope.row.maintenanceContent" :disabled="operationType === 'check'" clearable
+ <el-input v-model="scope.row.maintenanceContent" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="淇濆吇鍛ㄦ湡" min-width="90" prop="maintenanceIntervals">
<template slot-scope="scope">
- <el-input v-model="scope.row.maintenanceIntervals" :disabled="operationType === 'check'" clearable
+ <el-input v-model="scope.row.maintenanceIntervals" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="80" align="center" v-if="operationType !== 'check'">
+ <el-table-column label="鎿嶄綔" width="80" align="center" v-if="operationType === 'edit' || operationType === 'add'">
<template slot-scope="scope">
<el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">鍒犻櫎</el-button>
</template>
@@ -103,7 +104,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeDialog">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'check'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
璁�</el-button>
<el-button v-if="operationType === 'check'" :loading="submitFormLoading" type="primary"
@click="checkStatus(0)">涓嶉�氳繃</el-button>
@@ -124,7 +125,7 @@
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="addEquipDia = false">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'check'" :loading="submitFormLoading" type="primary"
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary"
@click="changeMachineName">纭�
璁�</el-button>
</span>
--
Gitblit v1.9.3