From f05458e128a327f1203bd6ab3d8d04eca152b1d0 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Fri, 10 Dec 2021 17:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8A=9F=E8=83=BD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 77 ++++----- .../billManage/InvoiceSettledDiff/index.vue | 37 +++-- .../ux/billManage/IssuedUnsettled/index.vue | 86 +++++----- .../UnInvoiceSettledDetailDiff/index.vue | 147 ++++++++++-------- 4 files changed, 186 insertions(+), 161 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 1870d33a..35374ec0 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -33,7 +33,7 @@ 说明：每间隔30秒进行自动刷新！说明：每间隔15秒进行自动刷新！ @@ -413,9 +413,9 @@ - + - + - + @@ -455,7 +455,7 @@ - + @@ -465,19 +465,19 @@ - - - + + + - +
@@ -546,8 +546,8 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, - startTime: "", - endTime: "", + // startTime: "", + // endTime: "", pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -562,7 +562,6 @@ export default { }, }, datetime5: [], - datetime7: [], checkedCities: [0], cities: cityOptions, selectValue: "", @@ -599,15 +598,15 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", - version: "", + startTime: "", + endTime: "", + // name: "未结算对比", + // settledate: "", + // materialCode: "", + // sapMaterialCode: "", + // chassisNumber: "", + // kennCode: "", + // version: "", }, list: null, totalCount: 0, @@ -662,7 +661,7 @@ export default { this.listQuery.taskId = ""; this.listQuery.stateName = ""; setTimeout(this.getList, 0); - }, 1000 * 30); //30秒刷新一次页面 + }, 1000 * 15); //15秒刷新一次页面 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 this.$once("hook:beforeDestroy", () => { clearInterval(timer); @@ -792,7 +791,6 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; }, save() { this.$refs.formCount.validate((valid) => { @@ -802,28 +800,29 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 - } + // if (this.formCount.sapMaterialCode != "") { + // this.listExportQuery.sapMaterialCode = + // this.formCount.sapMaterialCode; //厂内物料号 + // } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } var getdate5 = JSON.stringify(this.datetime5); if (getdate5 != "[]") { - alert(this.datetime5[0]); 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; } - if (this.startTime != "") { - this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 - } - if (this.endTime != "") { - this.listExportQuery.cp7end = this.endTime; //CP5结束日期 - } + this.listExportQuery.cp7begin = this.startTime + ? this.startTime + : undefined; + this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } @@ -868,8 +867,12 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.datetime5 = []; + this.startTime = ""; + this.endTime = ""; this.dialogFormVisible = true; }, + filterHandler(value, row, column) { const property = column["property"]; return row[property] === value; diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 3c1e7667..8406a006 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -33,7 +33,7 @@ 说明：每间隔30秒进行自动刷新！说明：每间隔15秒进行自动刷新！
@@ -333,7 +333,13 @@ append-to-body width="680px" > - + @@ -357,18 +363,16 @@ - - - + + -
@@ -553,7 +557,7 @@ export default { this.listQuery.taskId = ""; this.listQuery.stateName = ""; setTimeout(this.getList, 0); - }, 1000 * 30); //30秒刷新一次页面 + }, 1000 * 15); //15秒刷新一次页面 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 this.$once("hook:beforeDestroy", () => { clearInterval(timer); @@ -680,19 +684,19 @@ export default { /* 重置 */ resetForm(formName) { this.formCount = {}; - this.datetime5 = []; - this.startTime = ""; - this.endTime = ""; - // this.datetime7 = []; + //this.formCount.materialCode = ""; }, save() { this.$refs.formCount.validate((valid) => { if (valid) { this.formLoading = true; this.listExportQuery.version = this.formCount.versionValue; //版本 - if (this.formCount.materialCode != "") { - this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 - } + this.listExportQuery.matialCode = this.formCount.materialCode + ? this.formCount.materialCode + : undefined; + // if (this.formCount.materialCode != "") { + // this.listExportQuery.matialCode = this.formCount.materialCode; //物料号 + // } // if (this.formCount.kennCode != "") { // this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 // } @@ -719,7 +723,10 @@ export default { // this.listExportQuery.materialGroup = // this.formCount.materialGroupValue; //物料组车型 // } - console.log("发票与结算核对汇总-导出条件：" + JSON.stringify(this.listExportQuery)); + console.log( + "发票与结算核对汇总-导出条件：" + + JSON.stringify(this.listExportQuery) + ); this.$axios .gets( "/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make", diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index 1ee0e3a9..2b9f4a4f 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -33,7 +33,7 @@ 说明：每间隔30秒进行自动刷新！说明：每间隔15秒进行自动刷新！
@@ -408,14 +408,14 @@ - + - - - + + + - - +
@@ -546,8 +546,8 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, - startTime: "", - endTime: "", + // startTime: "", + // endTime: "", pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -562,7 +562,6 @@ export default { }, }, datetime5: [], - datetime7: [], checkedCities: [0], cities: cityOptions, selectValue: "", @@ -599,15 +598,15 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", - version: "", + startTime: "", + endTime: "", + // name: "未结算对比", + // settledate: "", + // materialCode: "", + // sapMaterialCode: "", + // chassisNumber: "", + // kennCode: "", + // version: "", }, list: null, totalCount: 0, @@ -662,7 +661,7 @@ export default { this.listQuery.taskId = ""; this.listQuery.stateName = ""; setTimeout(this.getList, 0); - }, 1000 * 30); //30秒刷新一次页面 + }, 1000 * 15); //15秒刷新一次页面 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 this.$once("hook:beforeDestroy", () => { clearInterval(timer); @@ -792,7 +791,6 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; }, save() { this.$refs.formCount.validate((valid) => { @@ -802,28 +800,29 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 - } + // if (this.formCount.sapMaterialCode != "") { + // this.listExportQuery.sapMaterialCode = + // this.formCount.sapMaterialCode; //厂内物料号 + // } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } var getdate5 = JSON.stringify(this.datetime5); if (getdate5 != "[]") { - alert(this.datetime5[0]); 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; } - if (this.startTime != "") { - this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 - } - if (this.endTime != "") { - this.listExportQuery.cp7end = this.endTime; //CP5结束日期 - } + this.listExportQuery.cp7begin = this.startTime + ? this.startTime + : undefined; + this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } @@ -831,6 +830,7 @@ export default { this.listExportQuery.materialGroup = this.formCount.materialGroupValue; //物料组车型 } + console.log( "大众准时化未结明细-导出条件：" + JSON.stringify(this.listExportQuery) @@ -868,8 +868,12 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.datetime5 = []; + this.startTime = ""; + this.endTime = ""; this.dialogFormVisible = true; }, + filterHandler(value, row, column) { const property = column["property"]; return row[property] === value; @@ -982,7 +986,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化未结明细表"; + this.listQuery.name = "大众发票与结算核对明细表"; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 4ad85d7e..19a560e5 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -33,7 +33,7 @@ 说明：每间隔30秒进行自动刷新！说明：每间隔15秒进行自动刷新！
@@ -333,7 +333,13 @@ append-to-body width="680px" > - + @@ -357,25 +363,7 @@ - - - - - - - - - - - - + @@ -425,9 +413,9 @@ - + - + - + @@ -467,13 +455,30 @@ - + - + + + + + + + + + + +