配料计划

src/views/materialPlan/components/detail/material.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="pane-box">
     <HeaderTitle title="物料信息表"> </HeaderTitle>
-    <ele-pro-table ref="table" :columns="columns" :datasource="[{}]">
+    <ele-pro-table
+      ref="table"
+      :columns="columns"
+      :needPage="false"
+      :initLoad="false"
+      :datasource="datasource"
+    >
     </ele-pro-table>
   </div>
 </template>
@@ -23,35 +29,35 @@
             width: '80'
           },
           {
-            prop: 'name',
+            prop: 'materialCode',
             label: '编码'
           },
           {
-            prop: 'name',
+            prop: 'materialName',
             label: '名称'
           },
           {
-            prop: 'name',
+            prop: 'materialType',
             label: '类型'
           },
           {
-            prop: 'name',
+            prop: 'materialUnit',
             label: '单位'
           },
           {
-            prop: 'name',
+            prop: 'requiredNum',
             label: '需求数量'
           },
           {
-            prop: 'name',
+            prop: 'claimNum',
             label: '领用数量'
           },
           {
-            prop: 'name',
+            prop: 'inputNum',
             label: '投入数量'
           },
           {
-            prop: 'name',
+            prop: 'returnNum',
             label: '退还数量'
           }
         ]

src/views/materialPlan/components/materialPlan-search.vue

@@ -87,7 +87,13 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col
+        v-bind="
+          styleResponsive
+            ? { lg: activeName == 'second' ? 5 : 12, md: 12 }
+            : { span: activeName == 'second' ? 5 : 12 }
+        "
+      >
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -166,6 +172,7 @@
       /*  重置 */
       reset () {
         this.where = { ...this.defaultWhere };
+        this.where.statusList = this.statusOpt[this.activeName][0].value;
         this.search();
       }
     }

src/views/productionPlan/components/productionPlan-search.vue

@@ -144,7 +144,13 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col
+        v-bind="
+          styleResponsive
+            ? { lg: activeName == 'first' ? 24 : 6, md: 12 }
+            : { span: activeName == 'first' ? 24 : 6 }
+        "
+      >
         <div class="ele-form-actions">
           <el-button
             type="primary"