diff --git a/src/components/Business/ProdOrder/ProdOrderCheck.vue b/src/components/Business/ProdOrder/ProdOrderCheck.vue index 54b26e8..f13a9b6 100644 --- a/src/components/Business/ProdOrder/ProdOrderCheck.vue +++ b/src/components/Business/ProdOrder/ProdOrderCheck.vue @@ -39,6 +39,18 @@ + + + + + + + + + + + + 搜索 重置 diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue index 679e1a8..e8c5e68 100644 --- a/src/views/yh/prodOrder/index.vue +++ b/src/views/yh/prodOrder/index.vue @@ -39,6 +39,18 @@ + + + + + + + + + + + + 搜索 重置 diff --git a/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue b/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue index bcf4ed6..c3e09a4 100644 --- a/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue +++ b/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue @@ -102,6 +102,11 @@ export default { priceUnit: { type: String, default: null + }, + // 报表产量 + reportProd: { + type: Object, + default: () => ({}) } }, data() { @@ -134,7 +139,8 @@ export default { orderQuery() { return { erpStatusList: [ProdOrderErpStatus.START_WORK], - + materialCategory: this.reportProd.priceCategory, + materialSize: this.reportProd.priceSize, } } }, diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue index f13842e..932271f 100644 --- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue +++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue @@ -52,6 +52,7 @@ :quantity="form.priceQuantityNumerator / form.priceQuantityDenominator" :price-unit="form.priceUnit" :rules="rules.orderProdList" + :report-prod="form" />