新增了镇管理公司任务

src/views/task_scheduling/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px] formtabel" :model="queryParams" inline label-width="100px">
+      <el-form
+        class="mb-[-16px] formtabel"
+        :model="queryParams"
+        inline
+        label-width="100px"
+      >
         <el-form-item label="区域经理" prop="create_user_id">
           <el-input
             class="w-[280px]"
@@ -19,7 +24,9 @@
           />
         </el-form-item>
         <el-form-item>
-                    <el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
+          <el-button class="el-btn" type="primary" @click="resetPage"
+            >查询</el-button
+          >
           <el-button @click="resetParams">重置</el-button>
         </el-form-item>
       </el-form>
@@ -46,9 +53,21 @@
       <div class="mt-4">
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
-                    <el-table-column label="区域经理" prop="admin_name" show-overflow-tooltip />
+          <el-table-column
-                    <el-table-column label="公司" prop="company_name" show-overflow-tooltip />
+            label="区域经理"
-                    <el-table-column label="每日最大金额" prop="money" show-overflow-tooltip />
+            prop="admin_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="公司"
+            prop="company_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="每日最大金额"
+            prop="money"
+            show-overflow-tooltip
+          />
           <el-table-column
             label="公司类型"
             prop="company_type_name"
@@ -89,8 +108,9 @@
                     path: getRoutePath('task_template.task_template/lists'),
                     query: {
                       id: row.id,
-                                            company_id: row.company_id
+                      company_id: row.company_id,
-                                        }
+                      company_type: row.dict_company_type,
+                    },
                   }"
                   >任务安排</router-link
                 >
@@ -101,8 +121,8 @@
                     path: getRoutePath('task.task_calendar'),
                     query: {
                       id: row.id,
-                                            company_id: row.company_id
+                      company_id: row.company_id,
-                                        }
+                    },
                   }"
                   >任务日程</router-link
                 >
@@ -132,78 +152,81 @@
 </template>
 
 <script lang="ts" setup name="taskSchedulingLists">
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from '@/hooks/useDictOptions'
+import { useDictData } from "@/hooks/useDictOptions";
-import { apiTaskSchedulingLists, apiTaskSchedulingEdit } from '@/api/task_scheduling'
+import {
-import { timeFormat } from '@/utils/util'
+  apiTaskSchedulingLists,
-import feedback from '@/utils/feedback'
+  apiTaskSchedulingEdit,
-import EditPopup from './edit.vue'
+} from "@/api/task_scheduling";
-import { dictDataLists } from '@/api/setting/dict'
+import { timeFormat } from "@/utils/util";
-import { getRoutePath } from '@/router'
+import feedback from "@/utils/feedback";
-import money from './money.vue'
+import EditPopup from "./edit.vue";
+import { dictDataLists } from "@/api/setting/dict";
+import { getRoutePath } from "@/router";
+import money from "./money.vue";
 
-const datalist = ref([])
+const datalist = ref([]);
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-const moneyRef = shallowRef<InstanceType<typeof money>>()
+const moneyRef = shallowRef<InstanceType<typeof money>>();
 // 是否显示编辑框
-const showEdit = ref(false)
+const showEdit = ref(false);
 // 是否显示金额编辑框
-const moneyShow = ref(false)
+const moneyShow = ref(false);
 
 // 查询条件
 const queryParams = reactive({
-    create_user_id: '',
+  create_user_id: "",
-    template_id: '',
+  template_id: "",
-    company_id: '',
+  company_id: "",
-    type: '',
+  type: "",
-    status: ''
+  status: "",
-})
+});
 
 // 选中数据
-const selectData = ref<any[]>([])
+const selectData = ref<any[]>([]);
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
+  selectData.value = val.map(({ id }) => id);
-}
+};
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData("");
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
   fetchFun: apiTaskSchedulingLists,
-    params: queryParams
+  params: queryParams,
-})
+});
 
 // 添加
 const handleAdd = async () => {
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('add')
+  editRef.value?.open("add");
-}
+};
 
 // 设置金额
 const moneyAdd = async (obj: any) => {
-    moneyShow.value = true
+  moneyShow.value = true;
-    await nextTick()
+  await nextTick();
-    moneyRef.value?.open(obj.money ? 'edit' : 'add')
+  moneyRef.value?.open(obj.money ? "edit" : "add");
-    moneyRef.value?.setFormData(obj)
+  moneyRef.value?.setFormData(obj);
-}
+};
 
 const changeStatus = (data: any) => {
   apiTaskSchedulingEdit({
     id: data.id,
-        status: data.status
+    status: data.status,
   }).finally(() => {
-        getLists()
+    getLists();
-    })
+  });
-}
+};
 dictDataLists({ type_id: 10 }).then((res) => {
-    datalist.value = res.lists
+  datalist.value = res.lists;
-})
+});
 
