diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index d3bd5717..56c9444f 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -6,282 +6,312 @@
 		style="width: 90%;"
 		@closed="$emit('closed')"
 	>
-		<el-container v-loading="loading">
-			<el-main style="padding: 0">
-				<el-form
-					ref="dialogForm"
-					:model="form"
-					:rules="rules"
-					label-position="right"
-					label-width="100px"
-					style="padding: 0"
-				>
-					<el-row>
-						<el-col v-if="route==null&&!is_fix">
-							<el-form-item label="工艺步骤">
-								<el-select
-									v-model="form.route"
-									placeholder="工艺步骤"
-									clearable
-									filterable
-									style="width: 100%"
-									@change="changeRoute"
-								>
-									<el-option
-										v-for="item in routeOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									>
-										<span>[{{ item.routepack_name }}]{{ item.name }}</span>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col>
-							<el-form-item label="批次号" prop="wm_in">
-								<xtSelect
-									:apiObj="apiObj"
-									:params="params"
-									v-model="form.wm_in"
-									:labelField="'batch'"
-									v-model:obj="materialrow"
-									v-model:label="form.batch"
-									style="width:100%"
-                                    @change="materialChange"
-								>
-									<el-table-column label="批次号" prop="batch"></el-table-column>
-									<el-table-column label="名称" prop="material_name"></el-table-column>
-									<el-table-column label="数量" prop="count"></el-table-column>
-									<el-table-column label="不良项" prop="defect_name"></el-table-column>
-								</xtSelect>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="班组">
-								<el-select
-									v-model="form.team"
-									placeholder="班组"
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-									@change="teamChange"
-								>
-									<el-option
-										v-for="item in teamOptions"
-										: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-select
-									v-model="form.equipment"
-									placeholder="生产设备"
-									clearable
-									filterable
-									class="width100"
-								>
-									<el-option
-										v-for="item in options"
-										:key="item.id"
-										:label="item.label"
-										:value="item.id"
-									>
-									<span style="float:left">{{item.name}}</span>
-									<span style="float:right">{{item.number}}</span>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<!-- 操作员多选 -->
-						<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
-							<el-form-item label="操作员">
-								<el-select
-									v-model="form.handle_users"
-									placeholder="操作员"
-									clearable
-									filterable
-									multiple
-									class="width100"
-									@change="handleUsersChange"
-								>
-									<el-option
-										v-for="item in userList"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-else>
-							<el-form-item label="操作员">
-								<el-select
-									v-model="form.handle_user"
-									placeholder="操作员"
-									clearable
-									filterable
-									class="width100"
-								>
-									<el-option
-										v-for="item in userList"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
-							<el-form-item :label="item.name">
-								<el-input-number
-									v-if="item.field_type=='input-number'"
-									v-model="item.value"
-									:min="0"
-									class="width-100"
-									controls-position="right"
-								>
-								</el-input-number>
-								<el-input-number
-									v-if="item.field_type=='input-int'"
-									v-model="item.value"
-									:min="0"
-									class="width-100"
-									controls-position="right"
-								>
-								</el-input-number>
-								<el-input
-									v-if="item.field_type=='input-text'"
-									v-model="item.value"
-									class="width-100"
-								>
-								</el-input>
-								<el-select
-									v-if="item.field_type=='select-text'"
-									v-model="item.value"
-									clearable
-									class="width-100"
-								>
-									<el-option
-										v-for="item0 in item.choices"
-										:key="item0"
-										:label="item0"
-										:value="item0"
-									>
-									</el-option>
-								</el-select>
-								<el-select
-									v-if="item.field_type=='selects-text'"
-									v-model="item.value"
-									clearable
-									multiple
-									class="width-100"
-								>
-									<el-option
-										v-for="item1 in item.choices"
-										:key="item1"
-										:label="item1"
-										:value="item1"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
-							<el-form-item label="批次序号">
-								<el-input-number
-									v-model="form.index"
-									:min="0"
-									:max="99"
-									placeholder="第几炉,追加到批次"
-									style="width: 100%"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item
-								label="开始时间"
-								prop="work_start_time"
+		<el-form
+			ref="dialogForm"
+			:model="form"
+			:rules="rules"
+			label-position="right"
+			label-width="100px"
+			style="padding: 0"
+		>
+			<el-row>
+				<el-col v-if="route==null&&!is_fix">
+					<el-form-item label="工艺步骤">
+						<el-select
+							v-model="form.route"
+							placeholder="工艺步骤"
+							clearable
+							filterable
+							style="width: 100%"
+							@change="changeRoute"
+						>
+							<el-option
+								v-for="item in routeOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
 							>
