Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/api.ts

@@ -0,0 +1,68 @@
+export const defalutModalForm = {
+  taskName: "", //任务名称
+  priority: "", //优先级
+  taskType: "0", //  任务类型
+  customerId: null, //  客户id 0
+  businessId: null, //商机id 1
+  orderId: null, //  订单id 2
+  clueId: null, //线索id 3
+  contactsId: null, //联系人id
+  executorId: null, //执行人id
+  repeat: "0", //是否重复
+  repeatType: "0", //重复类型
+  endType: "1", //结束类型
+  repeatEndNever: "1",
+  repeatEndCount: null, //重复指定次数次数后结束
+  repeatEndDate: null, //重复到指定日期后结束
+  repeatDesignDay: null, //自定义日期
+  repeatDesignSameday: null, //自定义周期
+  startDate: "", //开始日期
+  endDate: "", //截止日期
+  taskDesc: "", //任务描述
+  taskLogs: [],
+};
+export const PRIORITY = [
+  //优先级
+  { label: "高", value: "0" },
+  { label: "中", value: "1" },
+  { label: "低", value: "2" },
+];
+
+export const TASK_TYPE = [
+  // 弹窗任务类型
+  { label: "客户", value: "0", show: true },
+  { label: "商机", value: "1", show: true },
+  { label: "销售订单", value: "2", show: true },
+  { label: "线索", value: "3", show: false },
+];
+export const TASK_TYPE_FIELD = [
+  {
+    type: "0",
+    field: "customerId",
+  },
+  {
+    type: "1",
+    field: "businessId",
+  },
+  {
+    type: "2",
+    field: "orderId",
+  },
+  {
+    type: "3",
+    field: "clueId",
+  },
+];
+
+export const REPEAT_TYPE = [
+  { label: "每天", value: "0" },
+  { label: "每周", value: "1" },
+  { label: "每月", value: "2" },
+  { label: "自定义周期", value: "3" },
+  { label: "自定义日期", value: "4" },
+];
+export const defaultGenerateFormData = {
+  list: [],
+  config: {},
+};
+export const CUSTOMER_FORM_URL = "/sys-form/getListByCode/tasks";

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/index.vue

