From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 186 ++++++++++++++++++++++++++++++----------------
1 files changed, 121 insertions(+), 65 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index cd1bd20..1deb7f5 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,13 @@
@getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"
></FormTemplate>
- </div>
+ </div> -->
<div class="flex_box">
- <div class="left" :style="{ width: leftWidth }">
+ <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,9 +54,10 @@
>
</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"
@@ -66,63 +72,81 @@
highlight-current-row
@current-change="resembleRowChange"
@selection-change="tab1TableSelectChange"
+ v-if="cloNamesList.length > 1"
>
- <el-table-column type="index"></el-table-column>
+ <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>
+ <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="400px">
+ <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>
- <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>
@@ -131,7 +155,7 @@
<el-button size="small" type="primary" @click="submit"
>纭畾瀵煎叆</el-button
>
- <el-button size="small">鍙栨秷</el-button>
+ <el-button size="small" @click="dialogVisible = false">鍙栨秷</el-button>
</div>
</template>
<FormTemplateDialog
@@ -146,20 +170,20 @@
<script>
import {
- getHistorySuccessTable,
- getHistoryResembleTable,
+ getSuccessTable,
+ getResembleTable,
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'
+import codeApply from "@/mixins/codeApply.js";
export default {
name: "ShowImportData",
components: { ResembleQuery, FormTemplate },
- mixins: [ codeApply ],
+ // mixins: [codeApply],
props: {
title: {
type: String,
@@ -182,6 +206,11 @@
type: String,
default: "",
},
+ type: String,
+ secDTOList: {
+ type: Array,
+ default: () => ({}),
+ },
},
computed: {
dialogVisible: {
@@ -197,7 +226,7 @@
return {
isExpand: true,
filterText: "",
- leftWidth: "200px",
+ leftWidth: 200,
templateOid: null,
tab1Name: "鐩镐技椤�",
tab2Name: "姝ｇ‘鏁版嵁",
@@ -226,28 +255,33 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50px";
+ this.leftWidth = 50;
} else {
- this.leftWidth = "200px";
+ this.leftWidth = 200;
}
this.isExpand = !this.isExpand;
},
treeNodeClick(data) {
- this.localCodeClassifyOid = data.codeclassifyoid;
+ console.log(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,
+ this.templateOid = data.oid;
+ getResembleTable({
+ codeClassifyOid: this.templateOid,
redisOid: this.redisOid + "-resemble",
}).then((res) => {
- this.tab1Table = res.data;
+ this.tab1Table = res.data.data;
+ });
+ // 鑾峰彇姝ｇ‘鏁版嵁
+ getSuccessTable({
+ codeClassifyOid: this.templateOid,
+ redisOid: this.redisOid + "-ok",
+ }).then((res) => {
+ this.tab2Table = res.data.data;
});
getFormTemplate({
templateOid: data.oid,
- codeClassifyOid: data.codeClassifyOid,
+ codeClassifyOid: this.localCodeClassifyOid,
}).then((res) => {
this.resembleColumList = res.data.resembleTableVO.cols[0];
});
@@ -260,7 +294,7 @@
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
}).then((res) => {
- this.currentSelectedResemble = res.data;
+ this.currentSelectedResemble = res.data.data;
});
},
openFormTemlpate(row) {
@@ -273,8 +307,9 @@
},
submit() {
const params = {
- classifyAttr: this.classifyAttr,
- isImprot: true,
+ classifyAttr:
+ this.type === "historyImport" ? this.classifyAttr : undefined,
+ improt: this.type === "historyImport" ? true : false,
codeImprotSaveDatVOList: [
{
Clos: this.cloNamesList.map((item) => item.title),
@@ -282,16 +317,17 @@
orderDTO: {
codeClassifyOid: this.codeClassifyOid,
templateOid: this.templateOid,
- secDTOList: [],
+ secDTOList: this.secDTOList,
},
},
],
};
submitHistoryimport(params).then((res) => {
- if (res.code === 200) {
- this.$message.success(res.obj);
+ console.log(res);
+ if (res.data.code === 200) {
+ this.$message.success(res.data.msg);
} else {
- this.$message.error(res.obj);
+ this.$message.error(res.data.msg);
}
});
},
@@ -300,6 +336,25 @@
filterText(val) {
this.$refs.tree.filter(val);
},
+ leftTree: {
+ immediate: true,
+ deep: true,
+ handler(arr) {
+ 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>
@@ -307,13 +362,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;
}
@@ -321,7 +378,6 @@
.right {
margin-left: 20px;
margin-top: 30px;
- width: 1000px;
}
}
</style>
--
Gitblit v1.9.3