-								<el-date-picker
-									v-model="form.work_start_time"
-									type="datetime"
-									value-format="YYYY-MM-DD HH:mm:ss"
-									style="width: 100%"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="领用数量">
+								<span>[{{ item.routepack_name }}]{{ item.name }}</span>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col>
+					<el-form-item label="批次号" prop="wm_in">
+						<xtSelect
+							:apiObj="apiObj"
+							:params="params"
+							v-model="form.wm_in"
+							:labelField="'batch'"
+							v-model:obj="materialrow"
+							v-model:label="form.batch"
+							style="width:100%"
+							@change="materialChange"
+						>
+							<el-table-column label="批次号" prop="batch"></el-table-column>
+							<el-table-column label="名称" prop="material_name"></el-table-column>
+							<el-table-column label="数量" prop="count"></el-table-column>
+							<el-table-column label="不良项" prop="defect_name"></el-table-column>
+						</xtSelect>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="班组">
+						<el-select
+							v-model="form.team"
+							placeholder="班组"
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+							@change="teamChange"
+						>
+							<el-option
+								v-for="item in teamOptions"
+								: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-select
+							v-model="form.equipment"
+							placeholder="生产设备"
+							clearable
+							filterable
+							class="width100"
+						>
+							<el-option
+								v-for="item in options"
+								:key="item.id"
+								:label="item.label"
+								:value="item.id"
+							>
+							<span style="float:left">{{item.name}}</span>
+							<span style="float:right">{{item.number}}</span>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<!-- 操作员多选 -->
+				<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
+					<el-form-item label="操作员">
+						<el-select
+							v-model="form.handle_users"
+							placeholder="操作员"
+							clearable
+							filterable
+							multiple
+							class="width100"
+							@change="handleUsersChange"
+						>
+							<el-option
+								v-for="item in userList"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-else>
+					<el-form-item label="操作员">
+						<el-select
+							v-model="form.handle_user"
+							placeholder="操作员"
+							clearable
+							filterable
+							class="width100"
+						>
+							<el-option
+								v-for="item in userList"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
+					<el-form-item :label="item.name">
+						<el-input-number
+							v-if="item.field_type=='input-number'"
+							v-model="item.value"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+						>
+						</el-input-number>
+						<el-input-number
+							v-if="item.field_type=='input-int'"
+							v-model="item.value"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+						>
+						</el-input-number>
+						<el-input
+							v-if="item.field_type=='input-text'"
+							v-model="item.value"
+							class="width-100"
+						>
+						</el-input>
+						<el-select
+							v-if="item.field_type=='select-text'"
+							v-model="item.value"
+							clearable
+							class="width-100"
+						>
+							<el-option
+								v-for="item0 in item.choices"
+								:key="item0"
+								:label="item0"
+								:value="item0"
+							>
+							</el-option>
+						</el-select>
+						<el-select
+							v-if="item.field_type=='selects-text'"
+							v-model="item.value"
+							clearable
+							multiple
+							class="width-100"
+						>
+							<el-option
+								v-for="item1 in item.choices"
+								:key="item1"
+								:label="item1"
+								:value="item1"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
+					<el-form-item label="批次序号">
+						<el-input-number
+							v-model="form.index"
+							:min="0"
+							:max="99"
+							placeholder="第几炉,追加到批次"
+							style="width: 100%"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item
+						label="开始时间"
+						prop="work_start_time"
+					>
+						<el-date-picker
+							v-model="form.work_start_time"
+							type="datetime"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="领用数量">
+						<el-input-number
+							v-model="form.count_use"
+							:min="0"
+							controls-position="right"
+							class="width100"
+							@change = "countUseChange"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="加工前不良" prop="count_pn_jgqbl">
+						<el-input-number
+							v-model="form.count_pn_jgqbl"
+							:min="0"
+							class="width100"
+							:disabled="true"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="实际生产数">
+						<el-input-number
+							v-model="form.count_real"
+							:min="0"
+							class="width100"
+							controls-position="right"
+							:disabled="true"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="合格数量">
+						<el-input-number
+							v-model="form.count_ok"
+							class="width100"
+							:disabled="true"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="不合格数量">
+						<el-input-number
+							v-model="form.count_notok"
+							:disabled="true"
+							class="width100"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="备注">
+						<el-input
+							v-model="form.note"
+							clearable
+						></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-divider></el-divider>
+			<el-row v-if="is_fix">
+				<el-col style="padding-left: 10px;">不良记录</el-col>
+				<el-col :md="6" :sm="12" v-for="item in qct_defects" :key="item.id">
+					<el-form-item :label="item.defect_name">
+						<el-input-number
+							v-model="defectform[item.defect_name]"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+							@change="countChange"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row v-else>
+				<el-col :span=12>
+					<el-col>加工前不良</el-col>
+					<el-row style="width: 98%;">
+						<el-col :md="12" :sm="24" v-for="item in qct_indefects" :key="item.id">
+							<el-form-item :label="item.defect_name">
 								<el-input-number