@@ -0,0 +1,334 @@
+<template>
+  <el-dialog v-model="modalVisible" width="800px" :show-close="false" :close-on-click-modal="false" top="10vh">
+    <template #header="{ titleId, titleClass }">
+      <div class="flex justify-between items-center border-b pb-3">
+        <h4 :id="titleId" :class="titleClass">{{ editForm ? '编辑任务' : '新增任务' }}</h4>
+        <div>
+          <el-button v-if="!editForm" type="primary" :loading="['2'].includes(props.saveLoading)"
+            @click="submitForm(formRef, true)">保存并新建</el-button>
+          <el-button type="primary" :loading="['2'].includes(props.saveLoading)"
+            @click="submitForm(formRef, false)">保存</el-button>
+          <el-button @click="closeVisible()">取消</el-button>
+        </div>
+      </div>
+    </template>
+    <div class="h-[55vh] overflow-y-auto scroll-bar">
+      <el-form ref="formRef" :model="form" label-width="100px" :rules="rules" class="flex flex-wrap form">
+        <el-form-item label="任务名称" prop="taskName" required>
+          <el-input v-model="form.taskName" type="textarea" placeholder="请输入任务名称" clearable maxlength="100"
+            show-word-limit />
+        </el-form-item>
+        <el-form-item prop="priority" label="优先级" required>
+          <el-select v-model="form.priority" placeholder="请选择" clearable>
+            <el-option v-for="item in PRIORITY " :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="form.taskType">
+          <template #label>
+            <el-select v-model="form.taskType" class="border resetSelect" style="width: 100px" @change="changeTaskType">
+              <el-option v-for="item in TASK_TYPE" :key="item.value" :value="item.value" :label="item.label" />
+            </el-select>
+          </template>
+          <template v-for="item in TASK_TYPE_FIELD">
+            <el-select v-model="form[item.field]" v-if="form.taskType == item.type" placeholder="请选择" clearable
+              filterable>
+              <el-option v-for="item in taskTypeValueData" :key="item.value" :value="item.value" :label="item.label" />
+            </el-select>
+          </template>
+        </el-form-item>
+        <el-form-item label="联系人" v-if="TASK_TYPE.find(v => v.value === (form.taskType || '1'))?.show">
+          <el-select v-model="form.contactsId" placeholder="请选择" clearable filterable>
+            <el-option v-for="item in contactValueData" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行人">
+          <el-select v-model="form.executorId" placeholder="请选择" clearable multiple filterable>
+            <el-option v-for="item in executorValueData" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="重复提醒">
+          <el-switch v-model="form.repeat" active-value="1" inactive-value="0" @change="changeRepeat" />
+        </el-form-item>
+        <template v-if="form.repeat === '1'">
+          <el-form-item label="重复类型" label-width="7em">
+            <el-select v-model="form.repeatType" placeholder="请选择" @change="changeRepeatType">
+              <el-option v-for="item in REPEAT_TYPE" :key="item.value" :value="item.value" :label="item.label" />
+            </el-select>
+          </el-form-item>
+          <template v-if="['0', '1', '2', '3'].includes(form.repeatType)">
+            <el-form-item label="每" label-width="7em" v-if="form.repeatType == 3">
+              <el-input-number v-model="form.repeatDesignSameday" controls-position="right" :min="1" />天
+            </el-form-item>
+            <el-form-item label="结束" label-width="7em">
+              <el-radio-group v-model="form.endType" @change="changeEndType">
+                <el-radio label="1" class="w-full">永不</el-radio>
+                <el-radio label="2" class="w-full mb-3"><el-input-number v-model="form.repeatEndCount" :min="1"
+                    controls-position="right" />
+                  次以后
+                </el-radio>
+                <el-radio label="3" class="w-full">
+                  <el-date-picker v-model="form.repeatEndDate" type="date" placeholder="选择日期" style="width:65%"
+                    :disabled-date="(value: Date) => (new Date() > new Date(value))" />
+                  以后
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </template>
+          <template v-if="['4'].includes(form.repeatType)">
+            <el-form-item v-for="(v, i) in customeDate" class="flex justify-between items-center customeDate">
+              <div>
+                第{{ i + 1 }}次重复在
+                <el-input-number :model-value="Number(v)" controls-position="right" @change="changeDate(i, $event)"
+                  :min="1" />
+                天后
+              </div>
+              <div>
+                <el-icon size="24" @click="deleteCustomeDateItem(i)" class=" hover:text-blue-500 cursor-pointer">
+                  <Delete />
+                </el-icon>
+              </div>
+            </el-form-item>
+            <el-form-item>
+              <div>
+                <el-icon size="24" @click="addCustomeDateItem()" class=" hover:text-blue-500 cursor-pointer">
+                  <Plus />
+                </el-icon>
+              </div>
+            </el-form-item>
+          </template>
+        </template>
+        <el-form-item label="开始时间" label-width="7em" class="w50">
+          <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" />
+        </el-form-item>
+        <el-form-item label="截止时间" label-width="7em" class="w50">
+          <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" />
+        </el-form-item>
+      </el-form>
+      <GenerateForm ref="generateFormRef" :data="generateFormData" :value="form" />
+      <div v-if="editForm">
+        <el-form-item label="操作记录" label-width="7em">
+        </el-form-item>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch } from 'vue';
+import { PRIORITY, TASK_TYPE, TASK_TYPE_FIELD, defalutModalForm, REPEAT_TYPE, CUSTOMER_FORM_URL, defaultGenerateFormData } from "./api";
+import { GenerateForm } from "@zmjs/form-design"
+import { get } from '@/utils/request';
+import { Delete, Plus } from "@element-plus/icons-vue"
+import { FormInstance } from 'element-plus';
+import { getFromValue } from '@/utils/tools';
+const props = defineProps<{
+  visible: boolean,
+  saveLoading: saveLoadingType,
+  editForm: Object
+}>()
+const emit = defineEmits(['closeModalVisible', 'submitForm'])
+watch(() => props.saveLoading, (val) => {
+  if (val == "3") {
+    formRef.value?.resetFields();
+    form.value = { ...defalutModalForm };
+  }
+})
+watch(() => props.visible, (val) => {
+  formRef.value?.resetFields();
+  modalVisible.value = val
+  if (val) {
+    get(CUSTOMER_FORM_URL).then(res => {
+      if (Array.isArray(res.data) && res.data.length > 0) {
+        generateFormData.value = JSON.parse(res.data[0].config)
+      }
+    })
+  }
+})
+watch(() => props.editForm, (val) => {
+  if (!val) {
+    //TODO 如果是新增
+    form.value = { ...defalutModalForm };
+    taskTypeValueData.value = [{ label: '客户1', value: '1' }, { label: '客户2', value: '2' }];
+    contactValueData.value = [{ label: '联系人1', value: '1' }, { label: '联系人2', value: '2' }];
+    executorValueData.value = [{ label: '执行人1', value: '1' }, { label: '执行人2', value: '2' }];
+    return
+  }
+  //TODO 如果是编辑
+  form.value = { ...val };
+  customeDate.value = (form.value.repeatDesignSameday || "").split(',').filter(Boolean);
+  changeTaskType(form.value.taskType)
+  contactValueData.value = [{ label: '联系人1', value: '1' }, { label: '联系人2', value: '2' }];
+  executorValueData.value = [{ label: '执行人1', value: '1' }, { label: '执行人2', value: '2' }];
+
+})
+const rules = ref({
+  taskName: [
+    { required: true, message: '请输入任务名称', trigger: 'blur' }
+  ],
+  priority: [
+    { required: true, message: '请选择优先级', trigger: 'change' }
+  ]
+})
+const form = ref<any>({});
+const formRef = ref<FormInstance>();
+const generateFormRef = ref<typeof GenerateForm>();
+const generateFormData = ref<any>(defaultGenerateFormData);
+
+const modalVisible = ref(false);
+function closeVisible() {
+  generateFormData.value = defaultGenerateFormData;
+  emit('closeModalVisible')
+}
+function submitForm(formEl: FormInstance | undefined, isClose: boolean) {
+  if (!formEl) return
+  formEl.validate((valid) => {
+    if (!valid) {
+      return false
+    }
+    const repeatDesignDay = customeDate.value.join(",")
+    generateFormRef.value?.getData().then((res: any) => {
+      let submitData = getFromValue({
+        ...form.value,
+        repeatDesignDay,
+        ...res
+      })
+      console.log("submitDAata", submitData);
+      emit('submitForm', submitData, isClose)
+    }).catch((err: any) => {
+      console.log(err);
+    })
+  })
+}
+
+const taskTypeValueData = ref<any>([])
+function changeTaskType(value: TASK_VALUE_TYPE) {
+  form.value = {
+    ...form.value,
+    taskType: value,
+    customerId: null, //  客户id 0
+    businessId: null, //商机id 1
+    orderId: null, //  订单id 2
+    clueId: null, //线索id 3
+    contactsId: null, //联系人id
+  }
+  switch (value) {
+    case "0":
+      taskTypeValueData.value = [];
+      setTimeout(() => {
+        taskTypeValueData.value = [{ label: '客户1', value: '1' }, { label: '客户2', value: '2' }];
+      }, 500)
+      break;
+    case '1':
+      taskTypeValueData.value = [];
+      setTimeout(() => {
+        taskTypeValueData.value = [{ label: "商机1", value: "1" }, { label: "商机2", value: "2" }]
+      }, 500)
+      break;
+    case '2':
+      taskTypeValueData.value = [];
+      setTimeout(() => {
+        taskTypeValueData.value = [{ label: "订单1", value: "1" }, { label: "订单2", value: "2" }]
+      }, 500)
+      break;
+    case '3':
+      taskTypeValueData.value = [];
+      setTimeout(() => {
+        taskTypeValueData.value = [{ label: "线索1", value: "1" }, { label: "线索2", value: "2" }]
+      }, 500)
+      break;
+    default:
+      const _n: never = value;
+      break;
+  }
+}
+
+const contactValueData = ref<any>([])
+
+const executorValueData = ref<any>([])
+
+function changeRepeat(value: string | number | boolean) {
+  form.value = {
+    ...form.value,
+    repeat: value,
+    repeatType: "0", //重复类型
+    endType: "1", //结束类型
+    repeatEndNever: "1",
+    repeatEndCount: null, //重复指定次数次数后结束
+    repeatEndDate: null, //重复到指定日期后结束
+    repeatDesignDay: null, //自定义日期
+    repeatDesignSameday: null, //自定义周期
+  }
+  customeDate.value = [];
+}
+
+function changeRepeatType(value: REPEAT_VALUE_TYPE) {
+  form.value = {
+    ...form.value,
+    repeatType: value, //重复类型
+    endType: "1", //结束类型
+    repeatEndNever: "1",
+    repeatEndCount: null, //重复指定次数次数后结束
+    repeatEndDate: null, //重复到指定日期后结束
+    repeatDesignDay: null, //自定义日期
+    repeatDesignSameday: null, //自定义周期
+  }
+  customeDate.value = [];
+}
+
+function changeEndType(value: string | number | boolean) {
+  form.value = {
+    ...form.value,
+    endType: value, //重复类型
+    repeatEndNever: value == "1" ? "1" : null,//永不结束
+    repeatEndCount: null, //重复指定次数次数后结束
+    repeatEndDate: null, //重复到指定日期后结束
+    repeatDesignDay: null, //自定义日期
+    repeatDesignSameday: null, //自定义周期
+  }
+}
+
+const customeDate = ref<any>([])
+function changeDate(index: number, value: number | undefined) {
+  customeDate.value[index] = value;
+}
+function deleteCustomeDateItem(index: number) {
+  customeDate.value = customeDate.value.filter((_item: number, i: number) => i !== index);
+}
+function addCustomeDateItem() {
+  customeDate.value.push(undefined)
+}
+
+
+</script>
+
+<style lang="scss">
+.resetSelect {
+  border: 0;
+
+  .el-select__wrapper {
+    box-shadow: none;
+    padding-right: 0;
+  }
+
+  .el-select__selected-item {
+    text-align: right;
+  }
+}
+
+.customeDate {
+
+  .el-form-item__content {
+    justify-content: space-between;
+  }
+}
+
+.el-form-item {
+  width: 100%;
+}
+
+.form {
+  .w50 {
+    @apply w-1/2;
+  }
+}
+</style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/type.d.ts

