From 7fa356724330bea11387a48171bf4fde7f641c2a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 07 七月 2023 14:34:47 +0800
Subject: [PATCH] fjl
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 114 +++++++++++++++++++++++++++++++--------------------------
Source/UBCS-WEB/src/components/BatchImport/index.vue | 1
2 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index b4ebd93..1deb7f5 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -18,7 +18,11 @@
></FormTemplate>
</div> -->
<div class="flex_box">
- <div class="left" :style="{ width: leftWidth + 'px' }" v-show="false">
+ <div
+ class="left"
+ :style="{ width: leftWidth + 'px' }"
+ v-show="type !== 'batchImportApply'"
+ >
<div class="isExpand_box">
<el-link type="primary" @click="hideTree">
<i
@@ -38,6 +42,7 @@
v-show="isExpand"
class="filter_tree"
:data="leftTree"
+ node-key="codeClassifyOid"
default-expand-all
highlight-current
:filter-node-method="filterNode"
@@ -49,7 +54,7 @@
>
</el-tree>
</div>
- <div class="right" :style="{ width: 1280 - leftWidth - 60 + 'px' }">
+ <div class="right" :style="{ width: 1280 - leftWidth - 60 + 'px' }">
<div class="tab_box" style="width: 100%">
<el-tabs
style="width: 100%"
@@ -69,7 +74,7 @@
@selection-change="tab1TableSelectChange"
v-if="cloNamesList.length > 1"
>
- <el-table-column
+ <el-table-column
type="selection"
width="100px"
align="center"
@@ -92,39 +97,41 @@
</el-table>
<div v-else style="height: 400px"></div>
<div>
- <el-table
- border
- :data="currentSelectedResemble"
- style="width: 100%"
- height="200px"
- >
- <el-table-column
- v-for="item in resembleColumList"
- :key="item.field"
- :prop="item.field"
- :label="item.title"
- :minWidth="item.minWidth"
- align="center"
- >
- <template #default="{ row }">
- <span v-if="item.field === 'id'">
- <el-link type="primary" @click="openFormTemlpate(row)">{{
- row[item.field]
- }}</el-link>
- </span>
- <span v-else>
- {{ row[item.field] }}
- </span>
- </template>
- </el-table-column>
- <el-table-column
- v-show="resembleColumList.length > 0"
- prop="rowIndex"
- label="excel琛屾暟"
- align="center"
- ></el-table-column>
- </el-table>
- </div>
+ <el-table
+ border
+ :data="currentSelectedResemble"
+ style="width: 100%"
+ height="200px"
+ >
+ <el-table-column
+ v-for="item in resembleColumList"
+ :key="item.field"
+ :prop="item.field"
+ :label="item.title"
+ :minWidth="item.minWidth"
+ align="center"
+ >
+ <template #default="{ row }">
+ <span v-if="item.field === 'id'">
+ <el-link
+ type="primary"
+ @click="openFormTemlpate(row)"
+ >{{ row[item.field] }}</el-link
+ >
+ </span>
+ <span v-else>
+ {{ row[item.field] }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-show="resembleColumList.length > 0"
+ prop="rowIndex"
+ label="excel琛屾暟"
+ align="center"
+ ></el-table-column>
+ </el-table>
+ </div>
</el-tab-pane>
<el-tab-pane :label="tab2Name" name="tab2">
<el-table border :data="tab2Table" height="600px">
@@ -141,7 +148,6 @@
</el-tab-pane>
</el-tabs>
</div>
-
</div>
</div>
<template #footer>
@@ -203,8 +209,8 @@
type: String,
secDTOList: {
type: Array,
- default: () => ({})
- }
+ default: () => ({}),
+ },
},
computed: {
dialogVisible: {
@@ -257,7 +263,7 @@
},
treeNodeClick(data) {
console.log(data);
- this.localCodeClassifyOid = data.codeclassifyoid;
+ this.localCodeClassifyOid = data.codeClassifyOid;
this.cloNamesList = data.cloNamesList;
this.templateOid = data.oid;
getResembleTable({
@@ -301,8 +307,9 @@
},
submit() {
const params = {
- classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,
- improt: this.type === 'historyImport' ? true : false,
+ classifyAttr:
+ this.type === "historyImport" ? this.classifyAttr : undefined,
+ improt: this.type === "historyImport" ? true : false,
codeImprotSaveDatVOList: [
{
Clos: this.cloNamesList.map((item) => item.title),
@@ -333,18 +340,21 @@
immediate: true,
deep: true,
handler(arr) {
- if (arr.length > 0 ) {
- this.treeNodeClick(arr[0])
- if (this.type === 'batchImportApply') {
- this.tab1Name = '鏈夌浉浼奸」鎴栭敊璇暟鎹�'
- this.tab2Name = '姝ｇ‘鏁版嵁'
- this.leftWidth = 0
- } else {
- this.leftWidth = 200
+ if (arr.length > 0) {
+ this.treeNodeClick(arr[0]);
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(arr[0]["codeClassifyOid"]);
+ });
+ if (this.type === "batchImportApply") {
+ this.leftWidth = 0;
+ } else if (this.type === "batchApplyCode") {
+ this.tab1Name = "鏈夌浉浼奸」鎴栭敊璇暟鎹�";
+ this.tab2Name = "姝ｇ‘鏁版嵁";
+ this.leftWidth = 200;
}
}
- }
- }
+ },
+ },
},
};
</script>
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index af1fcd4..c7a1d41 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -277,6 +277,7 @@
return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
+ codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
};
}
});
--
Gitblit v1.9.3