From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 341 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 215 insertions(+), 126 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 32fde8d..cd1bd20 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -1,10 +1,22 @@
<template>
<el-dialog
:title="title"
- :visible="dialogVisible"
- width="1200px"
+ :visible.sync="dialogVisible"
+ width="1300px"
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="isExpand_box">
@@ -25,44 +37,151 @@
<el-tree
v-show="isExpand"
class="filter_tree"
- :data="data"
+ :data="leftTree"
default-expand-all
+ highlight-current
:filter-node-method="filterNode"
+ @node-click="treeNodeClick"
ref="tree"
+ :props="{
+ label: 'name',
+ }"
>
</el-tree>
</div>
<div class="right">
<div class="tab_box">
- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
- <el-tab-pane label="姝ｇ‘鏁版嵁" name="success">
- <el-table border :data="successData"></el-table>
+ <el-tabs
+ v-model="activeTab"
+ type="card"
+ @tab-click="handleClick"
+ size="small"
+ >
+ <el-tab-pane :label="tab1Name" name="tab1">
+ <el-table
+ border
+ :data="tab1Table"
+ style="width: 100%"
+ height="400px"
+ highlight-current-row
+ @current-change="resembleRowChange"
+ @selection-change="tab1TableSelectChange"
+ >
+ <el-table-column type="index"></el-table-column>
+ <el-table-column
+ v-for="item in cloNamesList"
+ :key="item.field"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ >
+ </el-table-column>
+ </el-table>
</el-tab-pane>
- <el-tab-pane label="鏈夌浉浼奸」鎴栬�呴敊璇暟鎹�" name="error">
- <el-table border :data="errorData"></el-table>
+ <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"
+ >
+ </el-table-column>
+ </el-table>
</el-tab-pane>
</el-tabs>
+ </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"
+ >
+ <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琛屾暟"
+ ></el-table-column>
+ </el-table>
</div>
</div>
</div>
<template #footer>
<div>
- <el-button size="small" type="primary">纭畾瀵煎叆</el-button>
+ <el-button size="small" type="primary" @click="submit"
+ >纭畾瀵煎叆</el-button
+ >
<el-button size="small">鍙栨秷</el-button>
</div>
</template>
+ <FormTemplateDialog
+ ref="FormTemplateDialog"
+ type="detail"
+ v-bind="currentSelectedResembleRow"
+ :visible.sync="currentSelectedResembleRow.visible"
+ title="鏌ョ湅璇︾粏淇℃伅"
+ ></FormTemplateDialog>
</el-dialog>
</template>
<script>
+import {
+ getHistorySuccessTable,
+ 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, FormTemplate },
+ mixins: [ codeApply ],
props: {
title: {
type: String,
default: "鍘嗗彶鏁版嵁瀵煎叆",
},
visible: false,
+ leftTree: {
+ type: Array,
+ default: () => [],
+ },
+ redisOid: {
+ type: String,
+ default: "",
+ },
+ classifyAttr: {
+ type: String,
+ default: "id",
+ },
+ codeClassifyOid: {
+ type: String,
+ default: "",
+ },
},
computed: {
dialogVisible: {
@@ -79,129 +198,31 @@
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",
- },
- ],
- },
- ],
- successData: [],
- errorData: [],
+ templateOid: null,
+ tab1Name: "鐩镐技椤�",
+ tab2Name: "姝ｇ‘鏁版嵁",
+ tab1Table: [],
+ selectedTab1Table: [],
+ tab2Table: [],
+ activeTab: "tab1",
+ cloNamesList: [], //鍒楄〃澶撮儴瀛楁
+ localCodeClassifyOid: "",
+ resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
+ currentSelectedResemble: [],
+ currentSelectedResembleRow: {
+ templateOid: "",
+ codeClassifyOid: "",
+ rowOid: "",
+ formTemplateVisible: false,
+ },
+ secVOList: [],
};
},
methods: {
filterNode(value, data) {
if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ return data.name.indexOf(value) !== -1;
},
hideTree() {
if (this.isExpand) {
@@ -210,6 +231,69 @@
this.leftWidth = "200px";
}
this.isExpand = !this.isExpand;
+ },
+ treeNodeClick(data) {
+ this.localCodeClassifyOid = data.codeclassifyoid;
+ this.cloNamesList = data.cloNamesList;
+ this.templateOid = data.codeClassifyTemplateVO.oid;
+ getHistorySuccessTable(this.redisOid).then((res) => {
+ this.tab2Table = res.data;
+ });
+ getHistoryResembleTable({
+ codeClassifyOid: data.codeClassifyOid,
+ redisOid: this.redisOid + "-resemble",
+ }).then((res) => {
+ this.tab1Table = res.data;
+ });
+ getFormTemplate({
+ templateOid: data.oid,
+ codeClassifyOid: data.codeClassifyOid,
+ }).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;
+ });
+ },
+ openFormTemlpate(row) {
+ this.currentSelectedResembleRow = {
+ visible: true,
+ templateOid: row.codetemplateoid,
+ codeClassifyOid: this.localCodeClassifyOid,
+ rowOid: row.rowOid,
+ };
+ },
+ submit() {
+ const params = {
+ classifyAttr: this.classifyAttr,
+ isImprot: 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) => {
+ if (res.code === 200) {
+ this.$message.success(res.obj);
+ } else {
+ this.$message.error(res.obj);
+ }
+ });
},
},
watch: {
@@ -234,5 +318,10 @@
overflow-y: scroll;
}
}
+ .right {
+ margin-left: 20px;
+ margin-top: 30px;
+ width: 1000px;
+ }
}
</style>
--
Gitblit v1.9.3