From c0e799f4c7a189ffd48e2d574bc2f606638dc5af Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 20 Dec 2023 23:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task_template/edit.vue         | 283 +++++++----------------
 src/views/task_template/edit_admin.vue   |  12 +
 src/views/task_template/edit_village.vue |  15 +-
 3 files changed, 105 insertions(+), 205 deletions(-)

diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index a2c75f0..6e0e410 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -1,55 +1,25 @@
 <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="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-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="false"
-            placeholder="请输入任务类型"
-            @change="changeTaskType"
-          >
-            <el-option
-              v-for="(item,index) in roleTypeList"
-              :key="item"
-              :value="index"
-              :label="item"
-            />
+          <el-select v-model="formData.type" clearable :disabled="false" placeholder="请输入任务类型" @change="changeTaskType">
+            <el-option v-for="(item, index) in roleTypeList" :key="item" :value="index" :label="item" />
           </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-form-item>
         <!-- <el-form-item
           v-if="formData.type == 32"
           label="起点"
@@ -62,150 +32,66 @@
             :value="formData.extend?.origin?.address"
           />
         </el-form-item> -->
-        <el-form-item
-          v-if="formData.type == 32"
-          label="中转点"
-          @click="changeMap(1)"
-          prop="extend.transfer.address"
-        >
-          <el-input
-            placeholder="请选择中转点"
-            readonly
-            :value="formData.extend?.transfer?.address"
-          />
+        <el-form-item v-if="formData.type == 32" label="中转点" @click="changeMap(1)" prop="extend.transfer.address">
+          <el-input placeholder="请选择中转点" readonly :value="formData.extend?.transfer?.address" />
         </el-form-item>
-        <el-form-item
-          v-if="formData.type == 32"
-          label="终点"
-          @click="changeMap(2)"
-          prop="extend.terminus.address"
-        >
-          <el-input
-            placeholder="请选择终点"
-            readonly
-            :value="formData.extend?.terminus?.address"
-          />
+        <el-form-item v-if="formData.type == 32" label="终点" @click="changeMap(2)" prop="extend.terminus.address">
+          <el-input placeholder="请选择终点" readonly :value="formData.extend?.terminus?.address" />
         </el-form-item>
-        <el-form-item
-          v-if="formData.type == 35"
-          label="负责人"
-          prop="task_admin"
-          @click="clickTaskAdmin"
-        >
-          <el-input
-            placeholder="请选择负责人"
-            readonly
-            v-model="formData.task_admin_name"
-          />
+        <el-form-item v-if="formData.type == 35" label="负责人" prop="task_admin" @click="clickTaskAdmin">
+          <el-input placeholder="请选择负责人" readonly v-model="formData.task_admin_name" />
         </el-form-item>
         <el-form-item label="阶段类型" prop="types">
           <div>
-            <el-select
-              v-model="formData.types"
-              clearable
-              :disabled="true"
-              placeholder="请输入阶段类型"
-            >
-              <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="请输入阶段类型">
+              <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>
         </el-form-item>
         <el-form-item label="一阶段天数">
-          <el-input
-            v-model="formData.stage_day_one"
-            clearable
-            placeholder="请输入天数"
-            type="number"
-            :disabled="true"
-          >
+          <el-input v-model="formData.stage_day_one" clearable placeholder="请输入天数" type="number" :disabled="true">
             <template #append>天</template>
           </el-input>
         </el-form-item>
         <el-form-item label="一阶段金额">
           <div style="width: 100%">
-            <el-input
-              v-model="formData.money"
-              clearable
-              placeholder="请输入金额"
-              :disabled="true"
-              type="number"
-            >
+            <el-input v-model="formData.money" clearable placeholder="请输入金额" :disabled="true" type="number">
               <template #append>元</template>
             </el-input>
-            <div
-              v-if="formData.type == 35"
-              style="color: #e6a23c; font-size: 12px"
-            >
+            <div v-if="formData.type == 35" style="color: #e6a23c; font-size: 12px">
               提示 : 本任务的金额将会在任务完成后按阶段天数*阶段金额统一结算
             </div>
           </div>
         </el-form-item>
         <el-form-item label="二阶段天数">
-          <el-input
-            v-model="formData.stage_day_two"
-            clearable
-            :disabled="true"
-            placeholder="请输入天数"
-            type="number"
-          >
+          <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 label="二阶段金额">
           <div style="width: 100%">
-            <el-input
-              v-model="formData.money_two"
-              clearable
-              :disabled="true"
-              placeholder="请输入金额"
-              type="number"
-            >
+            <el-input v-model="formData.money_two" clearable :disabled="true" placeholder="请输入金额" type="number">
               <template #append>元</template>
             </el-input>
-            <div
-              v-if="formData.type == 35"
-              style="color: #e6a23c; font-size: 12px"
-            >
+            <div v-if="formData.type == 35" style="color: #e6a23c; font-size: 12px">
               提示 : 本任务的金额将会在任务完成后按阶段天数*阶段金额统一结算
             </div>
           </div>
         </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>
