From f60c5156615626515bd6d84f151a1292b8b936c1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 01 七月 2024 12:36:32 +0800
Subject: [PATCH] 班制更新

---
 src/views/tigerprojects/system/role/RoleDrawer.vue |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/tigerprojects/system/role/RoleDrawer.vue b/src/views/tigerprojects/system/role/RoleDrawer.vue
index 73ceb23..e7dfdbb 100644
--- a/src/views/tigerprojects/system/role/RoleDrawer.vue
+++ b/src/views/tigerprojects/system/role/RoleDrawer.vue
@@ -38,7 +38,7 @@
           v-model:value="model[field]"
           :treeData="treeDataProd"
           :renderIcon="createIconOrg"
-          :fieldNames="{ title: 'deptName', key: 'id' }"
+          :fieldNames="{ title: 'NAME', key: 'ID' }"
           @gethalfCheckedKeys="gethalfCheckedKeysFty"
           :expanded-keys="expandedKeysFty"
           checkable
@@ -76,6 +76,8 @@
     getROList,
     getWhList,
     getProdList,
+    getEntity,
+    convertToTree,
   } from '/@/api/tigerapi/system';
   import { getProdTreeList, getTreeList } from '/@/api/tigerapi/dept';
   import { getTreeList as getTreeListWh } from '/@/api/tigerapi/wms/house';
@@ -124,13 +126,15 @@
     setDrawerProps({ confirmLoading: false });
     // 闇�瑕佸湪setFieldsValue涔嬪墠鍏堝～鍏卼reeData锛屽惁鍒橳ree缁勪欢鍙兘浼氭姤key not exist璀﹀憡
     if (unref(treeData).length === 0) {
-      treeData.value = (await getMenuList()) as any as TreeItem[];
+      treeData.value = (await getMenuList({menuName: 'SYSTEM'})) as any as TreeItem[];
     }
     if (unref(treeDataOrg).length === 0) {
       treeDataOrg.value = (await getTreeList()) as any as TreeItem[];
     }
     if (unref(treeDataProd).length === 0) {
-      treeDataProd.value = (await getProdTreeList()) as any as TreeItem[];
+      // treeDataProd.value = (await getProdTreeList()) as any as TreeItem[];
+      let prodTreeData = await getEntity({sqlcmd: '', entityName: 'V_PROD_TREE'});
+      treeDataProd.value = convertToTree(prodTreeData.Data.Items,'PARENT_CODE', 'CODE', '');
     }
     if (unref(treeDataWh).length === 0) {
       treeDataWh.value = (await getTreeListWh()) as any as TreeItem[];
@@ -152,6 +156,7 @@
       }
       //console.log(list,11);
       data.record.menu = list2;
+      halfCheckedKeys.value = list;
       expandedKeys.value = list;
       await getRuleOrg(data);
       await getRuleWh(data);
@@ -162,7 +167,11 @@
     }
   });
 
-  //鑾峰彇瑙掕壊瀵瑰簲鐨勭粍缁�
+  /**
+   * @description: 鑾峰彇瑙掕壊瀵瑰簲鐨勭粍缁�
+   * @param {*} data
+   * @return {*}
+   */  
   async function getRuleOrg(data) {
     const orgList = await getROList(data.record.ID);
     var hfList = [];
@@ -177,10 +186,15 @@
       }
     }
     data.record.org = hfList;
+    halfCheckedKeysOrg.value = list;
     expandedKeysOrg.value = list;
   }
 
-  //鑾峰彇瑙掕壊瀵瑰簲鐨勪粨搴�
+  /**
+   * @description: 鑾峰彇瑙掕壊瀵瑰簲鐨勪粨搴�
+   * @param {*} data
+   * @return {*}
+   */  
   async function getRuleWh(data) {
     const whList = await getWhList(data.record.ID);
     var hfList = [];
@@ -195,9 +209,15 @@
       }
     }
     data.record.wh = hfList;
+    halfCheckedKeysWh.value = list;
     expandedKeysWh.value = list;
   }
 
+  /**
+   * @description: 鑾峰彇瑙掕壊瀵瑰簲鐨勭敓浜�
+   * @param {*} data
+   * @return {*}
+   */  
   async function getRuleProd(data) {
     const prodList = await getProdList(data.record.ID);
     var hfList = [];
@@ -212,6 +232,7 @@
       }
     }
     data.record.fty = hfList;
+    halfCheckedKeysFty.value = list;
     expandedKeysFty.value = list;
   }
 
@@ -225,7 +246,7 @@
       values.menu = { checked: values.menu, halfChecked: currentValue };
       let curOrgValue = halfCheckedKeysOrg.value as [];
       values.org = { checked: values.org, halfChecked: curOrgValue };
-      let curFtyValue = halfCheckedKeysOrg.value as [];
+      let curFtyValue = halfCheckedKeysFty.value as [];
       values.fty = { checked: values.fty, halfChecked: curFtyValue };
       let curWhValue = halfCheckedKeysWh.value as [];
       values.wh = { checked: values.wh, halfChecked: curWhValue };

--
Gitblit v1.9.3