更新

src/api/task_scheduling.ts

@@ -24,3 +24,8 @@ export function apiTaskSchedulingDelete(params: any) {
 export function apiTaskSchedulingDetail(params: any) {
     return request.get({ url: '/task_scheduling.task_scheduling/detail', params })
 }
+
+// 任务公司排期详情
+export function apiTaskSchedulingEditMoney(params: any) {
+    return request.post({ url: '/task_scheduling.task_scheduling/editMoney', params })
+}

src/views/task_scheduling/index.vue

@@ -63,6 +63,11 @@
             prop="company_name"
             show-overflow-tooltip
           />
+          <el-table-column
+            label="每日最大金额"
+            prop="money"
+            show-overflow-tooltip
+          />
           <el-table-column
             label="公司类型"
             prop="company_type_name"
@@ -83,8 +88,32 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" width="120" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template #default="{ row }">
+              <el-button
+                v-perms="['task.task_calendar']"
+                @click="moneyAdd(row)"
+                type="primary"
+                link
+              >
+                金额
+              </el-button>
+              <el-button
+                v-perms="['task_template.task_template/lists']"
+                type="primary"
+                link
+              >
+                <router-link
+                  :to="{
+                    path: getRoutePath('task_template.task_template/lists'),
+                    query: {
+                      id: row.id,
+                      company_id: row.company_id,
+                    },
+                  }"
+                  >任务模板</router-link
+                >
+              </el-button>
               <el-button v-perms="['task.task_calendar']" type="primary" link>
                 <router-link
                   :to="{
@@ -111,6 +140,12 @@
       @success="getLists"
       @close="showEdit = false"
     />
+    <money
+      ref="moneyRef"
+      v-if="moneyShow"
+      @success="getLists"
+      @close="moneyShow = false"
+    ></money>
   </div>
 </template>
 
@@ -126,11 +161,15 @@ import feedback from "@/utils/feedback";
 import EditPopup from "./edit.vue";
 import { dictDataLists } from "@/api/setting/dict";
 import { getRoutePath } from "@/router";
+import money from "./money.vue";
 
 const datalist = ref([]);
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const moneyRef = shallowRef<InstanceType<typeof money>>();
 // 是否显示编辑框
 const showEdit = ref(false);
+// 是否显示金额编辑框
+const moneyShow = ref(false);
 
 // 查询条件
 const queryParams = reactive({
@@ -164,6 +203,15 @@ const handleAdd = async () => {
   await nextTick();
   editRef.value?.open("add");
 };
+
+// 设置金额
+const moneyAdd = async (obj: any) => {
+  moneyShow.value = true;
+  await nextTick();
+  moneyRef.value?.open(obj.money ? "edit" : "add");
+  moneyRef.value?.setFormData(obj);
+};
+
 const changeStatus = (data: any) => {
   apiTaskSchedulingEdit({
     id: data.id,

src/views/task_scheduling/money.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="500px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-form-item label="金额" prop="money">
+          <el-input
+            v-model="formData.money"
+            type="number"
+            clearable
+            placeholder="请输入公司每天最多的金额"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </popup>
+  </div>
+</template>
+
+<script lang="ts" setup name="taskSchedulingEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import {
+  apiTaskSchedulingAdd,
+  apiTaskSchedulingEdit,
+  apiTaskSchedulingEditMoney,
+} from "@/api/task_scheduling";
+
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑任务公司金额" : "新增任务公司金额";
+});
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  money: "",
+});
+
+const setFormData = (e) => {
+  Object.keys(formData).forEach((key) => {
+    if (e[key] != null && e[key] != undefined) {
+      formData[key] = e[key];
+    }
+  });
+};
+
+// 表单验证
+const formRules = reactive<any>({
+  money: {
+    required: true,
+    message: "请输入正确金额",
+    trigger: "change",
+  },
+});
+
+// 提交按钮
+const handleSubmit = async () => {
+  await formRef.value?.validate();
+  const data = { ...formData };
+  await apiTaskSchedulingEditMoney(data);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+});
+</script>
+  

src/views/task_template/edit.vue

@@ -8,14 +8,38 @@
       @confirm="handleSubmit"
       @close="handleClose"
     >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+      <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-input
