From 0cbdf3ccbd87a3a5a283f1ef7522416edb1ee96c Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Fri, 22 Dec 2023 10:49:17 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E5=93=8D=E5=BA=94=E9=80=9F=E5=BA=A6=EF=BC=9B=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E3=80=81=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/wms/st/inAndOutReturn/index.vue | 22 ++++++--- .../src/views/wms/st/inStor/change/index.vue | 47 +++++++++++++------ .../src/views/wms/st/inStor/check/index.vue | 23 ++++++++- .../src/views/wms/st/inbill/index.vue | 22 ++++++++- .../src/views/wms/st/incharge/index.vue | 28 +++++++++-- .../src/views/wms/st/outbill/index.vue | 40 +++++++++++++--- .../src/views/wms/st/outcharge/index.vue | 28 +++++++++-- 7 files changed, 169 insertions(+), 41 deletions(-) diff --git a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue index ce0a11ed0..9b7aca0ec 100644 --- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue @@ -237,7 +237,7 @@ @selection-change="crud.selectionChangeHandler" > - + @@ -247,7 +247,7 @@ - + @@ -300,7 +300,8 @@ export default { reset: true, download: false }, - query: { io_type: '0', bill_status: '99' } + query: { io_type: '0', bill_status: '99' }, + queryOnPresenterCreated: false }) }, mixins: [presenter(), header(), crud()], @@ -328,13 +329,20 @@ export default { crudUserStor.getUserStor().then(res => { this.storlist = res }) - debugger - this.billtypelist = this.dict.ST_INV_IN_TYPE + // debugger + this.billtypelist = this.dict.ST_INV_OUT_TYPE + this.initQuery() }, methods: { - [CRUD.HOOK.beforeRefresh]() { - return true + /* 搜索框出入类型 默认出库*/ + initQuery() { + this.query.io_type = '1' + this.query.is_upload = '0' + this.crud.toQuery() }, + // [CRUD.HOOK.beforeRefresh]() { + // return true + // }, querytable() { this.onSelectAll() this.crud.toQuery() diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue index 071a2a2af..53db2e117 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue @@ -91,7 +91,7 @@ - - + {{ scope.row.bill_code }} - - - - - - - - - - + + + + + + + + + + @@ -213,7 +213,9 @@ export default { del: false, reset: true, download: false - }}) + }, + queryOnPresenterCreated: false + }) }, mixins: [presenter(), header(), crud()], // 数据字典 @@ -243,8 +245,25 @@ export default { crudUserStor.getUserStor().then(res => { this.storlist = res }) + this.initQuery() }, methods: { + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() + }, canUd(row) { return row.bill_status !== '10' }, @@ -268,7 +287,7 @@ export default { this.buttonChange(row) } else if (val.length === 1) { this.buttonChange(row) - }else{ + } else { this.handleCurrentChange(null) } }, diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue index 3f2dd0e06..6c76007dc 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue @@ -38,7 +38,7 @@ - + { this.storlist = res }) + this.initQuery() }, methods: { + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() + }, canUd(row) { return row.status !== '1' }, diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue index dc4275ecb..012343358 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -38,7 +38,7 @@ - + { this.storlist = res }) + this.initQuery() }, methods: { + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() + }, fun(val) { return Number(val).toFixed(3) }, diff --git a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue index 6c4575a24..8c470df73 100644 --- a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue @@ -38,7 +38,7 @@ - + @@ -189,7 +189,8 @@ export default { del: false, download: false, reset: false - } + }, + queryOnPresenterCreated: false }) }, mixins: [presenter(), header(), crud()], @@ -208,11 +209,28 @@ export default { crudUserStor.getUserStor().then(res => { this.storlist = res }) + this.initQuery() }, methods: { - [CRUD.HOOK.beforeRefresh]() { - return true + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() }, + // [CRUD.HOOK.beforeRefresh]() { + // return false + // }, toView(index, row) { this.mstrow = row this.viewShow = true diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index ce20f55c5..ac16a7b30 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -23,11 +23,12 @@ - + - + + + + + @@ -349,7 +358,9 @@ export default { del: false, reset: true, download: false - }}) + }, + queryOnPresenterCreated: false + }) }, mixins: [presenter(), header(), crud()], // 数据字典 @@ -393,8 +404,25 @@ export default { crudUserStor.getUserStor().then(res => { this.storlist = res }) + this.initQuery() }, methods: { + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() + }, canUd(row) { return row.bill_status !== '10' }, diff --git a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue index a148bdf45..ac6703900 100644 --- a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue @@ -38,7 +38,7 @@ - + @@ -191,7 +191,8 @@ export default { del: false, download: false, reset: false - } + }, + queryOnPresenterCreated: false }) }, mixins: [presenter(), header(), crud()], @@ -214,11 +215,28 @@ export default { crudUserStor.getUserStor().then(res => { this.storlist = res }) + this.initQuery() }, methods: { - [CRUD.HOOK.beforeRefresh]() { - return true + /* 搜索框创建时间默认最近一周*/ + initQuery() { + const end = new Date() + const start = new Date() + const endYear = end.getFullYear() + const endMonth = end.getMonth() + 1 + const endDay = end.getDate() + const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59' + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) + const startYear = start.getFullYear() + const startMonth = start.getMonth() + 1 + const startDay = start.getDate() + const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00' + this.$set(this.query, 'createTime', [startDate, endDate]) + this.crud.toQuery() }, + // [CRUD.HOOK.beforeRefresh]() { + // return false + // }, toView(index, row) { this.mstrow = row this.viewShow = true