From 5ef4fa687896d8d3e061a38b0e009e64b018cb79 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 18:15:36 +0800
Subject: [PATCH] 批量带入
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index f4d3ed5..c25342c 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -6,7 +6,7 @@
append-to-body
top="5vh"
>
- <div>
+ <!-- <div>
<FormTemplate
v-if="type === 'batchApplyCode'"
type="add"
@@ -16,9 +16,9 @@
@getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"
></FormTemplate>
- </div>
+ </div> -->
<div class="flex_box">
- <div class="left" :style="{ width: leftWidth + 'px' }">
+ <div class="left" :style="{ width: leftWidth + 'px' }" v-show="false">
<div class="isExpand_box">
<el-link type="primary" @click="hideTree">
<i
@@ -91,23 +91,7 @@
</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">
- <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>
- </el-tab-pane>
- </el-tabs>
- </div>
- <div>
+ <div>
<el-table
border
:data="currentSelectedResemble"
@@ -141,6 +125,23 @@
></el-table-column>
</el-table>
</div>
+ </el-tab-pane>
+ <el-tab-pane :label="tab2Name" name="tab2">
+ <el-table border :data="tab2Table" height="600px">
+ <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>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+
</div>
</div>
<template #footer>
@@ -176,7 +177,7 @@
export default {
name: "ShowImportData",
components: { ResembleQuery, FormTemplate },
- mixins: [codeApply],
+ // mixins: [codeApply],
props: {
title: {
type: String,
@@ -199,7 +200,11 @@
type: String,
default: "",
},
- type: String
+ type: String,
+ secDTOList: {
+ type: Array,
+ default: () => ({})
+ }
},
computed: {
dialogVisible: {
@@ -295,8 +300,8 @@
},
submit() {
const params = {
- classifyAttr: this.classifyAttr,
- improt: true,
+ classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,
+ improt: this.type === 'historyImport' ? true : false,
codeImprotSaveDatVOList: [
{
Clos: this.cloNamesList.map((item) => item.title),
@@ -304,7 +309,7 @@
orderDTO: {
codeClassifyOid: this.codeClassifyOid,
templateOid: this.templateOid,
- secDTOList: [],
+ secDTOList: this.secDTOList,
},
},
],
@@ -329,6 +334,7 @@
handler(arr) {
if (arr.length > 0 && this.type === 'batchImportApply') {
this.treeNodeClick(arr[0])
+ this.leftWidth = 0
}
}
}
--
Gitblit v1.9.3