+            v-model="formData.title"
+            clearable
+            placeholder="请输入主题"
+          />
         </el-form-item>
-                <el-form-item label="金额" prop="moeny">
+        <el-form-item label="阶段类型" prop="types">
-                    <el-input v-model="formData.money" clearable placeholder="请输入金额" />
+          <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>
         </el-form-item>
-                <el-form-item label="一阶天数">
+        <el-form-item label="一阶段天数">
           <el-input
             v-model="formData.stage_day_one"
             clearable
@@ -25,17 +49,17 @@
             <template #append>天</template>
           </el-input>
         </el-form-item>
-                <el-form-item label="一阶比例">
+        <el-form-item label="一阶段金额">
           <el-input
-                        v-model="formData.proportion_one"
+            v-model="formData.money"
             clearable
-                        placeholder="请输入比例"
+            placeholder="请输入金额"
             type="number"
           >
-                        <template #append>%</template>
+            <template #append>元</template>
           </el-input>
         </el-form-item>
-                <el-form-item label="二阶天数">
+        <el-form-item label="二阶段天数">
           <el-input
             v-model="formData.stage_day_two"
             clearable
@@ -45,18 +69,33 @@
             <template #append>天</template>
           </el-input>
         </el-form-item>
-                <el-form-item label="二阶比例">
+
+        <el-form-item label="二阶段金额">
           <el-input
-                        v-model="formData.proportion_two"
+            v-model="formData.money_two"
             clearable
-                        placeholder="请输入比例"
+            placeholder="请输入金额"
             type="number"
           >
-                        <template #append>%</template>
+            <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="type">
-                    <el-select v-model="formData.type" clearable placeholder="请输入任务类型">
+          <el-select
+            v-model="formData.type"
+            clearable
+            placeholder="请输入任务类型"
+          >
             <el-option
               v-for="item in datalist"
               :key="item.label"
@@ -72,7 +111,11 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务描述" prop="content">
-                    <el-input v-model="formData.content" clearable placeholder="请输入任务描述" />
+          <el-input
+            v-model="formData.content"
+            clearable
+            placeholder="请输入任务描述"
+          />
         </el-form-item>
       </el-form>
     </popup>
@@ -80,120 +123,129 @@
 </template>
 
 <script lang="ts" setup name="taskTemplateEdit">
-import type { FormInstance } from 'element-plus'
+import type { FormInstance } from "element-plus";
-import Popup from '@/components/popup/index.vue'
+import Popup from "@/components/popup/index.vue";
-import { apiTaskTemplateAdd, apiTaskTemplateEdit, apiTaskTemplateDetail } from '@/api/task_template'
+import {
-import { timeFormat } from '@/utils/util'
+  apiTaskTemplateAdd,
-import type { PropType } from 'vue'
+  apiTaskTemplateEdit,
-import { dictDataLists } from '@/api/setting/dict'
+  apiTaskTemplateDetail,
+} from "@/api/task_template";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import { dictDataLists } from "@/api/setting/dict";
 defineProps({
   dictData: {
     type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
+    default: () => ({}),
-    }
+  },
-})
+});
-const emit = defineEmits(['success', 'close'])
+const emit = defineEmits(["success", "close"]);
-const formRef = shallowRef<FormInstance>()
+const formRef = shallowRef<FormInstance>();
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
-const mode = ref('add')
+const mode = ref("add");
-const datalist = ref([])
+const datalist = ref([]);
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑任务模板' : '新增任务模板'
+  return mode.value == "edit" ? "编辑任务模板" : "新增任务模板";
-})
+});
 
 // 表单数据
 const formData = reactive({
-    id: '',
+  id: "",
-    title: '',
+  company_id: "",
-    admin_id: '',
+  title: "",
-    money: '',
+  admin_id: "",
-    type: '',
+  type: "",
-    status: '',
+  status: "",
-    content: '',
+  content: "",
   stage_day_one: 0,
-    proportion_one: 0,
+  money: 0, // 一阶段金额
-    stage_day_two: 9999,
+  stage_day_two: 0,
-    proportion_two: 0
+  money_two: 0, // 二阶段金额
-})
+  money_three: 0, // 长期金额
+  types: "", //阶段类型
+});
+
 //任务类型接口
 dictDataLists({ type_id: 10 }).then((res) => {
-    datalist.value = res.lists
+  datalist.value = res.lists;
-})
+});
 
 // 表单验证
 const formRules = reactive<any>({
   title: [
     {
       required: true,
-            message: '请输入主题',
+      message: "请输入主题",
-            trigger: ['blur']
+      trigger: ["blur"],
-        }
+    },
   ],
   admin_id: [
     {
       required: true,
-            message: '请输入创建人',
+      message: "请输入创建人",
-            trigger: ['blur']
+      trigger: ["blur"],
-        }
+    },
   ],
   type: [
     {
       required: true,
-            message: '请输入任务类型',
+      message: "请输入任务类型",
-            trigger: ['blur']
+      trigger: ["blur"],
-        }
+    },
   ],
   status: [
     {
       required: true,
-            message: '请选择状态',
+      message: "请选择状态",
-            trigger: ['blur']
+      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]
+      formData[key] = data[key];
     }
   }
