From 9b1aa8494aa0706dee84f7bc34cd646cf13d9b64 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 10 七月 2023 14:24:56 +0800
Subject: [PATCH] fjl
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 214 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 145 insertions(+), 69 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index b4ebd93..8347d10 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -6,19 +6,12 @@
append-to-body
top="5vh"
>
- <!-- <div>
- <FormTemplate
- v-if="type === 'batchApplyCode'"
- type="add"
- :selfColumnType="selfColumnType"
- :selfColumnConfig="selfColumnConfig"
- ref="CodeApply"
- @getFormData="getCodeApplyFormData"
- @referConfigDataUpdate="referConfigDataUpdate"
- ></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 +31,7 @@
v-show="isExpand"
class="filter_tree"
:data="leftTree"
+ node-key="codeClassifyOid"
default-expand-all
highlight-current
:filter-node-method="filterNode"
@@ -49,7 +43,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,11 +63,22 @@
@selection-change="tab1TableSelectChange"
v-if="cloNamesList.length > 1"
>
- <el-table-column
+ <el-table-column
+ v-if="type !== 'batchApplyCode'"
type="selection"
width="100px"
align="center"
></el-table-column>
+ <el-table-column
+ v-else
+ type="operate"
+ width="100px"
+ align="center"
+ >
+ <template>
+ <el-button type="text">閲嶆柊缂栬緫</el-button>
+ </template>
+ </el-table-column>
<el-table-column
type="index"
label="搴忓彿"
@@ -92,44 +97,54 @@
</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">
+ <el-table
+ border
+ :data="tab2Table"
+ :height="
+ type === 'batchApplyCode' && tab2Table.length > 0
+ ? '400px'
+ : '700px'
+ "
+ >
<el-table-column
- v-for="item in cloNamesList"
+ v-for="item in successTableColumns"
:key="item.field"
:prop="item.field"
:label="item.title"
@@ -138,10 +153,26 @@
>
</el-table-column>
</el-table>
+ <el-card
+ style="min-height: 200px; margintop: 10px"
+ v-if="type === 'batchApplyCode' && tab2Table.length > 0"
+ >
+ <div slot="header" class="clearfix">
+ <h4>缂栫爜鐢宠</h4>
+ </div>
+ <FormTemplate
+ v-if="type === 'batchApplyCode'"
+ type="add"
+ :selfColumnType="selfColumnType"
+ :selfColumnConfig="selfColumnConfig"
+ ref="CodeApply"
+ @getFormData="getCodeApplyFormData"
+ @referConfigDataUpdate="referConfigDataUpdate"
+ ></FormTemplate>
+ </el-card>
</el-tab-pane>
</el-tabs>
</div>
-
</div>
</div>
<template #footer>
@@ -177,7 +208,7 @@
export default {
name: "ShowImportData",
components: { ResembleQuery, FormTemplate },
- // mixins: [codeApply],
+ mixins: [codeApply],
props: {
title: {
type: String,
@@ -203,8 +234,8 @@
type: String,
secDTOList: {
type: Array,
- default: () => ({})
- }
+ default: () => ({}),
+ },
},
computed: {
dialogVisible: {
@@ -214,6 +245,13 @@
set(val) {
this.$emit("update:visible", val);
},
+ },
+ successTableColumns() {
+ if (this.type === "batchApplyCode") {
+ return this.cloNamesList.slice(1);
+ } else {
+ return this.cloNamesList;
+ }
},
},
data() {
@@ -230,6 +268,7 @@
activeTab: "tab1",
cloNamesList: [], //鍒楄〃澶撮儴瀛楁
localCodeClassifyOid: "",
+ codeRuleOid: '',
resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
currentSelectedResemble: [],
currentSelectedResembleRow: {
@@ -239,6 +278,7 @@
formTemplateVisible: false,
},
secVOList: [],
+ batchApplyCodeTableData: {},
};
},
@@ -255,23 +295,55 @@
}
this.isExpand = !this.isExpand;
},
- treeNodeClick(data) {
+ async treeNodeClick(data) {
console.log(data);
- this.localCodeClassifyOid = data.codeclassifyoid;
+ this.localCodeClassifyOid = data.codeClassifyOid;
this.cloNamesList = data.cloNamesList;
this.templateOid = data.oid;
+ if (this.type === "batchApplyCode") {
+ this.codeRuleOid = data.codeRuleOid
+ if (!this.batchApplyCodeTableData[data.codeRuleOid]) {
+ this.batchApplyCodeTableData[data.codeRuleOid] = {};
+ } else {
+ console.log(this.$refs.CodeApply, 'this.$refs.CodeApply');
+ if (this.$refs.CodeApply) {
+ console.log(this.$refs.CodeApply.validate(), 'this.$refs.CodeApply.validate()');
+ if (!(await this.$refs.CodeApply.validate())) {
+ this.$message.warning('璇峰～鍐欎究缂栫爜鐢宠锛�')
+ return false
+ }
+ }
+ // 鏍￠獙
+ }
+ }
getResembleTable({
- codeClassifyOid: this.templateOid,
+ codeClassifyOid:
+ this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,
redisOid: this.redisOid + "-resemble",
}).then((res) => {
this.tab1Table = res.data.data;
+ if (this.type === "batchApplyCode" && this.tab1Table.length > 0) {
+ this.batchApplyCodeTableData[data.codeRuleOid]["tab1"] =
+ res.data.data;
+
+ }
});
// 鑾峰彇姝ｇ‘鏁版嵁
getSuccessTable({
- codeClassifyOid: this.templateOid,
+ codeClassifyOid:
+ this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,
redisOid: this.redisOid + "-ok",
}).then((res) => {
this.tab2Table = res.data.data;
+ if (this.tab2Table.length > 0 && this.type === "batchApplyCode") {
+ this.batchApplyCodeTableData[data.codeRuleOid]["codeApply"] = {}
+ this.batchApplyCodeTableData[data.codeRuleOid]["tab2"] =
+ res.data.data;
+ if (this.$refs.CodeApply) {
+ this.$refs.CodeApply.loading = true;
+ }
+ this.getCodeRule();
+ }
});
getFormTemplate({
templateOid: data.oid,
@@ -301,8 +373,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 +406,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>
--
Gitblit v1.9.3