From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 24 十一月 2023 16:41:32 +0800 Subject: [PATCH] 故障报修验收 --- src/views/eam/MalfunctionRepair.vue | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue index 12934f5..4358a35 100644 --- a/src/views/eam/MalfunctionRepair.vue +++ b/src/views/eam/MalfunctionRepair.vue @@ -215,7 +215,11 @@ slot="action" slot-scope="text, record" > - <a-popconfirm + <a + :disabled=" record.status !== '4'" + @click="handleAccept(record)" + >楠屾敹</a> + <!-- <a-popconfirm v-if="record.status == '1' || record.status == '4'" title="纭鎻愪氦鍚�?" @confirm="() =>handleCommit(record, 'commit')" @@ -271,9 +275,9 @@ </a-popconfirm> </a-menu-item> </a-menu> - </a-dropdown> + </a-dropdown> --> </span> - <span slot="faultDescription" slot-scope="text"> + <span slot="jell" slot-scope="text"> <j-ellipsis :value="text" :length="10" /> </span> @@ -307,6 +311,10 @@ @ok='approvalModalFormOk' @cancel='approvalModalFormOk' ></approvel-modal> + <accept-model + ref="acceptModel" + @ok="modalFormOk" + ></accept-model> </a-card> </template> @@ -321,6 +329,7 @@ import ApprovelModal from './modules/malfunctionRepair/ApprovelModal' import JEllipsis from '@/components/jeecg/JEllipsis' import moment from 'moment' +import AcceptModel from './modules/malfunctionRepair/AcceptModel' export default { name: 'MalfunctionRepairList', @@ -329,7 +338,8 @@ MalfunctionRepairModal, FaultDescriptionList, ApprovelModal, - JEllipsis + JEllipsis, + AcceptModel, }, data() { return { @@ -430,24 +440,27 @@ align: "center", dataIndex: 'createBy' }, - // { - // title: '鍒涘缓鏃堕棿', - // align: "center", - // dataIndex: 'createTime', - // }, + { + title: '楠屾敹鎰忚', + align: "center", + dataIndex: 'errUda5', + scopedSlots: { + customRender: 'jell' + } + }, { title: '澶囨敞', align: "center", dataIndex: 'remark' }, - // { - // title: '鎿嶄綔', - // dataIndex: 'action', - // align: "center", - // fixed: "right", - // width: 200, - // scopedSlots: { customRender: 'action' } - // } + { + title: '鎿嶄綔', + dataIndex: 'action', + align: "center", + fixed: "right", + width: 200, + scopedSlots: { customRender: 'action' } + } ], url: { list: "/eam/equipmentReportRepair/getReportRepairList", @@ -632,6 +645,10 @@ 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="楠屾敹" + this.$refs.acceptModel.edit(record) } } } -- Gitblit v1.9.3