diff --git a/.env.development b/.env.development
index 1ae6266..baa70dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
 NODE_ENV = 'development'
 
-VITE_APP_BASE_URL = 'http://192.168.1.16:8000'
+# VITE_APP_BASE_URL = 'http://192.168.1.16:8000'
 
-# VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn'
+VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn'
 
 # VITE_APP_BASE_URL = 'https://preview-worker-task.lihaink.cn'
 
diff --git a/src/api/create_task_template.ts b/src/api/create_task_template.ts
index 5f20e0e..ea43547 100644
--- a/src/api/create_task_template.ts
+++ b/src/api/create_task_template.ts
@@ -23,4 +23,17 @@ export function apiCreateTaskTemplateDelete(params: any) {
 // 任务创建模板详情
 export function apiCreateTaskTemplateDetail(params: any) {
     return request.get({ url: '/create_task_template.create_task_template/detail', params })
+}
+// 任务创建模板列表
+export function apiCreateTaskTypeLists(params: any) {
+    return request.get({ url: '/create_task_template.create_task_template/taskTypeList', params })
+}
+
+// 任务创建模板列表
+export function apiCreatetaskTypeInfo() {
+    return request.get({ url: '/create_task_template.create_task_template/taskTypeInfo' })
+}
+// 任务创建模板列表
+export function apiSelectList(params: any) {
+    return request.get({ url: '/create_task_template.create_task_template/selectList',params })
 }
\ No newline at end of file
diff --git a/src/views/create_taskTemplate/edit.vue b/src/views/create_taskTemplate/edit.vue
index 484d9ce..e40699e 100644
--- a/src/views/create_taskTemplate/edit.vue
+++ b/src/views/create_taskTemplate/edit.vue
@@ -1,32 +1,28 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="主题" prop="title">
                     <el-input v-model="formData.title" clearable placeholder="请输入主题" />
                 </el-form-item>
-                <el-form-item label="创建人" prop="admin_id">
+                <!-- <el-form-item label="创建人" prop="admin_id">
                     <el-input v-model="formData.admin_id" clearable placeholder="请输入创建人" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="任务角色" prop="task_role_id">
-                    <el-select class="flex-1" v-model="formData.task_role_id" clearable placeholder="请选择任务角色">
-                        <el-option 
-                            v-for="(item, index) in dictData.create_task_template_select_role"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
+                    <el-select class="flex-1" v-model="formData.task_role_id" clearable @change="roleChangeFn"
+                        placeholder="请选择任务角色">
+                        <el-option v-for="(item, index) in dictData.create_task_template_select_role" :key="index"
+                            :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="任务类型" prop="type">
-                    <el-input v-model="formData.type" clearable placeholder="请输入任务类型" />
+
+
+                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择任务类型">
+                        <el-option v-for="(item, index) in typeList" :key="index" :label="item.name"
+                            :value="parseInt(item.id)" />
+                    </el-select>
+                    <!-- <el-input v-model="formData.type" clearable placeholder="请输入任务类型" /> -->
                 </el-form-item>
                 <el-form-item label="一阶天数" prop="stage_day_one">
                     <el-input v-model="formData.stage_day_one" clearable placeholder="请输入一阶天数" />
@@ -56,11 +52,20 @@
                     <el-input v-model="formData.money_longtime" clearable placeholder="请输入长期金额" />
                 </el-form-item>
                 <el-form-item label="阶段类型" prop="types">
-                    <el-input v-model="formData.types" clearable placeholder="请输入1循环2长期3单次" />
+
+                    <el-select class="flex-1" v-model="formData.types" clearable placeholder="请选择任务类型">
+                        <el-option label="循环" :value="1" />
+                        <el-option label="长期" :value="2" />
+                        <el-option label="单次" :value="3" />
+
+                    </el-select>
+
+
+                    <!-- <el-input v-model="formData.types" clearable placeholder="请输入1循环2长期3单次" /> -->
                 </el-form-item>
-                <el-form-item label="扩展字段" prop="extend">
+                <!-- <el-form-item label="扩展字段" prop="extend">
                     <el-input v-model="formData.extend" clearable placeholder="请输入扩展字段" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="充值金额" prop="recharge">
                     <el-input v-model="formData.recharge" clearable placeholder="请输入充值金额" />
                 </el-form-item>
@@ -75,7 +80,7 @@
 <script lang="ts" setup name="createTaskTemplateEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiCreateTaskTemplateAdd, apiCreateTaskTemplateEdit, apiCreateTaskTemplateDetail } from '@/api/create_task_template'
+import { apiCreateTaskTemplateAdd, apiCreateTaskTemplateEdit, apiCreateTaskTemplateDetail, apiCreateTaskTypeLists } from '@/api/create_task_template'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -89,7 +94,7 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
-
+const typeList = reactive([])
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑任务创建模板' : '新增任务创建模板'
@@ -99,7 +104,7 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     title: '',
-    admin_id: '',
+    // admin_id: '',
     task_role_id: '',
     type: '',
     stage_day_one: '',
@@ -112,12 +117,28 @@ const formData = reactive({
     new_money_three: '',
     money_longtime: '',
     types: '',
-    extend: '',
+    // extend: '',
     recharge: '',
     content: '',
 })
 
 
+const roleChangeFn = () => {
+    typeList.splice(0, typeList.length)
+    apiCreateTaskTypeLists({
+        task_role_id: formData.task_role_id
+    }).then(res => {
+
+        for (let key in res) {
+            res[key].forEach(item => {
+                typeList.push(item)
+            });
+        }
+        // console.log(res)
+
+    })
+}
+
 // 表单验证
 const formRules = reactive<any>({
 
@@ -132,8 +153,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+    roleChangeFn()
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -147,9 +169,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiCreateTaskTemplateEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiCreateTaskTemplateEdit(data)
         : await apiCreateTaskTemplateAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/create_taskTemplate/index.vue b/src/views/create_taskTemplate/index.vue
index f716f47..7bda3b9 100644
--- a/src/views/create_taskTemplate/index.vue
+++ b/src/views/create_taskTemplate/index.vue
@@ -10,6 +10,8 @@
                     <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入主题" />
                 </el-form-item>
                 <el-form-item label="任务角色">
+
+                     <el-select v-model="queryParams.task_role_id">
                         <el-option label="全部" value=""></el-option>
                         <el-option 
                             v-for="(item, index) in dictData.create_task_template_select_role"
@@ -46,13 +48,17 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="主题" prop="title" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="admin_id" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="admin_name" show-overflow-tooltip />
                     <el-table-column label="任务角色" prop="task_role_id">
                         <template #default="{ row }">
                             <dict-value :options="dictData.create_task_template_select_role" :value="row.task_role_id" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="任务类型" prop="type" show-overflow-tooltip />
+                    <el-table-column label="任务类型"  show-overflow-tooltip >
+                        <template #default="{ row }">
+                            {{ roleTypeList[row.type] }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="一阶天数" prop="stage_day_one" show-overflow-tooltip />
                     <el-table-column label="第一阶段金额" prop="money" show-overflow-tooltip />
                     <el-table-column label="一阶比例" prop="proportion_one" show-overflow-tooltip />
@@ -62,7 +68,14 @@
                     <el-table-column label="三阶段天数" prop="stage_day_three" show-overflow-tooltip />
                     <el-table-column label="三阶段金额" prop="new_money_three" show-overflow-tooltip />
                     <el-table-column label="长期金额" prop="money_longtime" show-overflow-tooltip />
-                    <el-table-column label="阶段类型" prop="types" show-overflow-tooltip />
+                    <el-table-column label="阶段类型"  show-overflow-tooltip >
+
+                        <template #default="{ row }">
+                            <!-- <dict-value :options="dictData.create_task_template_select_role" :value="row.task_role_id" /> -->
+                            {{ row.types==1?"循坏":row.types==2?'长期':"单次" }}
+                        </template>
+
+                    </el-table-column>
                     <el-table-column label="扩展字段" prop="extend" show-overflow-tooltip />
                     <el-table-column label="充值金额" prop="recharge" show-overflow-tooltip />
                     <el-table-column label="任务描述" prop="content" show-overflow-tooltip />
@@ -99,7 +112,7 @@
 <script lang="ts" setup name="createTaskTemplateLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiCreateTaskTemplateLists, apiCreateTaskTemplateDelete } from '@/api/create_task_template'
+import { apiCreateTaskTemplateLists, apiCreateTaskTemplateDelete,apiCreatetaskTypeInfo } from '@/api/create_task_template'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -155,6 +168,18 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+
+// 获取任务类型
+const roleTypeList=reactive({})
+apiCreatetaskTypeInfo().then(res=>{
+    // console.log(res)
+    for (let key in res){
+        roleTypeList[key]=res[key]
+    }
+})
+
+// const getRoleTypeFn=(type)=>{
+// }
 getLists()
 </script>
 
diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index b3d5697..3fa9964 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -14,19 +14,39 @@
         label-width="120px"
         :rules="formRules"
       >
+
+
+
+      <el-form-item label="任务模板" prop="type">
+          <el-select
+            v-model="taskTempId"
+            clearable
+            :disabled="mode != 'add'"
+            placeholder="请输入任务类型"
+            @change="changeTaskTypeFn"
+          >
+            <el-option
+              v-for="item in taskTempList"
+              :key="item.id"
+              :value="item.id"
+              :label="item.title"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="任务类型" prop="type">
           <el-select
             v-model="formData.type"
             clearable
-            :disabled="mode != 'add'"
+
+            :disabled="false"
             placeholder="请输入任务类型"
             @change="changeTaskType"
           >
             <el-option
-              v-for="item in datalist"
-              :key="item.label"
-              :value="item.id"
-              :label="item.name"
+              v-for="(item,index) in roleTypeList"
+              :key="item"
+              :value="index"
+              :label="item"
             />
           </el-select>
         </el-form-item>
@@ -83,7 +103,7 @@
             <el-select
               v-model="formData.types"
               clearable
-              :disabled="mode != 'add'"
+              :disabled="true"
               placeholder="请输入阶段类型"
             >
               <el-option
@@ -111,6 +131,7 @@
             clearable
             placeholder="请输入天数"
             type="number"
+            :disabled="true"
           >
             <template #append>天</template>
           </el-input>
@@ -121,6 +142,7 @@
               v-model="formData.money"
               clearable
               placeholder="请输入金额"
+              :disabled="true"
               type="number"
             >
               <template #append>元</template>
@@ -137,6 +159,7 @@
           <el-input
             v-model="formData.stage_day_two"
             clearable
+            :disabled="true"
             placeholder="请输入天数"
             type="number"
           >
@@ -148,6 +171,7 @@
             <el-input
               v-model="formData.money_two"
               clearable
+              :disabled="true"
               placeholder="请输入金额"
               type="number"
             >
@@ -165,6 +189,7 @@
           <el-input
             v-model="formData.money_three"
             clearable
+            :disabled="true"
             placeholder="请输入金额"
             type="number"
           >
@@ -192,6 +217,7 @@
           <el-input
             v-model="formData.content"
             clearable
+            :disabled="true"
             placeholder="请输入任务描述"
             type="textarea"
             autosize
@@ -228,6 +254,8 @@ import {
   apiTaskTemplateDetail,
   apiTaskTypeList,
 } from "@/api/task_template";
+
+import { apiSelectList,apiCreatetaskTypeInfo } from '@/api/create_task_template'
 import { timeFormat } from "@/utils/util";
 import type { PropType } from "vue";
 import { dictDataLists } from "@/api/setting/dict";
@@ -294,10 +322,13 @@ let type_value = "xxx"
 if(route.query.company_type == 18) {
   type_value = "task_type"
 }
+
+
+
 //任务类型接口
-apiTaskTypeList({ type_value:  type_value}).then((res) => {
-  datalist.value = res.lists;
-});
+// apiTaskTypeList({ type_value:  type_value}).then((res) => {
+//   datalist.value = res.lists;
+// });
 
 // 表单验证
 const formRules = reactive<any>({
@@ -377,6 +408,53 @@ const formRules = reactive<any>({
   ],
 });
 
+// 任务模板
+const taskTempList=reactive([])
+const taskTempId=ref('')
+
+let task_role_id=''
+
+if(route.query.company_type==17 ){ task_role_id=4}
+if(route.query.company_type==18 ){ task_role_id=5}
+
+
+
+
+
+const getTaskTempFn=()=>{
+  apiSelectList(
+{
+  task_role_id
+}
+  ).then(res=>{
+    res.forEach(item=>{
+      taskTempList.push(item)
+    })
+})
+}
+const changeTaskTypeFn=()=>{
+let i
+taskTempList.forEach((item,index)=>{
+  if(item.id==taskTempId.value){
+      i=index
+  }
+})
+setFormData(taskTempList[i])
+formData.type=String(formData.type)
+
+console.log(formData)
+  // console.log(taskTempId.value)
+}
+// 获取任务类型
+const roleTypeList=reactive({})
+apiCreatetaskTypeInfo().then(res=>{
+    // console.log(res)
+    for (let key in res){
+        roleTypeList[key]=res[key]
+    }
+})
+
+
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
   for (const key in formData) {
@@ -385,9 +463,12 @@ const setFormData = async (data: Record<any, any>) => {
       formData[key] = data[key];
     }
   }
+// formData.type=(formData.type)
   if (formData.type == 32) {
     mapShow.value = true;
+   
   }
+
 };
 
 const getDetail = async (row: Record<string, any>) => {
@@ -403,6 +484,7 @@ const mapRef = shallowRef<InstanceType<typeof taskMap>>();
 
 // 选择任务类型
 const changeTaskType = async (e: any) => {
+
   datalist.value.forEach((item: any) => {
     if (item.id == e) formData.title = item.name;
   });
@@ -436,6 +518,9 @@ const changeMap = async (e: number) => {
 };
 
 const setMap = (e: any) => {
+
+
+
   formData.extend[mapType.value] = e[0];
 };
 
@@ -474,7 +559,7 @@ const open = (type = "add") => {
 const handleClose = () => {
   emit("close");
 };
-
+getTaskTempFn()
 defineExpose({
   open,
   setFormData,