@@ -0,0 +1,2 @@
+type TASK_VALUE_TYPE = "0" | "1" | "2" | "3";
+type REPEAT_VALUE_TYPE = "0" | "1" | "2" | "3" | "4";

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/TaskModal.vue

@@ -1,141 +0,0 @@
-<template>
-  <el-dialog v-model="modalVisible" width="30%" :show-close="false" :close-on-click-modal="false">
-    <template #header="{ titleId, titleClass }">
-      <div class="flex justify-between items-center border-b pb-3">
-        <h4 :id="titleId" :class="titleClass">{{ editForm ? '编辑任务' : '新增任务' }}</h4>
-        <div>
-          <el-button type="primary" @click="submitForm(false)">保存并新建</el-button>
-          <el-button type="primary" @click="submitForm(true)">保存</el-button>
-          <el-button @click="closeVisible()">取消</el-button>
-        </div>
-      </div>
-    </template>
-    <el-form ref="formRef" :model="form" label-width="100px" :rules="rules" class="flex flex-wrap form">
-      <el-form-item label="任务名称" prop="taskName" required>
-        <el-input v-model="form.taskName" type="textarea" placeholder="请输入任务名称" clearable maxlength="100"
-          show-word-limit />
-      </el-form-item>
-      <el-form-item prop="priority" label="优先级" required>
-        <el-select v-model="form.priority" placeholder="请选择" clearable>
-          <el-option v-for="item in PRIORITY " :key="item.value" :value="item.value" :label="item.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="taskType" :label="form.taskType">
-        <template #label>
-          <el-select v-model="form.taskType" class="border resetSelect" style="width: 100px">
-            <el-option v-for="item in TASK_TYPE" :key="item.value" :value="item.value" :label="item.label" />
-          </el-select>
-        </template>
-        <el-select v-model="form.priority" placeholder="请选择" clearable filterable>
-          <el-option v-for="item in PRIORITY" :key="item.value" :value="item.value" :label="item.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="联系人" v-if="TASK_TYPE.find(v => v.value === (form.taskType || '1'))?.show">
-        <el-select v-model="form.contact" placeholder="请选择" clearable filterable>
-          <el-option v-for="item in PRIORITY" :key="item.value" :value="item.value" :label="item.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="执行人">
-        <el-select v-model="form.executeor" placeholder="请选择" clearable multiple filterable>
-          <el-option v-for="item in PRIORITY" :key="item.value" :value="item.value" :label="item.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="重复提醒">
-        <el-switch v-model="form.repeat" active-value="1" inactive-value="0" />
-      </el-form-item>
-      <template v-if="form.repeat === '1'">
-        <el-form-item label="重复类型" label-width="7em" prop="startDate">
-          <el-select v-model="form.repeatType" placeholder="请选择">
-            <el-option v-for="item in REPEAT_TYPE" :key="item.value" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <template v-if="['0', '1', '2'].includes(form.repeatType)">
-          <div>
-            {{ REPEAT_TYPE[form.repeatType].label }}
-          </div>
-        </template>
-        <template v-if="['3'].includes(form.repeatType)">
-          <div>
-            {{ '自定义周期' }}
-          </div>
-        </template>
-        <template v-if="['4'].includes(form.repeatType)">
-          <div>
-            {{ '自定义日期' }}
-          </div>
-        </template>
-      </template>
-      <el-form-item label="开始时间" label-width="7em" prop="startDate" class="w50">
-        <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" />
-      </el-form-item>
-      <el-form-item label="截止时间" label-width="7em" prop="endDate" class="w50">
-        <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" />
-      </el-form-item>
-    </el-form>
-    <el-form-item label="详细描述" prop="taskName">
-      <el-input v-model="form.taskName" type="textarea" placeholder="请输入任务名称" clearable maxlength="1000" show-word-limit
-        :autosize="{ minRows: 4 }" />
-    </el-form-item>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, watch } from 'vue';
-import { PRIORITY, TASK_TYPE, modalForm, REPEAT_TYPE } from "./api"
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false
-  },
-  editForm: {
-    type: Object,
-  }
-})
-const emit = defineEmits(['closeModalVisible', 'submitForm'])
-const modalVisible = ref(false)
-const form = ref<any>({})
-const rules = ref({
-  taskName: [
-    { required: true, message: '请输入任务名称', trigger: 'blur' }
-  ],
-  priority: [
-    { required: true, message: '请选择优先级', trigger: 'blur' }
-  ]
-})
-function closeVisible() {
-  emit('closeModalVisible')
-}
-function submitForm(isClose: boolean) {
-  console.log("form", form.value, isClose);
-  // emit('submitForm', { form: form.value, isClose })
-}
-watch(props, (val) => {
-  modalVisible.value = val.visible
-  form.value = val.editForm ? { ...val.editForm } : modalForm
-})
-</script>
-
-<style lang="scss">
-.resetSelect {
-  border: 0;
-
-  .el-select__wrapper {
-    box-shadow: none;
-    padding-right: 0;
-  }
-
-  .el-select__selected-item {
-    text-align: right;
-  }
-}
-
-.el-form-item {
-  width: 100%;
-}
-
-.form {
-  .w50 {
-    @apply w-1/2;
-  }
-}
-</style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/api.ts

