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/MalfunctionRepair.vue | 142 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 12934f5..e1cd998 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -8,14 +8,17 @@
<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="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鈥�,鈥濋殧寮�,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鎹㈣闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
v-model="queryParam.nums"
:auto-size="{ minRows: 2, maxRows:2 }"
></a-textarea>
@@ -178,22 +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>
</div>
<div>
@@ -215,7 +224,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,10 +285,16 @@
</a-popconfirm>
</a-menu-item>
</a-menu>
- </a-dropdown>
+ </a-dropdown> -->
</span>
- <span slot="faultDescription" slot-scope="text">
- <j-ellipsis :value="text" :length="10" />
+ <span
+ slot="jell"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
</span>
</a-table>
@@ -292,7 +312,10 @@
class="table-operator"
style="margin-top: 0px"
>
- <FaultDescriptionList ref="FaultDescriptionList" @ok="modalFormOk"/>
+ <FaultDescriptionList
+ ref="FaultDescriptionList"
+ @ok="modalFormOk"
+ />
</div>
</a-tab-pane>
@@ -307,6 +330,10 @@
@ok='approvalModalFormOk'
@cancel='approvalModalFormOk'
></approvel-modal>
+ <accept-model
+ ref="acceptModel"
+ @ok="modalFormOk"
+ ></accept-model>
</a-card>
</template>
@@ -321,6 +348,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,12 +357,13 @@
MalfunctionRepairModal,
FaultDescriptionList,
ApprovelModal,
- JEllipsis
+ JEllipsis,
+ AcceptModel,
},
data() {
return {
- treeData:[],
- faultTime:[],
+ treeData: [],
+ faultTime: [],
description: '鏁呴殰鎶ヤ慨',
queryParam: { delflag: 0 },
selectedRowKeys: [],
@@ -351,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: '缁熶竴缂栧彿',
@@ -394,8 +447,8 @@
title: '鏁呴殰鎻忚堪',
align: "center",
dataIndex: 'faultDescription',
- scopedSlots: {
- customRender: 'faultDescription'
+ scopedSlots: {
+ customRender: 'faultDescription'
}
},
@@ -430,24 +483,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",
@@ -473,7 +529,7 @@
}
},
created() {
- this.initOptions();
+ this.initOptions();
},
computed: {
importExcelUrl: function () {
@@ -629,9 +685,13 @@
}
})
},
- 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 = "楠屾敹"
+ this.$refs.acceptModel.edit(record)
}
}
}
--
Gitblit v1.9.3