-        <el-form-item
-          v-if="formData.type == 35"
-          label="充值金额(元)"
-          prop="recharge"
-        >
-          <el-input
-            placeholder="请输入充值金额(元)"
-            v-model="formData.recharge"
-            type="number"
-          />
+        <el-form-item v-if="formData.type == 35" label="充值金额(元)" prop="recharge">
+          <el-input placeholder="请输入充值金额(元)" v-model="formData.recharge" type="number" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="formData.status">
@@ -214,32 +100,13 @@
           </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>
-      <taskMap
-        v-if="mapShow"
-        ref="mapRef"
-        @success="setMap"
-        @close=""
-      ></taskMap>
-      <el-dialog
-        v-model="personnelShow"
-        ref="personnelRef"
-        title="选择负责人"
-        width="60%"
-      >
-        <personnelPopup
-          @custom-event="changePersonner"
-          :company_id="formData.company_id"
-        ></personnelPopup>
+      <taskMap v-if="mapShow" ref="mapRef" @success="setMap" @close=""></taskMap>
+      <el-dialog v-model="personnelShow" ref="personnelRef" title="选择负责人" width="60%">
+        <personnelPopup @custom-event="changePersonner" :company_id="formData.company_id"></personnelPopup>
       </el-dialog>
     </popup>
   </div>
@@ -255,7 +122,7 @@ import {
   apiTaskTypeList,
 } from "@/api/task_template";
 
-import { apiSelectList,apiCreatetaskTypeInfo } from '@/api/create_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";
@@ -290,6 +157,7 @@ const formData = reactive({
   type: "",
   status: "",
   content: "",
+  cron_time: "",//任务下发时间
   stage_day_one: 0,
   money: 0, // 一阶段金额
   stage_day_two: 0,
@@ -319,7 +187,7 @@ if (route.query.id) {
 }
 
 let type_value = "xxx"
-if(route.query.company_type == 18) {
+if (route.query.company_type == 18) {
   type_value = "task_type"
 }
 
@@ -367,6 +235,13 @@ const formRules = reactive<any>({
       trigger: ["blur"],
     },
   ],
+  cron_time: [
+    {
+      required: true,
+      message: "请选择任务下发时间",
+      trigger: ["blur"],
+    },
+  ],
   task_admin: [
     {
       required: true,
@@ -409,43 +284,43 @@ 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 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=()=>{
+const getTaskTempFn = () => {
   apiSelectList(
-{
-  task_role_id
-}
-  ).then(res=>{
-    res.forEach(item=>{
+    {
+      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)
+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(formData)
   // console.log(taskTempId.value)
 }
 // 获取任务类型
-const roleTypeList=reactive({})
-apiCreatetaskTypeInfo().then(res=>{
-    // console.log(res)
-    for (let key in res){
-        roleTypeList[key]=res[key]
-    }
+const roleTypeList = reactive({})
+apiCreatetaskTypeInfo().then(res => {
+  // console.log(res)
+  for (let key in res) {
+    roleTypeList[key] = res[key]
+  }
 })
 
 
@@ -457,10 +332,10 @@ const setFormData = async (data: Record<any, any>) => {
       formData[key] = data[key];
     }
   }
-// formData.type=(formData.type)
+  // formData.type=(formData.type)
   if (formData.type == 32) {
     mapShow.value = true;
-   
+
   }
 
 };
diff --git a/src/views/task_template/edit_admin.vue b/src/views/task_template/edit_admin.vue
index cb34711..04c8ba9 100644
--- a/src/views/task_template/edit_admin.vue
+++ b/src/views/task_template/edit_admin.vue
@@ -8,6 +8,10 @@
             <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-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%">
@@ -184,6 +188,7 @@ const formData = reactive({
   type_value: "",
   status: "",
   content: "",
+  cron_time:"",
   stage_day_one: 0,
   money: 0, // 一阶段金额
   stage_day_two: 0,
@@ -359,6 +364,13 @@ const formRules = reactive<any>({
       trigger: ["blur"],
     },
   ],
+  cron_time: [
+    {
+      required: true,
+      message: "请选择状态",
+      trigger: ["blur"],
+    },
+  ],
   types: [
     {
       required: true,
diff --git a/src/views/task_template/edit_village.vue b/src/views/task_template/edit_village.vue
index 025005d..d732bcd 100644
--- a/src/views/task_template/edit_village.vue
+++ b/src/views/task_template/edit_village.vue
@@ -25,13 +25,17 @@
             <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-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>
         </el-form-item>
+
         <el-form-item label="阶段类型" prop="types">
           <div style="width: 100%">
             <el-select v-model="formData.types" clearable :disabled="true" placeholder="请选择阶段类型"
@@ -155,6 +159,7 @@ const formData = reactive({
   type_value: "",
   status: "",
   content: "",
+  cron_time:"",
   stage_day_one: 0,
   money: 0, // 一阶段金额
   stage_day_two: 0,
@@ -272,6 +277,14 @@ const formRules = reactive<any>({
       trigger: ["blur"],
     },
   ],
+  cron_time: [
+    {
+      required: true,
+      message: "请选择任务类型",
+      trigger: ["blur"],
+    },
+  ],
+  
   status: [
     {
       required: true,