From 5cca849c1690ac6e49bfc04b3f930d41c0513c32 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 16:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 503 +++++++++++++------------------------------------------
1 files changed, 124 insertions(+), 379 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 9a74712..f4d3ed5 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -6,8 +6,19 @@
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 }">
+ <div class="left" :style="{ width: leftWidth + 'px' }">
<div class="isExpand_box">
<el-link type="primary" @click="hideTree">
<i
@@ -38,41 +49,58 @@
>
</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"
size="small"
>
- <el-tab-pane label="鏈夌浉浼奸」" name="resemble">
+ <el-tab-pane :label="tab1Name" name="tab1">
<el-table
border
- :data="resembleData"
+ :data="tab1Table"
style="width: 100%"
height="400px"
highlight-current-row
@current-change="resembleRowChange"
+ @selection-change="tab1TableSelectChange"
+ v-if="cloNamesList.length > 1"
>
+ <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="姝ｇ‘鏁版嵁" name="success">
- <el-table border :data="successData" height="400px">
+ <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>
@@ -92,6 +120,7 @@
:prop="item.field"
:label="item.title"
:minWidth="item.minWidth"
+ align="center"
>
<template #default="{ row }">
<span v-if="item.field === 'id'">
@@ -108,6 +137,7 @@
v-show="resembleColumList.length > 0"
prop="rowIndex"
label="excel琛屾暟"
+ align="center"
></el-table-column>
</el-table>
</div>
@@ -115,8 +145,10 @@
</div>
<template #footer>
<div>
- <el-button size="small" type="primary">纭畾瀵煎叆</el-button>
- <el-button size="small">鍙栨秷</el-button>
+ <el-button size="small" type="primary" @click="submit"
+ >纭畾瀵煎叆</el-button
+ >
+ <el-button size="small" @click="dialogVisible = false">鍙栨秷</el-button>
</div>
</template>
<FormTemplateDialog
@@ -135,11 +167,16 @@
getHistoryResembleTable,
getFormTemplate,
getCurretnSelectedRowResemble,
+ submitHistoryimport,
} from "../../api/batchImport/index";
import ResembleQuery from "../FormTemplate/ResembleQuery.vue";
+import FormTemplate from "../FormTemplate/FormTemplate.vue";
+import codeApply from "@/mixins/codeApply.js";
+
export default {
name: "ShowImportData",
- components: { ResembleQuery },
+ components: { ResembleQuery, FormTemplate },
+ mixins: [codeApply],
props: {
title: {
type: String,
@@ -154,6 +191,15 @@
type: String,
default: "",
},
+ classifyAttr: {
+ type: String,
+ default: "id",
+ },
+ codeClassifyOid: {
+ type: String,
+ default: "",
+ },
+ type: String
},
computed: {
dialogVisible: {
@@ -169,127 +215,17 @@
return {
isExpand: true,
filterText: "",
- leftWidth: "200px",
- data: [
- {
- id: 1,
- label: "涓�绾� 1",
- children: [
- {
- id: 4,
- label: "浜岀骇 1-1",
- children: [
- {
- id: 9,
- label: "涓夌骇 1-1-1",
- },
- {
- id: 10,
- label: "涓夌骇 1-1-2",
- },
- ],
- },
- ],
- },
- {
- id: 2,
- label: "涓�绾� 2",
- children: [
- {
- id: 5,
- label: "浜岀骇 2-1",
- },
- {
- id: 6,
- label: "浜岀骇 2-2",
- },
- ],
- },
- {
- id: 3,
- label: "涓�绾� 3",
- children: [
- {
- id: 7,
- label: "浜岀骇 3-1",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- {
- id: 8,
- label: "浜岀骇 3-2",
- },
- ],
- },
- ],
- resembleData: [],
- successData: [],
- activeTab: "resemble",
- cloNamesList: [],
- codeClassifyOid: "",
- resembleColumList: [],
+ leftWidth: "200",
+ templateOid: null,
+ tab1Name: "鐩镐技椤�",
+ tab2Name: "姝ｇ‘鏁版嵁",
+ tab1Table: [],
+ selectedTab1Table: [],
+ tab2Table: [],
+ activeTab: "tab1",
+ cloNamesList: [], //鍒楄〃澶撮儴瀛楁
+ localCodeClassifyOid: "",
+ resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
currentSelectedResemble: [],
currentSelectedResembleRow: {
templateOid: "",
@@ -297,6 +233,7 @@
rowOid: "",
formTemplateVisible: false,
},
+ secVOList: [],
};
},
@@ -307,287 +244,94 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50px";
+ this.leftWidth = "50";
} else {
- this.leftWidth = "200px";
+ this.leftWidth = "200";
}
this.isExpand = !this.isExpand;
},
treeNodeClick(data) {
- this.codeClassifyOid = data.codeclassifyoid;
+ console.log(data);
+ this.localCodeClassifyOid = data.codeclassifyoid;
this.cloNamesList = data.cloNamesList;
- getHistorySuccessTable(this.redisOid).then((res) => {
- this.successData = res.data
- // this.successData = [
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH007",
- // caigouwl: "鏄�",
- // oid: "433DFA8E-4445-18F4-AC95-85E7EE1C92CF",
- // kucunwl: "鏄�",
- // tuhao: "TH006",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯4",
- // jiliangdw: "涓�",
- // oldcode: "z0004",
- // id: "0201020013",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH006",
- // caigouwl: "鏄�",
- // oid: "E94E3320-841F-AE87-1D56-D6B3398D0FFC",
- // kucunwl: "鏄�",
- // tuhao: "TH005",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯3",
- // jiliangdw: "涓�",
- // oldcode: "z0003",
- // id: "0201020012",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH003",
- // caigouwl: "鏄�",
- // oid: "D2E0A166-A774-BE6F-A9C7-3277467CE8EC",
- // kucunwl: "鏄�",
- // tuhao: "TH003",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯2",
- // jiliangdw: "涓�",
- // oldcode: "z0002",
- // id: "0201020011",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH002",
- // caigouwl: "鏄�",
- // oid: "291CD01A-F18D-2D95-5291-D2C80ED57CC8",
- // kucunwl: "鏄�",
- // tuhao: "TH002",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯1",
- // jiliangdw: "涓�",
- // oldcode: "z0001",
- // id: "0201020010",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH001",
- // caigouwl: "鏄�",
- // oid: "FED83315-F2B4-C603-2AC2-11B0DF3029A6",
- // kucunwl: "鏄�",
- // tuhao: "TH001",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘爴",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯6",
- // jiliangdw: "涓�",
- // oldcode: "z0006",
- // id: "0201010019",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH005",
- // caigouwl: "鏄�",
- // oid: "3E120284-8EC2-9BF4-D1AB-579380DFA085",
- // kucunwl: "鏄�",
- // tuhao: "TH005",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘爴",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯5",
- // jiliangdw: "涓�",
- // oldcode: "z0005",
- // id: "0201010018",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH004",
- // caigouwl: "鏄�",
- // oid: "2EB3B122-2FE4-A236-53F2-9B67E40332AC",
- // kucunwl: "鏄�",
- // tuhao: "TH004",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘爴",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯4",
- // jiliangdw: "涓�",
- // oldcode: "z0004",
- // id: "0201010017",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH009",
- // caigouwl: "鏄�",
- // oid: "8940A341-8041-E031-6FE1-A18526C62DE9",
- // kucunwl: "鏄�",
- // tuhao: "TH008",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯6",
- // jiliangdw: "涓�",
- // oldcode: "z0006",
- // id: "0201020015",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH008",
- // caigouwl: "鏄�",
- // oid: "936CBC1E-2FD0-5CD7-C331-64B86204FD78",
- // kucunwl: "鏄�",
- // tuhao: "TH007",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯5",
- // jiliangdw: "涓�",
- // oldcode: "z0005",
- // id: "0201020014",
- // },
- // ];
+ 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) => {
- console.log(res);
- this.resembleData = res.data
- // this.resembleData = [
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH007",
- // caigouwl: "鏄�",
- // oid: "FC2F0D9F-8B2E-5A19-3BDE-22107F373EB3",
- // kucunwl: "鏄�",
- // tuhao: "TH006",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯4",
- // jiliangdw: "涓�",
- // oldcode: "z0004",
- // id: "0201020013",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH007",
- // caigouwl: "鏄�",
- // oid: "B92CFF46-1D46-E680-66C4-33A3ABE77A6C",
- // kucunwl: "鏄�",
- // tuhao: "TH005",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯3",
- // jiliangdw: "涓�",
- // oldcode: "z0003",
- // id: "0201020012",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH15",
- // caigouwl: "鏄�",
- // oid: "B383C30E-D201-01F2-89EE-6F751EFA0AA1",
- // kucunwl: "鏄�",
- // tuhao: "TH008",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯6",
- // jiliangdw: "涓�",
- // oldcode: "z0006",
- // id: "0201020015",
- // },
- // {
- // xiaoshouwl: "鏄�",
- // xinghaoguige: "XH17",
- // caigouwl: "鏄�",
- // oid: "1C379116-F27B-3F20-DFC3-74A39B87E505",
- // kucunwl: "鏄�",
- // tuhao: "TH007",
- // codeSecLengthField: "6#4",
- // codeclsfid: "绱у浐浠�#铻烘瘝",
- // materialtype: "鏉愭枡",
- // chukufangshi: "鍏堣繘鍏堝嚭",
- // hesuanfenlei: "鍘熸潗鏂�",
- // name: "娴嬭瘯5",
- // jiliangdw: "涓�",
- // oldcode: "z0005",
- // id: "0201020014",
- // },
- // ];
+ this.tab1Table = res.data.data;
});
getFormTemplate({
templateOid: data.oid,
- codeClassifyOid: data.codeClassifyOid,
+ codeClassifyOid: this.localCodeClassifyOid,
}).then((res) => {
this.resembleColumList = res.data.resembleTableVO.cols[0];
});
+ },
+ tab1TableSelectChange(selection) {
+ this.selectedTab1Table = selection;
},
resembleRowChange(row) {
getCurretnSelectedRowResemble({
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
}).then((res) => {
- this.currentSelectedResemble = res.data
- // this.currentSelectedResemble = [
- // {
- // xinghaoguige: "XH007",
- // codetemplateoid: "f441b131-5ea0-4672-ab74-735b11161928",
- // rowIndex: "9",
- // id: "0201020012",
- // oid: "B92CFF46-1D46-E680-66C4-33A3ABE77A6C",
- // },
- // ];
+ this.currentSelectedResemble = res.data.data;
});
},
openFormTemlpate(row) {
this.currentSelectedResembleRow = {
visible: true,
templateOid: row.codetemplateoid,
- codeClassifyOid: this.codeClassifyOid,
+ codeClassifyOid: this.localCodeClassifyOid,
rowOid: row.rowOid,
- }
+ };
+ },
+ submit() {
+ const params = {
+ classifyAttr: this.classifyAttr,
+ improt: true,
+ codeImprotSaveDatVOList: [
+ {
+ Clos: this.cloNamesList.map((item) => item.title),
+ dataList: this.tab2Table.concat(this.selectedTab1Table),
+ orderDTO: {
+ codeClassifyOid: this.codeClassifyOid,
+ templateOid: this.templateOid,
+ secDTOList: [],
+ },
+ },
+ ],
+ };
+ submitHistoryimport(params).then((res) => {
+ console.log(res);
+ if (res.data.code === 200) {
+ this.$message.success(res.data.msg);
+ } else {
+ this.$message.error(res.data.msg);
+ }
+ });
},
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
},
+ leftTree: {
+ immediate: true,
+ deep: true,
+ handler(arr) {
+ if (arr.length > 0 && this.type === 'batchImportApply') {
+ this.treeNodeClick(arr[0])
+ }
+ }
+ }
},
};
</script>
@@ -595,13 +339,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;
}
@@ -609,7 +355,6 @@
.right {
margin-left: 20px;
margin-top: 30px;
- width: 1000px;
}
}
</style>
--
Gitblit v1.9.3