From 66c0f84ff4cd6fd7bfcd372037810e07afc82bd1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:43:32 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 60 +++++++++---
Source/UBCS-WEB/src/api/batchImport/index.js | 8 +
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 210 ++++++++++++++++++++++++++++++++++-------
Source/UBCS-WEB/src/mixins/codeApply.js | 11 +
Source/UBCS-WEB/src/components/BatchImport/index.vue | 2
5 files changed, 233 insertions(+), 58 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js
index f7392a7..de47980 100644
--- a/Source/UBCS-WEB/src/api/batchImport/index.js
+++ b/Source/UBCS-WEB/src/api/batchImport/index.js
@@ -87,3 +87,11 @@
})
}
+// 鏂板鏁版嵁
+export function addSaveCode(data) {
+ return request({
+ url: 'api/ubcs-code/ubcs-code/mdmEngineController/addSaveCode',
+ method: 'post',
+ data
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 8347d10..f797efb 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -75,8 +75,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
@@ -185,10 +187,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 +201,7 @@
getFormTemplate,
getCurretnSelectedRowResemble,
submitHistoryimport,
+ addSaveCode,
} from "../../api/batchImport/index";
import ResembleQuery from "../FormTemplate/ResembleQuery.vue";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
@@ -268,7 +270,7 @@
activeTab: "tab1",
cloNamesList: [], //鍒楄〃澶撮儴瀛楁
localCodeClassifyOid: "",
- codeRuleOid: '',
+ codeRuleOid: "",
resembleColumList: [], //鐩镐技椤规煡鍑烘潵鐨勫垪琛ㄥ瓧娈�
currentSelectedResemble: [],
currentSelectedResembleRow: {
@@ -276,9 +278,12 @@
codeClassifyOid: "",
rowOid: "",
formTemplateVisible: false,
+ type: "detail",
+ title: "鏌ョ湅璇︾粏淇℃伅",
+ setForm: {},
},
- secVOList: [],
batchApplyCodeTableData: {},
+ savedList: [],
};
},
@@ -295,37 +300,57 @@
}
this.isExpand = !this.isExpand;
},
- async treeNodeClick(data) {
- console.log(data);
+ async treeNodeClick(data, first) {
+ if (this.type === "batchApplyCode") {
+ if (
+ first === true ||
+ this.localCodeClassifyOid === data.codeClassifyOid
+ ) {
+ 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.$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;
- 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
- }
- }
- // 鏍￠獙
- }
- }
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.tab1Table = res.data.data.filter(
+ (item) => !this.savedList.includes(item.oid)
+ );
+ if (this.type === "batchApplyCode") {
this.batchApplyCodeTableData[data.codeRuleOid]["tab1"] =
- res.data.data;
-
+ this.tab1Table;
}
});
// 鑾峰彇姝ｇ‘鏁版嵁
@@ -336,9 +361,9 @@
}).then((res) => {
this.tab2Table = res.data.data;
if (this.tab2Table.length > 0 && this.type === "batchApplyCode") {
- this.batchApplyCodeTableData[data.codeRuleOid]["codeApply"] = {}
+ this.batchApplyCodeTableData[data.codeRuleOid]["codeApply"] = {};
this.batchApplyCodeTableData[data.codeRuleOid]["tab2"] =
- res.data.data;
+ res.data.data;
if (this.$refs.CodeApply) {
this.$refs.CodeApply.loading = true;
}
@@ -356,6 +381,9 @@
this.selectedTab1Table = selection;
},
resembleRowChange(row) {
+ if (!row || !row.oid) {
+ return;
+ }
getCurretnSelectedRowResemble({
redisOid: this.redisOid + "-resemble-data",
dataOid: row.oid,
@@ -365,18 +393,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 = {
+ 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.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),
@@ -386,14 +483,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: {},
+ };
}
});
},
@@ -407,7 +539,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"]);
});
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b951e11..a0f6495 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -154,7 +154,7 @@
this.secDTOList = this.localSecVOList.map((item) => {
return {
secOid: item.oid,
- secValue: this.codeApplyForm[item.id],
+ secValue: this.codeApplyForm[item.oid],
};
});
return {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index b47249f..5db4a8a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -115,6 +115,10 @@
type: String,
default: "纭� 瀹�",
},
+ setForm: {
+ type: Object,
+ default: () => ({}),
+ },
},
data() {
return {
@@ -192,6 +196,7 @@
"copyfromversion",
"secretgrade",
],
+ codeRuleOid: ''
};
},
created() {},
@@ -233,8 +238,13 @@
this.showResembleQuery = true;
}
this.$nextTick(() => {
- this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
- })
+ this.$refs.FormTemplate.templateRender(
+ res.data.formDefineVO.items
+ );
+ if (Object.keys(this.setForm).length > 0) {
+ this.$refs.FormTemplate.form = this.setForm;
+ }
+ });
}
})
.catch(() => {
@@ -245,6 +255,7 @@
getCodeRule() {
getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
+ this.codeRuleOid = res.data.data.oid
const typeList = [
"codefixedsec",
"codeclassifysec",
@@ -254,15 +265,15 @@
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (this.secVOList.length > 0 && this.type === "add") {
- this.showCodeApply = true;
- this.activeName = "codeApply";
- this.$nextTick(() => {
- this.$refs.CodeApply.templateRender(this.secVOList);
- })
- } else {
- this.showCodeApply = false;
- }
+ if (this.secVOList.length > 0 && this.type === "add") {
+ this.showCodeApply = true;
+ this.activeName = "codeApply";
+ this.$nextTick(() => {
+ this.$refs.CodeApply.templateRender(this.secVOList);
+ });
+ } else {
+ this.showCodeApply = false;
+ }
}
});
},
@@ -301,8 +312,10 @@
// 杩涜鐮佸�肩敵璇锋牎楠�
if (this.showCodeApply) {
codeValidate = await this.$refs.CodeApply.validate();
- console.log(9999);
- if (!codeValidate) return;
+ if (!codeValidate) {
+ this.activeName = "codeApply";
+ return false;
+ }
}
// 杩涜鐩镐技椤规煡璇�
const resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
@@ -320,10 +333,13 @@
if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
const value = this.codeApplyForm[key];
if (value) {
- resForm.secDTOList.push({ [key]: value });
+ resForm.secDTOList.push({ secOid: key, secValue: value });
}
}
}
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
this.$emit("submit", resForm);
} else {
this.$confirm(
@@ -336,7 +352,21 @@
}
)
.then(() => {
- this.$emit("submit", this.form);
+ let resForm = {};
+ const { defaultValue, formValue } =
+ this.getDefaultValueAndFormValues(this.form);
+ resForm.data = formValue;
+ resForm = Object.assign({}, resForm, defaultValue);
+ resForm.secDTOList = this.secVOList.map(item => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ }
+ });
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
})
.catch(() => {});
}
diff --git a/Source/UBCS-WEB/src/mixins/codeApply.js b/Source/UBCS-WEB/src/mixins/codeApply.js
index 4ed57d6..b424b44 100644
--- a/Source/UBCS-WEB/src/mixins/codeApply.js
+++ b/Source/UBCS-WEB/src/mixins/codeApply.js
@@ -59,6 +59,9 @@
if (this.localSecVOList.length > 0) {
this.showCodeApply = true
this.$nextTick(() => {
+ if (this.batchApplyCodeTableData) {
+ this.batchApplyCodeTableData[this.codeRuleOid]["localSecVOList"] = this.localSecVOList
+ }
this.$refs.CodeApply.templateRender(this.localSecVOList);
});
}
@@ -68,7 +71,9 @@
},
getCodeApplyFormData(codeApplyForm) {
this.codeApplyForm = codeApplyForm;
- this.batchApplyCodeTableData[this.codeRuleOid]["codeApply"] = codeApplyForm
+ if (this.batchApplyCodeTableData) {
+ this.batchApplyCodeTableData[this.codeRuleOid]["codeApply"] = codeApplyForm
+ }
},
getType(item) {
console.log(item.secType, 'item.secType');
@@ -165,14 +170,14 @@
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
const { field } = data;
- this.secVOList = this.secVOList.map((item) => {
+ this.localSecVOList = this.localSecVOList.map((item) => {
if (item.parentClassifySecOid === field) {
this.$refs.CodeApply.form[item.oid] = undefined;
this.$refs.CodeApply.form[item.name] = undefined;
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$refs.CodeApply.templateRender(this.localSecVOList);
},
}
}
\ No newline at end of file
--
Gitblit v1.9.3