From b68233f940161bbdf5c9cd7ffd773d1acf1addd4 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 22 Dec 2023 11:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts                    |  2 +-
 src/main.ts                            |  2 +-
 src/views/create_taskTemplate/edit.vue | 65 +++++++++++++-------------
 src/views/task_template/edit.vue       |  2 +-
 src/views/task_template/edit_admin.vue | 41 +++++++++-------
 5 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index efe50ec..e3e6b63 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -8,5 +8,5 @@ const config = {
   urlPrefix: "adminapi", //请求默认前缀
   timeout: 20 * 1000, //请求超时时长
 };
-
+console.log( import.meta.env,99999)
 export default config;
diff --git a/src/main.ts b/src/main.ts
index 6f02ee9..28b93c5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,4 +14,4 @@ const app = createApp(App)
 app.use(install)
 app.provide('base_url', configs.baseUrl+configs.urlPrefix);
 app.mount('#app')
-app.config.warnHandler = () => null
\ No newline at end of file
+app.config.warnHandler = () => null
diff --git a/src/views/create_taskTemplate/edit.vue b/src/views/create_taskTemplate/edit.vue
index e40699e..ecb0146 100644
--- a/src/views/create_taskTemplate/edit.vue
+++ b/src/views/create_taskTemplate/edit.vue
@@ -24,33 +24,6 @@
                     </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="请输入一阶天数" />
-                </el-form-item>
-                <el-form-item label="第一阶段金额" prop="money">
-                    <el-input v-model="formData.money" clearable placeholder="请输入第一阶段金额" />
-                </el-form-item>
-                <el-form-item label="一阶比例" prop="proportion_one">
-                    <el-input v-model="formData.proportion_one" clearable placeholder="请输入一阶比例" />
-                </el-form-item>
-                <el-form-item label="二阶天数" prop="stage_day_two">
-                    <el-input v-model="formData.stage_day_two" clearable placeholder="请输入二阶天数 0代表无天数" />
-                </el-form-item>
-                <el-form-item label="二阶比例" prop="proportion_two">
-                    <el-input v-model="formData.proportion_two" clearable placeholder="请输入二阶比例" />
-                </el-form-item>
-                <el-form-item label="二阶段金额" prop="money_two">
-                    <el-input v-model="formData.money_two" clearable placeholder="请输入二阶段金额" />
-                </el-form-item>
-                <el-form-item label="三阶段天数" prop="stage_day_three">
-                    <el-input v-model="formData.stage_day_three" clearable placeholder="请输入三阶段天数" />
-                </el-form-item>
-                <el-form-item label="三阶段金额" prop="new_money_three">
-                    <el-input v-model="formData.new_money_three" clearable placeholder="请输入三阶段金额" />
-                </el-form-item>
-                <el-form-item label="长期金额" prop="money_longtime">
-                    <el-input v-model="formData.money_longtime" clearable placeholder="请输入长期金额" />
-                </el-form-item>
                 <el-form-item label="阶段类型" prop="types">
 
                     <el-select class="flex-1" v-model="formData.types" clearable placeholder="请选择任务类型">
@@ -63,12 +36,40 @@
 
                     <!-- <el-input v-model="formData.types" clearable placeholder="请输入1循环2长期3单次" /> -->
                 </el-form-item>
+                <el-form-item label="一阶段天数" prop="stage_day_one">
+                    <el-input v-model="formData.stage_day_one" clearable placeholder="请输入一阶天数" />
+                </el-form-item>
+                <el-form-item label="一阶段金额" prop="money">
+                    <el-input v-model="formData.money" clearable placeholder="请输入第一阶段金额" />
+                </el-form-item>
+                <!-- <el-form-item label="一阶比例" prop="proportion_one">
+                    <el-input v-model="formData.proportion_one" clearable placeholder="请输入一阶比例" />
+                </el-form-item> -->
+                <el-form-item label="二阶段天数" prop="stage_day_two">
+                    <el-input v-model="formData.stage_day_two" clearable placeholder="请输入二阶天数 0代表无天数" />
+                </el-form-item>
+                <!-- <el-form-item label="二阶比例" prop="proportion_two">
+                    <el-input v-model="formData.proportion_two" clearable placeholder="请输入二阶比例" />
+                </el-form-item> -->
+                <el-form-item label="二阶段金额" prop="money_two">
+                    <el-input v-model="formData.money_two" clearable placeholder="请输入二阶段金额" />
+                </el-form-item>
+                <el-form-item label="三阶段天数" prop="stage_day_three">
+                    <el-input v-model="formData.stage_day_three" clearable placeholder="请输入三阶段天数" />
+                </el-form-item>
+                <el-form-item label="三阶段金额" prop="new_money_three">
+                    <el-input v-model="formData.new_money_three" clearable placeholder="请输入三阶段金额" />
+                </el-form-item>
+                <el-form-item label="长期金额" prop="money_longtime">
+                    <el-input v-model="formData.money_longtime" clearable placeholder="请输入长期金额" />
+                </el-form-item>
+
                 <!-- <el-form-item label="扩展字段" prop="extend">
                     <el-input v-model="formData.extend" clearable placeholder="请输入扩展字段" />
                 </el-form-item> -->
