diff --git a/src/views/task_template/edit_village.vue b/src/views/task_template/edit_village.vue
new file mode 100644
index 0000000..d821198
--- /dev/null
+++ b/src/views/task_template/edit_village.vue
@@ -0,0 +1,480 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="550px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form
+        ref="formRef"
+        :model="formData"
+        label-width="120px"
+        :rules="formRules"
+      >
+        <!-- <el-form-item label="任务角色" prop="extend.task_role">
+          <el-select
+            v-model="formData.extend.task_role"
+            clearable
+            :disabled="mode != 'add'"
+            placeholder="请选择任务角色"
+            @change="changeTaskRole"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in taskRoleRow"
+              :key="item.key"
+              :value="item.key"
+              :label="item.value"
+            />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="任务类型" prop="type">
+          <el-select
+            v-model="formData.type"
+            clearable
+            :disabled="mode != 'add'"
+            placeholder="请选择任务类型"
+            @change="changeTaskType"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in datalist"
+              :key="item.label"
+              :value="item.id"
+              :label="item.name"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="阶段类型" prop="types">
+          <div style="width: 100%">
+            <el-select
+              v-model="formData.types"
+              clearable
+              :disabled="mode != 'add'"
+              placeholder="请选择阶段类型"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in [
+                  { label: 1, name: '循环' },
+                  { label: 2, name: '长期' },
+                  { label: 3, name: '单次' },
+                ]"
+                :key="item.label"
+                :value="item.label"
+                :label="item.name"
+              />
+            </el-select>
+            <div
+              v-if="formData.types == 3"
+              style="color: #e6a23c; font-size: 12px"
+            >
+              提示 : 单次任务不会每日结算,而是按阶段合计天数结算
+            </div>
+          </div>
+        </el-form-item>
+        <!-- <el-form-item v-if="showTarget" label="目标数">
+          <el-input
+            v-model="formData.extend.target"
+            clearable
+            placeholder="请输入目标数"
+            type="number"
+          >
+          </el-input>
+        </el-form-item> -->
+        <el-form-item label="一阶段天数">
+          <el-input
+            v-model="formData.stage_day_one"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="一阶段金额">
+          <el-input
+            v-model="formData.money"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
+          label="二阶段天数"
+        >
+          <el-input
+            v-model="formData.stage_day_two"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
+          label="二阶段金额"
+        >
+          <el-input
+            v-model="formData.money_two"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="showThree" label="三阶段天数">
+          <el-input
+            v-model="formData.stage_day_three"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="showThree" label="三阶段金额">
+          <el-input
+            v-model="formData.new_money_three"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="长期金额" v-if="+formData.types == 2">
+          <el-input
+            v-model="formData.money_three"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">显示</el-radio>
+            <el-radio :label="0">隐藏</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="任务描述" prop="content">
+          <el-input
+            v-model="formData.content"
+            clearable
+            placeholder="请输入任务描述"
+            type="textarea"
+            autosize
+          />
+        </el-form-item>
+      </el-form>
+      <el-dialog
+        v-model="personnelShow"
+        ref="personnelRef"
+        title="选择负责人"
+        width="60%"
+      >
+        <personnelPopup
+          @custom-event="changePersonner"
+          :company_id="formData.company_id"
+        ></personnelPopup>
+      </el-dialog>
+    </popup>
+  </div>
+</template>
+  
+  <script lang="ts" setup name="taskTemplateEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import {
+  apiTaskTemplateAdd,
+  apiTaskTemplateEdit,
+  apiTaskTemplateDetail,
+  apiTaskTypeList,
+} from "@/api/task_template";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import { dictDataLists } from "@/api/setting/dict";
+import taskMap from "./map.vue";
+import personnelPopup from "./dialog_index_personnel.vue";
+defineProps({
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const datalist = ref([]);
+const route = useRoute();
+const taskType = ref("village_task_type");
+const taskRoleRow = ref([
+  { key: 1, value: "负责人" },
+  { key: 2, value: "市场部长" },
+  { key: 3, value: "服务部长" },
+]);
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";
+});
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  // task_role: 1,
+  task_scheduling: 0,
+  company_id: "",
+  title: "",
+  admin_id: "",
+  type: "", // 任务类型
+  type_value: "",
+  status: "",
+  content: "",
+  stage_day_one: 0,
+  money: 0, // 一阶段金额
+  stage_day_two: 0,
+  money_two: 0, // 二阶段金额
+  stage_day_three: 0,
+  new_money_three: 0, // 三阶段金额
+  money_three: 0, // 长期金额
+  types: "", //阶段类型
+  task_admin: "", //任务负责人
+  task_admin_name: "", //任务负责人
+  recharge: "",
+  extend: {
+    task_role: "", // 任务角色
+    target: "", //目标数量
+  },
+});
+if (route.query.id) {
+  formData.task_scheduling = route.query.id;
+}
+//任务类型接口
+apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+  datalist.value = res.lists;
+});
+
+// // 显示目标数的任务类型
+// const showTargetTypeList = [
+//   "town_task_type_marketing_director_9",
+//   "town_task_type_marketing_director_8",
+//   "town_task_type_marketing_director_6",
+//   "town_task_type_marketing_director_5",
+//   "town_task_type_marketing_director_4",
+// ];
+// const showTarget = computed(() => {
+//   let flag = false;
+//   if (showTargetTypeList.includes(formData.type_value)) flag = true;
+//   return flag;
+// });
+
+// 不显示第二阶段的任务类型
+const noShowTowTypeList = ["village_task_type_2"];
+const showTow = computed(() => {
+  let flag = true;
+  if (noShowTowTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
+// 不显示第三阶段的任务类型
+const noShowThreeTypeList = [
+  "village_task_type_1",
+  "village_task_type_2",
+  "village_task_type_3",
+  "village_task_type_4",
+  "village_task_type_5",
+  "village_task_type_6",
+];
+const showThree = computed(() => {
+  let flag = true;
+  if (noShowThreeTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
+// 表单验证
+const formRules = reactive<any>({
+  title: [
+    {
+      required: true,
+      message: "请输入任务名称",
+      trigger: ["blur"],
+    },
+  ],
+  "extend.task_role": [
+    {
+      required: true,
+      message: "请选择任务角色",
+      trigger: ["blur"],
+    },
+  ],
+  admin_id: [
+    {
+      required: true,
+      message: "请输入创建人",
+      trigger: ["blur"],
+    },
+  ],
+  type: [
+    {
+      required: true,
+      message: "请选择任务类型",
+      trigger: ["blur"],
+    },
+  ],
+  status: [
+    {
+      required: true,
+      message: "请选择状态",
+      trigger: ["blur"],
+    },
+  ],
+  types: [
+    {
+      required: true,
+      message: "请选择阶段类型",
+      trigger: ["blur"],
+    },
+  ],
+  task_admin: [
+    {
+      required: true,
+      message: "请选择负责人",
+      trigger: ["blur"],
+    },
+  ],
+  recharge: [
+    {
+      required: true,
+      // message: "请输入充值金额",
+      validator: (rule: any, value: any, callback: any) => {
+        if (value <= 0) callback(new Error("充值金额不能小于0"));
+        else callback();
+      },
+      trigger: ["blur"],
+    },
+  ],
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+  // if (formData.extend?.task_role) {
+  //   formData.extend.task_role = +formData.extend.task_role;
+  //   changeTaskRole(formData.extend.task_role);
+  // }
+};
+
+const getDetail = async (row: Record<string, any>) => {
+  const data = await apiTaskTemplateDetail({
+    id: row.id,
+  });
+  setFormData(data);
+};
+
+// 地图控件
+const mapShow = ref(false);
+const mapRef = shallowRef<InstanceType<typeof taskMap>>();
+
+// 选择任务类型
+const changeTaskType = async (e: any) => {
+  datalist.value.forEach((item: any) => {
+    if (item.id == e) {
+      formData.title = item.name;
+      formData.type_value = item.value;
+      console.log(item.id, formData.type_value);
+    }
+  });
+};
+
+// 选择任务角色
+const changeTaskRole = async (e: any) => {
+  // 负责人
+  if (e == 1) {
+    taskType.value = "town_task_type_master";
+  }
+  // 市场部长
+  if (e == 2) {
+    taskType.value = "town_task_type_marketing_director";
+  }
+  // 服务部长
+  if (e == 3) {
+    taskType.value = "town_task_type";
+  }
+  apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+    datalist.value = res.lists;
+    datalist.value.forEach((item: any) => {
+      if (item.id == formData.type) {
+        formData.type_value = item.value;
+      }
+    });
+  });
+};
+
+const setMap = (e: any) => {
+  formData.extend[mapType.value] = e[0];
+};
+
+// 选择负责人
+const personnelShow = ref(false);
+const personnelRef = shallowRef<InstanceType<typeof personnelPopup>>();
+const changePersonner = (e: any) => {
+  formData.task_admin = e.id;
+  formData.task_admin_name = e.nickname;
+  personnelShow.value = false;
+};
+
+const clickTaskAdmin = async () => {
+  personnelShow.value = true;
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+  await formRef.value?.validate();
+  const data = { ...formData };
+  mode.value == "edit"
+    ? await apiTaskTemplateEdit(data)
+    : await apiTaskTemplateAdd(data);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+  // if (type == "edit") {
+  //   apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+  //     datalist.value = res.lists;
+  //   });
+  // }
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+  getDetail,
+});
+</script>
+  
\ No newline at end of file
diff --git a/src/views/task_template/index.vue b/src/views/task_template/index.vue
index 933d67e..6daac4d 100644
--- a/src/views/task_template/index.vue
+++ b/src/views/task_template/index.vue
@@ -149,14 +149,21 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-    <edit-popup
-      v-if="showEdit && taskTypeId != 15"
+    <edit-admin-popup
+      v-if="showEdit && companyType == 41"
       ref="editRef"
       :dict-data="dictData"
       @success="getLists"
       @close="showEdit = false"
     />
-    <edit-admin-popup
+    <edit-village-popup
+      v-else-if="showEdit && companyType == 17"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+    <edit-popup
       v-else-if="showEdit"
       ref="editRef"
       :dict-data="dictData"
@@ -177,6 +184,7 @@ import { timeFormat } from "@/utils/util";
 import feedback from "@/utils/feedback";
 import EditPopup from "./edit.vue";
 import EditAdminPopup from "./edit_admin.vue";
+import EditVillagePopup from "./edit_village.vue";
 import { dictDataLists } from "@/api/setting/dict";
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 const datalist = ref([]);
@@ -196,10 +204,10 @@ const queryParams = reactive({
   status: "",
   content: "",
 });
-const taskTypeId = ref(10);
+const companyType = ref(10);
 if (route.query?.id) queryParams.id = route.query.id;
 if (route.query?.company_id) queryParams.company_id = route.query.company_id;
-if (route.query?.company_type == 41) taskTypeId.value = 15;
+if (route.query?.company_type) companyType.value = route.query.company_type;
 const statusdata = reactive([
   { id: 1, name: "显示" },
   { id: 2, name: "隐藏" },