diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 34d458f6..080f1eb6 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -284,7 +284,7 @@ export default { return this.stepsActive == 1; }, getMoudleDisable() { - if (this.crmType == "prebatch") { + if (this.crmType == "priceList") { //只状态可用 this.isEditYearMont = true; this.isEditFactory = true; @@ -298,6 +298,7 @@ export default { return ( { invoice: "大众发票汇总", + priceList: "标准价格单", vWKanBan: "大众看板结算明细", scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", @@ -338,6 +339,7 @@ export default { return ( { invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入 + priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //标准价格单 vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入 scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 @@ -563,7 +565,11 @@ export default { fd.append("period", "03"); fd.append("customerCode", "03"); fd.append("factory", this.YearMonthValue); - fd.append("version", this.versionValue); + if (this.crmType == "priceList") { + fd.append("version", "202110"); + } else { + fd.append("version", this.versionValue); + } const webapi = this.getWebApi; this.$axios .posts(webapi, fd) diff --git a/vue/src/views/role/index.vue b/vue/src/views/role/index.vue index 825e30cc..8a0845f9 100644 --- a/vue/src/views/role/index.vue +++ b/vue/src/views/role/index.vue @@ -321,7 +321,7 @@ export default { if (this.isEdit) { this.$axios .puts("/api/identity/roles/" + this.form.id, this.form) - .then((response) => { + .then((response) => { this.formLoading = false; this.$notify({ title: "成功", diff --git a/vue/src/views/ux/basedata/priceList/index.vue b/vue/src/views/ux/basedata/priceList/index.vue index 89361616..0b32b699 100644 --- a/vue/src/views/ux/basedata/priceList/index.vue +++ b/vue/src/views/ux/basedata/priceList/index.vue @@ -9,6 +9,15 @@ @value-change="selectValue" > + 导入文件(Excel) + + { - acc[cur.key] = cur.display_name; - return acc; -}, {}); export default { name: "PriceList", @@ -222,7 +221,6 @@ export default { // userId: "00000000-0000-0000-0000-000000000000", // }, page: 1, - bomUnit, multipleSelection: [], drawer: false, tableHeight: document.documentElement.clientHeight - 260,