From aabd5c8827ba48531efce521b9caedf2a4e90f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Fri, 1 Dec 2023 11:31:31 +0800
Subject: [PATCH] =?UTF-8?q?system=20=E6=8E=92=E7=89=88=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=B7=BB=E5=8A=A0/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=BC=B9=E7=AA=97=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Scheduling.vue | 50 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index bf81bad..e571a17 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -117,12 +117,6 @@
           <div class="search">
             <!-- 穿梭框左上方搜索 -->
             <div class="station-search">
-              <label>Station Name</label>
-              <a-input type="text" placeholder="Enter Station Name" v-model="stationName" />
-            </div>
-            <!-- 穿梭框左上方搜索结束 -->
-            <!-- 穿梭框右上方搜索 -->
-            <div class="account-search">
               <label>User Name</label>
               <custom-popover-search
                 placeholder="Enter User Name"
@@ -132,13 +126,19 @@
                 @add="onAddToList"
               ></custom-popover-search>
             </div>
+            <!-- 穿梭框左上方搜索结束 -->
+            <!-- 穿梭框右上方搜索 -->
+            <div class="account-search">
+              <label>Station Name</label>
+              <a-input type="text" placeholder="Enter Station Name" v-model="stationName" />
+            </div>
             <!-- 穿梭框右上方搜索结束 -->
           </div>
           <!-- 穿梭框开始 -->
           <a-transfer
             :target-keys="targetKeys"
             :render="(item) => item.title"
-            :operations="['Assign', 'Remove']"
+            :operations="['Remove', 'Assign']"
             :titles="['Particulate Station', 'Roster personnel']"
             :show-select-all="false"
             @change="onChange"
@@ -151,6 +151,22 @@
               <a-tree
                 v-if="direction === 'left'"
                 blockNode
+                checkStrictly
+                :treeData="accountTreeData"
+                :selectedKeys.sync="rightAccountChildSelectedKeys"
+                :expandedKeys.sync="rightAccountChildExpandedKeys"
+                @select="
+                  (_, props) => {
+                    onSelectAccount(_, props, itemSelect, itemSelectAll)
+                  }
+                "
+              >
+                <a-icon slot="switcherIcon" type="down" />
+              </a-tree>
+              <!-- 右侧穿梭框中的树 -->
+              <a-tree
+                v-if="direction === 'right'"
+                blockNode
                 checkable
                 checkStrictly
                 defaultExpandAll
@@ -170,22 +186,6 @@
               >
                 <a-icon slot="switcherIcon" type="down" />
               </a-tree>
-              <!-- 右侧穿梭框中的树 -->
-              <a-tree
-                v-if="direction === 'right'"
-                blockNode
-                checkStrictly
-                :treeData="accountTreeData"
-                :selectedKeys.sync="rightAccountChildSelectedKeys"
-                :expandedKeys.sync="rightAccountChildExpandedKeys"
-                @select="
-                  (_, props) => {
-                    onSelectAccount(_, props, itemSelect, itemSelectAll)
-                  }
-                "
-              >
-                <a-icon slot="switcherIcon" type="down" />
-              </a-tree>
             </template>
           </a-transfer>
           <!-- 穿梭框结束 -->
@@ -574,7 +574,9 @@ export default {
 
     // 穿梭框变化
     onChange(targetKeys, direction, moveKeys) {
-      if (direction == 'right') {
+      console.log(targetKeys, direction, moveKeys)
+      debugger
+      if (direction == 'left') {
         if (!this.checkedAccount) {
           this.$message.warning('Please Select A Person To Assign')
           return