diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index e1ad0c75..a586da5e 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -232,7 +232,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/BomDiffPrice'), name: 'BomDiffPrice',//命名路由 meta: { - title: 'Bom定价差异明细', + title: 'Bom定价明细', roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) icon: '看板' } diff --git a/vue/src/views/ux/billManage/BomDiffPrice/index.vue b/vue/src/views/ux/billManage/BomDiffPrice/index.vue index d0169e7b..3f360c97 100644 --- a/vue/src/views/ux/billManage/BomDiffPrice/index.vue +++ b/vue/src/views/ux/billManage/BomDiffPrice/index.vue @@ -4,18 +4,19 @@
- + > --> 统计 @@ -389,21 +387,13 @@ export default { /* 主表头 */ getDefaultField() { var tempsTabs = []; - tempsTabs.push({ - label: "版本号", - prop: "type", - width: 120, - }); + tempsTabs.push({ label: "单据流水号", prop: "taskId", width: 140, }); - // tempsTabs.push({ - // label: "模块名称", - // prop: "name", - // width: 170, - // }); + tempsTabs.push({ label: "创建人", prop: "email", @@ -415,11 +405,7 @@ export default { width: 150, }); - tempsTabs.push({ - label: "审批状态", - prop: "fileName", - width: 350, - }); + return tempsTabs; }, }, @@ -617,14 +603,35 @@ export default { this.formNoBill = {}; }, save() { + this.formLoading = true; + this.$axios + .gets( + "/api/settleaccount/ReportMakeService/BomDiffPrice-Make", + this.listExportQuery + ) + .then((res) => { + let taskid = res; + if (Number.isInteger(taskid)) { + this.$notify({ + title: "成功", + message: "任务生成成功!任务号:" + taskid, + type: "success", + duration: 2000, + }); + } + this.getList(); + this.formLoading = false; + this.dialogFormVisible = false; + }) + .catch(() => { + this.formLoading = false; + this.dialogFormVisible = false; + }); + }, + save1() { this.$refs.formCount.validate((valid) => { if (valid) { this.formLoading = true; - this.listExportQuery.version = this.formCount.versionValue; //版本 - - console.log( - "Bom定价差异明细-导出条件:" + JSON.stringify(this.listExportQuery) - ); this.$axios .gets( "/api/settleaccount/ReportMakeService/BomDiffPrice-Make", @@ -778,7 +785,7 @@ export default { this.listLoading = true; //导入界面中超链接过来的参数 this.listQuery.name = "Bom定价差异明细"; - this.listQuery.type = this.JobversionValue; + //this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/WMSOutputDetailCancelDiff/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailCancelDiff/index.vue index a38f3200..65cf884b 100644 --- a/vue/src/views/ux/billManage/WMSOutputDetailCancelDiff/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputDetailCancelDiff/index.vue @@ -65,6 +65,8 @@ label="红旗一轿手工出库(备件)" value="红旗一轿手工出库(备件)" > + + +