From 2024d0f570d9da956e792746992852749c06227c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 11 七月 2023 14:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 385 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 299 insertions(+), 86 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index c25342c..2b2f7de 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,24 @@
@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 #default="{ row }">
+ <el-button type="text" @click="reEdit(row)"
+ >閲嶆柊缂栬緫</el-button
+ >
+ </template>
+ </el-table-column>
<el-table-column
type="index"
label="搴忓彿"
@@ -92,44 +99,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 +155,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>
@@ -154,21 +187,21 @@
</template>
<FormTemplateDialog
ref="FormTemplateDialog"
- type="detail"
v-bind="currentSelectedResembleRow"
- :visible.sync="currentSelectedResembleRow.visible"
- title="鏌ョ湅璇︾粏淇℃伅"
+ :visible.sync="currentSelectedResembleRow.formTemplateVisible"
+ @submit="FormTemplateSubmit"
></FormTemplateDialog>
</el-dialog>
</template>
<script>
import {
- getHistorySuccessTable,
- getHistoryResembleTable,
+ getSuccessTable,
+ getResembleTable,
getFormTemplate,
getCurretnSelectedRowResemble,
submitHistoryimport,
+ addSaveCode,
} from "../../api/batchImport/index";
import ResembleQuery from "../FormTemplate/ResembleQuery.vue";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
@@ -177,7 +210,7 @@
export default {
name: "ShowImportData",
components: { ResembleQuery, FormTemplate },
- // mixins: [codeApply],
+ mixins: [codeApply],
props: {
title: {
type: String,
@@ -203,8 +236,8 @@
type: String,
secDTOList: {
type: Array,
- default: () => ({})
- }
+ default: () => ({}),
+ },
},
computed: {
dialogVisible: {
@@ -215,12 +248,19 @@
this.$emit("update:visible", val);
},
},
+ successTableColumns() {
+ if (this.type === "batchApplyCode") {
+ return this.cloNamesList.slice(1);
+ } else {
+ return this.cloNamesList;
+ }
+ },
},
data() {
return {
isExpand: true,
filterText: "",
- leftWidth: "200",
+ leftWidth: 200,
templateOid: null,
tab1Name: "鐩镐技椤�",
tab2Name: "姝ｇ‘鏁版嵁",
@@ -230,6 +270,7 @@
activeTab: "tab1",
cloNamesList: [], //鍒楄〃澶撮儴瀛楁
localCodeClassifyOid: "",
+ codeRuleOid: "",
resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
currentSelectedResemble: [],
currentSelectedResembleRow: {
@@ -237,8 +278,12 @@
codeClassifyOid: "",
rowOid: "",
formTemplateVisible: false,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
},
- secVOList: [],
+ batchApplyCodeTableData: {},
+ savedList: [],
};
},
@@ -249,28 +294,79 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50";
+ this.leftWidth = 50;
} else {
- this.leftWidth = "200";
+ this.leftWidth = 200;
}
this.isExpand = !this.isExpand;
},
- treeNodeClick(data) {
- console.log(data);
- this.localCodeClassifyOid = data.codeclassifyoid;
+ async treeNodeClick(data, first) {
+ if (this.type === "batchApplyCode") {
+ if (first === true) {
+ this.codeRuleOid = data.codeRuleOid;
+ // 绗竴娆℃墦寮�鐩存帴璧嬪�间笉鏍￠獙
+ this.batchApplyCodeTableData[data.codeRuleOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ codeRuleOid: data.codeRuleOid,
+ };
+ // 涓嶆槸绗竴娆℃墦寮�闇�瑕佷紭鍏堟牎楠�
+ } else if (this.localCodeClassifyOid === data.codeClassifyOid) {
+ console.log("閲嶅鐐瑰嚮");
+ } else {
+ if (this.$refs.CodeApply) {
+ if (!(await this.$refs.CodeApply.validate())) {
+ this.$message.warning("璇峰～鍐欎究缂栫爜鐢宠锛�");
+ this.activeTab = "tab2";
+ this.$refs.tree.setCurrentKey(this.localCodeClassifyOid);
+ return false;
+ }
+ }
+ }
+ if (!this.batchApplyCodeTableData[data.codeRuleOid]) {
+ this.batchApplyCodeTableData[data.codeRuleOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ codeRuleOid: data.codeRuleOid,
+ };
+ }
+ }
+ this.localCodeClassifyOid = data.codeClassifyOid;
this.cloNamesList = data.cloNamesList;
this.templateOid = data.oid;
- getHistorySuccessTable({
- codeClassifyOid: this.templateOid,
+ getResembleTable({
+ codeClassifyOid:
+ this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,
+ redisOid: this.redisOid + "-resemble",
+ }).then((res) => {
+ this.tab1Table = res.data.data.filter(
+ (item) => !this.savedList.includes(item.oid)
+ );
+ if (this.type === "batchApplyCode") {
+ this.batchApplyCodeTableData[data.codeRuleOid]["tab1"] =
+ this.tab1Table;
+ }
+ });
+ // 鑾峰彇姝ｇ‘鏁版嵁
+ getSuccessTable({
+ codeClassifyOid:
+ this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,
redisOid: this.redisOid + "-ok",
}).then((res) => {
this.tab2Table = res.data.data;
- });
- getHistoryResembleTable({
- codeClassifyOid: this.templateOid,
- redisOid: this.redisOid + "-resemble",
- }).then((res) => {
- this.tab1Table = 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,
@@ -283,6 +379,9 @@
this.selectedTab1Table = selection;
},
resembleRowChange(row) {
+ if (!row || !row.oid) {
+ return;
+ }
getCurretnSelectedRowResemble({
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
@@ -292,17 +391,87 @@
},
openFormTemlpate(row) {
this.currentSelectedResembleRow = {
- visible: true,
+ formTemplateVisible: true,
templateOid: row.codetemplateoid,
codeClassifyOid: this.localCodeClassifyOid,
rowOid: row.rowOid,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
};
},
- submit() {
- const params = {
- classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,
- improt: this.type === 'historyImport' ? true : false,
- codeImprotSaveDatVOList: [
+ async submit() {
+ let params = {
+ classifyAttr:
+ this.type === "historyImport" || this.type === "batchApplyCode"
+ ? this.classifyAttr
+ : undefined,
+ improt: this.type === "historyImport" ? true : false,
+ };
+ if (this.type === "batchApplyCode") {
+ if (this.$refs.CodeApply) {
+ if (!(await this.$refs.CodeApply.validate())) {
+ this.$message.warning("璇峰～鍐欎究缂栫爜鐢宠锛�");
+ this.activeTab = "tab2";
+ return false;
+ }
+ }
+ let lookedCodeRuleOidList = Object.keys(this.batchApplyCodeTableData);
+ let noLookCodeRuleOidList = this.leftTree.filter(
+ (item) => !lookedCodeRuleOidList.includes(item.codeRuleOid)
+ );
+ let noLookName = noLookCodeRuleOidList.map((item) => item.name);
+ if (noLookName.length > 0) {
+ this.$message.warning(`鏁版嵁${noLookName}杩樻湭鏇炬煡鐪嬶紝璇峰厛鏌ョ湅锛乣);
+ return false;
+ }
+ let errorData = [];
+ let successData = [];
+ for (const key in this.batchApplyCodeTableData) {
+ if (Object.hasOwnProperty.call(this.batchApplyCodeTableData, key)) {
+ const element = this.batchApplyCodeTableData[key];
+ if (element.tab1.length > 0) {
+ errorData.push(element);
+ }
+ if (element.tab2.length > 0) {
+ successData.push(element);
+ }
+ }
+ }
+ if (successData.length === 0) {
+ this.$message.warning("瀵煎叆鐨勬暟鎹腑娌℃湁姝ｇ‘鐨勬暟鎹紒");
+ return;
+ }
+ if (errorData.length > 0) {
+ await this.$confirm(
+ errorData.map((item) => item.name).join("銆�") +
+ "锛岃繖鍑犱釜缂栫爜瑙勫垯涓嬬殑鏈夐敊璇暟鎹拰鐩镐技椤规暟鎹病鏈夊鐞嗭紝鎮ㄥ鏋滅户缁繚瀛樼殑璇濓紝杩欎簺鏁版嵁灏嗕細琚嚜鍔ㄨ垗寮冿紝鏄惁缁х画锛�",
+ "鎻愮ず",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ params.codeImprotSaveDatVOList = successData.map((item) => {
+ return {
+ Clos: item.cloNamesList,
+ dataList: item.tab2,
+ orderDTO: {
+ codeClassifyOid: item.codeClassifyOid,
+ templateOid: item.templateOid,
+ secDTOList: item.localSecVOList.map((itm) => {
+ return {
+ secOid: itm.oid,
+ secValue: item.codeApply[itm.oid],
+ };
+ }),
+ },
+ };
+ });
+ } else {
+ params.codeImprotSaveDatVOList = [
{
Clos: this.cloNamesList.map((item) => item.title),
dataList: this.tab2Table.concat(this.selectedTab1Table),
@@ -312,14 +481,49 @@
secDTOList: this.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);
+ }
+ });
+ },
+ // 閲嶆柊缂栬緫
+ reEdit(row) {
+ console.log(row, "row");
+ this.currentSelectedResembleRow = {
+ templateOid: row.codetemplateoid,
+ codeClassifyOid: row.codeclassifyid,
+ rowOid: row.oid,
+ formTemplateVisible: true,
+ type: "add",
+ title: "缂栬緫鏁版嵁鍚庨噸鏂板叆搴�",
+ setForm: row,
+ };
+ },
+ // 鐩存帴缂栬緫鍚庝繚瀛�
+ FormTemplateSubmit(form) {
+ addSaveCode(form).then((res) => {
+ console.log(res);
+ if (res.data.code === 200) {
+ this.savedList.push(form.oid);
+ this.$message.success("鏂板鎴愬姛锛�");
+ this.treeNodeClick(
+ this.leftTree.find((item) => item.codeRuleOid === this.codeRuleOid)
+ );
+ this.currentSelectedResembleRow = {
+ templateOid: "",
+ codeClassifyOid: "",
+ rowOid: "",
+ formTemplateVisible: false,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
+ };
}
});
},
@@ -332,12 +536,21 @@
immediate: true,
deep: true,
handler(arr) {
- if (arr.length > 0 && this.type === 'batchImportApply') {
- this.treeNodeClick(arr[0])
- this.leftWidth = 0
+ if (arr.length > 0) {
+ this.treeNodeClick(arr[0], true);
+ 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