diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index 6d37215..352f30a 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -37,7 +37,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="出入记录ID">
diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue
index 8f14fe6..a4f883b 100644
--- a/hb_client/src/views/inm/materialbatch.vue
+++ b/hb_client/src/views/inm/materialbatch.vue
@@ -33,7 +33,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="物料批次">
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index 7fcbd01..ae2980e 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -37,7 +37,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="仓库名称">
diff --git a/hb_client/src/views/inm/wproduct.vue b/hb_client/src/views/inm/wproduct.vue
index f53458e..d4ff5cf 100644
--- a/hb_client/src/views/inm/wproduct.vue
+++ b/hb_client/src/views/inm/wproduct.vue
@@ -9,7 +9,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+         max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="半成品编号">
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index cb6daa9..cf40afa 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -37,9 +37,9 @@
         fit
         stripe
        highlight-current-row
-        max-height="600"
+        max-height="620"
          height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 10}"
       >
         <el-table-column type="index" width="50" />
          <el-table-column label="物料编号">
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index d8d0cf4..5050edf 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -20,13 +20,14 @@
             </el-button>
             <!--表格列表-->
             <el-table
-              v-el-height-adaptive-table="{ bottomOffset: 50 }"
+            
               :data="recordformList.results"
               border
               fit
               stripe
               highlight-current-row
-              height="100"
+              height="670"
+               v-el-height-adaptive-table="{ bottomOffset: 20 }"
               @current-change="handleCurrentChange"
             >
               <el-table-column type="index" width="50"/>
@@ -234,8 +235,8 @@
               fit
               stripe
               highlight-current-row
-              height="100"
-              v-el-height-adaptive-table="{ bottomOffset: 50 }"
+              height="670"
+              v-el-height-adaptive-table="{ bottomOffset: 20 }"
             >
               <el-table-column type="index" width="50"/>
               <el-table-column label="字段名称">
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index be91d34..fba7a12 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -15,9 +15,9 @@
         border
         fit
         stripe
-        highlight-current-row
-        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+      max-height="620"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 10}"
       >
         <el-table-column type="index" width="50" />
           <el-table-column label="工序编号">
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index 5aed59b..bdb8333 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -13,6 +13,7 @@
         stripe
         style="width: 100%"
          height="300"
+         
       >
         <el-table-column type="index" width="50" />
         
@@ -98,6 +99,7 @@
         stripe
         style="width: 100%"
         height="250"
+      
     
       >
         <el-table-column type="index" width="50" />
diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue
index 9ec3815..bf1a781 100644
--- a/hb_client/src/views/procurement/vendor.vue
+++ b/hb_client/src/views/procurement/vendor.vue
@@ -2,6 +2,10 @@
   <div class="app-container">
     <el-card>
       <div>
+       
+      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增供应商</el-button >
+  
       <el-input
               v-model="listQuery.search"
               placeholder="供应商名称"
@@ -24,11 +28,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增供应商</el-button
-      >
-    </div>
+    
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
@@ -38,7 +38,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="供应商名">
diff --git a/hb_client/src/views/qm/standard.vue b/hb_client/src/views/qm/standard.vue
index 4f6b6eb..45b6764 100644
--- a/hb_client/src/views/qm/standard.vue
+++ b/hb_client/src/views/qm/standard.vue
@@ -2,6 +2,8 @@
   <div class="app-container">
     <el-card>
       <div>
+          <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增标准</el-button >
       <el-input
               v-model="listQuery.search"
               placeholder="标准名称"
@@ -24,11 +26,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增标准</el-button
-      >
-    </div>
+  
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/qm/testitem.vue b/hb_client/src/views/qm/testitem.vue
index 6f8d7b3..198dfa9 100644
--- a/hb_client/src/views/qm/testitem.vue
+++ b/hb_client/src/views/qm/testitem.vue
@@ -2,6 +2,9 @@
   <div class="app-container">
     <el-card>
       <div>
+         <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增项目</el-button
+      >
       <el-input
               v-model="listQuery.search"
               placeholder="项目名称"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增项目</el-button
-      >
-    </div>
+  
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index edb2cfe..1497aed 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>操作记录表</span>
-      </div>
-
+    
+          
       <el-table
         :data="operationList.results"
         border
         fit
         stripe
         style="width: 100%"
