提交部署

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>

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>

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,
       }
     }
   },

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>