diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index a0e596a..e4e1ae1 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -47,21 +47,21 @@
         v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50"/>
-        <el-table-column label="设备名称" prop="name" width="120" show-overflow-tooltip>
+        <el-table-column label="设备名称" prop="name" min-width="120" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="设备编号" prop="number" width="120">
+        <el-table-column label="设备编号" prop="number" min-width="120">
         </el-table-column>
-        <el-table-column label="型号规格" prop="model" width="120">
+        <el-table-column label="型号规格" prop="model" min-width="120">
         </el-table-column>
-        <el-table-column label="生产厂及国别" prop="factory" width="120" show-overflow-tooltip>
+        <el-table-column label="生产厂及国别" prop="factory" min-width="120" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="生产日期" prop="production_date" width="120">
+        <el-table-column label="生产日期" prop="production_date" min-width="120">
         </el-table-column>
-        <el-table-column label="购置日期" prop="buy_date" width="120">
+        <el-table-column label="购置日期" prop="buy_date" min-width="120">
         </el-table-column>
-        <el-table-column label="数量" prop="count" width="120">
+        <el-table-column label="数量" prop="count" min-width="120">
         </el-table-column>
-        <el-table-column label="状态" width="120">
+        <el-table-column label="状态" min-width="120">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.state===10" type="success">
               {{ state_[scope.row.state] }}
@@ -77,16 +77,16 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="技术指标" width="120" show-overflow-tooltip>
+        <el-table-column label="技术指标" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.parameter }}</template>
         </el-table-column>
-        <el-table-column label="保管人" width="120">
+        <el-table-column label="保管人" min-width="120">
           <template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template>
         </el-table-column>
-        <el-table-column label="存放位置" width="120" show-overflow-tooltip>
+        <el-table-column label="存放位置" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.place }}</template>
         </el-table-column>
-        <el-table-column label="绑定工序" width="120" show-overflow-tooltip>
+        <el-table-column label="绑定工序" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope" v-if="scope.row.step_">
             <el-tag v-for="item in scope.row.step_"
                     :key="item.number"
@@ -101,7 +101,7 @@
         <el-table-column
           align="center"
           label="操作"
-          width="120px"
+          min-width="120px"
           fixed="right"
         >
           <template slot-scope="scope">
diff --git a/hb_client/src/views/wpm/firstCheck.vue b/hb_client/src/views/wpm/firstCheck.vue
index 2b4232c..edbd105 100644
--- a/hb_client/src/views/wpm/firstCheck.vue
+++ b/hb_client/src/views/wpm/firstCheck.vue
@@ -16,9 +16,10 @@
         :data="subPlanList"
         fit
         style="width: 100%"
-        height="100"
         stripe
         border
+        height="100"
+        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/productjy.vue b/hb_client/src/views/wpm/productjy.vue
index 2d1dd98..b046105 100644
--- a/hb_client/src/views/wpm/productjy.vue
+++ b/hb_client/src/views/wpm/productjy.vue
@@ -9,8 +9,9 @@
             border
             fit
             stripe
+            height="100"
             highlight-current-row
-            max-height="600"
+            v-el-height-adaptive-table="{bottomOffset: 60}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="成品名称">
@@ -53,7 +54,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="wproductList.count > 0"
             :total="wproductList.count"
             :page.sync="listQuery.page"
             :limit.sync="listQuery.page_size"
@@ -73,8 +73,9 @@
             border
             fit
             stripe
+            height="100"
             highlight-current-row
-            max-height="600"
+            v-el-height-adaptive-table="{bottomOffset: 60}"
           >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column type="index" width="50"/>
@@ -124,7 +125,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="wproductList1.count > 0"
             :total="wproductList1.count"
             :page.sync="listQuery1.page"
             :limit.sync="listQuery1.page_size"
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 4e5d163..23fb646 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -1,238 +1,242 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
-      <el-tab-pane
-        v-for="item in processOption"
-        :key="item.name"
-        :label="item.name"
-        :name="item.id"
-        :closable="item.close"
-      >
-        <el-table
-          :data="subproductionplanList.results"
-          border
-          stripe
-          style="width: 100%"
-          height="250"
-          highlight-current-row
-          @current-change="handleCurrentChange"
+    <el-card>
+      <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
+        <el-tab-pane
+          v-for="item in processOption"
+          :key="item.name"
+          :label="item.name"
+          :name="item.id"
+          :closable="item.close"
         >