-        max-height="700"
+        max-height="670"
+         highlight-current-row
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
 
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 4919546..9b28fe9 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -1,288 +1,403 @@
 <template>
   <div class="app-container">
-      <el-card >
-    <el-card >
-      <div slot="header" class="clearfix">
-        <span>基本信息</span>
-      </div>
-      <el-form
-        ref="form"
-        inline="true"
-        :model="operationData"
-        label-width="80px"
-      >
-        <el-form-item label="子工序">
-          <el-input
-            v-model="operationData.step_.name"
-            disabled="disabled"
-          ></el-input>
-        </el-form-item>
+    <el-card>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>基本信息</span>
+        </div>
+        <el-form
+          ref="form"
+          inline="true"
+          :model="operationData"
+          label-width="80px"
+        >
+          <el-form-item label="子工序">
+            <el-input
+              v-model="operationData.step_.name"
+              disabled="disabled"
+            ></el-input>
+          </el-form-item>
 
-        <el-form-item label="创建人">
-          <el-input
-            v-model="operationData.create_by_.username"
-            disabled="disabled"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-input
-            v-model="operationData.create_time"
-            disabled="disabled"
-          ></el-input>
-        </el-form-item>
+          <el-form-item label="创建人">
+            <el-input
+              v-model="operationData.create_by_.username"
+              disabled="disabled"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-input
+              v-model="operationData.create_time"
+              disabled="disabled"
+            ></el-input>
+          </el-form-item>
 
