From 12b25518c302a8ce6175df9d80add8ca5eed4d18 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 26 Dec 2023 14:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95mi?= =?UTF-8?q?oitem=E6=96=B0=E5=A2=9E=E6=97=B6=E9=80=89=E9=A1=B9=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/good_mio.vue | 2 +- src/views/inm/halfgood_mio.vue | 2 +- src/views/inm/helpso_mio.vue | 4 +- src/views/inm/mainso_mio.vue | 2 +- src/views/inm/mioitem_form.vue | 69 ++++++++++++++++------------------ 5 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue index 98784cb2..c6865b18 100644 --- a/src/views/inm/good_mio.vue +++ b/src/views/inm/good_mio.vue @@ -91,7 +91,7 @@ export default { }, query: { type__in: 'sale_out,do_in', - item_mio__material__type: 10 + // item_mio__material__type: 10 }, form: { diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue index 4f71b780..e99df970 100644 --- a/src/views/inm/halfgood_mio.vue +++ b/src/views/inm/halfgood_mio.vue @@ -91,7 +91,7 @@ export default { }, query: { type__in: 'do_in,do_out', - item_mio__material__type: 20 + // item_mio__material__type: 20 }, form: { diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index 43a2d443..cd4b7c48 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -85,8 +85,8 @@ export default { save: false, }, query: { - type__in: 'pur_in,do_out', - item_mio__material__type: 40 + type__in: 'pur_in', + // item_mio__material__type: 40 }, form: { diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue index 263c184e..e5e83c7a 100644 --- a/src/views/inm/mainso_mio.vue +++ b/src/views/inm/mainso_mio.vue @@ -91,7 +91,7 @@ export default { }, query: { type__in: 'pur_in,do_out', - item_mio__material__type: 30 + // item_mio__material__type: 30 }, form: { diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 8c2b0043..3578b0e0 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -210,50 +210,45 @@ export default { getMaterialOptions() { var type = this.form.type; var cate = this.cate; - var query - // if(cate=='good'){ - // query={ page: 0, is_hidden: false,count__gte:1,material__type:10} - // }else if(cate=='halfgood'){ - // if(type == 'do_in'){ - // query={ page: 0, is_hidden: false,count__gte:1} - // }else if(type == 'do_out'){ - // query={ page: 0, is_hidden: false,count__gte:1,material__type:20} - // } - // }else if(cate=='mainso'){//原料 - // query={ page: 0, is_hidden: false,count__gte:1,material__type__in:30} - // }else if(cate=='helpso'){ - // query={ page: 0, is_hidden: false,count__gte:1,material__type__in:40} - // }else{ - - // } - // if(type == 'do_in'){ - // this.$API.inm.warehouse.batch.req(query).then(res => { - // this.materialOptions = res - // }) - // }else{ - // this.$API.wpm.wmaterial.list.req(query).then(res => { - // this.materialOptions = res - // }) - // } - if (type == 'do_out') { - query = { page: 0, type__in: '10, 20, 30', is_hidden: false, is_assemb: false } - this.inputBatchDisable = true + var query = {}; + // 'do_out': '生产领料', + // 'sale_out': '销售发货', + // 'pur_in': '采购入库', + // 'do_in': '生产入库', + // 'other_in': '其他入库', + // 'other_out': '其他出库', + //(10, '成品'), (20, '半成品'), (30, '主要原料'), + // (40, '辅助材料'), (50, '加工工具'), (60, '辅助工装'), (70, '办公用品') + let type__in=''; + if(cate=='good'){ + type__in = '10' + }else if(cate=='halfgood'){ + type__in = '20' + }else if(cate=='mainso'){ + type__in = '30' + }else if(cate=='helpso'){ + type__in = '40' + } + if (type == 'do_out') {//生产领料'10, 20, 30' + query = { page: 0, type__in: type__in, is_hidden: false, is_assemb: false }; + this.inputBatchDisable = true } - else if (type == 'do_in') { - query = { page: 0, type__in: '10, 20', is_hidden: false } - this.inputBatchDisable = false + else if (type == 'do_in') {//生产入库 + query = { page: 0, type__in: type__in, is_hidden: false } + this.inputBatchDisable = false; } - else if (type == 'pur_in') { - query = { page: 0, type__in: 30, is_hidden: false, pu_orderitem_material__pu_order: this.mioObj.pu_order } - this.inputBatchDisable = false + else if (type == 'pur_in') {//采购入库 + query = { page: 0, type__in: type__in, is_hidden: false, pu_orderitem_material__pu_order: this.mioObj.pu_order } + this.inputBatchDisable = false } - else if (type == 'sale_out') { - query = { page: 0, type__in: 10, is_hidden: false, orderitem_material__order: this.mioObj.order } - this.inputBatchDisable = true + else if (type == 'sale_out') {//销售发货 + query = { page: 0, type__in: 10, is_hidden: false, orderitem_material__order: this.mioObj.order } + this.inputBatchDisable = true; } else { query = { page: 0 } } + this.$API.mtm.material.list.req(query).then(res => { this.materialOptions = res })