diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 31f1d13c..87c0042e 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -56,8 +56,8 @@
             <span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
           </el-form-item>
         </el-col>
-        <!-- <el-col :md="12" :sm="24">
-          <el-form-item label="班次" prop="material">
+        <el-col :md="12" :sm="24">
+          <el-form-item label="班次" prop="shift">
             <el-select
               v-model="form.shift"
               placeholder="班次"
@@ -72,7 +72,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="批次号" width="100">
             <el-input
@@ -83,7 +83,7 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="数量" width="100">
+          <el-form-item label="数量(桶数)" width="100">
             <el-input-number
               v-model="form.count_real"
               controls-position="right"
@@ -97,7 +97,7 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="重量" width="100">
+          <el-form-item label="每桶kg" width="100">
             <el-input-number
               v-model="form.count_real_eweight"
               controls-position="right"
@@ -190,6 +190,23 @@
             <span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
           </el-form-item>
         </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="班次" prop="shift">
+            <el-select
+              v-model="form.shift"
+              placeholder="班次"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in shiftOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="合格数">
             <el-input-number
@@ -1141,7 +1158,7 @@ export default {
   },
   methods: {
     routeChange(item) {
-      this.form.material = item.material_out
+      this.form.material_out = item.material_out
       this.form.material_in = item.material_in
       this.form.mgroup = item.mgroup
       this.getWorkShopMaterial();
@@ -1168,15 +1185,12 @@ export default {
     },
     getShiftOptions() {
       let req_dict = {page: 0}
+      console.log(this.mgroupShiftRule)
       if(this.mgroupShiftRule != null && this.mgroupShiftRule != undefined){
         req_dict.rule = this.mgroupShiftRule
       }
       this.$API.mtm.shift.list.req(req_dict).then((res) => {
-        if(res.length==1){
-          this.form.shift = res[0].id
-        }else{
           this.shiftOptions = res
-        }
       });
     },
     getUserList() {