diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 5253088a..d0ab1496 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -175,6 +175,36 @@
 						>
 					</el-form-item>
 				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="批次号" prop="material_in">
+						<el-select
+							v-model="form.batch"
+							placeholder="批次号"
+							filterable
+							clearable
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in wMaterialOptions"
+								:key="item.batch"
+								:label="item.batch"
+								:value="item.batch"
+							>
+								<div
+									style="
+										display: flex;
+										justify-content: space-between;
+									"
+								>
+									<span>{{ item.batch }}</span>
+									<span style="color: #aaaaaa">{{
+										item.count
+									}}</span>
+								</div>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
 				<el-col :md="12" :sm="24">
 					<el-form-item label="班次" prop="shift">
 						<el-select
@@ -218,36 +248,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24">
-					<el-form-item label="批次号" prop="material_in">
-						<el-select
-							v-model="form.batch"
-							placeholder="批次号"
-							filterable
-							clearable
-							style="width: 100%"
-						>
-							<el-option
-								v-for="item in wMaterialOptions"
-								:key="item.batch"
-								:label="item.batch"
-								:value="item.batch"
-							>
-								<div
-									style="
-										display: flex;
-										justify-content: space-between;
-									"
-								>
-									<span>{{ item.batch }}</span>
-									<span style="color: #aaaaaa">{{
-										item.count
-									}}</span>
-								</div>
-							</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
+
 				<el-col :md="12" :sm="24">
 					<el-form-item label="退火时间" prop="material">
 						<el-date-picker
@@ -1274,14 +1275,12 @@ export default {
 					this.form.count_n_qx;
 			} else if (this.activeType == "退火") {
 				this.form.count_notok =
-					this.form.count_n_wq +
-					this.form.count_n_tw +
-					this.form.count_n_dl +
-					this.form.count_n_pb +
-					this.form.count_n_dxt +
+					this.form.count_n_xzp +
+					this.form.count_n_thhs +
+					this.form.count_n_hs +
 					this.form.count_n_js +
 					this.form.count_n_qx +
-					this.form.count_n_xzp;
+					this.form.count_n_qt;
 				this.form.count_real =
 					this.form.count_ok + this.form.count_notok;
 				this.form.count_use = this.form.count_real;
@@ -1334,14 +1333,12 @@ export default {
 					} else if (this.activeType == "退火") {
 						// this.form.mgroup = "3428194648706011136";
 						this.form.count_notok =
-							this.form.count_n_wq +
-							this.form.count_n_tw +
-							this.form.count_n_dl +
-							this.form.count_n_pb +
-							this.form.count_n_dxt +
+							this.form.count_n_xzp +
+							this.form.count_n_thhs +
+							this.form.count_n_hs +
 							this.form.count_n_js +
 							this.form.count_n_qx +
-							this.form.count_n_xzp;
+							this.form.count_n_qt;
 						this.form.count_real =
 							this.form.count_ok + this.form.count_notok;
 						this.form.count_use = this.form.count_real;