From dced551698dd133b87acda47d8e2724e8d01077e Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Mon, 16 Oct 2023 23:56:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20CRM/=E5=90=88=E5=90=8C=20crud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contract/index.ts           |  53 +++++
 src/views/crm/contract/ContractForm.vue | 228 +++++++++++++++++++++
 src/views/crm/contract/contract.data.ts | 227 +++++++++++++++++++++
 src/views/crm/contract/index.vue        | 253 ++++++++++++++++++++++++
 4 files changed, 761 insertions(+)
 create mode 100644 src/api/crm/contract/index.ts
 create mode 100644 src/views/crm/contract/ContractForm.vue
 create mode 100644 src/views/crm/contract/contract.data.ts
 create mode 100644 src/views/crm/contract/index.vue

diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
new file mode 100644
index 00000000..bf438323
--- /dev/null
+++ b/src/api/crm/contract/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface ContractVO {
+  id: number
+  name: string
+  customerId: number
+  businessId: number
+  processInstanceId: number
+  orderDate: Date
+  ownerUserId: number
+  no: string
+  startTime: Date
+  endTime: Date
+  price: number
+  discountPercent: number
+  productPrice: number
+  roUserIds: string
+  rwUserIds: string
+  contactId: number
+  signUserId: number
+  contactLastTime: Date
+  remark: string
+}
+
+// 查询合同列表
+export const getContractPage = async (params) => {
+  return await request.get({ url: `/crm/contract/page`, params })
+}
+
+// 查询合同详情
+export const getContract = async (id: number) => {
+  return await request.get({ url: `/crm/contract/get?id=` + id })
+}
+
+// 新增合同
+export const createContract = async (data: ContractVO) => {
+  return await request.post({ url: `/crm/contract/create`, data })
+}
+
+// 修改合同
+export const updateContract = async (data: ContractVO) => {
+  return await request.put({ url: `/crm/contract/update`, data })
+}
+
+// 删除合同
+export const deleteContract = async (id: number) => {
+  return await request.delete({ url: `/crm/contract/delete?id=` + id })
+}
+
+// 导出合同 Excel
+export const exportContract = async (params) => {
+  return await request.download({ url: `/crm/contract/export-excel`, params })
+}
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
new file mode 100644
index 00000000..5d5578f9
--- /dev/null
+++ b/src/views/crm/contract/ContractForm.vue
@@ -0,0 +1,228 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="合同名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入合同名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="客户" prop="customerId">
+            <el-input v-model="formData.customerId" placeholder="请选择对应客户" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item label="商机名称" prop="businessId">
+        <el-input v-model="formData.businessId" placeholder="请选择对应商机" />
+      </el-form-item>
+      <el-form-item label="工作流" prop="processInstanceId">
+        <el-input v-model="formData.processInstanceId" placeholder="请选择工作流" />
+      </el-form-item>
+      <el-form-item label="下单日期" prop="orderDate">
+        <el-date-picker
+          v-model="formData.orderDate"
+          type="date"
+          value-format="x"
+          placeholder="选择下单日期"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-input v-model="formData.ownerUserId" placeholder="请选择负责人" />
+      </el-form-item>
+      <el-form-item label="合同编号" prop="no">
+        <el-input v-model="formData.no" placeholder="请输入合同编号" />
+      </el-form-item>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="formData.startTime"
+              type="date"
+              value-format="x"
+              placeholder="选择开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="formData.endTime"
+              type="date"
+              value-format="x"
+              placeholder="选择结束时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="合同金额" prop="price">
+            <el-input v-model="formData.price" placeholder="请输入合同金额" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="整单折扣" prop="discountPercent">
+            <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="产品总金额" prop="productPrice">
+            <el-input v-model="formData.productPrice" placeholder="请输入产品总金额" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item label="只读权限的用户" prop="roUserIds">
+        <el-input v-model="formData.roUserIds" placeholder="请输入只读权限的用户" />
+      </el-form-item>
+      <el-form-item label="读写权限的用户" prop="rwUserIds">
+        <el-input v-model="formData.rwUserIds" placeholder="请输入读写权限的用户" />
+      </el-form-item>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="联系人编号" prop="contactId">
+            <el-input v-model="formData.contactId" placeholder="请输入联系人编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司签约人" prop="signUserId">
+            <el-input v-model="formData.signUserId" placeholder="请输入公司签约人" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item label="最后跟进时间" prop="contactLastTime">
+        <el-date-picker
+          v-model="formData.contactLastTime"
+          type="date"
+          value-format="x"
+          placeholder="选择最后跟进时间"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as ContractApi from '@/api/crm/contract'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  customerId: undefined,
+  businessId: undefined,
+  processInstanceId: undefined,
+  orderDate: undefined,
+  ownerUserId: undefined,
+  no: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  price: undefined,
+  discountPercent: undefined,
+  productPrice: undefined,
+  roUserIds: undefined,
+  rwUserIds: undefined,
+  contactId: undefined,
+  signUserId: undefined,
+  contactLastTime: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ContractApi.getContract(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ContractApi.ContractVO
+    if (formType.value === 'create') {
+      await ContractApi.createContract(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContractApi.updateContract(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    customerId: undefined,
+    businessId: undefined,
+    processInstanceId: undefined,
+    orderDate: undefined,
+    ownerUserId: undefined,
+    no: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    price: undefined,
+    discountPercent: undefined,
+    productPrice: undefined,
+    roUserIds: undefined,
+    rwUserIds: undefined,
+    contactId: undefined,
+    signUserId: undefined,
+    contactLastTime: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/crm/contract/contract.data.ts b/src/views/crm/contract/contract.data.ts
new file mode 100644
index 00000000..7550677b
--- /dev/null
+++ b/src/views/crm/contract/contract.data.ts
@@ -0,0 +1,227 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const rules = reactive({
+  name: [required]
+})
+
+// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    label: '合同编号',
+    field: 'id',
+    isForm: false
+  },
+  {
+    label: '合同名称',
+    field: 'name',
+    isSearch: true
+  },
+  {
+    label: '客户编号',
+    field: 'customerId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '商机编号',
+    field: 'businessId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '工作流编号',
+    field: 'processInstanceId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '下单日期',
+    field: 'orderDate',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '负责人的用户编号',
+    field: 'ownerUserId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '合同编号',
+    field: 'no',
+    isSearch: true
+  },
+  {
+    label: '开始时间',
+    field: 'startTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '合同金额',
+    field: 'price',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '整单折扣',
+    field: 'discountPercent',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '产品总金额',
+    field: 'productPrice',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '只读权限的用户编号数组',
+    field: 'roUserIds',
+    isSearch: true
+  },
+  {
+    label: '读写权限的用户编号数组',
+    field: 'rwUserIds',
+    isSearch: true
+  },
+  {
+    label: '联系人编号',
+    field: 'contactId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isSearch: true
+  },
+  {
+    label: '公司签约人',
+    field: 'signUserId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '最后跟进时间',
+    field: 'contactLastTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false
+  }
+])
+export const { allSchemas } = useCrudSchemas(crudSchemas)
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
new file mode 100644
index 00000000..7a8211be
--- /dev/null
+++ b/src/views/crm/contract/index.vue
@@ -0,0 +1,253 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="合同名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户编号" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="商机编号" prop="businessId">
+        <el-input
+          v-model="queryParams.businessId"
+          placeholder="请输入商机编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="下单日期" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="合同编号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['crm:contract:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:contract:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="合同编号" align="center" prop="id" />
+      <el-table-column label="合同名称" align="center" prop="name" />
+      <el-table-column label="客户名称" align="center" prop="customerId" />
+      <el-table-column label="商机名称" align="center" prop="businessId" />
+      <el-table-column label="工作流名称" align="center" prop="processInstanceId" />
+      <el-table-column
+        label="下单时间"
+        align="center"
+        prop="orderDate"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column label="合同编号" align="center" prop="no" />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="合同金额" align="center" prop="price" />
+      <el-table-column label="整单折扣" align="center" prop="discountPercent" />
+      <el-table-column label="产品总金额" align="center" prop="productPrice" />
+      <el-table-column label="联系人" align="center" prop="contactId" />
+      <el-table-column label="公司签约人" align="center" prop="signUserId" />
+      <el-table-column
+        label="最后跟进时间"
+        align="center"
+        prop="contactLastTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+
+      <el-table-column label="操作" width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:contract:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:contract:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ContractForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ContractApi from '@/api/crm/contract'
+import ContractForm from './ContractForm.vue'
+
+defineOptions({ name: 'Contract' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  customerId: null,
+  businessId: null,
+  orderDate: [],
+  no: null,
+  discountPercent: null,
+  productPrice: null
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ContractApi.getContractPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContractApi.deleteContract(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContractApi.exportContract(queryParams)
+    download.excel(data, '合同.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From c27685285a6dfac271b4337f46ab6c5067624cee Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 17 Oct 2023 19:50:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?code=20review=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84=E5=AE=A1=E6=89=B9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessInstanceChildrenTaskList.vue       | 49 +++++++++----------
 .../detail/TaskAddSignDialogForm.vue          | 12 ++---
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
index f162d1fb..363874cf 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
@@ -1,13 +1,20 @@
 <template>
   <el-drawer v-model="drawerVisible" title="子任务" size="70%">
+    <!-- 当前任务 -->
     <template #header>
       <h4>【{{ baseTask.name }} 】审批人：{{ baseTask.assigneeUser?.nickname }}</h4>
-      <el-button style="margin-left: 5px" v-if="showSubSignButton(baseTask)" type="danger" plain @click="handleSubSign(baseTask)">
-        <Icon icon="ep:remove" />
-        减签
+      <el-button
+        style="margin-left: 5px"
+        v-if="isSubSignButtonVisible(baseTask)"
+        type="danger"
+        plain
+        @click="handleSubSign(baseTask)"
+      >
+        <Icon icon="ep:remove" /> 减签
       </el-button>
     </template>
-    <el-table :data="tableData" style="width: 100%" row-key="id" border>
+    <!-- 子任务列表 -->
+    <el-table :data="baseTask.children" style="width: 100%" row-key="id" border>
       <el-table-column prop="assigneeUser.nickname" label="审批人" />
       <el-table-column prop="assigneeUser.deptName" label="所在部门" />
       <el-table-column label="审批状态" prop="result">
@@ -32,18 +39,17 @@
       <el-table-column label="操作" prop="operation">
         <template #default="scope">
           <el-button
-            v-if="showSubSignButton(scope.row)"
+            v-if="isSubSignButtonVisible(scope.row)"
             type="danger"
             plain
             @click="handleSubSign(scope.row)"
           >
-            <Icon icon="ep:remove" />
-            减签
+            <Icon icon="ep:remove" /> 减签
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <!--  减签   -->
+    <!-- 减签 -->
     <TaskSubSignDialogForm ref="taskSubSignDialogForm" />
   </el-drawer>
 </template>
@@ -53,12 +59,11 @@ import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import TaskSubSignDialogForm from './TaskSubSignDialogForm.vue'
 
-const message = useMessage() // 消息弹窗
-defineOptions({ name: 'ProcessInstancechildrenList' })
+defineOptions({ name: 'ProcessInstanceChildrenTaskList' })
 
+const message = useMessage() // 消息弹窗
 const drawerVisible = ref(false) // 抽屉的是否展示
 
-const tableData = ref<any[]>([]) //表格数据
 const baseTask = ref<object>({})
 /** 打开弹窗 */
 const open = async (task: any) => {
@@ -67,30 +72,22 @@ const open = async (task: any) => {
     return
   }
   baseTask.value = task
-  //设置表格数据
-  tableData.value = task.children
-  //展开抽屉
+  // 展开抽屉
   drawerVisible.value = true
 }
 defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
 
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-
-/**
- * 减签
- */
+/** 发起减签 */
 const taskSubSignDialogForm = ref()
 const handleSubSign = (item) => {
   taskSubSignDialogForm.value.open(item.id)
+  // TODO @海洋：减签后，需要刷新下界面哈
 }
 
-/**
- * 显示减签按钮
- * @param task
- */
-const showSubSignButton = (task:any) => {
-  if(!isEmpty(task.children)){
-    //有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
+/** 是否显示减签按钮 */
+const isSubSignButtonVisible = (task: any) => {
+  if (task && task.children && !isEmpty(task.children)) {
+    // 有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
     const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
     return !isEmpty(subTask)
   }
diff --git a/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue b/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue
index 4b91c9b9..40cd200e 100644
--- a/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue
@@ -22,12 +22,12 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm('before')"
-        >向前加签</el-button
-      >
-      <el-button :disabled="formLoading" type="primary" @click="submitForm('after')"
-        >向后加签</el-button
-      >
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('before')">
+        向前加签
+      </el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('after')">
+        向后加签
+      </el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>

From d5328918ab91235de633fe252591ad2831a68b86 Mon Sep 17 00:00:00 2001
From: "1163996518@qq.com" <1163996518@qq.com>
Date: Tue, 17 Oct 2023 20:58:28 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/app/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue
index c949637b..7b8f1a96 100644
--- a/src/views/pay/app/index.vue
+++ b/src/views/pay/app/index.vue
@@ -51,7 +51,7 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['system:tenant:create']"
+          v-hasPermi="['pay:app:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -266,7 +266,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:tenant:update']"
+            v-hasPermi="['pay:app:update']"
           >
             编辑
           </el-button>
@@ -274,7 +274,7 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:tenant:delete']"
+            v-hasPermi="['pay:app:delete']"
           >
             删除
           </el-button>

From 533b4e5006c13892eba5e5b4e9cbd8840b65a35d Mon Sep 17 00:00:00 2001
From: "1163996518@qq.com" <1163996518@qq.com>
Date: Tue, 17 Oct 2023 21:27:13 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/app/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue
index 7b8f1a96..3531633f 100644
--- a/src/views/pay/app/index.vue
+++ b/src/views/pay/app/index.vue
@@ -47,12 +47,7 @@
       <el-form-item>
         <el-button @click="handleQuery"> <Icon icon="ep:search" class="mr-5px" />搜索 </el-button>
         <el-button @click="resetQuery"> <Icon icon="ep:refresh" class="mr-5px" />重置 </el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['pay:app:create']"
-        >
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['pay:app:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
       </el-form-item>

From 8832eafaae327cf11e2918991cbe3c9939eeb386 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 17 Oct 2023 22:52:24 +0800
Subject: [PATCH 5/7] =?UTF-8?q?code=20review=EF=BC=9Acrm=20=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/contract/contract.data.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/crm/contract/contract.data.ts b/src/views/crm/contract/contract.data.ts
index 7550677b..07458c24 100644
--- a/src/views/crm/contract/contract.data.ts
+++ b/src/views/crm/contract/contract.data.ts
@@ -6,6 +6,7 @@ export const rules = reactive({
   name: [required]
 })
 
+// TODO @dbh52：不使用 crud 模式哈，使用标准的 ep 代码哈；主要后续 crud schema 可能会改
 // CrudSchema https://doc.iocoder.cn/vue3/crud-schema/
 const crudSchemas = reactive<CrudSchema[]>([
   {

From 7af2a3bcc31dcfdc65db4fec968008b3a834bd2e Mon Sep 17 00:00:00 2001
From: "913752709@qq.com" <913752709@qq.com>
Date: Wed, 18 Oct 2023 20:02:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20CRM=20=E7=BA=BF=E7=B4=A2=E8=A1=A8?=
 =?UTF-8?q?=20crud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/clue/index.ts       |  46 +++++
 src/views/crm/clue/ClueForm.vue | 165 +++++++++++++++++
 src/views/crm/clue/index.vue    | 318 ++++++++++++++++++++++++++++++++
 3 files changed, 529 insertions(+)
 create mode 100644 src/api/crm/clue/index.ts
 create mode 100644 src/views/crm/clue/ClueForm.vue
 create mode 100644 src/views/crm/clue/index.vue

diff --git a/src/api/crm/clue/index.ts b/src/api/crm/clue/index.ts
new file mode 100644
index 00000000..39da03d3
--- /dev/null
+++ b/src/api/crm/clue/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+export interface ClueVO {
+  id: number
+  transformStatus: boolean
+  followUpStatus: boolean
+  name: string
+  customerId: number
+  contactNextTime: Date
+  telephone: string
+  mobile: string
+  address: string
+  ownerUserId: number
+  contactLastTime: Date
+  remark: string
+}
+
+// 查询线索列表
+export const getCluePage = async (params) => {
+  return await request.get({ url: `/crm/clue/page`, params })
+}
+
+// 查询线索详情
+export const getClue = async (id: number) => {
+  return await request.get({ url: `/crm/clue/get?id=` + id })
+}
+
+// 新增线索
+export const createClue = async (data: ClueVO) => {
+  return await request.post({ url: `/crm/clue/create`, data })
+}
+
+// 修改线索
+export const updateClue = async (data: ClueVO) => {
+  return await request.put({ url: `/crm/clue/update`, data })
+}
+
+// 删除线索
+export const deleteClue = async (id: number) => {
+  return await request.delete({ url: `/crm/clue/delete?id=` + id })
+}
+
+// 导出线索 Excel
+export const exportClue = async (params) => {
+  return await request.download({ url: `/crm/clue/export-excel`, params })
+}
diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
new file mode 100644
index 00000000..e72e4228
--- /dev/null
+++ b/src/views/crm/clue/ClueForm.vue
@@ -0,0 +1,165 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="转化状态" prop="transformStatus">
+        <el-radio-group v-model="formData.transformStatus">
+          <el-radio
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="跟进状态" prop="followUpStatus">
+        <el-radio-group v-model="formData.followUpStatus">
+          <el-radio
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="线索名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入线索名称" />
+      </el-form-item>
+      <!-- TODO 客户选择 -->
+      <el-form-item label="客户" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请选择客户" />
+      </el-form-item>
+      <el-form-item label="下次联系时间" prop="contactNextTime">
+        <el-date-picker
+          v-model="formData.contactNextTime"
+          type="date"
+          value-format="x"
+          placeholder="选择下次联系时间"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="telephone">
+        <el-input v-model="formData.telephone" placeholder="请输入电话" />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="formData.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地址" />
+      </el-form-item>
+      <!-- TODO 负责人选择 -->
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import * as ClueApi from '@/api/crm/clue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  transformStatus: undefined,
+  followUpStatus: undefined,
+  name: undefined,
+  customerId: undefined,
+  contactNextTime: undefined,
+  telephone: undefined,
+  mobile: undefined,
+  address: undefined,
+  ownerUserId: undefined,
+  contactLastTime: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  transformStatus: [{ required: true, message: '转化状态不能为空', trigger: 'blur' }],
+  followUpStatus: [{ required: true, message: '跟进状态不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }],
+  customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ClueApi.getClue(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ClueApi.ClueVO
+    if (formType.value === 'create') {
+      await ClueApi.createClue(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ClueApi.updateClue(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    transformStatus: undefined,
+    followUpStatus: undefined,
+    name: undefined,
+    customerId: undefined,
+    contactNextTime: undefined,
+    telephone: undefined,
+    mobile: undefined,
+    address: undefined,
+    ownerUserId: undefined,
+    contactLastTime: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/crm/clue/index.vue b/src/views/crm/clue/index.vue
new file mode 100644
index 00000000..42f20545
--- /dev/null
+++ b/src/views/crm/clue/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="转化状态" prop="transformStatus">
+        <el-select
+          v-model="queryParams.transformStatus"
+          placeholder="请选择转化状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="跟进状态" prop="followUpStatus">
+        <el-select
+          v-model="queryParams.followUpStatus"
+          placeholder="请选择跟进状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="线索名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入线索名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户id" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="下次联系时间" prop="contactNextTime">
+        <el-date-picker
+          v-model="queryParams.contactNextTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="telephone">
+        <el-input
+          v-model="queryParams.telephone"
+          placeholder="请输入电话"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+          v-model="queryParams.mobile"
+          placeholder="请输入手机号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入地址"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-input
+          v-model="queryParams.ownerUserId"
+          placeholder="请输入负责人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="最后跟进时间" prop="contactLastTime">
+        <el-date-picker
+          v-model="queryParams.contactLastTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['crm:clue:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:clue:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="转化状态" align="center" prop="transformStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.transformStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="跟进状态" align="center" prop="followUpStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.followUpStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="线索名称" align="center" prop="name" />
+      <el-table-column label="客户id" align="center" prop="customerId" />
+      <el-table-column
+        label="下次联系时间"
+        align="center"
+        prop="contactNextTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="电话" align="center" prop="telephone" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column
+        label="最后跟进时间"
+        align="center"
+        prop="contactLastTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:clue:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:clue:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ClueForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ClueApi from '@/api/crm/clue'
+import ClueForm from './ClueForm.vue'
+
+defineOptions({ name: 'CrmClue' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  transformStatus: null,
+  followUpStatus: null,
+  name: null,
+  customerId: null,
+  contactNextTime: [],
+  telephone: null,
+  mobile: null,
+  address: null,
+  ownerUserId: null,
+  contactLastTime: [],
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ClueApi.getCluePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ClueApi.deleteClue(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ClueApi.exportClue(queryParams)
+    download.excel(data, '线索.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 3074adb1df8d7bc8321912d5f918a1035aa83d42 Mon Sep 17 00:00:00 2001
From: "1351515658@qq.com" <1351515658@qq.com>
Date: Thu, 19 Oct 2023 18:43:02 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=95=E5=85=A5TaskDelegateForm.vue=20?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9liunx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processInstance/detail/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index f9c5452b..ba6c1298 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -114,7 +114,7 @@ import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
 import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
 import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
 import TaskReturnDialog from './TaskReturnDialogForm.vue'
-import TaskDelegateForm from './taskDelegateForm.vue'
+import TaskDelegateForm from './TaskDelegateForm.vue'
 import TaskAddSignDialogForm from './TaskAddSignDialogForm.vue'
 import { registerComponent } from '@/utils/routerHelper'
 import { isEmpty } from '@/utils/is'