-                <el-form-item label="充值金额" prop="recharge">
+                <!-- <el-form-item label="充值金额" prop="recharge">
                     <el-input v-model="formData.recharge" clearable placeholder="请输入充值金额" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="任务描述" prop="content">
                     <el-input v-model="formData.content" clearable placeholder="请输入任务描述" />
                 </el-form-item>
@@ -109,16 +110,16 @@ const formData = reactive({
     type: '',
     stage_day_one: '',
     money: '',
-    proportion_one: '',
+    // proportion_one: '',
     stage_day_two: '',
-    proportion_two: '',
+    // proportion_two: '',
     money_two: '',
     stage_day_three: '',
     new_money_three: '',
     money_longtime: '',
     types: '',
     // extend: '',
-    recharge: '',
+    // recharge: '',
     content: '',
 })
 
diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 6e0e410..a4d2eac 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -6,7 +6,7 @@
 
 
         <el-form-item label="任务模板" prop="type">
-          <el-select v-model="taskTempId" clearable :disabled="mode != 'add'" placeholder="请输入任务类型"
+          <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>
diff --git a/src/views/task_template/edit_admin.vue b/src/views/task_template/edit_admin.vue
index 04c8ba9..846c880 100644
--- a/src/views/task_template/edit_admin.vue
+++ b/src/views/task_template/edit_admin.vue
@@ -3,31 +3,31 @@
     <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="type">
-          <el-select v-model="taskTempId" clearable placeholder="请输入任务类型" @change="changeTaskTypeFn">
+        <el-form-item label="任务模板">
+          <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="cron_time">
-          <el-date-picker format="YYYY/MM/DD" value-format="YYYY-MM-DD" :disabled="mode != 'add'" v-model="formData.cron_time" type="date"
-            placeholder="请选择时间" />
+          <el-date-picker format="YYYY/MM/DD" value-format="YYYY-MM-DD" :disabled="mode != 'add'"
+            v-model="formData.cron_time" type="date" placeholder="请选择时间" />
         </el-form-item>
         <el-form-item label="任务角色" prop="extend.task_role">
-          <el-select v-model="formData.extend.task_role" clearable :disabled="true" placeholder="请选择任务角色"
+          <el-select v-model="formData.extend.task_role" clearable  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"
+          <el-select v-model="formData.type" clearable  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-select v-model="formData.types" clearable  placeholder="请选择阶段类型" style="width: 100%">
               <el-option v-for="item in [
                 { label: 1, name: '循环' },
                 { label: 2, name: '长期' },
@@ -64,41 +64,41 @@
           <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  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  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  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-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 :disabled="true" placeholder="请输入金额" type="number">
+          <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 && noThreefilter(formData.type_value)" label="三阶段天数">
-          <el-input v-model="formData.stage_day_three" clearable :disabled="true" placeholder="请输入天数" type="number">
+          <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 && noThreefilter(formData.type_value)" label="三阶段金额">
-          <el-input v-model="formData.new_money_three" clearable :disabled="true" placeholder="请输入金额" type="number">
+          <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 :disabled="true" placeholder="请输入金额" type="number">
+          <el-input v-model="formData.money_three" clearable  placeholder="请输入金额" type="number">
             <template #append>元</template>
           </el-input>
         </el-form-item>
@@ -109,7 +109,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务描述" prop="content">
-          <el-input v-model="formData.content" clearable :disabled="true" placeholder="请输入任务描述" type="textarea"
+          <el-input v-model="formData.content" clearable  placeholder="请输入任务描述" type="textarea"
             autosize />
         </el-form-item>
       </el-form>
@@ -188,7 +188,7 @@ const formData = reactive({
   type_value: "",
   status: "",
   content: "",
-  cron_time:"",
+  cron_time: "",
   stage_day_one: 0,
   money: 0, // 一阶段金额
   stage_day_two: 0,
@@ -236,11 +236,13 @@ const showTargetTypeList = [
   "town_task_type_marketing_director_8",
   "town_task_type_marketing_director_6",
   "town_task_type_marketing_director_5",
+  "town_task_type_marketing_director_11",
   "town_task_type_marketing_director_4",
   "town_task_type_marketing_director_3",
   "town_task_type_marketing_director_2",
   'town_task_type_master_3',
-  "town_task_type_master_7"
+  "town_task_type_master_7",
+
 ];
 const showTarget = computed(() => {
   let flag = false;
@@ -323,6 +325,9 @@ const changeTaskTypeFn = () => {
   })
   setFormData(taskTempList[i])
   formData.type = Number(formData.type)
+
+  formData.money_three = taskTempList[i].money_longtime
+
   formData.extend.task_role = formData.task_role_id
   changeTaskRole(formData.task_role_id)
 }