diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 3fa9964..a2c75f0 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -411,16 +411,10 @@ 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(
 {
diff --git a/src/views/task_template/edit_admin.vue b/src/views/task_template/edit_admin.vue
index fcda401..cb34711 100644
--- a/src/views/task_template/edit_admin.vue
+++ b/src/views/task_template/edit_admin.vue
@@ -1,85 +1,36 @@
 <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"
-      >
+    <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="taskTempId" clearable  placeholder="请输入任务类型"
-            @change="changeTaskTypeFn">
+          <el-select v-model="taskTempId" clearable 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="extend.task_role">
+          <el-select v-model="formData.extend.task_role" clearable :disabled="true" 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="true"
-            placeholder="请选择任务类型"
-            @change="changeTaskType"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in datalist"
-              :key="item.label"
-              :value="item.id"
-              :label="item.name"
-            />
+          <el-select v-model="formData.type" clearable :disabled="true" 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="true"
-              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 v-model="formData.types" clearable :disabled="true" 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 v-if="formData.types == 3" style="color: #e6a23c; font-size: 12px">
               提示 : 单次任务不会每日结算,而是按阶段合计天数结算
             </div>
           </div>
@@ -106,106 +57,44 @@
           >
           </el-input> -->
           <div style="width: 100%">{{ formData.extend.store_name }}</div>
-          <el-button class="mt-2" type="primary" @click="openCommodity"
-            >选择商品</el-button
-          >
+          <el-button class="mt-2" type="primary" @click="openCommodity">选择商品</el-button>
         </el-form-item>
         <el-form-item v-if="showTarget" label="目标数" prop="extend.target">
-          <el-input
-            v-model="formData.extend.target"
-            clearable
-            :disabled="true"
-            placeholder="请输入目标数"
-            type="number"
-          >
+          <el-input v-model="formData.extend.target" clearable :disabled="true" placeholder="请输入目标数" type="number">
           </el-input>
         </el-form-item>
         <el-form-item label="一阶段天数">
-          <el-input
-            v-model="formData.stage_day_one"
-            clearable
-            :disabled="true"
-            placeholder="请输入天数"
-            type="number"
-          >
+          <el-input v-model="formData.stage_day_one" clearable :disabled="true" placeholder="请输入天数" type="number">
             <template #append>天</template>
           </el-input>
         </el-form-item>
         <el-form-item label="一阶段金额">
-          <el-input
-            v-model="formData.money"
-            clearable
-            :disabled="true"
-            placeholder="请输入金额"
-            type="number"
-          >
+          <el-input v-model="formData.money" clearable :disabled="true" 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
-            :disabled="true"
-            placeholder="请输入天数"
-            type="number"
-          >
+        <el-form-item v-if="showTow && formData.type_value != 'town_task_type_5'" label="二阶段天数">
+          <el-input v-model="formData.stage_day_two" clearable :disabled="true" 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
-            :disabled="true"
-            placeholder="请输入金额"
-            type="number"
-          >
+        <el-form-item v-if="showTow && formData.type_value != 'town_task_type_5'" label="二阶段金额">
+          <el-input v-model="formData.money_two" clearable :disabled="true" placeholder="请输入金额" type="number">
             <template #append>元</template>
           </el-input>
         </el-form-item>
-        <el-form-item
-          v-if="showThree && noThreefilter(formData.type_value)"
-          label="三阶段天数"
-        >
-          <el-input
-            v-model="formData.stage_day_three"
-            clearable
-            :disabled="true"
-            placeholder="请输入天数"
-            type="number"
-          >
+        <el-form-item v-if="showThree && noThreefilter(formData.type_value)" label="三阶段天数">
+          <el-input v-model="formData.stage_day_three" clearable :disabled="true" placeholder="请输入天数" type="number">
             <template #append>天</template>
           </el-input>
         </el-form-item>
-        <el-form-item
-          v-if="showThree && noThreefilter(formData.type_value)"
-          label="三阶段金额"
-        >
-          <el-input
-            v-model="formData.new_money_three"
-            clearable
-            :disabled="true"
-            placeholder="请输入金额"
-            type="number"
-          >
+        <el-form-item v-if="showThree && noThreefilter(formData.type_value)" label="三阶段金额">
+          <el-input v-model="formData.new_money_three" clearable :disabled="true" 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
-            :disabled="true"
-            placeholder="请输入金额"
-            type="number"
-          >
+          <el-input v-model="formData.money_three" clearable :disabled="true" placeholder="请输入金额" type="number">
             <template #append>元</template>
           </el-input>
         </el-form-item>
@@ -216,39 +105,22 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务描述" prop="content">
-          <el-input
-            v-model="formData.content"
-            clearable
-            :disabled="true"
-            placeholder="请输入任务描述"
-            type="textarea"
-            autosize
-          />
+          <el-input v-model="formData.content" clearable :disabled="true" 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 v-model="personnelShow" ref="personnelRef" title="选择负责人" width="60%">
+        <personnelPopup @custom-event="changePersonner" :company_id="formData.company_id"></personnelPopup>
       </el-dialog>
       <el-dialog v-model="showDialogCommodity">
-        <dialogCommodity
-          :ids="formData.extend.goods_id"
-          @customEvent="customEventCommodity"
-          @close="commodityClose"
-        ></dialogCommodity>
+        <dialogCommodity :ids="formData.extend.goods_id" @customEvent="customEventCommodity" @close="commodityClose">
+        </dialogCommodity>
       </el-dialog>
     </popup>
   </div>
 </template>
   
-  <script lang="ts" setup name="taskTemplateEdit">
+<script lang="ts" setup name="taskTemplateEdit">
 import type { FormInstance } from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import {
@@ -323,6 +195,7 @@ const formData = reactive({
   task_admin: "", //任务负责人
   task_admin_name: "", //任务负责人
   recharge: "",
+  task_role_id: "",
   extend: {
     task_role: "", // 任务角色
     target: "", //目标数量
@@ -425,12 +298,10 @@ const commodityClose = () => {
 // 任务模板
 const taskTempList = reactive([])
 const taskTempId = ref('')
-
-
 const getTaskTempFn = (role) => {
   apiSelectList(
     {
-      task_role_id: role
+      task_role_id: '1,2,3'
     }
   ).then(res => {
     res.forEach(item => {
@@ -443,16 +314,14 @@ const getTaskTempFn = (role) => {
 const changeTaskTypeFn = () => {
   let i
   taskTempList.forEach((item, index) => {
-    if (item.id == taskTempId.value) {
-      i = index
-    }
+    if (item.id == taskTempId.value) { i = index }
   })
   setFormData(taskTempList[i])
   formData.type = Number(formData.type)
-
-  console.log(formData)
-  // console.log(taskTempId.value)
+  formData.extend.task_role = formData.task_role_id
+  changeTaskRole(formData.task_role_id)
 }
+getTaskTempFn()
 // 表单验证
 const formRules = reactive<any>({
   title: [
@@ -570,8 +439,6 @@ const changeTaskType = async (e: any) => {
     if (item.id == e) {
       formData.title = item.name;
       formData.type_value = item.value;
-      console.log(item.value,9999)
-      // console.log(item.id, formData.type_value);
     }
   });
 };
@@ -579,9 +446,6 @@ const changeTaskType = async (e: any) => {
 // 选择任务角色
 const changeTaskRole = async (e: any) => {
 
-
-  getTaskTempFn(e)
-
   // 负责人
   if (e == 1) {
     taskType.value = "town_task_type_master";