From 1eecf2853cf923579274a9a7a8df0ed36f407db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 11:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Business/ProdOrder/ProdOrderCheck.vue | 12 ++++++++++++
 src/views/yh/prodOrder/index.vue                     | 12 ++++++++++++
 .../edit/components/ReportProductOrderListEdit.vue   |  8 +++++++-
 .../report/edit/components/ReportProductRowEdit.vue  |  1 +
 4 files changed, 32 insertions(+), 1 deletion(-)

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 @@
           </el-checkbox-button>
         </el-checkbox-group>
       </el-form-item>
+      <el-form-item label="物料规格" prop="materialCategory">
+        <el-input v-model="queryParams.materialCategory" placeholder="请输入物料规格" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="物料大小" prop="materialSize">
+        <el-input v-model="queryParams.materialSize" placeholder="请输入物料大小" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="表面处理" prop="materialSurface">
+        <el-input v-model="queryParams.materialSurface" placeholder="请输入物料表面处理" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="盖子方式" prop="materialCover">
+        <el-input v-model="queryParams.materialCover" placeholder="请输入物料盖子方式" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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 @@
           </el-checkbox-button>
         </el-checkbox-group>
       </el-form-item>
+      <el-form-item label="物料规格" prop="materialCategory">
+        <el-input v-model="queryParams.materialCategory" placeholder="请输入物料规格" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="物料大小" prop="materialSize">
+        <el-input v-model="queryParams.materialSize" placeholder="请输入物料大小" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="表面处理" prop="materialSurface">
+        <el-input v-model="queryParams.materialSurface" placeholder="请输入物料表面处理" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="盖子方式" prop="materialCover">
+        <el-input v-model="queryParams.materialCover" placeholder="请输入物料盖子方式" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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"
           />
         </el-form>
       </div>