diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index de9dcb3b..93de70ed 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -19,6 +19,22 @@ @click="handleCreate" >统计 + 删除(支持批量) + 生成出库单(支持批量) @@ -60,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + @@ -378,9 +396,12 @@ - + @@ -411,12 +433,13 @@ - + @@ -466,7 +489,7 @@ style="color: #37b328" > - + + + + + + + + + + + @@ -651,6 +691,19 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -712,6 +765,8 @@ export default { // kennCode: "", // version: "", }, + cp5startTime: "", + cp5endTime: "", dataKenCode: "", datachassisNumber: "", datamaterialCode: "", @@ -743,7 +798,7 @@ export default { listQuery: { taskId: "", name: "", - type:"" + type: "", }, page: 1, JobversionValue: "", @@ -836,6 +891,107 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //出库单 + handleCreateBills(row){ + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否确认出库" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, //版本下拉列表选择项 JobVersionValue(params) { //版本下拉选择 @@ -931,12 +1087,13 @@ export default { this.getbalanceIndexData(); }, - cp5getdateValue(val) { + //cp5 + getdateValueCp5(val) { this.cp5startTime = val; this.getbalanceIndexData(); }, - cp5getdateValue(val) { - this.cp5startTime = val; + getdateValCp5(val) { + this.cp5endTime = val; this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -1045,8 +1202,6 @@ export default { "大众发票与结算核对明细表-导出条件：" + JSON.stringify(this.listExportQuery) ); - this.formLoading = false; - this.dialogFormVisible = false; this.$axios .gets( "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 8cbf03e3..736c2e9d 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -58,10 +66,12 @@ stripe border highlight-current-row + @selection-change="handleSelectionChange" style="width: 100%" @row-click="handleRowClick" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index 618ec3d1..fe737698 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -60,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + + @@ -717,6 +761,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, //版本下拉列表选择项 JobVersionValue(params) { //版本下拉选择 @@ -844,18 +940,23 @@ export default { if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } else { - this.listExportQuery.begin = undefined; - this.listExportQuery.end = undefined; - } + // var getdate5 = JSON.stringify(this.datetime5); + // if (getdate5 != "[]") { + // this.listExportQuery.begin = this.datetime5 + // ? this.datetime5[0] || undefined + // : undefined; + // this.listExportQuery.end = this.datetime5 + // ? this.datetime5[1] || undefined + // : undefined; + // } else { + // this.listExportQuery.begin = undefined; + // this.listExportQuery.end = undefined; + // } + //cp5 + this.listExportQuery.begin = this.startTime + ? this.startTime + : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 913801d8..2aa3f604 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -60,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 2e817124..7d837232 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -60,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; @@ -830,7 +892,6 @@ export default { }, getdateValue(val) { this.startTime = val; - alert(this.startTime); this.getbalanceIndexData(); }, getdateVal(val) { diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 688da86d..5fa2d4c3 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -20,6 +20,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -61,8 +69,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + + @@ -620,7 +664,7 @@ export default { materialGroup: undefined, begin: undefined, end: undefined, - sapCode:undefined + sapCode: undefined, }, listQuery: { taskId: "", @@ -717,6 +761,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; @@ -839,25 +935,29 @@ export default { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapCode = - this.formCount.sapMaterialCode; //厂内物料号 + this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号 } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } //CP5 - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } else { - this.listExportQuery.begin = undefined; - this.listExportQuery.end = undefined; - } + // var getdate5 = JSON.stringify(this.datetime5); + // if (getdate5 != "[]") { + // this.listExportQuery.begin = this.datetime5 + // ? this.datetime5[0] || undefined + // : undefined; + // this.listExportQuery.end = this.datetime5 + // ? this.datetime5[1] || undefined + // : undefined; + // } else { + // this.listExportQuery.begin = undefined; + // this.listExportQuery.end = undefined; + // } + //CP5 + this.listExportQuery.begin = this.startTime + ? this.startTime + : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index 5a7bf4f0..fc2a3da1 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -59,9 +67,11 @@ border highlight-current-row style="width: 100%" + @selection-change="handleSelectionChange" @row-click="handleRowClick" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + @@ -716,6 +759,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; @@ -843,18 +938,22 @@ export default { if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } else { - this.listExportQuery.begin = undefined; - this.listExportQuery.end = undefined; - } + // var getdate5 = JSON.stringify(this.datetime5); + // if (getdate5 != "[]") { + // this.listExportQuery.begin = this.datetime5 + // ? this.datetime5[0] || undefined + // : undefined; + // this.listExportQuery.end = this.datetime5 + // ? this.datetime5[1] || undefined + // : undefined; + // } else { + // this.listExportQuery.begin = undefined; + // this.listExportQuery.end = undefined; + // } + this.listExportQuery.begin = this.startTime + ? this.startTime + : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 86b3e803..9e0f12b1 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -5,6 +5,12 @@
+ 统计 + 删除(支持批量) + 生成出库单(支持批量)
@@ -54,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + +
+ 统计 + 删除(支持批量) + 生成出库单(支持批量)
@@ -54,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + //出库单 + handleCreateBills(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否确认出库" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + valueChange(data) { + this.getmaterialGroupValue = ""; + this.getmaterialGroupValue += data + ","; + this.getmaterialGroupValue = this.getmaterialGroupValue.substring( + 0, + this.getmaterialGroupValue.length - 1 + ); + }, + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.JobversionValue = params.value; + this.getList(); + }, + getJobVersionInfo() { + //取版本列表信息 + //this.listLoading = true; + this.listQuery.SkipCount = (this.page - 1) * 1000; + this.$axios + .posts("/api/settleaccount/Job/versionlist", this.listQuery) + .then((response) => { + this.JobVersionList = []; + response.forEach((element) => { + let options = {}; + options.value = element; + options.label = element; + this.JobVersionList.push(options); + }); + if (JSON.stringify(this.JobVersionList) != "[]") { + //因版本下拉有默认值，所以详表要自动绑定子表数据 + this.JobversionValue = this.JobVersionList[0].value; + this.JobversionValueVerson = this.JobVersionList[0].label; + this.getList(); + } + }) + .catch(() => { + //this.listLoading = false; + }); + }, getdateValue(val) { this.startTime = val; this.getbalanceIndexData(); @@ -832,8 +1001,7 @@ export default { this.formCount.materialGroupValue; //物料组车型 } console.log( - "大众备件结算核对-导出条件：" + - JSON.stringify(this.listExportQuery) + "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) ); this.$axios .gets(