-									v-model="form.count_use"
+									v-model="defectinform[item.defect_name]"
 									:min="0"
+									style="width:100%"
 									controls-position="right"
-									class="width100"
-									@change = "countUseChange"
+									@change="countinChange"
 								/>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="加工前不良" prop="count_pn_jgqbl">
-								<el-input-number
-									v-model="form.count_pn_jgqbl"
-									:min="0"
-									class="width100"
-									:disabled="true"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="实际生产数">
-								<el-input-number
-									v-model="form.count_real"
-									:min="0"
-									class="width100"
-									controls-position="right"
-									:disabled="true"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="合格数量">
-								<el-input-number
-									v-model="form.count_ok"
-									class="width100"
-									:disabled="true"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="不合格数量">
-								<el-input-number
-									v-model="form.count_notok"
-									:disabled="true"
-									class="width100"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="备注">
-								<el-input
-									v-model="form.note"
-									clearable
-								></el-input>
-							</el-form-item>
-						</el-col>
 					</el-row>
-					<el-divider></el-divider>
-					<el-row v-if="is_fix">
-						<el-col style="padding-left: 10px;">不良记录</el-col>
-						<el-col :md="6" :sm="12" v-for="item in qct_defects" :key="item.id">
+				</el-col>
+				<el-col :span=12 style="border-left:dotted 1px #ccc;">
+					<el-col style="padding-left: 10px;">本工段不良</el-col>
+					<el-row style="width: 98%;">
+						<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
 							<el-form-item :label="item.defect_name">
 								<el-input-number
 									v-model="defectform[item.defect_name]"
@@ -293,49 +323,15 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					<el-row v-else>
-						<el-col :span=12>
-							<el-col>加工前不良</el-col>
-							<el-row style="width: 98%;">
-								<el-col :md="12" :sm="24" v-for="item in qct_indefects" :key="item.id">
-									<el-form-item :label="item.defect_name">
-										<el-input-number
-											v-model="defectinform[item.defect_name]"
-											:min="0"
-											style="width:100%"
-											controls-position="right"
-											@change="countinChange"
-										/>
-									</el-form-item>
-								</el-col>
-							</el-row>
-						</el-col>
-						<el-col :span=12 style="border-left:dotted 1px #ccc;">
-							<el-col style="padding-left: 10px;">本工段不良</el-col>
-							<el-row style="width: 98%;">
-								<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
-									<el-form-item :label="item.defect_name">
-										<el-input-number
-											v-model="defectform[item.defect_name]"
-											:min="0"
-											class="width-100"
-											controls-position="right"
-											@change="countChange"
-										/>
-									</el-form-item>
-								</el-col>
-							</el-row>
-						</el-col>
-					</el-row>
-				</el-form>
-			</el-main>
-			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit"
-					>保存</el-button
-				>
-				<el-button @click="visible = false">取消</el-button>
-			</el-footer>
-		</el-container>
+				</el-col>
+			</el-row>
+		</el-form>
+		<el-footer>
+			<el-button type="primary" :loading="isSaveing" @click="submit"
+				>保存</el-button
+			>
+			<el-button @click="visible = false">取消</el-button>
+		</el-footer>
 	</el-dialog>
 </template>
 
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index ba0fede9..3cebe28e 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -6,265 +6,261 @@
 		style="width: 80%;"
 		@closed="$emit('closed')"
 	>
