From d1135f31a7dae36d04bd2f47936dbd5a39fba9e3 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 21 八月 2023 10:06:37 +0800
Subject: [PATCH] 备品备件：调整、 Jvxtbale 修改 默认显示一行
---
src/views/eam/MalfunctionRepair.vue | 114 +++++++++++++++++++++++++++++----------------------------
1 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 007551e..a716e69 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -77,8 +77,9 @@
:loading="loading"
class="j-table-force-nowrap"
@change="handleTableChange"
- :rowSelection = "rowSelection"
+ :customRow="clickThenSelect"
>
+ <!-- :rowSelection="rowSelection" -->
<!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
<template
@@ -128,32 +129,35 @@
slot="action"
slot-scope="text, record"
>
- <a-popconfirm
- v-if="record.status == '1'"
- title="纭鎻愪氦鍚�?"
- @confirm="() =>handleCommit(record, 'commit')"
- >
- <a>鎻愪氦</a>
- </a-popconfirm>
- <a-popconfirm
- v-if="record.status == '2'"
- title="纭鎾ゅ洖鍚�?"
- @confirm="() =>handleCommit(record, 'back')"
- >
- <a>鎾ゅ洖</a>
- </a-popconfirm>
+ <a-popconfirm
+ v-if="record.status == '1' || record.status == '4'"
+ title="纭鎻愪氦鍚�?"
+ @confirm="() =>handleCommit(record, 'commit')"
+ >
+ <a>鎻愪氦</a>
+ </a-popconfirm>
+ <a-popconfirm
+ v-if="record.status == '2'"
+ title="纭鎾ゅ洖鍚�?"
+ @confirm="() =>handleCommit(record, 'back')"
+ >
+ <a>鎾ゅ洖</a>
+ </a-popconfirm>
<a-divider
- v-if="record.status == '1' || record.status == '2'"
+ v-if="record.status == '1' || record.status == '2' || record.status == '4'"
type="vertical"
/>
<a
- v-if="record.status == '1' "
+ v-if="record.status == '1' || record.status == '4'"
@click="handleEdit(record)"
>缂栬緫</a>
- <a v-if="record.status == '2'" @click="handleApprove(record)">瀹℃壒</a>
+ <a
+ v-if="record.status == '2'"
+ @click="handleApprove(record)"
+ >瀹℃壒</a>
<a-divider
- v-if="record.status == '1' || record.status == '2'"
+ v-if="record.status == '1' || record.status == '2' || record.status == '4'"
type="vertical"
/>
<a-dropdown>
@@ -171,33 +175,6 @@
<a>鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
- <!-- <a-menu-item v-if="record.status == '1'">
- <a-popconfirm
- v-if="record.status == '1'"
- title="纭鎻愪氦鍚�?"
- @confirm="() =>handleCommit(record, 'commit')"
- >
- <a>鎻愪氦</a>
- </a-popconfirm>
- </a-menu-item>
- <a-menu-item v-if="record.status == '2'">
- <a-popconfirm
- v-if="record.status == '2'"
- title="纭鎾ゅ洖鍚�?"
- @confirm="() =>handleCommit(record, 'back')"
- >
- <a>鎾ゅ洖</a>
- </a-popconfirm>
- </a-menu-item>
- <a-menu-item v-if="record.status == '2'">
- <a-popconfirm
- v-if="record.status == '2'"
- title="纭椹冲洖鍚�?"
- @confirm="() =>handleFinish(record, 'reject')"
- >
- <a>椹冲洖</a>
- </a-popconfirm>
- </a-menu-item>-->
<a-menu-item v-if="record.status == '3' || record.status == '4'">
<a-popconfirm
v-if="record.status == '3' || record.status == '4'"
@@ -236,14 +213,18 @@
ref="modalForm"
@ok="modalFormOk"
></malfunction-repair-modal>
- <approvel-modal ref='approvalModalForm' @ok='approvalModalFormOk' @cancel='approvalModalFormOk'></approvel-modal>
+ <approvel-modal
+ ref='approvalModalForm'
+ @ok='approvalModalFormOk'
+ @cancel='approvalModalFormOk'
+ ></approvel-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
-import { putAction,getAction } from '@/api/manage'
+import { putAction, getAction } from '@/api/manage'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MalfunctionRepairModal from './modules/malfunctionRepair/MalfunctionRepaireModal'
@@ -356,7 +337,7 @@
dataIndex: 'action',
align: "center",
fixed: "right",
- width: 147,
+ width: 200,
scopedSlots: { customRender: 'action' }
}
],
@@ -368,7 +349,18 @@
importExcelUrl: "eam/equipmentReportRepair/importExcel",
edit: "/eam/equipmentReportRepair/edit",
},
- imgList:''
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
}
},
created() {
@@ -397,6 +389,16 @@
},
},
methods: {
+
+ clickThenSelect(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
+ },
loadData(arg) {
if (!this.url.list) {
@@ -459,12 +461,12 @@
})
},
- handleFinish(record,type) {
- if(type == 'agree'){
+ handleFinish(record, type) {
+ if (type == 'agree') {
record.status = '3'
- }else if(type == 'reject'){
+ } else if (type == 'reject') {
record.status = '4'
- }else if(type == 'revoke'){
+ } else if (type == 'revoke') {
record.status = '2'
}
putAction(this.url.edit, record).then(res => {
@@ -476,10 +478,10 @@
}
})
},
- handleApprove: function(record) {
+ handleApprove: function (record) {
let edit
edit = this.url.edit
- this.$refs.approvalModalForm.showModals(record, edit,'3','4')
+ this.$refs.approvalModalForm.showModals(record, edit, '3', '4')
this.$refs.approvalModalForm.title = '瀹℃壒'
this.$refs.approvalModalForm.disableSubmit = false
--
Gitblit v1.9.3