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 +++++++++++++++------------
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 1
Source/UBCS-WEB/src/components/BatchImport/index.vue | 28 ++++++++------
3 files changed, 48 insertions(+), 37 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
}
}
}
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b54d048..a1ebae2 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -76,6 +76,8 @@
:codeClassifyOid="codeClassifyOid"
:redisOid="redisOid"
:type="type"
+ :title="title"
+ :secDTOList="secDTOList"
></ShowImportData>
</el-dialog>
</template>
@@ -135,7 +137,7 @@
return this.currentTypeObj[this.type]["tipList"];
},
downloadTemplateApi() {
- console.log(this.currentTypeObj[this.type], 'this.type');
+ console.log(this.currentTypeObj[this.type], "this.type");
return this.currentTypeObj[this.type]["downloadTemplateFun"];
},
action() {
@@ -148,15 +150,16 @@
classifyAttr: this.classifyAttr,
};
} else if (this.type === "batchImportApply") {
- const secDTOList = this.localSecVOList.map(item => {
- return {
- secOid: item.oid,
- secValue: this.codeApplyForm[item.id]
- }
- })
+ // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+ this.secDTOList = this.localSecVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.id],
+ };
+ });
return {
codeClassifyOid: this.codeClassifyOid,
- secDTOList: JSON.stringify(secDTOList),
+ secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
};
} else if (this.type === "batchApplyCode") {
@@ -212,6 +215,7 @@
upParams: "classifyAttr",
},
},
+ secDTOList: [],
};
},
methods: {
@@ -252,9 +256,9 @@
},
onSuccess(res) {
if (Object.keys(res.data).length === 0) {
- this.$message.success(this.title + '瀵煎叆鎴愬姛锛�')
- this.dialogVisible = false
- return
+ this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
+ this.dialogVisible = false;
+ return;
}
if (res.data.fileOid) {
const fileName = res.data.filePath.split("/").pop();
@@ -277,7 +281,7 @@
}
},
onError(err) {
- console.log(err, 'err');
+ console.log(err, "err");
this.pageLoading.close();
},
uploadChange(file) {
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 9e622e0..c40df95 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -456,6 +456,7 @@
this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫");
} else {
this.editvisible = true;
+ this.rowOid = this.selectRow[0]['oid']
}
},
//楂樼骇鏌ヨ鎸夐挳
--
Gitblit v1.9.3