-		<el-container v-loading="loading">
-			<el-main style="padding: 0 20px 20px 20px">
-				<el-form
-					ref="dialogForm"
-					:model="form"
-					:rules="rules"
-					label-position="right"
-					label-width="80px"
-					style="padding: 0 10px"
-				>
-					<el-row>
-						<el-col :md="12" :sm="24" v-if="mgroupMtype == 20">
-							<el-form-item
-								label="外协单位"
-								prop="supplier"
+		<el-form
+			ref="dialogForm"
+			:model="form"
+			:rules="rules"
+			label-position="right"
+			label-width="80px"
+			style="padding: 0 10px"
+		>
+			<el-row>
+				<el-col :md="12" :sm="24" v-if="mgroupMtype == 20">
+					<el-form-item
+						label="外协单位"
+						prop="supplier"
+					>
+						<el-select
+							v-model="form.supplier"
+							placeholder="外协单位"
+							clearable
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in supplierOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="mlogtype!=='rework'">
+					<el-form-item label="工艺步骤">
+						<el-select
+							v-model="form.route"
+							placeholder="工艺步骤"
+							clearable
+							filterable
+							style="width: 100%"
+							:disabled="mode == 'edit'"
+						>
+							<el-option
+								v-for="item in routeOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
 							>
-								<el-select
-									v-model="form.supplier"
-									placeholder="外协单位"
-									clearable
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in supplierOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="mlogtype!=='rework'">
-							<el-form-item label="工艺步骤">
-								<el-select
-									v-model="form.route"
-									placeholder="工艺步骤"
-									clearable
-									filterable
-									style="width: 100%"
-									:disabled="mode == 'edit'"
-								>
-									<el-option
-										v-for="item in routeOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									>
-									<span>[{{ item.routepack_name }}]{{ item.name }}</span>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="班组">
-								<el-select
-									v-model="form.team"
-									placeholder="班组"
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in teamOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
-							<el-form-item label="批次序号">
-								<el-input-number
-									v-model="form.index"
-									:min="0"
-									:max="99"
-									placeholder="第几炉,追加到批次"
-									style="width: 100%"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item
-								label="开始时间"
-								prop="work_start_time"
+							<span>[{{ item.routepack_name }}]{{ item.name }}</span>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="班组">
+						<el-select
+							v-model="form.team"
+							placeholder="班组"
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in teamOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
 							>
