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/system/modules/SelectDeviceModal.vue |   88 ++++++++++++++++++++-----------------------
 1 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue
index af931d0..f91e1d4 100644
--- a/src/views/system/modules/SelectDeviceModal.vue
+++ b/src/views/system/modules/SelectDeviceModal.vue
@@ -1,12 +1,11 @@
 <template>
   <div>
-    <a-modal
+    <a-drawer
       :title="title"
       :visible="visible"
+      width="650"
       @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="鍏抽棴"
-      centered
+      @close="handleCancel"
     >
 
       <!--&lt;!&ndash; 鏌ヨ鍖哄煙 &ndash;&gt;-->
@@ -52,47 +51,41 @@
           <a-form-item label="杞﹂棿灞傜骇锛�">
             <a-tree showLine ref="tree" :expandedKeys.sync="expandedKeys"
                     :treeData="treeDataSource" checkable @check="onCheck" v-model="checkedKeys"
-                    :autoExpandParent="autoExpandParent" @expand="onExpand">
+                    @expand="onExpand">
             </a-tree>
           </a-form-item>
         </a-form>
 
       </a-spin>
 
-      <template slot="footer">
-        <div>
-          <div>
-            <a-dropdown
-              style="float: left"
-              :trigger="['click']"
-              placement="topCenter"
-            >
-              <a-menu slot="overlay">
-                <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
-                <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
-                <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
-              </a-menu>
-              <a-button>
-                鏍戞搷浣�
-                <a-icon type="up"/>
-              </a-button>
-            </a-dropdown>
-          </div>
-          <a-space>
-            <a-button
-              @click="handleCancel"
-            >鍏抽棴
-            </a-button>
-            <a-button
-              @click="handleOk"
-              type="primary"
-            >纭畾
-            </a-button>
-          </a-space>
-        </div>
-      </template>
 
-    </a-modal>
+      <div class="drawer-bottom-button">
+        <a-dropdown
+          style="float: left"
+          :trigger="['click']"
+          placement="topCenter"
+        >
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
+            <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
+            <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
+          </a-menu>
+          <a-button>
+            鏍戞搷浣�
+            <a-icon type="up"/>
+          </a-button>
+        </a-dropdown>
+        <a-popconfirm title="纭畾鏀惧純缂栬緫锛�" @confirm="handleCancel" okText="纭畾" cancelText="鍙栨秷">
+          <a-button style="margin-right: .8rem">鍏抽棴</a-button>
+        </a-popconfirm>
+        <a-button
+          @click="handleOk"
+          type="primary"
+        >纭畾
+        </a-button>
+      </div>
+
+    </a-drawer>
   </div>
 </template>
 
@@ -119,11 +112,13 @@
         default() {
           return true
         }
+      },
+      title: {
+        type: String
       }
     },
     data() {
       return {
-        title: '娣诲姞宸叉湁璁惧',
         cardLoading: false,
         loading: false,
         treeDataSource: [],
@@ -133,8 +128,6 @@
           getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction'
         },
         dataList: [],
-        autoExpandParent: true,
-        checkStrictly: true,
         allTreeKeys: [],
         visible: false,
         dataSource: []
@@ -230,6 +223,7 @@
             this.treeDataSource = res.result
             this.generateList(this.treeDataSource)
             console.log('treeDataSource', this.treeDataSource)
+            this.expandedKeys = this.allTreeKeys
           } else {
             this.$message.warn(res.message)
           }
@@ -273,19 +267,19 @@
       refreshTree() {
         this.queryTreeData()
       },
-      onCheck(value) {
+      onCheck(value, obj) {
         this.checkedKeys = value
+        console.log('obj,', obj)
+        this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
+        console.log(this.deviceNodes)
       },
       handleCancel() {
         this.visible = false
       },
       handleOk() {
-        if (this.checkedKeys.length > 0) {
-          this.$emit('selectFinished', this.checkedKeys)
-        }
+        this.$emit('selectFinished', this.deviceNodes)
         this.visible = false
       }
-
 
       // add() {
       //   this.visible = true
@@ -401,7 +395,7 @@
     overflow-y: hidden
   }
 
-  .drawer-bootom-button {
+  .drawer-bottom-button {
     position: absolute;
     bottom: 0;
     width: 100%;

--
Gitblit v1.9.3