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/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index a199f59..d72624a 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -112,7 +112,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -298,6 +298,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<!-- <span
slot="photo"
@@ -423,37 +424,42 @@
},
width: 50,
},
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
- title: '閮ㄤ綅',
+ title: '淇濆吇瑙掕壊',
align: 'center',
- dataIndex: 'location'
+ dataIndex: 'maintenanceRole'
},
{
- title: '淇濆吇椤圭洰',
+ title: '淇濆吇鍐呭',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
- {
- title: '淇濆吇鏍囧噯',
- align: 'center',
- dataIndex: 'standard'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' }
- },
+ // {
+ // title: '淇濆吇鏍囧噯',
+ // align: 'center',
+ // dataIndex: 'standard'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' }
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -487,7 +493,7 @@
},
useId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: false, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
maintenanceCycleId: {
@@ -635,12 +641,12 @@
onSearchMaintenanceStandard() {
let data = this.form.getFieldsValue(['useId']);
- if (data.useId == null || data.useId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬!");
- return
- }
+ // if (data.useId == null || data.useId == "") {
+ // this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬!");
+ // return
+ // }
this.$refs.DailyMaintenanceStandardList.list(data.useId);
- this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨鏃ュ父淇濆吇鏍囧噯";
+ this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨浜岀骇淇濆吇鏍囧噯";
},
sendMaintenanceStandardRecord(data) {
let record = data.record;
--
Gitblit v1.9.3