-}
+};
 
 const getDetail = async (row: Record<string, any>) => {
   const data = await apiTaskTemplateDetail({
-        id: row.id
+    id: row.id,
-    })
+  });
-    setFormData(data)
+  setFormData(data);
-}
+};
 
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate()
+  await formRef.value?.validate();
-    const data = { ...formData }
+  const data = { ...formData };
-    mode.value == 'edit' ? await apiTaskTemplateEdit(data) : await apiTaskTemplateAdd(data)
+  mode.value == "edit"
-    popupRef.value?.close()
+    ? await apiTaskTemplateEdit(data)
-    emit('success')
+    : await apiTaskTemplateAdd(data);
-}
+  popupRef.value?.close();
+  emit("success");
+};
 
 //打开弹窗
-const open = (type = 'add') => {
+const open = (type = "add") => {
-    mode.value = type
+  mode.value = type;
-    popupRef.value?.open()
+  popupRef.value?.open();
-}
+};
 
 // 关闭回调
 const handleClose = () => {
-    emit('close')
+  emit("close");
-}
+};
 
 defineExpose({
   open,
   setFormData,
-    getDetail
+  getDetail,
-})
+});
 </script>

src/views/task_template/index.vue

@@ -1,22 +1,37 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-            <el-form
+      <el-form class="mb-[-16px] formtabel" :model="queryParams" inline>
-                class="mb-[-16px] formtabel"
-                :model="queryParams"
-                inline
-            >
         <el-form-item label-width="100px" label="主题" prop="title">
-                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入主题" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.title"
+            clearable
+            placeholder="请输入主题"
+          />
         </el-form-item>
         <el-form-item label-width="100px" label="创建人" prop="admin_id">
-                    <el-input class="w-[280px]" v-model="queryParams.admin_id" clearable placeholder="请输入创建人" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.admin_id"
+            clearable
+            placeholder="请输入创建人"
+          />
         </el-form-item>
         <el-form-item label-width="100px" label="金额" prop="money">
-                    <el-input class="w-[280px]" v-model="queryParams.money" clearable placeholder="请输入金额" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.money"
+            clearable
+            placeholder="请输入金额"
+          />
         </el-form-item>
         <el-form-item label-width="100px" label="任务类型" prop="type">
-                <el-select v-model="queryParams.type" clearable placeholder="请输入任务类型" >
+          <el-select
+            v-model="queryParams.type"
+            clearable
+            placeholder="请输入任务类型"
+          >
             <el-option
               v-for="item in datalist"
               :key="item.label"
@@ -26,7 +41,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label-width="100px" label="状态" prop="status">
-                    <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
+          <el-select
+            v-model="queryParams.status"
+            clearable
+            placeholder="请选择状态"
+          >
             <el-option
               v-for="item in statusdata"
               :key="item.label"
@@ -36,16 +55,27 @@
           </el-select>
         </el-form-item>
         <el-form-item label-width="100px" label="任务描述" prop="content">
-                    <el-input class="w-[280px]" v-model="queryParams.content" clearable placeholder="请输入任务描述" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.content"
+            clearable
+            placeholder="请输入任务描述"
+          />
         </el-form-item>
         <el-form-item label-width="100px" label="">