-        <el-form-item label="边角料">
-          <el-radio-group v-model="operationData.use_scrap">
-            <el-radio
-              :label="item.value"
-              :key="item.value"
-              v-for="item in scrap"
-              >{{ item.lable }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" v-if="operationData.use_scrap">
-          <el-input type="textarea" v-model="operationData.remark"></el-input>
-        </el-form-item>
+          <el-form-item label="边角料">
+            <el-radio-group v-model="operationData.use_scrap">
+              <el-radio border
+                :label="item.value"
+                :key="item.value"
+                v-for="item in scrap"
+                >{{ item.lable }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注" v-if="operationData.use_scrap">
+            <el-input type="textarea" v-model="operationData.remark"></el-input>
+          </el-form-item>
 
-        <el-form-item v-if="operationData.use_scrap">
-          <el-button type="primary" @click="scrapSubmit()">创建</el-button>
-          <el-button>取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-row gutter="2">
-      <el-col span="8">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>半成品</span>
-          </div>
+          <el-form-item v-if="operationData.use_scrap">
+            <el-button type="primary" @click="scrapSubmit()">创建</el-button>
+            <el-button>取消</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-row gutter="2">
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>半成品</span>
+            </div>
 
-          <template>
-            
-            <el-table :data="operationwpData"  border
-        fit
-        stripe  highlight-current-row
-       height="230" style="width: 100%" >
+            <template>
+              <el-table
+                :data="operationwpData"
+                border
+                fit
+                stripe
+                highlight-current-row
+                height="230"
+                style="width: 100%"
+              >
                 <el-table-column type="index" width="50" />
-              <el-table-column prop="subproduction_plan_.number" label="子计划编号">
-              </el-table-column>
-              <el-table-column prop="number" label="半成品编号">
-              </el-table-column>
-               <el-table-column prop="material_.name" label="半成品名称">
-              </el-table-column>
-             
-              <el-table-column align="center" label="操作" width="100px">
-                <template slot-scope="scope">
-                  <el-link
-                    v-if="checkPermission(['warehouse_update'])"
-                    @click="handleDeletewproduct(scope)"
-                    >删除</el-link
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-card>
-      </el-col>
-      <el-col span="8" >
-        <el-card class="box-card" >
-          <div slot="header" class="clearfix">
-            <span>设备</span>
-          </div>
-          <template>
-            <el-table :data="equData" border
-        fit
-        stripe  highlight-current-row
-       height="230" style="width: 100%" >
-              <el-table-column prop="equip_.number" label="设备编号">
-              </el-table-column>
-              <el-table-column prop="equip_.name" label="设备名称">
-              </el-table-column>
-              <el-table-column align="center" label="操作" width="100px">
-                <template slot-scope="scope">
-                  <el-link
-                    v-if="checkPermission(['warehouse_update'])"
-                    @click="handleDeletequip(scope)"
-                    >删除</el-link
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-card>
-      </el-col>
-      <el-col span="8">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>自定义表格</span>
-          </div>
-          <template>
-            <el-table :data="recordData" border
-        fit
-        stripe  highlight-current-row
-       height="230" style="width: 100%">
-              <el-table-column prop="form_.name" label="表名">
-              </el-table-column>
-              <el-table-column label="是否填写">
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.is_filled == false">未填写</el-tag>
-                  <el-tag v-else>已填写</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="操作" width="100px">
-                <template slot-scope="scope">
-                  <el-link
-                    v-if="checkPermission(['warehouse_update'])"
-                    @click="handlerecord(scope)"
-                    >填写表单</el-link
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-dialog
-              :model="tableForm"
-              :visible.sync="dialogVisibleForm"
-              :title="tableForm.name"
-            >
-              <el-form label-width="80px" label-position="right">
-                <el-row v-for="(item, $index) in fieldList" :key="$index">
-                  <el-form-item
-                    v-if="item.field_type === 'string'"
-                    :label="item.field_name"
-                  >
-                    <el-input placeholder="请输入" v-model="item.sort" />
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'int'"
-                    :label="item.field_name"
-                  >
-                    <el-input
-                      type="number"
-                      placeholder="请输入"
-                      v-model="item.sort"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'float'"
-                    :label="item.field_name"
-                  >
-                    <el-input
-                      type="number"
-                      placeholder="请输入"
-                      v-model="item.sort"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'date'"
-                    :label="item.field_name"
-                  >
-                    <el-date-picker
-                      v-model="item.create_time"
-                      type="date"
-                      placeholder="选择日期"
-                      value-format="yyyy-MM-dd"
-                      style="width: 100%"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'datetime'"
-                    :label="item.field_name"
-                  >
-                    <el-date-picker
-                      v-model="item.create_time"
-                      type="datetime"
-                      placeholder="选择日期"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      style="width: 100%"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'select'"
-                    :label="item.field_name"
-                  >
-                    <el-select
-                      style="width: 100%"
-                      v-model="item.sort"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item1 in item.field_choice"
-                        :key="item1"
-                        :label="item1"
-                        :value="item1"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="item.field_type === 'selects'"
-                    :label="item.field_name"
-                  >
-                    <el-select
-                      style="width: 100%"
-                      v-model="optio"
-                      multiple
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item1 in item.field_choice"
-                        :key="item1"
-                        :label="item1"
-                        :value="item1"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-row>
-              </el-form>
-              <span slot="footer">
-                <el-button type="danger" @click="dialogVisibleForm = false"
-                  >取消</el-button
+                <el-table-column
+                  prop="subproduction_plan_.number"
+                  label="子计划编号"
                 >
-                <el-button type="primary" @click="recordconfirm()"
-                  >提交</el-button
+                </el-table-column>
+                <el-table-column prop="number" label="半成品编号">
+                </el-table-column>
+                <el-table-column prop="material_.name" label="半成品名称">
+                </el-table-column>
+
+                <el-table-column align="center" label="操作" width="100px">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="checkPermission(['warehouse_update'])"
+                      @click="handleDeletewproduct(scope)"
+                      >删除</el-link
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-card>
+        </el-col>
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>设备</span>
+            </div>
+            <template>
+              <el-table
+                :data="equData"
+                border
+                fit
+                stripe
+                highlight-current-row
+                height="230"
+                style="width: 100%"
+              >
+                <el-table-column prop="equip_.number" label="设备编号">
+                </el-table-column>
+                <el-table-column prop="equip_.name" label="设备名称">
+                </el-table-column>
+                <el-table-column align="center" label="操作" width="100px">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="checkPermission(['warehouse_update'])"
+                      @click="handleDeletequip(scope)"
+                      >删除</el-link
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-card>
+        </el-col>
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>自定义表格</span>
+            </div>
+            <template>
+              <el-table
+                :data="recordData"
+                border
+                fit
+                stripe
+                highlight-current-row
+                height="230"
+                style="width: 100%"
+              >
+                <el-table-column prop="form_.name" label="表名">
+                </el-table-column>
+                <el-table-column label="是否填写">
+                  <template slot-scope="scope">
+                    <el-tag v-if="scope.row.is_filled == false">未填写</el-tag>
+                    <el-tag v-else>已填写</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="操作" width="100px">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="checkPermission(['warehouse_update'])"
+                      @click="handlerecord(scope)"
+                      >填写表单</el-link
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-dialog
+                :model="tableForm"
+                :visible.sync="dialogVisibleForm"
+                :title="tableForm.name"
+              >
+                <el-form label-width="80px" label-position="right">
+                  <el-row v-for="(item, $index) in fieldList" :key="$index">
+                    <el-form-item
+                      v-if="item.field_type === 'string'"
+                      :label="item.field_name"
+                    >
+                      <el-input placeholder="请输入" v-model="item.sort" />
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'int'"
+                      :label="item.field_name"
+                    >
+                      <el-input
+                        type="number"
+                        placeholder="请输入"
+                        v-model="item.sort"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'float'"
+                      :label="item.field_name"
+                    >
+                      <el-input
+                        type="number"
+                        placeholder="请输入"
+                        v-model="item.sort"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'date'"
+                      :label="item.field_name"
+                    >
+                      <el-date-picker
+                        v-model="item.create_time"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        style="width: 100%"
+                      >
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'datetime'"
+                      :label="item.field_name"
+                    >
+                      <el-date-picker
+                        v-model="item.create_time"
+                        type="datetime"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        style="width: 100%"
+                      >
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'select'"
+                      :label="item.field_name"
+                    >
+                      <el-select
+                        style="width: 100%"
+                        v-model="item.sort"
+                        placeholder="请选择"
+                      >
+                        <el-option
+                          v-for="item1 in item.field_choice"
+                          :key="item1"
+                          :label="item1"
+                          :value="item1"
+                        >
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="item.field_type === 'selects'"
+                      :label="item.field_name"
+                    >
+                      <el-select
+                        style="width: 100%"
+                        v-model="optio"
+                        multiple
+                        placeholder="请选择"
+                      >
+                        <el-option
+                          v-for="item1 in item.field_choice"
+                          :key="item1"
+                          :label="item1"
+                          :value="item1"
+                        >
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-row>
+                </el-form>
+                <span slot="footer">
+                  <el-button type="danger" @click="dialogVisibleForm = false"
+                    >取消</el-button
+                  >
+                  <el-button type="primary" @click="recordconfirm()"
+                    >提交</el-button
+                  >
+                </span>
+              </el-dialog>
+            </template>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-row gutter="2">
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>消耗物料</span>
+              <el-button
+                style="float: right; padding: 3px 0"
+                type="text"
+                @click="cjllclick()"
+                >从车间领料</el-button
+              >
+            </div>
+            <template>
+              <el-table
+                :data="inputData"
+                border
+                fit
+                stripe
+                highlight-current-row
+                height="230"
+                style="width: 100%"
+              >
+                <el-table-column
+                  prop="subproduction_plan_.number"
+                  label="子计划编号"
                 >
-              </span>
-            </el-dialog>
-          </template>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row gutter="2">
-      <el-col span="8">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>消耗物料</span>
-            <el-button
-              style="float: right; padding: 3px 0"
-              type="text"
-              @click="cjllclick()"
-              >从车间领料</el-button
+                </el-table-column>
+                <el-table-column prop="batch" label="物料批次">
+                </el-table-column>
+                <el-table-column prop="material_.name" label="物料名称">
+                </el-table-column>
+                <el-table-column prop="material_.unit" label="物料单位">
+                </el-table-column>
+                <el-table-column prop="count" label="消耗数量">
+                </el-table-column>
+              </el-table>
+              <el-dialog title="车间物料" :visible.sync="dialogTablepick">
+                <el-table
+                  :data="wmaterialData"
+                  border
+                  fit
+                  stripe
+                  style="width: 100%"
+                  max-height="400"
+                >
+                  <el-table-column type="index" width="50" />
+
+                  <el-table-column label="物料名称">
+                    <template slot-scope="scope">{{
+                      scope.row.material_.name
+                    }}</template>
+                  </el-table-column>
+                  <el-table-column label="物料单位">
+                    <template slot-scope="scope">{{
+                      scope.row.material_.unit
+                    }}</template>
+                  </el-table-column>
+                  <el-table-column label="物料批次">
+                    <template slot-scope="scope">{{
+                      scope.row.batch
+                    }}</template>
+                  </el-table-column>
+                  <el-table-column label="车间物料数量">
+                    <template slot-scope="scope">{{
+                      scope.row.count
+                    }}</template>
+                  </el-table-column>
+                  <el-table-column label="实际使用数量" width="140px">
+                    <template slot-scope="scope">
+                      <el-form :model="scope.row" widht="100px">
+                        <el-form-item size="mini">
+                          <el-input-number
+                            v-model="scope.row.pick_count"
+                            :min="0"
+                            :controls="false"
+                            :value="0"
+                          ></el-input-number>
+                        </el-form-item>
+                      </el-form>
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="center" label="操作" width="100px">
+                    <template slot-scope="scope">
+                      <el-link
+                        v-if="checkPermission(['warehouse_update'])"
+                        @click="handlepick(scope)"
+                        >提交</el-link
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-dialog>
+            </template>
+          </el-card>
+        </el-col>
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>产出物料</span>
+              <el-button
+                style="float: right; padding: 3px 0"
+                type="text"
+                @click="dialogTableoutput = true"
+                >选择产出</el-button
+              >
+            </div>
+            <el-table
+              :data="outputData"
+              border
+              fit
+              stripe
+              highlight-current-row
+              height="230"
+              style="width: 100%"
             >
-          </div>
-          <template>
-            <el-table :data="inputData" border
-        fit
-        stripe  highlight-current-row
-       height="230" style="width: 100%">
               <el-table-column
                 prop="subproduction_plan_.number"
                 label="子计划编号"
               >
               </el-table-column>
-              <el-table-column prop="batch" label="物料批次"> </el-table-column>
+
               <el-table-column prop="material_.name" label="物料名称">
               </el-table-column>
               <el-table-column prop="material_.unit" label="物料单位">
               </el-table-column>
-              <el-table-column prop="count" label="消耗数量"> </el-table-column>
+              <el-table-column prop="count" label="产出数量"> </el-table-column>
             </el-table>
-            <el-dialog title="车间物料" :visible.sync="dialogTablepick">
+            <el-dialog title="产出物料" :visible.sync="dialogTableoutput">
               <el-table
-                :data="wmaterialData"
+                :data="tprogressData"
                 border
                 fit
                 stripe
@@ -291,6 +406,11 @@
               >
                 <el-table-column type="index" width="50" />
 
+                <el-table-column label="生产计划编号">
+                  <template slot-scope="scope">{{
+                    scope.row.subproduction_plan
+                  }}</template>
+                </el-table-column>
                 <el-table-column label="物料名称">
                   <template slot-scope="scope">{{
                     scope.row.material_.name
@@ -301,18 +421,16 @@
                     scope.row.material_.unit
                   }}</template>
                 </el-table-column>
-                <el-table-column label="物料批次">
-                  <template slot-scope="scope">{{ scope.row.batch }}</template>
-                </el-table-column>
-                <el-table-column label="车间物料数量">
+                <el-table-column label="应产数量">
                   <template slot-scope="scope">{{ scope.row.count }}</template>
                 </el-table-column>
-                <el-table-column label="实际使用数量" width="140px">
+
+                <el-table-column label="本操作产出数量" width="140px">
                   <template slot-scope="scope">
                     <el-form :model="scope.row" widht="100px">
                       <el-form-item size="mini">
                         <el-input-number
-                          v-model="scope.row.pick_count"
+                          v-model="scope.row.output_count"
                           :min="0"
                           :controls="false"
                           :value="0"
@@ -325,126 +443,35 @@
                   <template slot-scope="scope">
                     <el-link
                       v-if="checkPermission(['warehouse_update'])"
-                      @click="handlepick(scope)"
+                      @click="handleoutput(scope)"
                       >提交</el-link
                     >
                   </template>
                 </el-table-column>
               </el-table>
             </el-dialog>
-          </template>
-        </el-card>
-      </el-col>
-      <el-col span="8">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>产出物料</span>
-            <el-button
-              style="float: right; padding: 3px 0"
-              type="text"
-              @click="dialogTableoutput = true"
-              >选择产出</el-button
-            >
-          </div>
-          <el-table :data="outputData" border
-        fit
-        stripe  highlight-current-row
-       height="230" style="width: 100%">
-            <el-table-column
-              prop="subproduction_plan_.number"
-              label="子计划编号"
-            >
-            </el-table-column>
-
-            <el-table-column prop="material_.name" label="物料名称">
-            </el-table-column>
-            <el-table-column prop="material_.unit" label="物料单位">
-            </el-table-column>
-            <el-table-column prop="count" label="产出数量"> </el-table-column>
-          </el-table>
-          <el-dialog title="产出物料" :visible.sync="dialogTableoutput">
-            <el-table
-              :data="tprogressData"
-              border
-              fit
-              stripe
-              style="width: 100%"
-              max-height="400"
-            >
-              <el-table-column type="index" width="50" />
-
-       <el-table-column label="生产计划编号">
-                <template slot-scope="scope">{{
-                  scope.row.subproduction_plan
-                }}</template>
-              </el-table-column>
-              <el-table-column label="物料名称">
-                <template slot-scope="scope">{{
-                  scope.row.material_.name
-                }}</template>
-              </el-table-column>
-              <el-table-column label="物料单位">
-                <template slot-scope="scope">{{
-                  scope.row.material_.unit
-                }}</template>
-              </el-table-column>
-              <el-table-column label="应产数量">
-                <template slot-scope="scope">{{ scope.row.count }}</template>
-              </el-table-column>
-             
-
-              <el-table-column label="本操作产出数量" width="140px">
-                <template slot-scope="scope">
-                  <el-form :model="scope.row" widht="100px">
-                    <el-form-item size="mini">
-                      <el-input-number
-                        v-model="scope.row.output_count"
-                        :min="0"
-                        :controls="false"
-                        :value="0"
-                      ></el-input-number>
-                    </el-form-item>
-                  </el-form>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="操作" width="100px">
-                <template slot-scope="scope">
-                  <el-link
-                    v-if="checkPermission(['warehouse_update'])"
-                    @click="handleoutput(scope)"
-                    >提交</el-link
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-dialog>
-        </el-card>
-      </el-col>
-       <el-col span="8" >
-        <el-card class="box-card" >
-          <div slot="header" class="clearfix">
-            <span>工序工装</span>
-          </div>
-         
-        </el-card>
-      </el-col>
-    </el-row>
-
-      <el-button type="primary"
-                   
-                    @click="handlesubmit()"
-                    >提交本次操作</el-button
-                  >
-       </el-card>
-
-
-
+          </el-card>
+        </el-col>
+        <el-col span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>工序工装</span>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-card>
+        <el-button type="primary" style="float: right" @click="handlesubmit()"
+          >提交本次操作</el-button
+        >
+      </el-card>
+    </el-card>
   </div>
 </template>
 <style scoped>
 .box-card {
-    height: 300px;
-  }
+  height: 300px;
+}
 </style>
 </style>
   <script>
@@ -464,7 +491,7 @@ import {
   deleteOperationequip,
   deleteOperationwproduct,
   gettoolList,
-  createTool
+  createTool,
 } from "@/api/wpm";
 
 import { getrffieldList } from "@/api/mtm";
@@ -474,7 +501,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 
 export default {
   components: { Pagination },
-  inject:['reload'],
+  inject: ["reload"],
   data() {
     return {
       operationList: {
@@ -578,13 +605,13 @@ export default {
       output: {},
       record_data: [],
       record: {},
-      inputData:[],
-      operationwpData:[],
-      equData:[],
-      recordData:[],
-      wmaterialData:[],
-      outputData:[],
-      tprogressData:[],
+      inputData: [],
+      operationwpData: [],
+      equData: [],
+      recordData: [],
+      wmaterialData: [],
+      outputData: [],
+      tprogressData: [],
     };
   },
   computed: {},
@@ -608,7 +635,6 @@ export default {
         if (response.data) {
           this.operationData = response.data;
         }
-       
       });
     },
     //如果使用边角料提交
@@ -629,14 +655,12 @@ export default {
           if (response.data) {
             this.operationwpData = response.data;
           }
-         
         }
       );
     },
     //操作半成品删除
