diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue index 1d917cb5..2aea3c01 100644 --- a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue +++ b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue @@ -211,7 +211,7 @@ export default { }, { label: '批次号', - prop: 'batchCode', + prop: 'piNo', search: false, width: 150, }, diff --git a/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue b/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue index a1083e18..259ec194 100644 --- a/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue +++ b/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue @@ -428,7 +428,7 @@ export default { // 报废 handleScrap(row) { this.rowItem = row; - this.scrapForm.outboundNum = row.outQty; + this.scrapForm.outboundNum = row.outedQuantity; this.scrapForm.rlsId = row.rlsId; this.scrapForm.woCode = row.woCode; this.scarpTitle = `【${row.goodsName}】物料报废需工艺员审批,审批通过后可出库`; diff --git a/src/views/orderManagement/urgentUphold.vue b/src/views/orderManagement/urgentUphold.vue index a14485e7..586eff3b 100644 --- a/src/views/orderManagement/urgentUphold.vue +++ b/src/views/orderManagement/urgentUphold.vue @@ -7,7 +7,6 @@ v-model="form" v-model:page="page" ref="crud" - @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @@ -128,6 +127,10 @@ export default { type: 'date', // 启用日期类型 format: 'YYYY-MM-DD', // 展示格式 valueFormat: 'YYYY-MM-DD', // 如果作为搜索条件传给后端的格式也需要一致 + startPlaceholder: '开始时间', + endPlaceholder: '结束时间', + searchRange: true, + searchOrder:20, }, { label: '到期日期', @@ -213,56 +216,6 @@ export default { // return removePersonAbility(row.id); }); }, - rowSave(row, done, loading) { - // addPersonAbility(row).then( - // () => { - // this.onLoad(this.page); - // this.$message({ - // type: 'success', - // message: '操作成功!', - // }); - // done(); - // }, - // error => { - // window.console.log(error); - // loading(); - // } - // ); - }, - rowUpdate(row, index, done, loading) { - // updatePersonAbility(row).then( - // () => { - // this.onLoad(this.page); - // this.$message({ - // type: 'success', - // message: '操作成功!', - // }); - // done(); - // }, - // error => { - // window.console.log(error); - // loading(); - // } - // ); - }, - rowDel(row) { - this.$confirm('确定将选择数据删除?', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }) - .then(() => { - // return removePersonAbility(row.id); - }) - .then(() => { - this.onLoad(this.page); - this.$message({ - type: 'success', - message: '操作成功!', - }); - }); - }, - searchReset() { this.query = {}; this.onLoad(this.page); @@ -288,11 +241,16 @@ export default { this.page.pageSize = pageSize; }, refreshChange() { - this.onLoad(this.page, this.query); + this.onLoad(this.page, this.query);s }, onLoad(page, params = {}) { this.loading = true; + if (!!params.requireDate) { + this.query.requireDateStart = params.requireDate[0] + ' 00:00:00'; + this.query.requireDateEnd = params.requireDate[1] + ' 23:59:59'; + delete params.requireDate; + } getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { this.data = res.data.data.records; this.loading = false;