@@ -1,6 +1,7 @@
 import { EpPropMergeType } from "element-plus/es/utils";
 
 export const MDO = "/tasks";
+
 type StatusType = {
   label: "全部" | "未开始" | "进行中" | "已完成" | "已超时";
   value: string;
@@ -22,22 +23,6 @@ export const defaultSearchForm = {
   page: 1,
   pageSize: 10,
 };
-export const modalForm = {
-  taskName: "", //任务名称
-  priority: "", //优先级
-  taskType: "1", //  任务类型
-  customerId: "0", //  客户id 0
-  businessId: "1", //商机id 1
-  orderId: "2", //  订单id 2
-  clueid: "3", //线索id 3
-  contactsId: "", //联系人id
-  executorId: "", //执行人id
-  repeat: "0", //是否重复
-  repeatType: "0", //重复类型
-  startDate: "", //开始日期
-  endDate: "", //截止日期
-  taskDesc: "", //任务描述
-};
 export const PRIORITY = [
   //优先级
   { label: "高", value: "0" },
@@ -51,17 +36,3 @@ export const STATUS: StatusType[] = [
   { label: "已完成", value: "2", type: "success" },
   { label: "已超时", value: "3", type: "danger" },
 ];
-export const TASK_TYPE = [
-  // 弹窗任务类型
-  { label: "客户", value: "0", show: true },
-  { label: "商机", value: "1", show: true },
-  { label: "销售订单", value: "2", show: true },
-  { label: "线索", value: "3", show: false },
-];
-export const REPEAT_TYPE = [
-  { label: "每天", value: "0" },
-  { label: "每周", value: "1" },
-  { label: "每月", value: "2" },
-  { label: "自定义周期", value: "3" },
-  { label: "自定义日期", value: "4" },
-];

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/index.vue

@@ -114,7 +114,8 @@
         </div>
       </div>
     </div>
-    <TaskModal :visible="taskModalVisible" :edit-form="taskForm" @close-modal-visible="closeModal()" />
+    <TaskModal :visible="taskModalVisible" :saveLoading="taskLoading" :edit-form="taskForm"
+      @close-modal-visible="closeModal()" @submitForm="submitForm" />
   </div>
 </template>
 
@@ -123,17 +124,26 @@ import { onBeforeMount, ref } from 'vue';
 import { useStore } from '@/store';
 import { MDO, PRIORITY, STATUS, defaultSearchForm } from './api';
 import { dayjs } from 'element-plus';
-import TaskModal from './TaskModal.vue';
+import TaskModal from '@/components/TaskModal/index.vue';
 const { getFunctionList } = useStore()
 
 const pagePermission = ref<any[]>();
 const taskModalVisible = ref(false);
 const taskForm = ref<any>();
+const taskLoading = ref<saveLoadingType>("1");
 function closeModal() {
   taskModalVisible.value = false;
   taskForm.value = null;
 }
+function submitForm(data: any, isClose: boolean) {
+  console.log("提交的数据水水水水", data, isClose);
+  taskLoading.value = "2";
+  setTimeout(() => {
+    taskLoading.value = "4";
+    taskModalVisible.value = isClose;
+  }, 2000)
 
+}
 const searchForm = ref<any>();
 const tableData = ref<any[]>([
   {
@@ -145,7 +155,33 @@ const tableData = ref<any[]>([
     priority: '0',
     startDate: dayjs().format('YYYY-MM-DD'),
     endDate: dayjs().format('YYYY-MM-DD'),
-    taskType: '1'
+    taskType: '1',
+    endType: '1',
+    taskDesc: "任务秒数",
+    repeat_design_sameday: "1,4,3,4",
+    taskLogs: [
+      {
+        id: 3,
+        operateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        operateType: '3',
+        operateUser: '张三',
+        operateDesc: '删除任务'
+
+      },
+      {
+        id: 2,
+        operateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        operateType: '2',
+        operateUser: '张三',
+        operateDesc: '修改任务'
+      }, {
+        id: 1,
+        operateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        operateType: '1',
+        operateUser: '张三',
+        operateDesc: '创建任务'
+      }
+    ]
   },
   {
     taskName: '任务222',
@@ -203,7 +239,7 @@ function search() {
   console.log("searchForm", searchForm.value);
 }
 function reset() {
-  searchForm.value = defaultSearchForm;
+  searchForm.value = { ...defaultSearchForm };
 }
 function createTasks() {
   taskModalVisible.value = true;
@@ -237,7 +273,7 @@ function deleteRow(index: any) {
 }
 onBeforeMount(() => {
   pagePermission.value = getFunctionList(MDO);
-  searchForm.value = defaultSearchForm;
+  searchForm.value = { ...defaultSearchForm };
 })
 </script>
 

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/global.scss

@@ -23,7 +23,7 @@ $modena: #6f4afe;
 }
 
 .scroll-bar::-webkit-scrollbar-thumb {
-  background: linear-gradient(to bottom right, #075985 0%, #075985 100%);
+  background: linear-gradient(to bottom right, #C1C1C1 0%, #C1C1C1 100%);
   border-radius: 5px;
 }
 
@@ -33,7 +33,7 @@ $modena: #6f4afe;
 }
 
 .scroll-bar::-webkit-scrollbar-button {
-  background-color: #075985;
+  background-color: #C1C1C1;
   border-radius: 2px;
   height: 4px;
 }

fhKeeper/formulahousekeeper/customerBuler-crm/src/type.d.ts

@@ -6,8 +6,19 @@ interface GlobalPopup extends Notify {
 }
 
 interface Tree {
-  label: string
-  children?: Tree[]
+  label: string;
+  children?: Tree[];
 }
 
-type ListByCodeType = ('线索来源'|'客户级别'|'客户行业'|'客户来源'|'商机阶段'|'产品类型'|'产品单位'|'订单类型')[] 
+type ListByCodeType = (
+  | "线索来源"
+  | "客户级别"
+  | "客户行业"
+  | "客户来源"
+  | "商机阶段"
+  | "产品类型"
+  | "产品单位"
+  | "订单类型"
+)[];
+
+type saveLoadingType = "1" | "2" | "3" | "4"; //1是没有保存, 2是正在保存, 3是保存成功, 4是保存失败

fhKeeper/formulahousekeeper/customerBuler-crm/vite.config.ts

@@ -3,12 +3,14 @@ import vue from "@vitejs/plugin-vue";
 
 import { resolve } from "path";
 
-const target = "http://47.101.180.183:10010";
+// const target = "http://192.168.2.8:10010";
+const target = "http://192.168.2.118:10010";
+// const target = "http://47.101.180.183:10010";
 
 export default defineConfig({
   plugins: [vue()],
   server: {
-    host: "127.0.0.1",
+    host: "0.0.0.0",
     port: 19123,
     open: true,
     proxy: {