diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 34d458f6..39f5cbf7 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.crmType == "spareparts") { //只状态可用 this.isEditYearMont = true; this.isEditFactory = true; @@ -298,6 +298,8 @@ export default { return ( { invoice: "大众发票汇总", + priceList: "标准价格单", + spareparts: "备件价格单", vWKanBan: "大众看板结算明细", scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", @@ -338,6 +340,8 @@ export default { return ( { invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入 + priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //标准价格单 + spareparts: "/api/SettleAccount/PriceListBJ/ExcelImport-Map", //备件价格单 vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入 scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 @@ -563,7 +567,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" || this.crmType == "spareparts") { + fd.append("version", "202110"); + } else { + fd.append("version", this.versionValue); + } const webapi = this.getWebApi; this.$axios .posts(webapi, fd) diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js index 6efa7d1c..7937c43f 100644 --- a/vue/src/router/modules/basedata.js +++ b/vue/src/router/modules/basedata.js @@ -49,6 +49,16 @@ const basedataRouter = { icon: '结算' } }, + { + path: 'spareparts', + component: () => import('@/views/ux/basedata/spareparts/index'), + name: 'Spareparts',//命名路由 + meta: { + title: '备件价格单', + roles: ['SettleAccount.PriceLists'], + icon: '结算' + } + }, // { // path: 'wms-kanban', // component: () => import('@/views/ux/vw/dataInput/wmsKanban'), diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index 273decdb..6d3f5d6c 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -9,7 +9,7 @@ const hqMenudataRouter = { meta: { title: '红旗工厂', icon: '红旗', - roles: ['SettleAccount.WMSHQ'], + roles: ['SettleAccount.WMSHQ','SettleAccount.HQ_HPlatform', 'SettleAccount.HQ_MPlatform','SettleAccount.HQ_FPlatform','SettleAccount.BT_Carlatform','SettleAccount.Reports'], keepAlive: false, }, children: [ diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js index 715e6813..0423cf81 100644 --- a/vue/src/router/modules/hq_out_order.js +++ b/vue/src/router/modules/hq_out_order.js @@ -13,6 +13,7 @@ const hqOutOrderDataRouter = { index: 0, type: 'crm', icon: '单据导入', + roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色） keepAlive: false, }, children: [ diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 49df7f94..666a6709 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -9,7 +9,7 @@ const vwMenudataRouter = { meta: { title: '大众工厂', icon: 'vw', - //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + roles: ['SettleAccount.Invoices', 'SettleAccount.SettleAccounts', 'SettleAccount.UnSettleAccount', 'SettleAccount.VWKanBan', 'SettleAccount.SparePart', 'SettleAccount.ScrapClaims', 'SettleAccount.Reports'], keepAlive: false, }, children: [ diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js index 52723efd..2eeffa64 100644 --- a/vue/src/router/modules/vw_out_order.js +++ b/vue/src/router/modules/vw_out_order.js @@ -13,6 +13,7 @@ const vwOutOrderDataRouter = { index: 0, type: 'crm', icon: '单据导入', + roles: ['SettleAccount.WMSJIT'], keepAlive: false, }, children: [ 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..bcaa8f53 100644 --- a/vue/src/views/ux/basedata/priceList/index.vue +++ b/vue/src/views/ux/basedata/priceList/index.vue @@ -9,6 +9,16 @@ @value-change="selectValue" > + 导入文件（Excel） + + { - acc[cur.key] = cur.display_name; - return acc; -}, {}); export default { name: "PriceList", @@ -222,7 +222,6 @@ export default { // userId: "00000000-0000-0000-0000-000000000000", // }, page: 1, - bomUnit, multipleSelection: [], drawer: false, tableHeight: document.documentElement.clientHeight - 260, diff --git a/vue/src/views/ux/basedata/spareparts/index.vue b/vue/src/views/ux/basedata/spareparts/index.vue new file mode 100644 index 00000000..0a6c8506 --- /dev/null +++ b/vue/src/views/ux/basedata/spareparts/index.vue @@ -0,0 +1,567 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue index 4801e0e9..640eb970 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue @@ -243,6 +243,7 @@ export default { dialogFormVisible: false, multipleSelection: [], formTitle: "", + stockQty: "", drawer: false, showExcelImport: false, tableHeight: document.documentElement.clientHeight - 230, @@ -426,6 +427,7 @@ export default { this.dialogFormVisible = false; this.getList(); this.listLoading = false; + this.dialogFormVisible = false; }) .catch(() => { this.listLoading = false; diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue index 0bde4947..f6b85325 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue @@ -102,15 +102,7 @@ {{ scope.column.label }} - - - + + + +
@@ -248,7 +249,9 @@ export default { version: "", guids: "", billNum: "", - accountDate: "", + accountDate:"", + branchId:"", + outPutQty:"", }, listDeleteQuery: { billNum: "", @@ -328,6 +331,51 @@ export default { }, }, methods: { + //可获取到编辑的数据 + handleEdit(index, row) { + console.log(index, row); + + }, + handle(row){ + this.multipleSelection.forEach((element) => { + let outPutQty=element.outPutQty; + }); + if (row.outPutQty > row.stockQty) { + this.$message({ + message: "出库数量大于寄售库存,不允许出库！", + type: "warning", + }); + } else { + if (row.branchId != "") { + this.listOutPutQuery.branchId = row.branchId; + } + if (row.outPutQty != "") { + this.listOutPutQuery.outPutQty = row.outPutQty; + } + console.log( + "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery) + ); + //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0 + this.$axios + .posts( + "/api/settleaccount/wmsHQFSharePartoutput/WmsSharePartOutPutModify", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "操作成功", + type: "success", + duration: 2000, + }); + this.getList(); + }) + .catch(() => { + this.listLoading = false; + }); + } + }, //版本下拉列表选择项 JobVersionValue(params) { //版本下拉选择 @@ -496,13 +544,8 @@ export default { }); this.getList(); }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", }); - }); + }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue index 5abab004..340ab710 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue @@ -66,6 +66,7 @@ + - -