Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

src/api/bpm/task/index.ts

@@ -63,19 +63,19 @@ export const delegateTask = async (data) => {
  * 加签
  */
 export const taskAddSign = async (data) => {
-  return await request.put({ url: '/bpm/task/add-sign', data })
+  return await request.put({ url: '/bpm/task/create-sign', data })
 }
 
 /**
  * 获取减签任务列表
  */
 export const getChildrenTaskList = async (id: string) => {
-  return await request.get({ url: '/bpm/task/get-children-task-list?taskId=' + id })
+  return await request.get({ url: '/bpm/task/children-list?taskId=' + id })
 }
 
 /**
  * 减签
  */
 export const taskSubSign = async (data) => {
-  return await request.put({ url: '/bpm/task/sub-sign', data })
+  return await request.delete({ url: '/bpm/task/delete-sign', data })
 }

src/api/crm/receivable/index.ts

+import request from '@/config/axios'
+
+export interface ReceivableVO {
+  id: number
+  no: string
+  planId: number
+  customerId: number
+  contractId: number
+  checkStatus: number
+  processInstanceId: number
+  returnTime: Date
+  returnType: string
+  price: number
+  ownerUserId: number
+  batchId: number
+  sort: number
+  dataScope: number
+  dataScopeDeptIds: string
+  status: number
+  remark: string
+}
+
+// 查询回款管理列表
+export const getReceivablePage = async (params) => {
+  return await request.get({ url: `/crm/receivable/page`, params })
+}
+
+// 查询回款管理详情
+export const getReceivable = async (id: number) => {
+  return await request.get({ url: `/crm/receivable/get?id=` + id })
+}
+
+// 新增回款管理
+export const createReceivable = async (data: ReceivableVO) => {
+  return await request.post({ url: `/crm/receivable/create`, data })
+}
+
+// 修改回款管理
+export const updateReceivable = async (data: ReceivableVO) => {
+  return await request.put({ url: `/crm/receivable/update`, data })
+}
+
+// 删除回款管理
+export const deleteReceivable = async (id: number) => {
+  return await request.delete({ url: `/crm/receivable/delete?id=` + id })
+}
+
+// 导出回款管理 Excel
+export const exportReceivable = async (params) => {
+  return await request.download({ url: `/crm/receivable/export-excel`, params })
+}

src/api/crm/receivablePlan/index.ts

+import request from '@/config/axios'
+
+export interface ReceivablePlanVO {
+  id: number
+  indexNo: number
+  receivableId: number
+  status: number
+  checkStatus: string
+  processInstanceId: number
+  price: number
+  returnTime: Date
+  remindDays: number
+  remindTime: Date
+  customerId: number
+  contractId: number
+  ownerUserId: number
+  sort: number
+  remark: string
+}
+
+// 查询回款计划列表
+export const getReceivablePlanPage = async (params) => {
+  return await request.get({ url: `/crm/receivable-plan/page`, params })
+}
+
+// 查询回款计划详情
+export const getReceivablePlan = async (id: number) => {
+  return await request.get({ url: `/crm/receivable-plan/get?id=` + id })
+}
+
+// 新增回款计划
+export const createReceivablePlan = async (data: ReceivablePlanVO) => {
+  return await request.post({ url: `/crm/receivable-plan/create`, data })
+}
+
+// 修改回款计划
+export const updateReceivablePlan = async (data: ReceivablePlanVO) => {
+  return await request.put({ url: `/crm/receivable-plan/update`, data })
+}
+
+// 删除回款计划
+export const deleteReceivablePlan = async (id: number) => {
+  return await request.delete({ url: `/crm/receivable-plan/delete?id=` + id })
+}
+
+// 导出回款计划 Excel
+export const exportReceivablePlan = async (params) => {
+  return await request.download({ url: `/crm/receivable-plan/export-excel`, params })
+}

src/utils/dict.ts

@@ -183,5 +183,9 @@ export enum DICT_TYPE {
   PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
   PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
-  PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status' // 拼团记录的状态
+  PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
+
+  // ========== CRM - 客户管理模块 ==========
+  CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
+  CRM_RETURN_TYPE = 'crm_return_type'
 }

src/views/crm/receivable/ReceivableForm.vue

+<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="no">
+        <el-input v-model="formData.no" placeholder="请输入回款编号" />
+      </el-form-item>
+      <!--<el-form-item label="回款计划ID" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入回款计划ID" />
+      </el-form-item>-->
+      <el-form-item label="客户ID" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户ID" />
+      </el-form-item>
+      <el-form-item label="合同ID" prop="contractId">
+        <el-input v-model="formData.contractId" placeholder="请输入合同ID" />
+      </el-form-item>
+      <!--<el-form-item label="审批状态" prop="checkStatus">
+        <el-select v-model="formData.checkStatus" placeholder="请选择审批状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>-->
+      <!--<el-form-item label="工作流编号" prop="processInstanceId">
+        <el-input v-model="formData.processInstanceId" placeholder="请输入工作流编号" />
+      </el-form-item>-->
+      <el-form-item label="回款日期" prop="returnTime">
+        <el-date-picker
+          v-model="formData.returnTime"
+          type="date"
+          value-format="x"
+          placeholder="选择回款日期"
+        />
+      </el-form-item>
+      <el-form-item label="回款方式" prop="returnType">
+        <el-select v-model="formData.returnType" placeholder="请选择回款方式">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.CRM_RETURN_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="回款金额" prop="price">
+        <el-input-number v-model="formData.price" 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="batchId">
+        <el-input v-model="formData.batchId" placeholder="请输入批次" />
+      </el-form-item>
+      <!--<el-form-item label="显示顺序" prop="sort">
+        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
+      </el-form-item>-->
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input type="textarea" :rows="3" 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, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import * as ReceivableApi from '@/api/crm/receivable'
+
+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,
+  no: undefined,
+  planId: undefined,
+  customerId: undefined,
+  contractId: undefined,
+  checkStatus: undefined,
+  processInstanceId: undefined,
+  returnTime: undefined,
+  returnType: undefined,
+  price: undefined,
+  ownerUserId: undefined,
+  batchId: undefined,
+  sort: undefined,
+  dataScope: undefined,
+  dataScopeDeptIds: undefined,
+  status: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+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 ReceivableApi.getReceivable(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 ReceivableApi.ReceivableVO
+    if (formType.value === 'create') {
+      await ReceivableApi.createReceivable(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ReceivableApi.updateReceivable(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    no: undefined,
+    planId: undefined,
+    customerId: undefined,
+    contractId: undefined,
+    checkStatus: undefined,
+    processInstanceId: undefined,
+    returnTime: undefined,
+    returnType: undefined,
+    price: undefined,
+    ownerUserId: undefined,
+    batchId: undefined,
+    sort: undefined,
+    dataScope: undefined,
+    dataScopeDeptIds: undefined,
+    status: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/crm/receivablePlan/ReceivablePlanForm.vue

+<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="indexNo">
+        <el-input-number v-model="formData.indexNo" placeholder="请输入期数" />
+      </el-form-item>
+      <!--<el-form-item label="回款ID" prop="receivableId">
+        <el-input v-model="formData.receivableId" placeholder="请输入回款ID" />
+      </el-form-item>
+      <el-form-item label="完成状态" prop="status">
+        <el-select v-model="formData.status" placeholder="请选择完成状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="checkStatus">
+        <el-select v-model="formData.checkStatus" placeholder="请选择审批状态">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.CRM_RECEIVABLE_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作流编号" prop="processInstanceId">
+        <el-input v-model="formData.processInstanceId" placeholder="请输入工作流编号" />
+      </el-form-item>-->
+      <el-form-item label="计划回款金额" prop="price">
+        <el-input-number v-model="formData.price" placeholder="请输入计划回款金额" />
+      </el-form-item>
+      <el-form-item label="计划回款日期" prop="returnTime">
+        <el-date-picker
+          v-model="formData.returnTime"
+          type="date"
+          value-format="x"
+          placeholder="选择计划回款日期"
+        />
+      </el-form-item>
+      <el-form-item label="提前几天提醒" prop="remindDays">
+        <el-input-number v-model="formData.remindDays" placeholder="请输入提前几天提醒" />
+      </el-form-item>
+      <el-form-item label="提醒日期" prop="remindTime">
+        <el-date-picker
+          v-model="formData.remindTime"
+          type="date"
+          value-format="x"
+          placeholder="选择提醒日期"
+        />
+      </el-form-item>
+      <el-form-item label="客户ID" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户ID" />
+      </el-form-item>
+      <el-form-item label="合同ID" prop="contractId">
+        <el-input v-model="formData.contractId" placeholder="请输入合同ID" />
+      </el-form-item>
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
+      </el-form-item>
+      <!--<el-form-item label="显示顺序" prop="sort">
+        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
+      </el-form-item>-->
+      <el-form-item label="备注" prop="remark">
+        <el-input type="textarea" :rows="3" 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, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import * as ReceivablePlanApi from '@/api/crm/receivablePlan'
+
+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,
+  indexNo: undefined,
+  receivableId: undefined,
+  status: undefined,
+  checkStatus: undefined,
+  processInstanceId: undefined,
+  price: undefined,
+  returnTime: undefined,
+  remindDays: undefined,
+  remindTime: undefined,
+  customerId: undefined,
+  contractId: undefined,
+  ownerUserId: undefined,
+  sort: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }]
+})
+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 ReceivablePlanApi.getReceivablePlan(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 ReceivablePlanApi.ReceivablePlanVO
+    if (formType.value === 'create') {
+      await ReceivablePlanApi.createReceivablePlan(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ReceivablePlanApi.updateReceivablePlan(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    indexNo: undefined,
+    receivableId: undefined,
+    status: undefined,
+    checkStatus: undefined,
+    processInstanceId: undefined,
+    price: undefined,
+    returnTime: undefined,
+    remindDays: undefined,
+    remindTime: undefined,
+    customerId: undefined,
+    contractId: undefined,
+    ownerUserId: undefined,
+    sort: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>