diff --git a/src/bg-ui/bg-inner-tabs.vue b/src/bg-ui/bg-inner-tabs.vue
index c17e1dc252eb9c6e66b459a24b832e15bcff5582..886c58590078bea38148841e84dd7f77c6e03d0c 100644
--- a/src/bg-ui/bg-inner-tabs.vue
+++ b/src/bg-ui/bg-inner-tabs.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, onBeforeMount, toRefs } from "vue";
+import { reactive, ref, onBeforeMount, toRefs, watch } from "vue";
 const props = defineProps({
   modelValue: {
     type: [String, Number],
@@ -35,6 +35,13 @@ const emit = defineEmits(["update:modelValue", "change"]);
 
 const nowIndex = ref("");
 
+watch(
+  () => props.modelValue,
+  () => {
+    nowIndex.value = props.modelValue;
+  }
+);
+
 const changeInner = (val) => {
   nowIndex.value = val;
   emit("update:modelValue", val);
@@ -42,7 +49,7 @@ const changeInner = (val) => {
 };
 
 onBeforeMount(() => {
-  nowIndex.value = props.default;
+  nowIndex.value = props.modelValue;
 });
 </script>
 
diff --git a/src/page/main/auto-maintenance/task-manage/add/base-info.vue b/src/page/main/auto-maintenance/task-manage/add/base-info.vue
index 5135d362be9aecee1678fd256c8a039366128298..cf1ccd4960a0c76f60f46f7af52f2c397c6dcd89 100644
--- a/src/page/main/auto-maintenance/task-manage/add/base-info.vue
+++ b/src/page/main/auto-maintenance/task-manage/add/base-info.vue
@@ -33,10 +33,12 @@ const props = defineProps({
   },
 });
 
+const ruleFormRef = ref(null);
+
 const state = reactive({
   ruleForm: {
-    name: props.data?.name,
-    desc: props.data?.desc,
+    name: props.data?.name || "",
+    desc: props.data?.desc || "",
   },
   rules: {
     name: [
@@ -47,10 +49,28 @@ const state = reactive({
   },
 });
 
-const save = () => {};
+const save = () => {
+  return new Promise((resolve, reject) => {
+    ruleFormRef.value.validate((valid, fields) => {
+      if (valid) {
+        props.data.name = state.ruleForm.name;
+        props.data.desc = state.ruleForm.desc;
+        resolve();
+      } else {
+        reject();
+        console.log("error submit!", fields);
+      }
+    });
+  });
+};
+
+const clear = () => {
+  ruleFormRef.value.resetFields();
+};
 
 defineExpose({
   save,
+  clear,
 });
 </script>
 
diff --git a/src/page/main/auto-maintenance/task-manage/add/finish.vue b/src/page/main/auto-maintenance/task-manage/add/finish.vue
index 4fd7fd6ff29b7bcfb020b6d6aca986f99180e49d..560d469bd0e118fa3407980a783015cef32b9eba 100644
--- a/src/page/main/auto-maintenance/task-manage/add/finish.vue
+++ b/src/page/main/auto-maintenance/task-manage/add/finish.vue
@@ -4,8 +4,8 @@
       <img src="@/assets/imgs/img_data-complete.png" />
       <p class="tips">新增成功</p>
       <div class="apaas_button btns">
-        <el-button type="default" @click="goStepOne"> 返回列表 </el-button>
-        <el-button type="primary" @click="putawayAction"> 继续新增 </el-button>
+        <el-button type="default" @click="goToList"> 返回列表 </el-button>
+        <el-button type="primary" @click="goStepOne"> 继续新增 </el-button>
       </div>
     </div>
   </div>
@@ -17,8 +17,16 @@ import { useRouter, useRoute } from "vue-router";
 import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
-const state = reactive({ data: 1 });
-const { data } = toRefs(state);
+
+const emit = defineEmits(["clear"]);
+
+const goToList = () => {
+  router.push("/auto-maintenance/task-manage");
+};
+
+const goStepOne = () => {
+  emit("clear");
+};
 </script>
 
 <style scoped>
diff --git a/src/page/main/auto-maintenance/task-manage/add/index.vue b/src/page/main/auto-maintenance/task-manage/add/index.vue
index d265e8499d7985d857ab26e801be53e7eecf7f37..22422756da6551b90a56e37ba9597937fc23a577 100644
--- a/src/page/main/auto-maintenance/task-manage/add/index.vue
+++ b/src/page/main/auto-maintenance/task-manage/add/index.vue
@@ -40,9 +40,9 @@
         </div>
       </div>
       <div class="content_main log_content_nor" :style="step == 3 ? { height: 'calc(100vh - 234px)' } : {}">
-        <base-info v-show="step == 1"></base-info>
-        <use-content v-show="step == 2"></use-content>
-        <finish v-show="step == 3"></finish>
+        <base-info v-show="step == 1" :data="state.data" ref="baseInfoRef"></base-info>
+        <use-content v-show="step == 2" :data="state.data" ref="useContentRef"></use-content>
+        <finish v-show="step == 3" @clear="clearData"></finish>
       </div>
       <div class="content_foot apaas_button" v-if="step == 1 || step == 2">
         <el-button type="default" @click="cancel"> 取消 </el-button>
@@ -68,18 +68,57 @@ const router = useRouter();
 const route = useRoute();
 
 const step = ref(1);
+const baseInfoRef = ref(null);
+const useContentRef = ref(null);
 
-const state = reactive({ data: 1 });
+const state = reactive({
+  data: {},
+});
 
 const cancel = () => {
   router.back();
 };
 
-const confirm = (val) => {
-  step.value = step.value + val;
+const confirm = async (val) => {
+  let flag = true;
+  if (val == 1) {
+    if (step.value == 1) {
+      //下一步
+      await baseInfoRef.value
+        .save()
+        .then()
+        .catch(() => {
+          flag = false;
+        });
+    } else if (step.value == 2) {
+      //保存
+      await useContentRef.value
+        .save()
+        .then(() => {
+          saveTask();
+        })
+        .catch(() => {
+          flag = false;
+        });
+    }
+  }
+  if (flag) {
+    step.value = step.value + val;
+  }
 };
 
+const saveTask = () => {};
+
 const useScript = () => {};
+
+const clearData = () => {
+  baseInfoRef.value.clear();
+  useContentRef.value.clear();
+  state.data = {};
+  step.value = 1;
+};
+
+onBeforeMount(() => {});
 </script>
 
 <style scoped>
diff --git a/src/page/main/auto-maintenance/task-manage/add/use-content.vue b/src/page/main/auto-maintenance/task-manage/add/use-content.vue
index c9078f26e78299b9bea34a6eaeca85b8f5b7bbb5..d1d2cf31369f9b5585b4d578bb7b465631d0873a 100644
--- a/src/page/main/auto-maintenance/task-manage/add/use-content.vue
+++ b/src/page/main/auto-maintenance/task-manage/add/use-content.vue
@@ -14,9 +14,9 @@
       </bg-upload>
     </div>
     <bg-form-gap title="执行主机"></bg-form-gap>
-    <el-form ref="ruleFormRef" :model="state.ruleForm" :rules="state.rules" label-position="top" label-width="120px">
-      <el-form-item label="主机分组名称" prop="name" style="width: 1100px">
-        <el-select v-model="state.ruleForm.name" style="width: 1020px" clearable placeholder="请选择">
+    <el-form ref="pcFormRef" :model="state.ruleForm" :rules="state.rules" label-position="top" label-width="120px">
+      <el-form-item label="主机分组名称" prop="pcName" style="width: 1100px">
+        <el-select v-model="state.ruleForm.pcName" style="width: 1020px" clearable placeholder="请选择">
           <el-option v-for="item in state.options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <span class="add-pc can_click_text">去创建</span>
@@ -26,21 +26,31 @@
 </template>
 
 <script setup>
-import { reactive, ref, onBeforeMount, toRefs } from "vue";
+import { reactive, ref, onBeforeMount, toRefs, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => {},
+  },
+});
+
+const pcFormRef = ref(null);
+
 const state = reactive({
   useType: 0,
   useData: ["文本执行", "文件执行"],
-  useText: "",
-  doc_file: [],
+  useText: props.data?.useText || "",
+  doc_file: props.data?.doc_file || [],
   ruleForm: {
-    name: "",
+    pcName: props.data?.pcName || "",
   },
   rules: {
-    name: [{ required: true, message: "请选择主机分组", trigger: "change" }],
+    pcName: [{ required: true, message: "请选择主机分组", trigger: "change" }],
   },
   options: [
     {
@@ -49,6 +59,50 @@ const state = reactive({
     },
   ],
 });
+
+const save = () => {
+  return new Promise((resolve, reject) => {
+    pcFormRef.value.validate((valid, fields) => {
+      if (valid) {
+        props.data.pcName = state.ruleForm.pcName;
+        if (state.useType == 0) {
+          props.data.useText = state.useText;
+        } else {
+          props.data.doc_file = state.doc_file;
+        }
+        resolve();
+      } else {
+        reject();
+        console.log("error submit!", fields);
+      }
+    });
+  });
+};
+
+const clear = () => {
+  pcFormRef.value.resetFields();
+  state.useText = "";
+  state.doc_file = [];
+  state.useType = 0;
+};
+
+onMounted(() => {
+  if (
+    (props.data && props.data.useText == "" && props.data.doc_file.length == 0) ||
+    (!props.data.useText && !props.data.doc_file)
+  ) {
+    state.useType = 0;
+  } else if (props.data && props.data.useText !== "") {
+    state.useType = 1;
+  } else if (props.data && props.data.doc_file.length == 0) {
+    state.useType = 0;
+  }
+});
+
+defineExpose({
+  save,
+  clear,
+});
 </script>
 
 <style lang="scss" scoped>