From 7033fa158e4f62fbb756344f6c359c93750e7a34 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 07 七月 2023 10:51:36 +0800
Subject: [PATCH] 批量带入
---
Source/UBCS-WEB/src/api/batchImport/index.js | 4 +-
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 35 ++++++++++-------
Source/UBCS-WEB/src/components/BatchImport/index.vue | 26 +++++++-----
3 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js
index 23a4323..c24ad26 100644
--- a/Source/UBCS-WEB/src/api/batchImport/index.js
+++ b/Source/UBCS-WEB/src/api/batchImport/index.js
@@ -46,7 +46,7 @@
})
}
// 鑾峰彇鍘嗗彶鏁版嵁姝ｇ‘鏁版嵁
-export const getHistorySuccessTable = (params) => {
+export const getSuccessTable = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/gridValidata',
method: 'get',
@@ -54,7 +54,7 @@
})
}
// 鑾峰彇鍘嗗彶鐩镐技椤�
-export const getHistoryResembleTable = (params) => {
+export const getResembleTable = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/gridResemble',
method: 'get',
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index c25342c..b4ebd93 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -164,8 +164,8 @@
<script>
import {
- getHistorySuccessTable,
- getHistoryResembleTable,
+ getSuccessTable,
+ getResembleTable,
getFormTemplate,
getCurretnSelectedRowResemble,
submitHistoryimport,
@@ -220,7 +220,7 @@
return {
isExpand: true,
filterText: "",
- leftWidth: "200",
+ leftWidth: 200,
templateOid: null,
tab1Name: "鐩镐技椤�",
tab2Name: "姝ｇ‘鏁版嵁",
@@ -249,9 +249,9 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50";
+ this.leftWidth = 50;
} else {
- this.leftWidth = "200";
+ this.leftWidth = 200;
}
this.isExpand = !this.isExpand;
},
@@ -260,17 +260,18 @@
this.localCodeClassifyOid = data.codeclassifyoid;
this.cloNamesList = data.cloNamesList;
this.templateOid = data.oid;
- getHistorySuccessTable({
- codeClassifyOid: this.templateOid,
- redisOid: this.redisOid + "-ok",
- }).then((res) => {
- this.tab2Table = res.data.data;
- });
- getHistoryResembleTable({
+ getResembleTable({
codeClassifyOid: this.templateOid,
redisOid: this.redisOid + "-resemble",
}).then((res) => {
this.tab1Table = res.data.data;
+ });
+ // 鑾峰彇姝ｇ‘鏁版嵁
+ getSuccessTable({
+ codeClassifyOid: this.templateOid,
+ redisOid: this.redisOid + "-ok",
+ }).then((res) => {
+ this.tab2Table = res.data.data;
});
getFormTemplate({
templateOid: data.oid,
@@ -332,9 +333,15 @@
immediate: true,
deep: true,
handler(arr) {
- if (arr.length > 0 && this.type === 'batchImportApply') {
+ if (arr.length > 0 ) {
this.treeNodeClick(arr[0])
- this.leftWidth = 0
+ if (this.type === 'batchImportApply') {
+ this.tab1Name = '鏈夌浉浼奸」鎴栭敊璇暟鎹�'
+ this.tab2Name = '姝ｇ‘鏁版嵁'
+ this.leftWidth = 0
+ } else {
+ this.leftWidth = 200
+ }
}
}
}
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index a1ebae2..af1fcd4 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -144,7 +144,7 @@
return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === "historyImport") {
+ if (this.type === "historyImport" || this.type === "batchApplyCode") {
return {
codeClassifyOid: this.codeClassifyOid,
classifyAttr: this.classifyAttr,
@@ -161,11 +161,6 @@
codeClassifyOid: this.codeClassifyOid,
secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
- };
- } else if (this.type === "batchApplyCode") {
- return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
};
}
},
@@ -227,10 +222,10 @@
return Promise.reject(false);
}
if (this.type === "batchImportApply" && this.showCodeApply) {
- // const flag = await this.$refs.CodeApply.validate();
- // if (!flag) {
- // return Promise.reject(false);
- // }
+ const flag = await this.$refs.CodeApply.validate();
+ if (!flag) {
+ return Promise.reject(false);
+ }
}
this.pageLoading = this.$loading({
lock: true,
@@ -271,10 +266,19 @@
this.redisOid = res.data.redisUuid;
importDataShow(res.data.redisUuid).then((res2) => {
this.leftTree = res2.data.data.map((item) => {
- return {
+ if (this.type === 'batchApplyCode') {
+ return {
+ cloNamesList: item.cloNamesList,
+ oid: item.codeTemplateOid,
+ codeClassifyOid: item.codeClassifyOid,
+ name: item.codeRuleVO.name
+ }
+ } else {
+ return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
};
+ }
});
this.showVisible = true;
});
--
Gitblit v1.9.3