-								<el-date-picker
-									:disabled="mode == 'edit'"
-									v-model="form.work_start_time"
-									type="datetime"
-									value-format="YYYY-MM-DD HH:mm:ss"
-									style="width: 100%"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="mode == 'edit'">
-							<el-form-item label="结束时间" prop="work_end_time">
-								<el-date-picker
-									v-model="form.work_end_time"
-									type="datetime"
-									:disabledDate="disabledDateFn"
-									value-format="YYYY-MM-DD HH:mm:ss"
-									style="width: 100%"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'">
-							<el-form-item label="操作人">
-								<el-select
-									v-model="form.handle_users"
-									placeholder="操作人"
-									clearable
-									filterable
-									multiple
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-									@change="handleUsersChange"
-								>
-									<el-option
-										v-for="item in userOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-else>
-							<el-form-item label="操作人">
-								<el-select
-									v-model="form.handle_user"
-									placeholder="操作人"
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-									filterable
-								>
-									<el-option
-										v-for="item in userOptions"
-										: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-select
-									v-model="form.equipment"
-									placeholder="生产设备"
-									clearable
-									filterable
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in options"
-										:key="item.id"
-										:label="item.label"
-										:value="item.id"
-									>
-									<span style="float:left">{{item.name}}</span>
-									<span style="float:right">{{item.number}}</span>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<!-- 黑化 -->
-						<el-col :md="12" :sm="24" 	v-if="mgroupName=='黑化'">
-							<el-form-item label="检验文件">
-								<sc-upload-file
-									v-model="fileList"
-									:multiple="false"
-									:limit="1"
-									:accept="['.xlsx', '.xls']"
-									@success = "fileUPSuccess"
-									>
-									<el-button type="primary" icon="el-icon-upload"> </el-button>
-								</sc-upload-file>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :md="8" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
-							<el-form-item :label="item.name">
-								<el-input-number
-									v-if="item.field_type=='input-number'"
-									v-model="item.value"
-									:min="0"
-									class="width-100"
-									controls-position="right"
-								>
-								</el-input-number>
-								<el-input-number
-									v-if="item.field_type=='input-int'"
-									v-model="item.value"
-									:min="0"
-									class="width-100"
-									controls-position="right"
-								>
-								</el-input-number>
-								<el-input
-									v-if="item.field_type=='input-text'"
-									v-model="item.value"
-									class="width-100"
-								>
-								</el-input>
-								<el-select
-									v-if="item.field_type=='select-text'"
-									v-model="item.value"
-									clearable
-									class="width-100"
-								>
-									<el-option
-										v-for="item0 in item.choices"
-										:key="item0"
-										:label="item0"
-										:value="item0"
-									>
-									</el-option>
-								</el-select>
-								<el-select
-									v-if="item.field_type=='selects-text'"
-									v-model="item.value"
-									clearable
-									multiple
-									class="width-100"
-								>
-									<el-option
-										v-for="item1 in item.choices"
-										:key="item1"
-										:label="item1"
-										:value="item1"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="备注">
-								<el-input
-									v-model="form.note"
-									clearable
-								></el-input>
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-			</el-main>
-			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-				<el-button @click="visible = false">取消</el-button>
-			</el-footer>
-		</el-container>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
+					<el-form-item label="批次序号">
+						<el-input-number
+							v-model="form.index"
+							:min="0"
+							:max="99"
+							placeholder="第几炉,追加到批次"
+							style="width: 100%"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item
+						label="开始时间"
+						prop="work_start_time"
+					>
+						<el-date-picker
+							:disabled="mode == 'edit'"
+							v-model="form.work_start_time"
+							type="datetime"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="mode == 'edit'">
+					<el-form-item label="结束时间" prop="work_end_time">
+						<el-date-picker
+							v-model="form.work_end_time"
+							type="datetime"
+							:disabledDate="disabledDateFn"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'">
+					<el-form-item label="操作人">
+						<el-select
+							v-model="form.handle_users"
+							placeholder="操作人"
+							clearable
+							filterable
+							multiple
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+							@change="handleUsersChange"
+						>
+							<el-option
+								v-for="item in userOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-else>
+					<el-form-item label="操作人">
+						<el-select
+							v-model="form.handle_user"
+							placeholder="操作人"
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+							filterable
+						>
+							<el-option
+								v-for="item in userOptions"
+								: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-select
+							v-model="form.equipment"
+							placeholder="生产设备"
+							clearable
+							filterable
+							:disabled="mode == 'edit'"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in options"
+								:key="item.id"
+								:label="item.label"
+								:value="item.id"
+							>
+							<span style="float:left">{{item.name}}</span>
+							<span style="float:right">{{item.number}}</span>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<!-- 黑化 -->
+				<el-col :md="12" :sm="24" 	v-if="mgroupName=='黑化'">
+					<el-form-item label="检验文件">
+						<sc-upload-file
+							v-model="fileList"
+							:multiple="false"
+							:limit="1"
+							:accept="['.xlsx', '.xls']"
+							@success = "fileUPSuccess"
+							>
+							<el-button type="primary" icon="el-icon-upload"> </el-button>
+						</sc-upload-file>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row>
+				<el-col :md="8" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
+					<el-form-item :label="item.name">
+						<el-input-number
+							v-if="item.field_type=='input-number'"
+							v-model="item.value"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+						>
+						</el-input-number>
+						<el-input-number
+							v-if="item.field_type=='input-int'"
+							v-model="item.value"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+						>
+						</el-input-number>
+						<el-input
+							v-if="item.field_type=='input-text'"
+							v-model="item.value"
+							class="width-100"
+						>
+						</el-input>
+						<el-select
+							v-if="item.field_type=='select-text'"
+							v-model="item.value"
+							clearable
+							class="width-100"
+						>
+							<el-option
+								v-for="item0 in item.choices"
+								:key="item0"
+								:label="item0"
+								:value="item0"
+							>
+							</el-option>
+						</el-select>
+						<el-select
+							v-if="item.field_type=='selects-text'"
+							v-model="item.value"
+							clearable
+							multiple
+							class="width-100"
+						>
+							<el-option
+								v-for="item1 in item.choices"
+								:key="item1"
+								:label="item1"
+								:value="item1"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="备注">
+						<el-input
+							v-model="form.note"
+							clearable
+						></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<el-footer>
+			<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+			<el-button @click="visible = false">取消</el-button>
+		</el-footer>
 	</el-dialog>
 </template>
 
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index d3bf8cba..8f98c24a 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -6,185 +6,181 @@
 		destroy-on-close
 		@closed="$emit('closed')"
 	>
