From 3dd1c81c84d78a30fff6468ccb05f979f2d50966 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 17:48:45 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
index aa9686c..b653554 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
@@ -1,6 +1,6 @@
<template>
<div class="deviceCalendar_list">
- <a-card :bordered="false">
+ <div :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<div>
@@ -31,6 +31,15 @@
<div style="overflow: auto;width: 100%;margin-top: 20px;height: 569px;">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns" @change="handleTableChange" class="ant-table-striped"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)">
+ <span slot="action"
+ slot-scope="text, record">
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
<span slot="isDaySpan" slot-scope="text, record">
<span v-if="text == 'true'">鏄�</span>
<span v-if="text == 'false'">鍚�</span>
@@ -38,7 +47,7 @@
</a-table>
</div>
<device-calendar-model ref="modalForm" @ok="modalFormOk"></device-calendar-model>
- </a-card>
+ </div>
</div>
</template>
@@ -127,12 +136,21 @@
title: '缁撴潫浼戞伅鏃堕棿',
align: 'center',
dataIndex: 'sleepEndDate'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ fixed: "right",
+ width: 147,
+ scopedSlots: { customRender: 'action' }
}
],
checkedList: ['lyl'],
dataList: [],
url: {
- list: '/mdc/mdcDeviceCalendar/list'
+ list: '/mdc/mdcDeviceCalendar/list',
+ delete:'/mdc/mdcDeviceCalendar/delete'
}
}
},
@@ -178,9 +196,8 @@
this.queryParam = {}
this.loadData()
},
-
loadData(arg) {
-
+ this.dataSource = [];
if(!this.url.list){
this.$message.error("璇疯缃畊rl.list灞炴��!")
return
--
Gitblit v1.9.3