From fbb473488a8b7ece88ecba16d8f2ba25c0c35c61 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 14:55:05 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 303 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 250 insertions(+), 53 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 8347d10..6d28988 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -57,11 +57,12 @@
border
:data="tab1Table"
style="width: 100%"
- height="400px"
+ height="40vh"
highlight-current-row
@current-change="resembleRowChange"
@selection-change="tab1TableSelectChange"
v-if="cloNamesList.length > 1"
+ v-loading="tab1Loading"
>
<el-table-column
v-if="type !== 'batchApplyCode'"
@@ -75,8 +76,10 @@
width="100px"
align="center"
>
- <template>
- <el-button type="text">閲嶆柊缂栬緫</el-button>
+ <template #default="{ row }">
+ <el-button type="text" @click="reEdit(row)"
+ >閲嶆柊缂栬緫</el-button
+ >
</template>
</el-table-column>
<el-table-column
@@ -101,7 +104,8 @@
border
:data="currentSelectedResemble"
style="width: 100%"
- height="200px"
+ height="20vh"
+ v-loading="tab1BottomTableLoading"
>
<el-table-column
v-for="item in resembleColumList"
@@ -136,12 +140,9 @@
<el-tab-pane :label="tab2Name" name="tab2">
<el-table
border
+ v-loading="tab2Loading"
:data="tab2Table"
- :height="
- type === 'batchApplyCode' && tab2Table.length > 0
- ? '400px'
- : '700px'
- "
+ height="60vh"
>
<el-table-column
v-for="item in successTableColumns"
@@ -177,7 +178,7 @@
</div>
<template #footer>
<div>
- <el-button size="small" type="primary" @click="submit"
+ <el-button size="small" type="primary" @click="submit" :loading="submitLoading"
>纭畾瀵煎叆</el-button
>
<el-button size="small" @click="dialogVisible = false">鍙栨秷</el-button>
@@ -185,10 +186,9 @@
</template>
<FormTemplateDialog
ref="FormTemplateDialog"
- type="detail"
v-bind="currentSelectedResembleRow"
- :visible.sync="currentSelectedResembleRow.visible"
- title="鏌ョ湅璇︾粏淇℃伅"
+ :visible.sync="currentSelectedResembleRow.formTemplateVisible"
+ @submit="FormTemplateSubmit"
></FormTemplateDialog>
</el-dialog>
</template>
@@ -200,6 +200,7 @@
getFormTemplate,
getCurretnSelectedRowResemble,
submitHistoryimport,
+ addSaveCode,
} from "../../api/batchImport/index";
import ResembleQuery from "../FormTemplate/ResembleQuery.vue";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
@@ -236,6 +237,7 @@
type: Array,
default: () => ({}),
},
+ resetTable: Function
},
computed: {
dialogVisible: {
@@ -268,7 +270,7 @@
activeTab: "tab1",
cloNamesList: [], //鍒楄〃澶撮儴瀛楁
localCodeClassifyOid: "",
- codeRuleOid: '',
+ codeRuleOid: "",
resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
currentSelectedResemble: [],
currentSelectedResembleRow: {
@@ -276,9 +278,16 @@
codeClassifyOid: "",
rowOid: "",
formTemplateVisible: false,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
},
- secVOList: [],
- batchApplyCodeTableData: {},
+ batchSelectTableData: {},
+ savedList: [],
+ tab1Loading: false,
+ tab2Loading: false,
+ tab1BottomTableLoading: false,
+ submitLoading: false
};
},
@@ -295,54 +304,109 @@
}
this.isExpand = !this.isExpand;
},
- async treeNodeClick(data) {
- console.log(data);
+ async treeNodeClick(data, first) {
+ if (this.type === "batchApplyCode") {
+ if (first === true) {
+ this.codeRuleOid = data.codeRuleOid;
+ // 绗竴娆℃墦寮�鐩存帴璧嬪�间笉鏍￠獙
+ this.batchSelectTableData[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.batchSelectTableData[data.codeRuleOid]) {
+ this.batchSelectTableData[data.codeRuleOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ codeRuleOid: data.codeRuleOid,
+ };
+ }
+ }
+ if (this.type === 'historyImport') {
+ if (first === true) {
+ // 绗竴娆℃墦寮�鐩存帴璧嬪�间笉鏍￠獙
+ this.batchSelectTableData[data.codeClassifyOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ codeRuleOid: data.codeRuleOid,
+ };
+ // 涓嶆槸绗竴娆℃墦寮�闇�瑕佷紭鍏堟牎楠�
+ }else if (this.localCodeClassifyOid === data.codeClassifyOid) {
+ console.log("閲嶅鐐瑰嚮");
+ }
+ if (!this.batchSelectTableData[data.codeClassifyOid]) {
+ this.batchSelectTableData[data.codeClassifyOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ tab1Selected: []
+ };
+ }
+ this.selection = this.batchSelectTableData[this.localCodeClassifyOid]['tab1Selected']
+ }
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
- }
- }
- // 鏍￠獙
- }
- }
+ this.tab1Loading = true
getResembleTable({
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;
-
+ this.tab1Loading = false
+ this.tab1Table = res.data.data.filter(
+ (item) => !this.savedList.includes(item.oid)
+ );
+ if (this.type === "batchApplyCode") {
+ this.batchSelectTableData[data.codeRuleOid]["tab1"] =
+ this.tab1Table;
+ }
+ if (this.type === "historyImport") {
+ this.batchSelectTableData[data.codeClassifyOid]["tab1"] =
+ this.tab1Table;
}
});
+ this.tab2Loading = true
// 鑾峰彇姝ｇ‘鏁版嵁
getSuccessTable({
codeClassifyOid:
this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,
redisOid: this.redisOid + "-ok",
}).then((res) => {
+ this.tab2Loading = false
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;
+ this.batchSelectTableData[data.codeRuleOid]["codeApply"] = {};
+ this.batchSelectTableData[data.codeRuleOid]["tab2"] =
+ this.tab2Table
if (this.$refs.CodeApply) {
this.$refs.CodeApply.loading = true;
}
this.getCodeRule();
+ }
+ if (this.type === "historyImport") {
+ this.batchSelectTableData[data.codeClassifyOid]["tab2"] =
+ this.tab2Table
}
});
getFormTemplate({
@@ -354,29 +418,127 @@
},
tab1TableSelectChange(selection) {
this.selectedTab1Table = selection;
+ if (this.batchSelectTableData[this.localCodeClassifyOid]) {
+ this.batchSelectTableData[this.localCodeClassifyOid]['tab1Selected'] = selection
+ }
},
resembleRowChange(row) {
+ if (!row || !row.oid) {
+ return;
+ }
+ this.tab1BottomTableLoading = true
getCurretnSelectedRowResemble({
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
}).then((res) => {
+ this.tab1BottomTableLoading = false
this.currentSelectedResemble = res.data.data;
});
},
openFormTemlpate(row) {
this.currentSelectedResembleRow = {
- visible: true,
+ formTemplateVisible: true,
templateOid: row.codetemplateoid,
codeClassifyOid: this.localCodeClassifyOid,
rowOid: row.rowOid,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
};
},
- submit() {
- const params = {
+ async submit() {
+ let params = {
classifyAttr:
- this.type === "historyImport" ? this.classifyAttr : undefined,
+ this.type === "historyImport" || this.type === "batchApplyCode"
+ ? this.classifyAttr
+ : undefined,
improt: this.type === "historyImport" ? true : false,
- codeImprotSaveDatVOList: [
+ };
+ 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.batchSelectTableData);
+ 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.batchSelectTableData) {
+ if (Object.hasOwnProperty.call(this.batchSelectTableData, key)) {
+ const element = this.batchSelectTableData[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 if (this.type === 'historyImport') {
+ let lookedCodeRuleOidList = Object.keys(this.batchSelectTableData);
+ let noLookCodeRuleOidList = this.leftTree.filter(
+ (item) => !lookedCodeRuleOidList.includes(item.codeClassifyOid)
+ );
+ let noLookName = noLookCodeRuleOidList.map((item) => item.name);
+ if (noLookName.length > 0) {
+ this.$message.warning(`鏁版嵁${noLookName}杩樻湭鏇炬煡鐪嬶紝璇峰厛鏌ョ湅锛乣);
+ return false;
+ }
+ params.codeImprotSaveDatVOList = this.batchSelectTableData.map(item => {
+ return {
+ Clos: item.cloNamesList,
+ dataList: item.tab2.concat(item.tab1Selected),
+ orderDTO: {
+ codeClassifyOid: item.codeClassifyOid,
+ templateOid: item.templateOid,
+ secDTOList: this.secDTOList,
+ },
+ }
+ })
+ } else {
+ params.codeImprotSaveDatVOList = [
{
Clos: this.cloNamesList.map((item) => item.title),
dataList: this.tab2Table.concat(this.selectedTab1Table),
@@ -386,14 +548,48 @@
secDTOList: this.secDTOList,
},
},
- ],
- };
+ ];
+ }
+ this.submitLoading = true
submitHistoryimport(params).then((res) => {
- console.log(res);
+ this.submitLoading = false
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- } else {
- this.$message.error(res.data.msg);
+ this.$parent.dialogVisible = false
+ this.resetTable()
+ }
+ });
+ },
+ // 閲嶆柊缂栬緫
+ reEdit(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) => {
+ 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: {},
+ };
}
});
},
@@ -407,7 +603,7 @@
deep: true,
handler(arr) {
if (arr.length > 0) {
- this.treeNodeClick(arr[0]);
+ this.treeNodeClick(arr[0], true);
this.$nextTick(() => {
this.$refs.tree.setCurrentKey(arr[0]["codeClassifyOid"]);
});
@@ -442,6 +638,7 @@
}
}
.right {
+ transition: all 0.5s;
margin-left: 20px;
margin-top: 30px;
}
--
Gitblit v1.9.3