-getLists()
+getLists();
 </script>
 <style lang="scss" scoped>
 .formtabel {

src/views/task_template/edit.vue

@@ -230,6 +230,7 @@ import type { PropType } from "vue";
 import { dictDataLists } from "@/api/setting/dict";
 import taskMap from "./map.vue";
 import personnelPopup from "./dialog_index_personnel.vue";
+import { number } from "echarts/core";
 defineProps({
   dictData: {
     type: Object as PropType<Record<string, any[]>>,
@@ -242,6 +243,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>();
 const mode = ref("add");
 const datalist = ref([]);
 const route = useRoute();
+
 // 弹窗标题
 const popupTitle = computed(() => {
   return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";

src/views/task_template/edit_admin.vue

@@ -0,0 +1,423 @@
+<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="type">
+          <el-select
+            v-model="formData.type"
+            clearable
+            placeholder="请输入任务类型"
+            @change="changeTaskType"
+          >
+            <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>
+            <el-select
+              v-model="formData.types"
+              clearable
+              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>
+          </div>
+        </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 label="二阶段天数">
+          <el-input
+            v-model="formData.stage_day_two"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item 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="noThreefilter(+formData.type)" 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="noThreefilter(+formData.type)" 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,
+} 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 popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";
+});
+
+// 没有三阶段的任务类型ID, 使用以下方法过滤
+const noThreeList = reactive([45, 48, 49]);
+const noThreefilter = (id: number) => {
+  if (noThreeList.includes(id)) return false;
+  else return true;
+};
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  task_scheduling: 0,
+  company_id: "",
+  title: "",
+  admin_id: "",
+  type: "", // 任务类型
+  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: {
+    // origin: {
+    //   address: "",
+    //   lnglat: [],
+    // }, //起点
+    transfer: {
+      address: "",
+      lnglat: [],
+    }, //中转
+    terminus: {
+      address: "",
+      lnglat: [],
+    }, //终点
+  },
+});
+if (route.query.id) {
+  formData.task_scheduling = route.query.id;
+}
+//任务类型接口
+dictDataLists({ type_id: 15 }).then((res) => {
+  datalist.value = res.lists;
+});
+
+// 表单验证
+const formRules = reactive<any>({
+  title: [
+    {
+      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"],
+    },
+  ],
+  "extend.origin.address": [
+    {
+      required: true,
+      message: "请选择中转点",
+      trigger: ["blur"],
+    },
+  ],
+  "extend.transfer.address": [
+    {
+      required: true,
+      message: "请选择中转点",
+      trigger: ["blur"],
+    },
+  ],
+  "extend.terminus.address": [
+    {
+      required: true,
+      message: "请选择终点",
+      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.type == 32) {
+    mapShow.value = true;
+  }
+};
+
+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;
+  });
+  if (e == 32) {
+    mapShow.value = true; //为三轮车时
+    // await nextTick();
+    // mapRef.value?.open();
+  }
+};
+
+// 当前点击的地图类型(起,转,终)点
+const mapType = ref("");
+const changeMap = async (e: number) => {
+  let map_title = "";
+  switch (e) {
+    case 0:
+      mapType.value = "origin";
+      map_title = "起点";
+      break;
+    case 1:
+      mapType.value = "transfer";
+      map_title = "中转点";
+      break;
+    case 2:
+      mapType.value = "terminus";
+      map_title = "终点";
+      break;
+  }
+  await nextTick();
+  mapRef.value?.open(map_title);
+};
+
+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 };
+  if (data.type != 32) data.extend = {}; // 不为三轮车任务时,过滤三轮车配置
+  mode.value == "edit"
+    ? await apiTaskTemplateEdit(data)
+    : await apiTaskTemplateAdd(data);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+  getDetail,
+});
+</script>
+  

src/views/task_template/index.vue

@@ -150,7 +150,14 @@
       </div>
     </el-card>
     <edit-popup
-      v-if="showEdit"
+      v-if="showEdit && taskTypeId != 15"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+    <edit-admin-popup
+      v-else-if="showEdit"
       ref="editRef"
       :dict-data="dictData"
       @success="getLists"
@@ -169,6 +176,7 @@ import {
 import { timeFormat } from "@/utils/util";
 import feedback from "@/utils/feedback";
 import EditPopup from "./edit.vue";
+import EditAdminPopup from "./edit_admin.vue";
 import { dictDataLists } from "@/api/setting/dict";
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 const datalist = ref([]);
@@ -188,8 +196,10 @@ const queryParams = reactive({
   status: "",
   content: "",
 });
+const taskTypeId = 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;
 const statusdata = reactive([
   { id: 1, name: "显示" },
   { id: 2, name: "隐藏" },