-		<el-container v-loading="loading">
-			<el-main style="padding: 0 0 20px 0">
-				<el-form
-					ref="dialogForm"
-					:model="form"
-					:rules="rules"
-					label-position="right"
-					label-width="100px"
-				>
-					<el-row>
-						<el-col v-if="!hasRoute&&!is_fix">
-							<el-form-item label="工艺步骤" prop="route">
-								<el-select
-									v-model="form.route"
-									placeholder="工艺步骤"
-									clearable
-									filterable
-									style="width: 100%"
-									:disabled="mode == 'edit'"
-									@change="routeChange"
-								>
-									<el-option
-										v-for="item in routeOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									>
-									<span>[{{ item.routepack_name }}]{{ item.name }}</span>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col>
-							<el-form-item label="批次号" prop="wm_in">
-								<xtSelect
-									:apiObj="apiObjM"
-									v-model="form.wm_in"
-									v-model:obj="selectObj"
-									v-model:label="wmInLabel"
-									:labelField="'batch'"
-									style="width: 100%;"
-									:params = "paramsM"
-									@change="materialBatchChange"
-								>
-									<!-- :params = "{type__in: '10,20',is_hidden: false}" -->
-									<el-table-column label="物料" prop="full_name">
-										<template #default="scope">
-											<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
-											<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
-											<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
-											<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
-										</template>
-									</el-table-column>
-									<el-table-column label="车间库存" prop="count" width="110px"></el-table-column>
-									<el-table-column label="可用数量" prop="count_cando" width="110px"></el-table-column>
-								</xtSelect>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="关联任务">
-								<el-select
-									v-model="form.mtask"
-									placeholder="关联任务"
-									clearable
-									style="width: 100%"
-									@change="getMaterial"
-								>
-									<el-option
-										v-for="item in options"
-										:key="item.id"
-										:label="item.number"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						
-						<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
-							<el-form-item label="进炉数">
-								<el-input-number
-									v-model="batch_count"
-									class="width-100"
-									:disabled="true"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item :label="mgroupMtype==10?'领用数量':'批次总数'">
-								<el-input-number
-									v-model="form.count_use"
-									:max="selectObj.count_cando"
-									:min="0"
-									class="width-100"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="mgroupMtype==10">
-							<el-form-item label="加工前不良" prop="count_pn_jgqbl">
-								<el-input-number
-									v-model="form.count_pn_jgqbl"
-									:min="0"
-									:disabled="true"
-									style="width: 100%"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="备注">
-								<el-input v-model="form.note"/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-divider v-if="(mgroupName=='黑化'||mgroupName=='退火')&&cellsList.length>0"></el-divider>
-					<el-button 
-						v-if="mgroupName=='黑化'||mgroupName=='退火'" 
-						icon="el-icon-plus"
-						type="primary"
-						@click="cellsAdd"
-					></el-button>
-					<template v-if="mgroupName=='黑化'||mgroupName=='退火'">
-						<el-row v-for="(item,$index) in cellsList" :key="item">
-							<el-col style="display: flex;">
-								<el-form-item label="第" label-width="50">
-									<el-input-number
-										v-model="item.start"
-										:min="1"
-										placeholder="层数"
-										controls-position="right"
-									/>
-								</el-form-item>
-								<el-form-item label="层到第" label-width="65">
-									<el-input-number
-										v-model="item.end"
-										:min="1"
-										placeholder="层数"
-										controls-position="right"
-									/>
-								</el-form-item>
-								<el-form-item label="层，总数:" label-width="80">
-									<el-input-number
-									v-model="item.count_t"
-									:min="0"
-									placeholder="总数量"
-									controls-position="right"
-									@change="countTotalChange"
-									/>
-								</el-form-item>
-								<el-button
-									type="danger" 
-									style="margin: 0 20px;" 
-									@click="cellsDel($index)">删除</el-button>
-							</el-col>
-						</el-row>
-					</template>
-					<el-divider v-if="qct_defects.length>0"></el-divider>
-					<el-row>
-						<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
-							<el-form-item :label="item.defect_name">
-								<el-input-number
-									v-model="defectform[item.defect_name]"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-									@change="countChange"
-								/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-			</el-main>
-			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-				<el-button @click="visible = false">取消</el-button>
-			</el-footer>
-		</el-container>
+		<el-form
+			ref="dialogForm"
+			:model="form"
+			:rules="rules"
+			label-position="right"
+			label-width="100px"
+		>
+			<el-row>
+				<el-col v-if="!hasRoute&&!is_fix">
+					<el-form-item label="工艺步骤" prop="route">
+						<el-select
+							v-model="form.route"
+							placeholder="工艺步骤"
+							clearable
+							filterable
+							style="width: 100%"
+							:disabled="mode == 'edit'"
+							@change="routeChange"
+						>
+							<el-option
+								v-for="item in routeOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							>
+							<span>[{{ item.routepack_name }}]{{ item.name }}</span>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col>
+					<el-form-item label="批次号" prop="wm_in">
+						<xtSelect
+							:apiObj="apiObjM"
+							v-model="form.wm_in"
+							v-model:obj="selectObj"
+							v-model:label="wmInLabel"
+							:labelField="'batch'"
+							style="width: 100%;"
+							:params = "paramsM"
+							@change="materialBatchChange"
+						>
+							<!-- :params = "{type__in: '10,20',is_hidden: false}" -->
+							<el-table-column label="物料" prop="full_name">
+								<template #default="scope">
+									<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
+									<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
+									<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
+									<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
+								</template>
+							</el-table-column>
+							<el-table-column label="车间库存" prop="count" width="110px"></el-table-column>
+							<el-table-column label="可用数量" prop="count_cando" width="110px"></el-table-column>
+						</xtSelect>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="关联任务">
+						<el-select
+							v-model="form.mtask"
+							placeholder="关联任务"
+							clearable
+							style="width: 100%"
+							@change="getMaterial"
+						>
+							<el-option
+								v-for="item in options"
+								:key="item.id"
+								:label="item.number"
+								:value="item.id"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
+					<el-form-item label="进炉数">
+						<el-input-number
+							v-model="batch_count"
+							class="width-100"
+							:disabled="true"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item :label="mgroupMtype==10?'领用数量':'批次总数'">
+						<el-input-number
+							v-model="form.count_use"
+							:max="selectObj.count_cando"
+							:min="0"
+							class="width-100"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="mgroupMtype==10">
+					<el-form-item label="加工前不良" prop="count_pn_jgqbl">
+						<el-input-number
+							v-model="form.count_pn_jgqbl"
+							:min="0"
+							:disabled="true"
+							style="width: 100%"
+							controls-position="right"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="备注">
+						<el-input v-model="form.note"/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-divider v-if="(mgroupName=='黑化'||mgroupName=='退火')&&cellsList.length>0"></el-divider>
+			<el-button 
+				v-if="mgroupName=='黑化'||mgroupName=='退火'" 
+				icon="el-icon-plus"
+				type="primary"
+				@click="cellsAdd"
+			></el-button>
+			<template v-if="mgroupName=='黑化'||mgroupName=='退火'">
+				<el-row v-for="(item,$index) in cellsList" :key="item">
+					<el-col style="display: flex;">
+						<el-form-item label="第" label-width="50">
+							<el-input-number
+								v-model="item.start"
+								:min="1"
+								placeholder="层数"
+								controls-position="right"
+							/>
+						</el-form-item>
+						<el-form-item label="层到第" label-width="65">
+							<el-input-number
+								v-model="item.end"
+								:min="1"
+								placeholder="层数"
+								controls-position="right"
+							/>
+						</el-form-item>
+						<el-form-item label="层，总数:" label-width="80">
+							<el-input-number
+							v-model="item.count_t"
+							:min="0"
+							placeholder="总数量"
+							controls-position="right"
+							@change="countTotalChange"
+							/>
+						</el-form-item>
+						<el-button
+							type="danger" 
+							style="margin: 0 20px;" 
+							@click="cellsDel($index)">删除</el-button>
+					</el-col>
+				</el-row>
+			</template>
+			<el-divider v-if="qct_defects.length>0"></el-divider>
+			<el-row>
+				<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
+					<el-form-item :label="item.defect_name">
+						<el-input-number
+							v-model="defectform[item.defect_name]"
+							:min="0"
+							style="width: 100%"
+							controls-position="right"
+							@change="countChange"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<el-footer>
+			<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+			<el-button @click="visible = false">取消</el-button>
+		</el-footer>
 	</el-dialog>
 </template>