diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 89e4db69..4c6b8a0b 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -177,16 +177,16 @@ const vwMenudataRouter = { icon: '看板' } }, - { - path: '/kbwithoutcode', - component: () => import('@/views/ux/billManage/kanBanWithOutCode'), - name: 'KanBanWithOutCode',//命名路由 - meta: { - title: '无条码看板结算输出', - roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '看板' - } - }, + // { + // path: '/kbwithoutcode', + // component: () => import('@/views/ux/billManage/kanBanWithOutCode'), + // name: 'KanBanWithOutCode',//命名路由 + // meta: { + // title: '无条码看板结算输出', + // roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + // icon: '看板' + // } + // }, { path: '/vwsparepart', component: () => import('@/views/ux/billManage/sparePart'), diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 96e50bf0..484b1dcd 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -652,7 +652,7 @@ export default { kanBan: undefined, //看板 settledate: undefined, materialCode: undefined, //客户物料号 - sapMaterialCode:undefined, //厂内物料号 + sapMaterialCode: undefined, //厂内物料号 chassisNumber: undefined, kennCode: undefined, version: undefined, @@ -857,23 +857,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: "有未成功的任务，不能单击确认！：" + @@ -945,23 +944,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: "有未成功的任务，不能单击确认！：" + @@ -995,7 +993,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: "取消", @@ -1324,6 +1324,7 @@ export default { this.listLoading = true; //导入界面中超链接过来的参数 this.listQuery.name = "看板结算输出"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index a2c887c4..88288408 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -298,6 +298,8 @@ export default { tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "开票单价", prop: "price", width: 100 }); + tempsTabs.push({ label: "开票金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 4f709ed7..673c91f2 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -8,7 +8,7 @@ class="search-container" @value-change="JobVersionValue" > - - + --> + + + + + + + diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 21f0de4e..2add744c 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -16,19 +16,7 @@ class="search-container" @value-change="JobVersionValue" > - - - + { let outPutQty = element.outputQty; }); - // if (row.outPutQty > row.stockQty) { - // this.$message({ - // message: "出库数量大于寄售库存,不允许出库！", - // type: "warning", - // }); - // } else { - if (row.branchId != "") { - this.listOutPutQuery.branchId = row.id; - } - if (row.outPutQty != "") { - this.listOutPutQuery.outPutQty = row.outPutQty; + if (row.materialCode === null) { + this.$message({ + message: "SAP编码为空，不允许出库！", + type: "warning", + }); + return; } - console.log( - "大众备件调整结算数量按钮：" + JSON.stringify(this.listOutPutQuery) - ); - //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0 - this.$axios - .posts( - "/api/settleaccount/wmsSharePartoutput/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; + if (row.outPutQty > row.stockQty) { + this.$message({ + message: "出库数量大于寄售库存,不允许出库！", + type: "warning", }); - //} + } else { + if (row.branchId != "") { + this.listOutPutQuery.branchId = row.id; + } + if (row.outPutQty != "") { + this.listOutPutQuery.outPutQty = row.outPutQty; + } + console.log( + "大众备件调整结算数量按钮：" + JSON.stringify(this.listOutPutQuery) + ); + //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0 + // this.$axios + // .posts( + // "/api/settleaccount/wmsSharePartoutput/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; + // }); + } }, //取消出库单 handleCancelBills(row) { @@ -733,11 +728,7 @@ export default { }, /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { - if ( - column.property === "fisQty" || - column.property === "diffQty" || - column.property === "stockQty" - ) { + if (column.property === "qty" || column.property === "stockQty") { return { textAlign: "right" }; } else { return { textAlign: "left" }; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail-old.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail-old.vue new file mode 100644 index 00000000..30755daf --- /dev/null +++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail-old.vue @@ -0,0 +1,787 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index 47ac84be..0379a3b8 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -232,7 +232,7 @@ export default { billNum: "", accountDate: "", }, - listDeleteQuery: { + listDeleteQuery: { billNum: "", }, page: 1, @@ -288,26 +288,21 @@ export default { prop: "version", width: 110, }); + tempsTabs.push({ label: "SAP编码", prop: "materialCode", width: 150 }); tempsTabs.push({ - label: "订单号", - prop: "billNum", - width: 170, - }); - tempsTabs.push({ - label: "订货看板编号", - prop: "kanban", - width: 150, + label: "物料组", + prop: "materialGroup", + width: 220, }); - tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); - tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ - label: "物料组(车型)", - prop: "materialGroup", + label: "物料组描述", + prop: "materialDesc", width: 220, }); - tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "结算单价", prop: "price", width: 100 }); + tempsTabs.push({ label: "结算金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; @@ -387,28 +382,27 @@ export default { }, print() { this.dialogFormVisible = true; - if (this.$refs["accountDatelist"] !== undefined) { + if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); } - // this.$axios - // .posts( - // "/api/settleaccount/WmsHQCaroutput/WmsHQCaroutput-Pass", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "生成成功", - // type: "success", - // duration: 2000, - // }); - // this.getList(); - // this.listLoading = false; - // }) + // this.$axios + // .posts( + // "/api/settleaccount/WmsHQCaroutput/WmsHQCaroutput-Pass", + // this.listOutPutQuery + // ) + // .then((response) => { + // const index = this.list.indexOf(row); + // this.$notify({ + // title: "成功", + // message: "生成成功", + // type: "success", + // duration: 2000, + // }); + // this.getList(); + // this.listLoading = false; + // }) }, - handleCreateBillsEnd(row) - { + handleCreateBillsEnd(row) { this.dialogFormVisible = false; this.getList(); }, @@ -419,7 +413,7 @@ export default { this.listOutPutQuery.guids = []; this.listOutPutQuery.version = this.customerInfo.version; this.listOutPutQuery.billNum = this.customerInfo.parentId; - if (this.accountDatelist.accountDate == "") { + if (this.accountDatelist.accountDate == "") { this.$message({ message: "请选择日期！", type: "warning", @@ -427,82 +421,85 @@ export default { this.getList(); return; //this.getList(); - }else { - if (this.accountDatelist != "") { - this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; - } - //this.listOutPutQuery.accountDate = this.accountDatelist; - console.log( - "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) - ); + } else { + if (this.accountDatelist != "") { + this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; + } + //this.listOutPutQuery.accountDate = this.accountDatelist; + console.log( + "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + ); - this.$axios - .posts( - "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass", - this.listOutPutQuery - ) - .then((response) => { - const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "生成成功", - type: "success", - duration: 2000, + this.$axios + .posts( + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.accountDatelist.accountDate = ""; + this.dialogFormVisible = false; + this.getList(); + this.listLoading = false; + this.dialogFormVisible = false; + }) + .catch(() => { + this.listLoading = false; }); - this.accountDatelist.accountDate = ""; - this.dialogFormVisible = false; - this.getList(); - this.listLoading = false; - this.dialogFormVisible = false; - }) - .catch(() => { - this.listLoading = false; - }); } }, //删除出库单 - handleDelete(row){ + handleDelete(row) { var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - if (row) { - //单行 - params.push(row.id); - myalert = row.name; - } else { - //多选 - this.multipleSelection.forEach((element) => { - let id = element.id; - params.push(id); - }); - myalert = "选中项"; - } - this.listDeleteQuery.billNum = this.listQuery.billNum ; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum; console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); - this.$confirm("是否删除" + myalert + "?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$axios - .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", this.listDeleteQuery) - .then((response) => { - const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "删除成功", - type: "success", - duration: 2000, - }); - this.getList(); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts( + "/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", + this.listDeleteQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", + this.getList(); }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", }); + }); }, /** 刷新列表 */ handleHandle(data) {