diff --git a/mes/qd/src/api/wms/statistics/report.js b/mes/qd/src/api/wms/statistics/report.js index 3900c4a0..5adff2c4 100644 --- a/mes/qd/src/api/wms/statistics/report.js +++ b/mes/qd/src/api/wms/statistics/report.js @@ -1,34 +1,25 @@ import request from '@/utils/request' -export function add(data) { +export function getHeader() { return request({ - url: 'api/rawUatWcQuery', + url: 'api/statistical/getHeader', + method: 'get' + }) +} + +export function getHeader2() { + return request({ + url: 'api/statistical/getHeader2', + method: 'get' + }) +} + +export function materPlanDtlQuery(data) { + return request({ + url: 'api/statistical/materPlanDtlQuery', method: 'post', data }) } -export function del(ids) { - return request({ - url: 'api/rawUatWcQuery/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/rawUatWcQuery', - method: 'put', - data - }) -} - -export function getHeader(material_type_id) { - return request({ - url: 'api/rawUatWcQuery/getHeader/' + material_type_id, - method: 'get' - }) -} - -export default { add, edit, del, getHeader } +export default { getHeader, getHeader2, materPlanDtlQuery } diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index bfdaae02..45b94be4 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -282,11 +282,7 @@ export default { data() { return { height: document.documentElement.clientHeight - 180 + 'px;', - permission: { - add: ['admin', 'workorder:add'], - edit: ['admin', 'workorder:edit'], - del: ['admin', 'workorder:del'] - }, + permission: {}, divShow: false, sub_flag: true, dissub_flag: true, diff --git a/mes/qd/src/views/wms/sb/inbill/index.vue b/mes/qd/src/views/wms/sb/inbill/index.vue index 1da98122..8c090d72 100644 --- a/mes/qd/src/views/wms/sb/inbill/index.vue +++ b/mes/qd/src/views/wms/sb/inbill/index.vue @@ -184,6 +184,8 @@ {{ fun(scope.row.total_qty) }} + + @@ -249,11 +251,7 @@ export default { data() { return { height: document.documentElement.clientHeight - 180 + 'px;', - permission: { - add: ['admin', 'user:add'], - edit: ['admin', 'user:edit'], - del: ['admin', 'user:del'] - }, + permission: {}, audit_flag: true, dis_flag: true, disShow: false, diff --git a/mes/qd/src/views/wms/sb/outbill/IvtDialog.vue b/mes/qd/src/views/wms/sb/outbill/IvtDialog.vue index 82dd9742..0cfbe1a9 100644 --- a/mes/qd/src/views/wms/sb/outbill/IvtDialog.vue +++ b/mes/qd/src/views/wms/sb/outbill/IvtDialog.vue @@ -24,7 +24,7 @@ @keyup.enter.native="crud.toQuery" /> - + 查询 @@ -39,10 +39,10 @@ @current-change="clickChange" :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + @@ -126,6 +126,11 @@ export default { this.tableDtl = res }) }, + queryBtn() { + sparePartout.getIvt(this.queryrow).then(res => { + this.tableDtl = res + }) + }, queryClassId() { const param = { 'class_idStr': this.class_idStr diff --git a/mes/qd/src/views/wms/sb/outbill/index.vue b/mes/qd/src/views/wms/sb/outbill/index.vue index b14da108..9346533d 100644 --- a/mes/qd/src/views/wms/sb/outbill/index.vue +++ b/mes/qd/src/views/wms/sb/outbill/index.vue @@ -235,11 +235,7 @@ export default { data() { return { height: document.documentElement.clientHeight - 180 + 'px;', - permission: { - add: ['admin', 'user:add'], - edit: ['admin', 'user:edit'], - del: ['admin', 'user:del'] - }, + permission: {}, audit_flag: true, dis_flag: true, disShow: false, diff --git a/mes/qd/src/views/wms/sb/scrap/index.vue b/mes/qd/src/views/wms/sb/scrap/index.vue index 886f116e..683d6c23 100644 --- a/mes/qd/src/views/wms/sb/scrap/index.vue +++ b/mes/qd/src/views/wms/sb/scrap/index.vue @@ -235,11 +235,7 @@ export default { data() { return { height: document.documentElement.clientHeight - 180 + 'px;', - permission: { - add: ['admin', 'user:add'], - edit: ['admin', 'user:edit'], - del: ['admin', 'user:del'] - }, + permission: {}, audit_flag: true, dis_flag: true, disShow: false, diff --git a/mes/qd/src/views/wms/statistics/ioStorQuery2/index.vue b/mes/qd/src/views/wms/statistics/ioStorQuery2/index.vue index 19cc346d..f74cdf3a 100644 --- a/mes/qd/src/views/wms/statistics/ioStorQuery2/index.vue +++ b/mes/qd/src/views/wms/statistics/ioStorQuery2/index.vue @@ -154,7 +154,7 @@ @change="crud.toQuery" /> - + @@ -170,17 +170,6 @@ > 单据明细 - - 作业明细 - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + - - + + @@ -240,21 +234,23 @@ import crudStorattr from '@/api/wms/basedata/st/storattr' import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' export default { - name: 'IoStorQuery', + name: 'IoStorQuery2', components: { crudOperation, rrOperation, pagination, TaskDialog, DivDialog }, cruds() { - return CRUD({ title: '出入库单报表', + return CRUD({ + title: '出入库单报表', props: { // 每页数据条数 size: 20 - },idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill }, + }, idField: 'iostorinv_id', url: 'api/statistical/ioStorQuery', optShow: { add: false, edit: false, del: false, reset: true, download: false - }}) + } + }) }, mixins: [presenter(), header(), crud()], // 数据字典 @@ -262,8 +258,7 @@ export default { data() { return { height: document.documentElement.clientHeight - 180 + 'px;', - permission: { - }, + permission: {}, divShow: false, taskShow: false, dis_flag: true, diff --git a/mes/qd/src/views/wms/statistics/materPlan/index.vue b/mes/qd/src/views/wms/statistics/materPlan/index.vue index 9d106147..fcd16f96 100644 --- a/mes/qd/src/views/wms/statistics/materPlan/index.vue +++ b/mes/qd/src/views/wms/statistics/materPlan/index.vue @@ -11,80 +11,14 @@ label-width="80px" label-suffix=":" > - - + - - - - - - - - - - - - - - - - - - - - + - - 导出Excel - - + + + + + + -