From e5ea7094423b4d48c080c9f5d135e0e29a8a8a68 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 29 十二月 2023 14:59:02 +0800
Subject: [PATCH] 修改提交
---
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue | 2
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 22 +++++-
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 22 +++++-
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 6 +-
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 22 +++++-
src/views/eam/MalfunctionRepair.vue | 102 +++++++++++++++++++++++----------
6 files changed, 126 insertions(+), 50 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 2d67ed0..e1cd998 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -8,12 +8,15 @@
<a-form
layout="inline"
@keyup.enter.native="searchQuery"
- > <a-row :gutter="24" style="margin-bottom: 1%;">
+ > <a-row
+ :gutter="24"
+ style="margin-bottom: 1%;"
+ >
<a-col
:md="24"
:sm="6"
>
- <a-form-item label="缁熶竴缂栧彿缇�">
+ <a-form-item label="缁熶竴缂栧彿缇�">
<a-textarea
placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鎹㈣闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
v-model="queryParam.nums"
@@ -178,24 +181,28 @@
</a-form>
</div>
<div class="table-operator">
- <a-button
- type="primary"
- @click="searchQuery"
- icon="search"
- >鏌ヨ</a-button>
- <a-button
- type="primary"
- @click="searchReset"
- icon="reload"
- style="margin-left: 8px"
- >閲嶇疆</a-button>
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
<a-button
@click="handleAdd"
type="primary"
icon="plus"
v-has="'report:add&edit'"
>鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('鏁呴殰鎶ヤ慨')">瀵煎嚭</a-button>
+ <a-button
+ type="primary"
+ icon="download"
+ @click="handleExportXls('鏁呴殰鎶ヤ慨')"
+ >瀵煎嚭</a-button>
</div>
<div>
@@ -280,8 +287,14 @@
</a-menu>
</a-dropdown> -->
</span>
- <span slot="jell" slot-scope="text">
- <j-ellipsis :value="text" :length="10" />
+ <span
+ slot="jell"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
</span>
</a-table>
@@ -299,7 +312,10 @@
class="table-operator"
style="margin-top: 0px"
>
- <FaultDescriptionList ref="FaultDescriptionList" @ok="modalFormOk"/>
+ <FaultDescriptionList
+ ref="FaultDescriptionList"
+ @ok="modalFormOk"
+ />
</div>
</a-tab-pane>
@@ -315,8 +331,8 @@
@cancel='approvalModalFormOk'
></approvel-modal>
<accept-model
- ref="acceptModel"
- @ok="modalFormOk"
+ ref="acceptModel"
+ @ok="modalFormOk"
></accept-model>
</a-card>
</template>
@@ -346,8 +362,8 @@
},
data() {
return {
- treeData:[],
- faultTime:[],
+ treeData: [],
+ faultTime: [],
description: '鏁呴殰鎶ヤ慨',
queryParam: { delflag: 0 },
selectedRowKeys: [],
@@ -364,14 +380,38 @@
}
},
{
+ title: '鍗曟嵁鍙�',
+ align: "center",
+ dataIndex: 'num'
+ },
+ {
title: '鐘舵��',
align: "center",
dataIndex: 'statusName',
},
{
- title: '鍗曟嵁鍙�',
+ title: '绫诲瀷',
align: "center",
- dataIndex: 'num'
+ dataIndex: 'type',
+ customRender: (text) => {
+ if (text == '1') {
+ return "琚姩鎶ヤ慨";
+ } else if (text == '2') {
+ return "涓诲姩鎶ヤ慨";
+ }
+ },
+ },
+ {
+ title: '鏉ユ簮',
+ align: "center",
+ dataIndex: 'source',
+ customRender: (text) => {
+ if (text == '1') {
+ return "鎵嬪姩鍒涘缓";
+ } else if (text == '2') {
+ return "鐐规鎶ヤ慨";
+ }
+ },
},
{
title: '缁熶竴缂栧彿',
@@ -407,8 +447,8 @@
title: '鏁呴殰鎻忚堪',
align: "center",
dataIndex: 'faultDescription',
- scopedSlots: {
- customRender: 'faultDescription'
+ scopedSlots: {
+ customRender: 'faultDescription'
}
},
@@ -447,8 +487,8 @@
title: '楠屾敹鎰忚',
align: "center",
dataIndex: 'errUda5',
- scopedSlots: {
- customRender: 'jell'
+ scopedSlots: {
+ customRender: 'jell'
}
},
{
@@ -489,7 +529,7 @@
}
},
created() {
- this.initOptions();
+ this.initOptions();
},
computed: {
importExcelUrl: function () {
@@ -645,12 +685,12 @@
}
})
},
- timeChange(){
+ timeChange() {
this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
},
- handleAccept(record){
- this.$refs.acceptModel.title="楠屾敹"
+ handleAccept(record) {
+ this.$refs.acceptModel.title = "楠屾敹"
this.$refs.acceptModel.edit(record)
}
}
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 4c05333..be1208e 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -385,6 +385,18 @@
xs: { span: 24 },
sm: { span: 18 },
},
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 99,
+ pageSizeOptions: ['99'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
validatorRules: {
// description: {
// rules: [
@@ -513,11 +525,11 @@
// }
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
+ // if (res.result.total) {
+ // this.ipagination.total = res.result.total;
+ // } else {
+ // this.ipagination.total = 0;
+ // }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
} else {
this.$message.warning(res.message)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
index 100224c..9d7f6c4 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
@@ -646,7 +646,7 @@
send3MaintenanceStandardRecord(data) {
let record = data.record;
this.form.setFieldsValue({ equipmentId: record.equipmentId, maintenanceStandardId: record.id, equipmentNum: record.equipmentNum, maintenanceStandardNum: record.num, maintenanceCycleId: null });
- this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
+ this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
this.getCycleByStandardId(record.id);
if ("3" == record.assignMode) {
this.isHidden = false
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 19dafbd..db7ef0f 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -336,6 +336,18 @@
xs: { span: 24 },
sm: { span: 18 },
},
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 99,
+ pageSizeOptions: ['99'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
columns: [
{
title: '#',
@@ -475,11 +487,11 @@
// }
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
+ // if (res.result.total) {
+ // this.ipagination.total = res.result.total;
+ // } else {
+ // this.ipagination.total = 0;
+ // }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
} else {
this.$message.warning(res.message)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index c5a0bbc..1dc2390 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -291,10 +291,10 @@
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
- :pagination="ipagination"
:loading="loading"
- @change="handleTableChange"
+ :pagination="false"
>
+ <!-- @change="handleTableChange" -->
<template
slot="photo"
slot-scope="text,record"
@@ -633,7 +633,7 @@
this.inspectionStandardId = record.id;
this.form.setFieldsValue({ inspectionStandardId: record.id, inspectionStandardNum: record.num + "/" + record.version });
this.form.setFieldsValue({ equipmentId: record.equipmentId, equipmentName: record.equipmentNum + "/" + record.equipmentName });
- this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
+ this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
this.form.setFieldsValue({ effectiveTime: null, inspectionCycleId: null, unit: null });
this.getInspectionCycles(record.id)
if ("3" == record.assignMode) {
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 277863d..3a7a7af 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -386,6 +386,18 @@
xs: { span: 24 },
sm: { span: 18 },
},
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 99,
+ pageSizeOptions: ['99'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
validatorRules: {
// description: {
// rules: [
@@ -520,11 +532,11 @@
// }
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
+ // if (res.result.total) {
+ // this.ipagination.total = res.result.total;
+ // } else {
+ // this.ipagination.total = 0;
+ // }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
} else {
this.$message.warning(res.message)
--
Gitblit v1.9.3