From 5d3661fd40aa5fe0f669edb18b1c2aed458fb4e8 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 11 六月 2024 14:03:58 +0800
Subject: [PATCH] 低代码更新，工单更新
---
src/layouts/default/header/components/AppDept.vue | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/src/layouts/default/header/components/AppDept.vue b/src/layouts/default/header/components/AppDept.vue
index b42dfc2..6351b27 100644
--- a/src/layouts/default/header/components/AppDept.vue
+++ b/src/layouts/default/header/components/AppDept.vue
@@ -24,47 +24,64 @@
const ARow = Row;
const ACol = Col;
onMounted(async () => {
- const temp = globSetting.useOrg == 'true' ? await getTreeList() : await getProdTreeList();
+ const temp = await getProdTreeList(); //globSetting.useOrg == 'Y' ? await getTreeList() : await getProdTreeList();
const treeData = [];
const treeOption =
- globSetting.useOrg == 'true'
- ? await optionsListApi(useUserStore().getUserInfo.userId)
- : await prodListApi(useUserStore().getUserInfo.userId);
- if (globSetting.useOrg == 'true') {
- let newArr = [];
- //newArr.push(treeOption.Data.Items[0])
- for (let i = 0; i < treeOption.Data.Items.length; i++) {
- // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
- let flag = true;
- for (let j = 0; j < newArr.length; j++) {
- // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
- treeOption.Data.Items[i].ORG_CODE === newArr[j].ORG_CODE ? (flag = false) : flag;
- }
- flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // globSetting.useOrg == 'Y'
+ // ? await optionsListApi(useUserStore().getUserInfo.userId)
+ // : await prodListApi(useUserStore().getUserInfo.userId);
+ await prodListApi(useUserStore().getUserInfo.userId);
+ let newArr = [];
+ //newArr.push(treeOption.Data.Items[0])
+ for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ let flag = true;
+ for (let j = 0; j < newArr.length; j++) {
+ // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
}
-
- newArr.map((item) => {
- let options = temp.find((obj) => obj.id == item.ORG_ID);
- treeData.push(options);
- });
- } else {
- let newArr = [];
- //newArr.push(treeOption.Data.Items[0])
- for (let i = 0; i < treeOption.Data.Items.length; i++) {
- // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
- let flag = true;
- for (let j = 0; j < newArr.length; j++) {
- // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
- treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
- }
- flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
- }
-
- newArr.map((item) => {
- let options = temp.find((obj) => obj.id == item.PROD_ID);
- treeData.push(options);
- });
+ flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
}
+
+ newArr.map((item) => {
+ let options = temp.find((obj) => obj.id == item.PROD_ID);
+ treeData.push(options);
+ });
+ // if (globSetting.useOrg == 'Y') {
+ // let newArr = [];
+ // //newArr.push(treeOption.Data.Items[0])
+ // for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ // let flag = true;
+ // for (let j = 0; j < newArr.length; j++) {
+ // // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ // treeOption.Data.Items[i].ORG_CODE === newArr[j].ORG_CODE ? (flag = false) : flag;
+ // }
+ // flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // }
+
+ // newArr.map((item) => {
+ // let options = temp.find((obj) => obj.id == item.ORG_ID);
+ // treeData.push(options);
+ // });
+ // } else {
+ // let newArr = [];
+ // //newArr.push(treeOption.Data.Items[0])
+ // for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ // let flag = true;
+ // for (let j = 0; j < newArr.length; j++) {
+ // // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ // treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
+ // }
+ // flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // }
+
+ // newArr.map((item) => {
+ // let options = temp.find((obj) => obj.id == item.PROD_ID);
+ // treeData.push(options);
+ // });
+ // }
updateSchema([
{
@@ -73,10 +90,10 @@
},
]);
setFieldsValue({
- dept:
- globSetting.useOrg == 'true'
- ? useUserStore().getUserInfo.orgCode
- : useUserStore().getUserInfo.prodCode,
+ dept: useUserStore().getUserInfo.prodCode,
+ // globSetting.useOrg == 'Y'
+ // ? useUserStore().getUserInfo.orgCode
+ // : useUserStore().getUserInfo.prodCode,
});
});
--
Gitblit v1.9.3