-    handleDeletewproduct(scope)
-    {
-        this.$confirm("确认删除该半成品?", "警告", {
+    handleDeletewproduct(scope) {
+      this.$confirm("确认删除该半成品?", "警告", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
         type: "error",
@@ -656,15 +680,13 @@ export default {
         if (response.data) {
           this.equData = response.data;
         }
-        
       });
     },
     //操作删除设备
-    handleDeletequip(scope)
-    {  
+    handleDeletequip(scope) {
       alert(scope.row.equip_.id);
 
-        this.$confirm("确认删除该设备?", "警告", {
+      this.$confirm("确认删除该设备?", "警告", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
         type: "error",
@@ -684,7 +706,6 @@ export default {
         if (response.data) {
           this.recordData = response.data;
         }
-        
       });
     },
     //调出表单内容
@@ -713,9 +734,9 @@ export default {
       this.record.record_data = _this.record_data;
       createRecord(this.formID, this.record).then((res) => {
         if (res.code >= 200) {
-           this.getrecordLists();
+          this.getrecordLists();
           this.$message.success("创建成功！");
-         
+
           this.dialogVisibleForm = false;
         }
       });
@@ -725,16 +746,14 @@ export default {
     getinputLists() {
       getinputList({ operation: this.id, page: 0 }).then((response) => {
         if (response.data) {
-         debugger;
+         
           this.inputData = response.data;
         }
-        
       });
     },
-  cjllclick(){
-
-    this.dialogTablepick = true;
-  },
+    cjllclick() {
+      this.dialogTablepick = true;
+    },
 
     //从车间领料
     getwmaterialList() {
@@ -764,7 +783,6 @@ export default {
         if (response.data) {
           this.outputData = response.data;
         }
-        
       });
     },
     //产出物料选择
@@ -774,7 +792,6 @@ export default {
           if (response.data) {
             this.tprogressData = response.data;
           }
-          
         }
       );
     },
@@ -785,22 +802,21 @@ export default {
       this.output.count = scope.row.output_count;
       createOutput(this.output).then((res) => {
         if (res.code >= 200) {
-           this.getoutputLists();
+          this.getoutputLists();
           this.$message.success("创建成功！");
-         
+
           this.dialogTableoutput = false;
         }
       });
     },
-//提交本次操作
-    handlesubmit(){
+    //提交本次操作
+    handlesubmit() {
       submitOperation(this.id).then((res) => {
         if (res.code >= 200) {
           this.$message.success("操作提交成功！");
-         
         }
       });
-    }
+    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index f30d8aa..057c4fc 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -13,7 +13,7 @@
           border
           stripe
           style="width: 100%"
-          height="300"
+          height="250"
           highlight-current-row
           @current-change="handleCurrentChange"
         >
@@ -24,7 +24,7 @@
               scope.row.number
             }}</template>
           </el-table-column>
-            <el-table-column label="生产主产品">
+            <el-table-column label="生产主产品" width="140">
             <template slot-scope="scope" >{{
               scope.row.main_product_.name
             }}</template>
@@ -59,11 +59,13 @@
             <template slot-scope="scope">{{ scope.row.end_date }}</template>
           </el-table-column>
           <el-table-column label="状态">
-            <template slot-scope="scope">{{
+            <template slot-scope="scope">
+
+              {{
               state_[scope.row.state]
             }}</template>
           </el-table-column>
-          <el-table-column label="领料状态">
+          <el-table-column label="领料状态" width="100">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
               <el-tag v-else>已领料</el-tag>
@@ -180,7 +182,7 @@
                 fit
                 stripe
                 style="width: 100%"
-                max-height="400"
+                max-height="300"
               >
                 <el-table-column type="index" width="50" />
                   <el-table-column label="子计划编号">
@@ -257,7 +259,7 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        max-height="300"
         @selection-change="handleSelectionChangess"
       >
        <el-table-column type="selection" width="55"> </el-table-column>
@@ -295,7 +297,7 @@
           <span>生产所需领料表</span>
         </div>
         <template>
-          <el-table :data="needwl" style="width: 100%">
+          <el-table :data="needwl" highlight-current-row height="300" style="width: 100%">
             <el-table-column prop="material_.name" label="物料名称">
             </el-table-column>
             <el-table-column prop="material_.number" label="物料编号">
@@ -322,7 +324,7 @@
           >
         </div>
         <template>
-          <el-table :data="havewl" style="width: 100%" >
+          <el-table :data="havewl" highlight-current-row height="300" style="width: 100%" >
            
             <el-table-column prop="batch" label="物料批次"> </el-table-column>
             <el-table-column prop="material_.name" label="物料名称">
@@ -354,7 +356,8 @@
               <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
-              v-if="checkPermission(['warehouse_update'])"
+            v-if="scope.row.material_.type==2"
+             
               @click="handlewproduct(scope)"
               >选择半成品</el-link
             >