From f67b4c736c68cd3d1f75e5fc6b6e23189f12b979 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 19 十二月 2023 11:34:57 +0800
Subject: [PATCH] 设备管理增加按车间筛选条件
---
src/views/eam/MalfunctionRepair.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 12934f5..058aa14 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -15,7 +15,7 @@
>
<a-form-item label="缁熶竴缂栧彿缇�">
<a-textarea
- placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鈥�,鈥濋殧寮�,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
v-model="queryParam.nums"
:auto-size="{ minRows: 2, maxRows:2 }"
></a-textarea>
@@ -193,6 +193,7 @@
@click="handleAdd"
type="primary"
icon="plus"
+ v-has="'report:add&edit'"
>鏂板</a-button>
</div>
@@ -215,7 +216,12 @@
slot="action"
slot-scope="text, record"
>
- <a-popconfirm
+ <a
+ :disabled=" record.status !== '4'"
+ @click="handleAccept(record)"
+ v-has="'report:accept'"
+ >楠屾敹</a>
+ <!-- <a-popconfirm
v-if="record.status == '1' || record.status == '4'"
title="纭鎻愪氦鍚�?"
@confirm="() =>handleCommit(record, 'commit')"
@@ -271,9 +277,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 +313,10 @@
@ok='approvalModalFormOk'
@cancel='approvalModalFormOk'
></approvel-modal>
+ <accept-model
+ ref="acceptModel"
+ @ok="modalFormOk"
+ ></accept-model>
</a-card>
</template>
@@ -321,6 +331,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 +340,8 @@
MalfunctionRepairModal,
FaultDescriptionList,
ApprovelModal,
- JEllipsis
+ JEllipsis,
+ AcceptModel,
},
data() {
return {
@@ -430,24 +442,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 +647,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