-          <el-table-column type="index" width="50"/>
-          <el-table-column label="子计划编号" prop="number" min-width="100" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.plan_product_.name}}
-            </template>
-          </el-table-column>
-          <el-table-column label="产品型号">
-            <template slot-scope="scope">
-              {{scope.row.product_.specification}}
-            </template>
-          </el-table-column>
-          <el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.product_.name}}
-            </template>
-          </el-table-column>
-          <el-table-column label="名称" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.subproduction_.name}}
-            </template>
-          </el-table-column>
-          <el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.workshop_.name}}
-            </template>
-          </el-table-column>
-          <el-table-column label="子工序" min-width="160">
-            <template slot-scope="scope" v-if="scope.row.steps">
-              <el-tag
-                v-for="item in scope.row.steps"
-                :key="item.number"
-                :label="item.name"
-                :value="item.number"
-              >
-                {{ item.name }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="开工时间" prop="start_date" width="100">
-          </el-table-column>
-          <el-table-column label="完工时间" prop="end_date" width="100">
-          </el-table-column>
-          <el-table-column label="状态">
-            <template slot-scope="scope">
-              {{ state_[scope.row.state] }}
-            </template>
-          </el-table-column>
-          <el-table-column label="领料状态" width="80">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
-              <el-tag v-else>已领料</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="计划/生产/合格">
-            <template slot-scope="scope">
-              {{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            width="80px"
-            fixed="right"
+          <el-table
+            :data="subproductionplanList.results"
+            border
+            stripe
+            style="width: 100%"
+            :height="tableHeight"
+            highlight-current-row
+            @current-change="handleCurrentChange"
           >
-            <template slot-scope="scope">
-              <el-link
-                v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked"
-                type="success"
-                @click="handleNeed(scope)"
-              >
-                领料
-              </el-link>
-              <el-link
-                v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked"
-                type="success"
-                @click="handleNeed(scope)"
-              >
-                继续领料
-              </el-link>
-              <el-link
-                v-if="checkPermission(['wmaterial_pick'])"
-                type="primary"
-                @click="handlepick(scope)"
-              >
-                领半成品
-              </el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="subproductionplanList.count > 0"
-          :total="subproductionplanList.count"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.page_size"
-          @pagination="subproductionplanList"
-        />
-        <el-row :gutter="2">
-          <el-col :span="12">
-            <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                <span>半成品</span>
-              </div>
-              <el-button
-                v-for="item in steps"
-                v-show="checkPermission(['wmaterial_operation'])"
-                :key="item.number"
-                type="primary"
-                style="margin-left: 2px"
-                :label="item.name"
-                :value="item.number"
-                @click="handlework(item)"
-              >
-                {{ item.name }}
-              </el-button>
-              <el-button
-                v-show="checkPermission(['wp_scrap'])&&activeName==1"
-                id="scrap"
-                type="primary"
-                style="float: right;"
-                @click="handleScrapbcp()"
-              >
-                报废
-              </el-button>
-              <el-badge :value="count" class="item" style="float:right">
-                <el-button
-                  type="primary"
-                  @click="handleAll()"
+            <el-table-column type="index" width="50"/>
+            <el-table-column label="子计划编号" prop="number" min-width="100" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.plan_product_.name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="产品型号">
+              <template slot-scope="scope">
+                {{scope.row.product_.specification}}
+              </template>
+            </el-table-column>
+            <el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.product_.name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="名称" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.subproduction_.name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.workshop_.name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="子工序" min-width="160">
+              <template slot-scope="scope" v-if="scope.row.steps">
+                <el-tag
+                  v-for="item in scope.row.steps"
+                  :key="item.number"
+                  :label="item.name"
+                  :value="item.number"
                 >
-                  显示全部
-                </el-button>
-              </el-badge>
-              <el-table
-                border
-                fit
-                stripe
-                style="width: 100%"
-                max-height="300"
-                :data="wproductData"
-                @selection-change="handleSelectionChange"
+                  {{ item.name }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="开工时间" prop="start_date" width="100">
+            </el-table-column>
+            <el-table-column label="完工时间" prop="end_date" width="100">
+            </el-table-column>
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                {{ state_[scope.row.state] }}
+              </template>
+            </el-table-column>
+            <el-table-column label="领料状态" width="80">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
+                <el-tag v-else>已领料</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="计划/生产/合格">
+              <template slot-scope="scope">
+                {{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="80px"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-link
+                  v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked"
+                  type="success"
+                  @click="handleNeed(scope)"
+                >
+                  领料
+                </el-link>
+                <el-link
+                  v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked"
+                  type="success"
+                  @click="handleNeed(scope)"
+                >
+                  继续领料
+                </el-link>
+                <el-link
+                  v-if="checkPermission(['wmaterial_pick'])"
+                  type="primary"
+                  @click="handlepick(scope)"
+                >
+                  领半成品
+                </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="subproductionplanList.count > 0"
+            :total="subproductionplanList.count"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.page_size"
+            @pagination="subproductionplanList"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+    <el-card>
+      <el-row :gutter="2">
+        <el-col :span="12">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>半成品</span>
+            </div>
+            <el-button
+              v-for="item in steps"
+              v-show="checkPermission(['wmaterial_operation'])"
+              :key="item.number"
+              type="primary"
+              style="margin-left: 2px"
+              :label="item.name"
+              :value="item.number"
+              @click="handlework(item)"
+            >
+              {{ item.name }}
+            </el-button>
+            <el-button
+              v-show="checkPermission(['wp_scrap'])&&activeName==1"
+              id="scrap"
+              type="primary"
+              style="float: right;"
+              @click="handleScrapbcp()"
+            >
+              报废
+            </el-button>
+            <el-badge :value="count" class="item" style="float:right">
+              <el-button
+                type="primary"
+                @click="handleAll()"
               >
-                <el-table-column type="selection" width="40"></el-table-column>
-                <el-table-column type="index" width="50"/>
-                <el-table-column label="子计划编号" width="100" show-overflow-tooltip>
-                  <template slot-scope="scope">{{ scope.row.number }}</template>>
-                  <template slot-scope="scope">
-                    {{scope.row.subproduction_plan_.number}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="玻璃编号" prop="number" width="100" show-overflow-tooltip>
-                </el-table-column>
-                <el-table-column label="玻璃状态" width="100" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    {{scope.row.material_.name}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="所在子工序" width="100" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    {{scope.row.step_.name}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="进行状态" width="100" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    {{actstate_[scope.row.act_state]}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="不合格标记" width="100">
-                  <template slot-scope="scope">
-                    {{ ng_sign_[scope.row.ng_sign] }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="更新时间" prop="update_time" width="160">
-                </el-table-column>
-              </el-table>
-            </el-card>
-          </el-col>
-          <el-col :span="12">
-            <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                <span>车间物料</span>
-              </div>
-              <el-table
-                :data="wmaterialList"
-                border
-                fit
-                stripe
-                style="width: 100%"
-                max-height="300"
-              >
-                <el-table-column type="index" width="50"/>
-                <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    {{scope.row.subproduction_plan_.number }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="物料名称" min-width="130" show-overflow-tooltip>
-                  <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 prop="batch" label="物料批次">
-                </el-table-column>
-                <el-table-column prop="count" label="物料数量">
-                </el-table-column>
-              </el-table>
-            </el-card>
-          </el-col>
-        </el-row>
-      </el-tab-pane>
-    </el-tabs>
+                显示全部
+              </el-button>
+            </el-badge>
+            <el-table
+              border
+              fit
+              stripe
+              style="width: 100%"
+              :height="secondTableHeight"
+              :data="wproductData"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="40"></el-table-column>
+              <el-table-column type="index" width="50"/>
+              <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.number }}</template>>
+                <template slot-scope="scope">
+                  {{scope.row.subproduction_plan_.number}}
+                </template>
+              </el-table-column>
+              <el-table-column label="玻璃编号" prop="number" min-width="100" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column label="玻璃状态" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{scope.row.material_.name}}
+                </template>
+              </el-table-column>
+              <el-table-column label="所在子工序" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{scope.row.step_.name}}
+                </template>
+              </el-table-column>
+              <el-table-column label="进行状态" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{actstate_[scope.row.act_state]}}
+                </template>
+              </el-table-column>
+              <el-table-column label="不合格标记" min-width="100">
+                <template slot-scope="scope">
+                  {{ ng_sign_[scope.row.ng_sign] }}
+                </template>
+              </el-table-column>
+              <el-table-column label="更新时间" prop="update_time" min-width="160">
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>车间物料</span>
+            </div>
+            <el-table
+              :data="wmaterialList"
+              border
+              fit
+              stripe
+              style="width: 100%"
+              :height="tableHeight"
+            >
+              <el-table-column type="index" width="50"/>
+              <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{scope.row.subproduction_plan_.number }}
+                </template>
+              </el-table-column>
+              <el-table-column label="物料名称" min-width="130" show-overflow-tooltip>
+                <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 prop="batch" label="物料批次">
+              </el-table-column>
+              <el-table-column prop="count" label="物料数量">
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
     <el-dialog
       title="半成品报废"
       :close-on-click-modal="false"
@@ -781,7 +785,6 @@
           4: "已完成",
         },
         listLoading: true,
-        listLoading: true,
         id: "",
         dialogTableVisible: false,
         dialogVisible: false,
@@ -828,6 +831,8 @@
           {lable: "其他", value: 40},
         ],
         count: null,
+        tableHeight: null,
+        secondTableHeight: null,
       };
     },
     process: "",
@@ -1187,5 +1192,11 @@
         });
       },
     },
+    mounted() {
+      let H = document.getElementsByClassName('app-main')[0].clientHeight;
+      let h = H/2-85;
+      this.tableHeight = h+'px';
+      this.secondTableHeight = h-36+'px';
+    }
   };
 </script>