From 9a66f7174f695139f288d98d45516018e3821831 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 10:25:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 1
Source/UBCS-WEB/src/api/batchImport/index.js | 4 +-
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 69 +++++++++++++++++++++++-----------
Source/UBCS-WEB/src/components/BatchImport/index.vue | 4 +-
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 1
5 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js
index a586e7e..23a4323 100644
--- a/Source/UBCS-WEB/src/api/batchImport/index.js
+++ b/Source/UBCS-WEB/src/api/batchImport/index.js
@@ -46,11 +46,11 @@
})
}
// 鑾峰彇鍘嗗彶鏁版嵁姝ｇ‘鏁版嵁
-export const getHistorySuccessTable = (redisOid) => {
+export const getHistorySuccessTable = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/gridValidata',
method: 'get',
- params: {redisOid: redisOid + "-ok"}
+ params: params
})
}
// 鑾峰彇鍘嗗彶鐩镐技椤�
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index cd1bd20..684801e 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -18,7 +18,7 @@
></FormTemplate>
</div>
<div class="flex_box">
- <div class="left" :style="{ width: leftWidth }">
+ <div class="left" :style="{ width: leftWidth + 'px' }">
<div class="isExpand_box">
<el-link type="primary" @click="hideTree">
<i
@@ -49,9 +49,10 @@
>
</el-tree>
</div>
- <div class="right">
- <div class="tab_box">
+ <div class="right" :style="{ width: 1280 - leftWidth - 60 + 'px' }">
+ <div class="tab_box" style="width: 100%">
<el-tabs
+ style="width: 100%"
v-model="activeTab"
type="card"
@tab-click="handleClick"
@@ -66,17 +67,30 @@
highlight-current-row
@current-change="resembleRowChange"
@selection-change="tab1TableSelectChange"
+ v-if="cloNamesList.length > 1"
>
- <el-table-column type="index"></el-table-column>
+ <el-table-column
+ type="selection"
+ width="100px"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="100px"
+ align="center"
+ ></el-table-column>
<el-table-column
v-for="item in cloNamesList"
:key="item.field"
:prop="item.field"
:label="item.title"
:width="item.width"
+ align="center"
>
</el-table-column>
</el-table>
+ <div v-else style="height: 400px"></div>
</el-tab-pane>
<el-tab-pane :label="tab2Name" name="tab2">
<el-table border :data="tab2Table" height="400px">
@@ -86,6 +100,7 @@
:prop="item.field"
:label="item.title"
:width="item.width"
+ align="center"
>
</el-table-column>
</el-table>
@@ -105,6 +120,7 @@
:prop="item.field"
:label="item.title"
:minWidth="item.minWidth"
+ align="center"
>
<template #default="{ row }">
<span v-if="item.field === 'id'">
@@ -121,6 +137,7 @@
v-show="resembleColumList.length > 0"
prop="rowIndex"
label="excel琛屾暟"
+ align="center"
></el-table-column>
</el-table>
</div>
@@ -131,7 +148,7 @@
<el-button size="small" type="primary" @click="submit"
>纭畾瀵煎叆</el-button
>
- <el-button size="small">鍙栨秷</el-button>
+ <el-button size="small" @click="dialogVisible = false">鍙栨秷</el-button>
</div>
</template>
<FormTemplateDialog
@@ -154,12 +171,12 @@
} from "../../api/batchImport/index";
import ResembleQuery from "../FormTemplate/ResembleQuery.vue";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
-import codeApply from '@/mixins/codeApply.js'
+import codeApply from "@/mixins/codeApply.js";
export default {
name: "ShowImportData",
components: { ResembleQuery, FormTemplate },
- mixins: [ codeApply ],
+ mixins: [codeApply],
props: {
title: {
type: String,
@@ -197,7 +214,7 @@
return {
isExpand: true,
filterText: "",
- leftWidth: "200px",
+ leftWidth: "200",
templateOid: null,
tab1Name: "鐩镐技椤�",
tab2Name: "姝ｇ‘鏁版嵁",
@@ -226,28 +243,32 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50px";
+ this.leftWidth = "50";
} else {
- this.leftWidth = "200px";
+ this.leftWidth = "200";
}
this.isExpand = !this.isExpand;
},
treeNodeClick(data) {
+ console.log(data);
this.localCodeClassifyOid = data.codeclassifyoid;
this.cloNamesList = data.cloNamesList;
- this.templateOid = data.codeClassifyTemplateVO.oid;
- getHistorySuccessTable(this.redisOid).then((res) => {
- this.tab2Table = res.data;
+ this.templateOid = data.oid;
+ getHistorySuccessTable({
+ codeClassifyOid: this.templateOid,
+ redisOid: this.redisOid + "-ok",
+ }).then((res) => {
+ this.tab2Table = res.data.data;
});
getHistoryResembleTable({
- codeClassifyOid: data.codeClassifyOid,
+ codeClassifyOid: this.templateOid,
redisOid: this.redisOid + "-resemble",
}).then((res) => {
- this.tab1Table = res.data;
+ this.tab1Table = res.data.data;
});
getFormTemplate({
templateOid: data.oid,
- codeClassifyOid: data.codeClassifyOid,
+ codeClassifyOid: this.localCodeClassifyOid,
}).then((res) => {
this.resembleColumList = res.data.resembleTableVO.cols[0];
});
@@ -260,7 +281,7 @@
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
}).then((res) => {
- this.currentSelectedResemble = res.data;
+ this.currentSelectedResemble = res.data.data;
});
},
openFormTemlpate(row) {
@@ -274,7 +295,7 @@
submit() {
const params = {
classifyAttr: this.classifyAttr,
- isImprot: true,
+ improt: true,
codeImprotSaveDatVOList: [
{
Clos: this.cloNamesList.map((item) => item.title),
@@ -288,10 +309,11 @@
],
};
submitHistoryimport(params).then((res) => {
- if (res.code === 200) {
- this.$message.success(res.obj);
+ console.log(res);
+ if (res.data.code === 200) {
+ this.$message.success(res.data.msg);
} else {
- this.$message.error(res.obj);
+ this.$message.error(res.data.msg);
}
});
},
@@ -307,13 +329,15 @@
<style lang="scss" scoped>
.flex_box {
display: flex;
+ width: 1280px;
.left {
- transition: all 0.3s;
+ transition: all 0.5s;
.isExpand_box {
margin-bottom: 10px;
text-align: right;
}
.filter_tree {
+ margin-top: 15px;
max-height: 400px;
overflow-y: scroll;
}
@@ -321,7 +345,6 @@
.right {
margin-left: 20px;
margin-top: 30px;
- width: 1000px;
}
}
</style>
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 1d9c488..2bbbf18 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -258,8 +258,8 @@
}
if (res.data.redisUuid) {
this.redisOid = res.data.redisUuid;
- importDataShow(res.data.redisUuid).then((res) => {
- this.leftTree = res.obj.map((item) => {
+ importDataShow(res.data.redisUuid).then((res2) => {
+ this.leftTree = res2.data.data.map((item) => {
return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3023328..9c4accb 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -5,6 +5,7 @@
<avue-form
v-model="form"
:option="option"
+ v-loading="loading"
ref="form"
:style="{ minHeight: loading ? '300px' : '' }"
:key="updateIndex"
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 45f318e..b47249f 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,6 +14,7 @@
:type="type"
:rowOid="rowOid"
:templateOid="templateOid"
+ v-if="dialogVisible"
ref="FormTemplate"
@getFormData="getFormData"
></FormTemplate>
--
Gitblit v1.9.3