-                    <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>
     </el-card>
     <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['task_template.task_template/add']" type="primary" @click="handleAdd">
+      <el-button
+        v-perms="['task_template.task_template/add']"
+        type="primary"
+        @click="handleAdd"
+      >
         <template #icon>
           <icon name="el-icon-Plus" />
         </template>
@@ -61,16 +91,34 @@
       <div class="mt-4">
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
+          <el-table-column
+            label="ID"
+            width="80"
+            prop="id"
+            show-overflow-tooltip
+          />
           <el-table-column label="主题" prop="title" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="admin_name" show-overflow-tooltip />
+          <el-table-column
+            label="创建人"
+            prop="admin_name"
+            show-overflow-tooltip
+          />
           <el-table-column label="金额" prop="money" show-overflow-tooltip />
-                    <el-table-column label="任务类型" prop="type_name" show-overflow-tooltip />
+          <el-table-column
+            label="任务类型"
+            prop="type_name"
+            show-overflow-tooltip
+          />
           <el-table-column label="状态" show-overflow-tooltip>
             <template #default="{ row }">
-                         <span>{{row.status==1?'显示':"隐藏"}}</span>
+              <span>{{ row.status == 1 ? "显示" : "隐藏" }}</span>
             </template>
           </el-table-column>
-                    <el-table-column label="任务描述" prop="content" show-overflow-tooltip />
+          <el-table-column
+            label="任务描述"
+            prop="content"
+            show-overflow-tooltip
+          />
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
@@ -97,90 +145,104 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
   </div>
 </template>
 
 <script lang="ts" setup name="taskTemplateLists">
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from '@/hooks/useDictOptions'
+import { useDictData } from "@/hooks/useDictOptions";
-import { apiTaskTemplateLists, apiTaskTemplateDelete } from '@/api/task_template'
+import {
-import { timeFormat } from '@/utils/util'
+  apiTaskTemplateLists,
-import feedback from '@/utils/feedback'
+  apiTaskTemplateDelete,
-import EditPopup from './edit.vue'
+} from "@/api/task_template";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import EditPopup from "./edit.vue";
 import { dictDataLists } from "@/api/setting/dict";
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-const datalist=ref([])
+const datalist = ref([]);
 // 是否显示编辑框
-const showEdit = ref(false)
+const showEdit = ref(false);
 
+const route = useRoute();
 
 // 查询条件
 const queryParams = reactive({
-    title: '',
+  id: "", //任务公司排期id
-    admin_id: '',
+  company_id: "",
-    money: '',
+  title: "",
-    type: '',
+  admin_id: "",
-    status: '',
+  money: "",
-    content: ''
+  type: "",
-})
+  status: "",
-const statusdata=reactive([
+  content: "",
-    {id:1,name:"显示"},
+});
-    {id:2,name:"隐藏"}
+if (route.query?.id) queryParams.id = route.query.id;
-])
+if (route.query?.company_id) queryParams.company_id = route.query.company_id;
+const statusdata = reactive([
+  { id: 1, name: "显示" },
+  { id: 2, name: "隐藏" },
+]);
 
 // 选中数据
-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: apiTaskTemplateLists,
-    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");
-}
+  editRef.value?.setFormData({ company_id: queryParams.company_id });
+};
 
 // 编辑
 const handleEdit = async (data: any) => {
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('edit')
+  editRef.value?.open("edit");
-    editRef.value?.setFormData(data)
+  editRef.value?.setFormData(data);
-}
+};
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
+  await feedback.confirm("确定要删除？");
-    await apiTaskTemplateDelete({ id })
+  await apiTaskTemplateDelete({ id });
-    getLists()
+  getLists();
-}
+};
 //任务类型接口
 dictDataLists({ type_id: 10 }).then((res) => {
   datalist.value = res.lists;
 });
-getLists()
+getLists();
 </script>
 <style lang="scss" scoped>
-.formtabel{
+.formtabel {
-    .el-form-item{
+  .el-form-item {
     width: 20%;
-        .el-btn{
+    .el-btn {
       margin-left: 60px;
     }
   }
 }
-
 </style>