diff --git a/src/views/plan/plan/index.vue b/src/views/plan/plan/index.vue
index d24b596c..0066858d 100644
--- a/src/views/plan/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -793,6 +793,7 @@ export default {
           this.workOrderList = []
           this.selectProductList = null
           this.newWorkOrderList = []
+          this.bmsList = []
           this.bmapId = null
           // 初始化数据
           this.form.planTime = new Date()
@@ -827,6 +828,14 @@ export default {
     },
     /** 修改-提交按钮 */
     updateForm() {
+      // 必须全部修改
+      if (this.wetMaterialPlanList.length>0){
+        this.$message({
+          message: '计划要全部重新分配完！',
+          type: 'warning'
+        })
+        return
+      }
       // 校验数据判断newList是否为空
       if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null) {
         this.$message({
@@ -836,6 +845,7 @@ export default {
         return
       }
 
+      // 更新表数据
       updatePlanDetail(this.newWorkOrderList).then(response => {
         if (response.code === 200) {
           this.$message({
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 6eec0daa..db6ac43a 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -67,14 +67,16 @@
 					end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="班次" prop="shiftId">
-				<el-input
-					v-model="queryParams.shiftId"
-					placeholder="请输入班次"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+      <el-form-item label="班次" prop="shiftId">
+        <el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable>
+          <el-option
+            v-for="dict in dict.type.shift_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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>
@@ -162,7 +164,11 @@
 					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="班次" align="center" prop="shiftId" />
+      <el-table-column label="班次" align="center" prop="shiftId">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.shift_type" :value="scope.row.shiftId"/>
+        </template>
+      </el-table-column>
 			<el-table-column label="工单状态" align="center" prop="status" >
 				<template slot-scope="scope">
 					<dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
@@ -235,11 +241,19 @@
           <el-col :span="6">
             <!-- 选择班次 -->
             <el-form-item size="small" label="选择班次:" class="my-select my-first">
-              <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次">
-                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
-                           :value="item.shiftId"
-                ></el-option>
+              <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次" clearable>
+                <el-option
+                  v-for="dict in dict.type.shift_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
+<!--              <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次">-->
+<!--                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"-->
+<!--                           :value="item.shiftId"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
             </el-form-item>
           </el-col>
           <el-col :offset="2" :span="6">
@@ -325,7 +339,7 @@ import moment from 'moment';
 import { getprodLineShift } from '@/api/plan/order'
 export default {
 	name: "Workorder",
-	dicts: ['product_type','workorder_type'],
+	dicts: ['product_type','workorder_type','shift_type'],
 	data() {
 		return {
       // 工单修改form