From f74c2fd43150311e0aa8b1eb8eb715ac20ca21cf Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 10:21:22 +0800
Subject: [PATCH] 上传代码
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 10 ++++++++--
Source/UBCS-WEB/src/views/MasterData/items.vue | 3 ++-
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 5 ++++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 29cfe88..9b76f3d 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -169,7 +169,7 @@
return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === "historyImport" || this.type === "batchApplyCode") {
+ if (this.type === "historyImport" || this.type === "batchApplyCode" ) {
return {
codeClassifyOid: this.codeClassifyOid,
classifyAttr: this.classifyAttr,
@@ -188,6 +188,10 @@
...this.codeApplyForm,
};
} else if (this.type === "bulkEdit") {
+ return {
+ codeClassifyOid: this.codeClassifyOid,
+ };
+ }else if(this.type === 'groupCode'){
return {
codeClassifyOid: this.codeClassifyOid,
};
@@ -257,7 +261,9 @@
"2.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
"3.Excel绗竴琛屽拰绗簩琛屼緷娆′负浼佷笟缂栫爜鍜岄泦鍥㈢紪鐮侊紙蹇呭～锛�"
],
- action: "/api/ubcs-code/mdmEngineController/importGroupCode"
+ action: "/api/ubcs-code/mdmEngineController/importGroupCode",
+ downloadTemplateFun: null,
+ upParams: "classifyAttr",
}
},
secDTOList: [],
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 6e77ae6..978e482 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -31,6 +31,10 @@
type: String,
default: ''
},
+ isLoading:{
+ type: Boolean,
+ default:false
+ }
},
data() {
return {
@@ -47,7 +51,6 @@
CloneTreeAvueform: {},
loading: false,
Treedata: [],
- isLoading: false,
nodeClickList: "",
Treeoption: {
addBtn: false,
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 9398d41..d87f292 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,5 +1,5 @@
<template>
- <el-container>
+ <el-container v-loading="isLoading">
<el-aside style="width:250px">
<basic-container>
<!-- 鏍戠粍浠�-->
@@ -17,6 +17,7 @@
@tableHeadFindData="tableHeadFindDatas"
@nodeClickList="nodeClickLists"
@total="totals"
+ :isLoading="isLoading"
>
</master-tree>
</basic-container>
--
Gitblit v1.9.3