diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 53c2b244..6d0b07af 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -527,6 +527,10 @@ export default { }, //执行按钮 sureClick() { + if(this.versionValue==''){ + this.$message.error("必须选择版本！"); + return false; + } if ( this.fileuploadList === [] || JSON.stringify(this.fileuploadList) === "[]" diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js index 143ff198..b798957f 100644 --- a/vue/src/router/modules/vw_out_order.js +++ b/vue/src/router/modules/vw_out_order.js @@ -50,13 +50,23 @@ const vwOutOrderDataRouter = { { path: 'sparepart-out-order', component: () => import('@/views/ux/billManage/sparepartOutOrder/index'), - name: 'Invoices',//命名路由 + name: 'Sparepartoutorder',//命名路由 meta: { title: '大众备件出库单', roles: ['SettleAccount.WMSJIT'], icon: '文件' } }, + { + path: 'sparepart90-out-order', + component: () => import('@/views/ux/billManage/sparepartOutOrder90/index'), + name: 'Sparepartoutorder90',//命名路由 + meta: { + title: '大众备件调整出库单', + roles: ['SettleAccount.WMSJIT'], + icon: '文件' + } + }, ] } diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 7e079dce..4f709ed7 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -1,27 +1,32 @@ - + @@ -123,7 +180,7 @@ import { formatTimeToTimestamp } from "@/utils/index"; export default { name: "sendUnsettledDiffReport", - components: { Pagination, Detail,importExcel }, + components: { Pagination, Detail, importExcel }, directives: { permission }, data() { return { @@ -172,6 +229,12 @@ export default { MaxResultCount: 15, }, page: 1, + formCount: { + versionValue: undefined, + }, + listExportQuery: { + version: "", + }, dialogFormVisible: false, multipleSelection: [], formTitle: "", @@ -190,7 +253,7 @@ export default { }, created() { this.getList(); - //this.getVersionInfo(); + this.getVersionInfo(); }, computed: { /** 列表字段 */ @@ -209,6 +272,57 @@ export default { }, }, methods: { + save() { + this.$refs.formCount.validate((valid) => { + if (valid) { + this.formLoading = true; + if ( + this.formCount.versionValue == "" || + this.formCount.versionValue == undefined + ) { + this.$message({ + message: "必须选择版本！", + type: "warning", + }); + this.formLoading = false; + return; + } + + this.listExportQuery.version = this.formCount.versionValue; //版本 + console.log( + "生成出库单-条件：" + JSON.stringify(this.listExportQuery) + ); + this.$axios + .posts( + "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPutExtend", + this.listExportQuery + ) + .then((res) => { + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + + this.getList(); + this.formLoading = false; + this.dialogFormVisible = false; + }) + .catch(() => { + this.formLoading = false; + this.dialogFormVisible = false; + }); + } + }); + }, + handleCreate() { + if (this.$refs["formCount"] !== undefined) { + this.$refs["formCount"].resetFields(); + } + this.formTitle = "生成出库单"; + this.dialogFormVisible = true; + }, handleImportExcel() { //导入 this.showExcelImport = true; @@ -277,7 +391,10 @@ export default { this.listQuery.SkipCount = (this.page - 1) * 15; } this.$axios - .posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery) + .posts( + "/api/settleaccount/wmskanbanoutputextend/WmsKanbanList", + this.listQuery + ) .then((response) => { this.list = response.items; //alert(JSON.stringify(response.Items)) diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 143ea982..1fc69b6a 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -44,14 +44,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) - 备件未结明细统计 - + --> @@ -404,7 +404,7 @@ - + @@ -452,7 +452,6 @@ - @@ -587,7 +586,10 @@
重置 - 确认
@@ -957,23 +959,22 @@ export default { }); return; } else { - var getbillNum = ""; - var getTaskState=""; + var getbillNum = ""; + var getTaskState = ""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; if (state != "" && state != "已确认") { this.isEdit = true; getbillNum += state + ","; - } - else if(element.stateName != "Succeeded"){ - this.isTaskSuccess=true; - getTaskState+=element.taskId; + } else if (element.stateName != "Succeeded") { + this.isTaskSuccess = true; + getTaskState += element.taskId; } }); } //任务不成功的不能单击确认 - if(this.isTaskSuccess == true){ + if (this.isTaskSuccess == true) { this.$message({ message: "有未成功的任务，不能单击确认！：" + @@ -1045,23 +1046,22 @@ export default { }); return; } else { - var getbillNum = ""; - var getTaskState=""; + var getbillNum = ""; + var getTaskState = ""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; if (state != "" && state != "已确认") { this.isEdit = true; getbillNum += state + ","; - } - else if(element.stateName != "Succeeded"){ - this.isTaskSuccess=true; - getTaskState+=element.taskId; + } else if (element.stateName != "Succeeded") { + this.isTaskSuccess = true; + getTaskState += element.taskId; } }); } //任务不成功的不能单击确认 - if(this.isTaskSuccess == true){ + if (this.isTaskSuccess == true) { this.$message({ message: "有未成功的任务，不能单击确认！：" + @@ -1095,7 +1095,9 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("大众备件出库单条件：" + JSON.stringify(this.listBillQuery)); + console.log( + "大众备件出库单条件：" + JSON.stringify(this.listBillQuery) + ); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -1248,7 +1250,8 @@ export default { this.formLoading = true; this.listExportQuery.version = this.formCount.versionValue; //版本 if (this.formCount.purchaseOrderNo != "") { - this.listExportQuery.purchaseOrderNo = this.formCount.purchaseOrderNo; //采购订单号 + this.listExportQuery.purchaseOrderNo = + this.formCount.purchaseOrderNo; //采购订单号 } if (this.formCount.sapCode != "") { this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 @@ -1257,9 +1260,7 @@ export default { this.listExportQuery.begin = this.startTime ? this.startTime : undefined; - this.listExportQuery.end = this.endTime - ? this.endTime - : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; console.log( "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) ); @@ -1309,7 +1310,8 @@ export default { : undefined; console.log( - "大众备件未结明细-导出条件：" + JSON.stringify(this.listNoBillExportQuery) + "大众备件未结明细-导出条件：" + + JSON.stringify(this.listNoBillExportQuery) ); this.$axios .gets( @@ -1359,7 +1361,7 @@ export default { if (this.$refs["formNoBill"] !== undefined) { this.$refs["formNoBill"].resetFields(); } - this.formTitle = "无条码备件明细报表统计"; + this.formTitle = "备件明细报表统计"; this.isEdit = false; this.formNoBill = {}; this.startTimeNoBill = ""; @@ -1478,7 +1480,8 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "备件结算输出"; + this.listQuery.name = "大众备件结算输出"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { @@ -1501,16 +1504,13 @@ export default { // }); // }, resetQuery() {}, - /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { var item = this.list[rowIndex]; - if (column.property === "stateName") { - if (item.stateName === "Succeeded") { - return { color: "#71d87f", cursor: "pointer" }; - } else if (item.stateName === "Processing") { - return { color: "#d87171", cursor: "pointer" }; - } else if (item.stateName === "Failed") { - return { color: "#ff5640", cursor: "pointer" }; + if (column.property === "fileName") { + if (item.fileName === "已确认") { + return { color: "#13CE66", cursor: "pointer", fontWeight: 700 }; + } else { + return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 }; } } return { textAlign: "left" }; diff --git a/vue/src/views/ux/billManage/sparePart90/index.vue b/vue/src/views/ux/billManage/sparePart90/index.vue index f69cdb0a..6b3d51ce 100644 --- a/vue/src/views/ux/billManage/sparePart90/index.vue +++ b/vue/src/views/ux/billManage/sparePart90/index.vue @@ -471,7 +471,6 @@ > - @@ -892,7 +891,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutAudit", + "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPutAudit", params ) .then((response) => { @@ -974,7 +973,7 @@ export default { this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; console.log( - "大众备件出库单条件：" + JSON.stringify(this.listBillQuery) + "大众备件数据调整出库单条件：" + JSON.stringify(this.listBillQuery) ); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", @@ -985,7 +984,7 @@ export default { this.formLoading = true; this.$axios .posts( - "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut", + "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut", this.listBillQuery ) .then((response) => { @@ -1296,7 +1295,8 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "(0-90天)大众备件结算输出"; + this.listQuery.name = "大众备件数据调整结算输出"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { @@ -1322,13 +1322,11 @@ export default { /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { var item = this.list[rowIndex]; - if (column.property === "stateName") { - if (item.stateName === "Succeeded") { - return { color: "#71d87f", cursor: "pointer" }; - } else if (item.stateName === "Processing") { - return { color: "#d87171", cursor: "pointer" }; - } else if (item.stateName === "Failed") { - return { color: "#ff5640", cursor: "pointer" }; + if (column.property === "fileName") { + if (item.fileName === "已确认") { + return { color: "#13CE66", cursor: "pointer", fontWeight: 700 }; + } else { + return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 }; } } return { textAlign: "left" }; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 9f117401..21f0de4e 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -1,4 +1,4 @@ - +