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/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
index aa9686c..5706370 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>
@@ -13,14 +13,20 @@
                 </a-form-item>
               </a-col>
               <a-col :md="2" :sm="2" :xs="2">
-                <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+                <a-space>
+                  <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+                  <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>
+                </a-space>
               </a-col>
-              <a-col :md="2" :sm="2">
-                <!--//娌堥-->
-                <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>
+              <!--<a-col :md="2" :sm="2" :xs="2">-->
+                <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+              <!--</a-col>-->
+              <!--<a-col :md="2" :sm="2">-->
+                <!--&lt;!&ndash;//娌堥&ndash;&gt;-->
+                <!--<a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>-->
 
-                <!--<a-button type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>-->
-              </a-col>
+                <!--&lt;!&ndash;<a-button type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>&ndash;&gt;-->
+              <!--</a-col>-->
 
 
             </a-row>
@@ -31,6 +37,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 +53,7 @@
         </a-table>
       </div>
       <device-calendar-model ref="modalForm" @ok="modalFormOk"></device-calendar-model>
-    </a-card>
+    </div>
   </div>
 </template>
 
@@ -127,12 +142,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 +202,8 @@
         this.queryParam = {}
         this.loadData()
       },
-
       loadData(arg) {
-
+        this.dataSource = [];
         if(!this.url.list){
           this.$message.error("璇疯缃畊rl.list灞炴��!")
           return

--
Gitblit v1.9.3