diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue
index e7116ed7..f35baed5 100644
--- a/src/views/wpm_gx/fmlogs.vue
+++ b/src/views/wpm_gx/fmlogs.vue
@@ -50,6 +50,10 @@
 			>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="工艺步骤" prop="route_name" :min-width="100">
+					<template #default="scope">
+						<span v-if="scope.row.is_fix">返工</span>
+						<span v-else>{{scope.row.route_name}}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="任务编号" prop="mtask_number">
 				</el-table-column>
@@ -233,9 +237,21 @@ export default {
 			});
 		},
 		table_rework(){
-			this.dialog.save = true;
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open("add","rework");
+			let that = this;
+			// let form = {};
+			// form.mtype = 10;
+			// form.is_fix = true;
+			// form.mgroup = that.mgroupId;
+			// form.work_end_time = that.$TOOL.fomatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
+			// form.work_start_time = that.$TOOL.fomatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
+			// that.$API.wpm.fmlog.create.req(form).then((res) => {
+			// 	that.$message.success("日志创建成功");
+			// }).catch(()=>{
+			// 	that.$message.error("日志创建失败，请重试");
+			// });
+			that.dialog.save = true;
+			that.$nextTick(() => {
+				that.$refs.saveDialog.open("add","rework");
 			});
 		},
 		//编辑日志
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index dd3fde2d..273a1642 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -510,6 +510,9 @@ export default {
 				if (valid) {
 					that.isSaveing = true;
 					that.form.mgroup = that.mgroup;
+					if(that.form.is_fix){
+						that.form.route = null;
+					}
 					if (that.mode === "add") {
 						that.$API.wpm.mlog.init.req(that.form).then((res) => {
 							that.isSaveing = false;
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index f8b6c2d1..023943e2 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -65,8 +65,9 @@
 					min-width="130"
 				>
 					<template #default="scope">
+						<el-tag v-if="scope.row.is_fix" type="warning">返工</el-tag>
+						<span v-if="scope.row.material_in_name!==null">{{scope.row.material_in_name}}-></span>
 						<span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
-						<span v-else>返工</span>
 					</template>
 				</el-table-column>
 				<el-table-column