✨ CRM：完善回款的新增/修改

(cherry picked from commit 5369328b37)

src/api/crm/receivable/plan/index.ts

@@ -4,7 +4,6 @@ export interface ReceivablePlanVO {
   id: number
   period: number
   receivableId: number
-  finishStatus: number
   price: number
   returnTime: Date
   remindDays: number
@@ -43,10 +42,9 @@ export const getReceivablePlan = async (id: number) => {
 }
 
 // 查询回款计划下拉数据
-// TODO @芋艿：再看看这里
+export const getReceivablePlanSimpleList = async (customerId: number, contractId: number) => {
-export const getReceivablePlanListByContractId = async (customerId: number, contractId: number) => {
   return await request.get({
-    url: `/crm/receivable-plan/list-all-simple-by-customer?customerId=${customerId}&contractId=${contractId}`
+    url: `/crm/receivable-plan/simple-list?customerId=${customerId}&contractId=${contractId}`
   })
 }
 

src/views/crm/receivable/ReceivableForm.vue

@@ -10,12 +10,37 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="回款编号" prop="no">
-            <el-input v-model="formData.no" placeholder="请输入回款编号" />
+            <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人" prop="ownerUserId">
+            <el-select
+              v-model="formData.ownerUserId"
+              :disabled="formType !== 'create'"
+              class="w-1/1"
+            >
+              <el-option
+                v-for="item in userOptions"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="客户名称" prop="customerId">
-            <el-select v-model="formData.customerId" class="w-1/1" placeholder="请选择客户">
+            <el-select
+              v-model="formData.customerId"
+              :disabled="formType !== 'create'"
+              class="w-1/1"
+              filterable
+              @change="handleCustomerChange"
+              placeholder="请选择客户"
+            >
               <el-option
                 v-for="item in customerList"
                 :key="item.id"
@@ -29,8 +54,10 @@
           <el-form-item label="合同名称" prop="contractId">
             <el-select
               v-model="formData.contractId"
-              :disabled="!formData.customerId"
+              :disabled="formType !== 'create' || !formData.customerId"
-              class="!w-100%"
+              class="w-1/1"
+              filterable
+              @change="handleContractChange"
               placeholder="请选择合同"
             >
               <el-option
@@ -38,42 +65,35 @@
                 :key="data.id"
                 :label="data.name"
                 :value="data.id!"
+                :disabled="data.auditStatus !== 20"
               />
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="回款期数" prop="planId">
             <el-select
               v-model="formData.planId"
-              :disabled="!formData.contractId"
+              :disabled="formType !== 'create' || !formData.contractId"
-              class="!w-100%"
+              class="!w-1/1"
+              @change="handleReceivablePlanChange"
               placeholder="请选择回款期数"
             >
               <el-option
                 v-for="data in receivablePlanList"
                 :key="data.id"
-                :label="data.period + '期'"
+                :label="'第 ' + data.period + ' 期'"
                 :value="data.id!"
-              />
+                :disabled="data.receivableId"
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="负责人" prop="ownerUserId">
-            <el-select v-model="formData.ownerUserId" clearable placeholder="请输入负责人">
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id"
               />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="回款方式" prop="returnType">
-            <el-select v-model="formData.returnType" placeholder="请选择回款方式">
+            <el-select v-model="formData.returnType" class="w-1/1" placeholder="请选择回款方式">
               <el-option
                 v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE)"
                 :key="dict.value"
@@ -83,6 +103,8 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="回款金额" prop="price">
             <el-input-number
@@ -90,6 +112,8 @@
               class="!w-100%"
               controls-position="right"
               placeholder="请输入回款金额"
+              :min="0.01"
+              :precision="2"
             />
           </el-form-item>
         </el-col>
@@ -103,14 +127,11 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input
+            <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
-              v-model="formData.remark"
-              :rows="3"
-              placeholder="请输入备注"
-              type="textarea"
-            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -129,20 +150,19 @@ import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
 import { useUserStore } from '@/store/modules/user'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import form from '@/components/Form/src/Form.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<ReceivableApi.ReceivableVO>({} as ReceivableApi.ReceivableVO)
 const formRules = reactive({
-  no: [{ required: true, message: '回款编号不能为空', trigger: 'blur' }],
   customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
   contractId: [{ required: true, message: '合同不能为空', trigger: 'blur' }],
-  auditStatus: [{ required: true, message: '审批状态不能为空', trigger: 'blur' }],
   returnTime: [{ required: true, message: '回款日期不能为空', trigger: 'blur' }],
   price: [{ required: true, message: '回款金额不能为空', trigger: 'blur' }]
 })
@@ -150,8 +170,13 @@ const formRef = ref() // 表单 Ref
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 const contractList = ref<ContractApi.ContractVO[]>([]) // 合同列表
 const receivablePlanList = ref<ReceivablePlanApi.ReceivablePlanVO[]>([]) // 回款计划列表
+
 /** 打开弹窗 */
-const open = async (type: string, id?: number, planData?: ReceivablePlanApi.ReceivablePlanVO) => {
+const open = async (
+  type: string,
+  id?: number,
+  receivablePlan?: ReceivablePlanApi.ReceivablePlanVO
+) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -166,7 +191,7 @@ const open = async (type: string, id?: number, planData?: ReceivablePlanApi.Rece
     }
   }
   // 获得用户列表
-  userList.value = await UserApi.getSimpleUserList()
+  userOptions.value = await UserApi.getSimpleUserList()
   // 获得客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
   // 默认新建时选中自己
@@ -174,10 +199,12 @@ const open = async (type: string, id?: number, planData?: ReceivablePlanApi.Rece
     formData.value.ownerUserId = useUserStore().getUser.id
   }
   // 从回款计划创建回款
-  if (planData) {
+  if (receivablePlan) {
-    formData.value.customerId = planData.customerId
+    formData.value.customerId = receivablePlan.customerId
-    formData.value.contractId = planData.contractId
+    formData.value.contractId = receivablePlan.contractId
-    formData.value.planId = planData.id
+    formData.value.planId = receivablePlan.id
+    formData.value.price = receivablePlan.price
+    formData.value.returnType = receivablePlan.returnType
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -214,53 +241,47 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-const getContractList = async (customerId: number) => {
+/** 处理切换客户 */
-  contractList.value = await ContractApi.getContractSimpleList(customerId)
+const handleCustomerChange = async (customerId: number) => {
+  // 重置合同编号
+  formData.value.contractId = undefined
+  // 获得合同列表
+  if (customerId) {
+    contractList.value = []
+    contractList.value = await ContractApi.getContractSimpleList(customerId)
+  }
 }
-const getReceivablePlanList = async (contractId: number) => {
+
-  receivablePlanList.value = await ReceivablePlanApi.getReceivablePlanListByContractId(
+/** 处理切换合同 */
-    formData.value.customerId,
+const handleContractChange = async (contractId: number) => {
-    contractId
+  // 重置回款计划编号
-  )
+  formData.value.planId = undefined
+  if (contractId) {
+    // 获得回款计划列表
+    receivablePlanList.value = []
+    receivablePlanList.value = await ReceivablePlanApi.getReceivablePlanSimpleList(
+      formData.value.customerId,
+      contractId
+    )
+    // 设置金额
+    const contract = contractList.value.find((item) => item.id === contractId)
+    if (contract) {
+      // TODO @芋艿：后续可以改成未还款金额
+      formData.value.price = contract.totalPrice
+    }
+  }
 }
-watch(
+
-  () => formData.value.customerId,
+/** 处理切换回款计划 */
-  (newVal) => {
+const handleReceivablePlanChange = (planId: number) => {
-    if (!newVal) {
+  if (!planId) {
-      return
+    return
-    }
-    getContractList(newVal)
-  },
-  {
-    immediate: true
   }
-)
+  const receivablePlan = receivablePlanList.value.find((item) => item.id === planId)
-watch(
+  if (!receivablePlan) {
-  () => formData.value.contractId,
+    return
-  (newVal) => {
-    if (!newVal) {
-      return
-    }
-    getReceivablePlanList(newVal)
-  },
-  {
-    immediate: true
   }
-)
+  formData.value.price = receivablePlan.price
-watch(
+  formData.value.returnType = receivablePlan.returnType
-  () => formData.value.planId,
+}
-  (newVal) => {
-    if (!newVal) {
-      return
-    }
-    const receivablePlan = receivablePlanList.value.find((item) => item.id === newVal)
-    if (!receivablePlan) {
-      return
-    }
-    // 只有没有金额的时候才设置
-    if (!formData.value.price || formData.value.price === 0) {
-      formData.value.price = receivablePlan.price
-    }
-  }
-)
 </script>

src/views/crm/receivable/index.vue

@@ -195,7 +195,6 @@
   <!-- 表单弹窗：添加/修改 -->
   <ReceivableForm ref="formRef" @success="getList" />
 </template>
-
 <script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'

src/views/crm/receivable/plan/components/ReceivablePlanList.vue

@@ -31,17 +31,6 @@
       />
       <el-table-column label="负责人" prop="ownerUserName" width="120" />
       <el-table-column align="center" label="备注" prop="remark" />
-      <el-table-column
-        align="center"
-        fixed="right"
-        label="完成状态"
-        prop="finishStatus"
-        width="130px"
-      >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.finishStatus" />
-        </template>
-      </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="200px">
         <template #default="scope">
           <el-button
@@ -141,6 +130,7 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+// todo @puhui999：拼写错误
 const emits = defineEmits<{
   (e: 'crateReceivable', v: ReceivablePlanApi.ReceivablePlanVO)
 }>()
@@ -161,6 +151,7 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+
 /** 监听打开的 customerId + contractId，从而加载最新的列表 */
 watch(
   () => [props.customerId, props.contractId],

src/views/crm/receivable/plan/index.vue

@@ -152,17 +152,6 @@
           <el-text v-else>{{ erpPriceInputFormatter(scope.row.price) }}</el-text>
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        fixed="right"
-        label="完成状态"
-        prop="finishStatus"
-        width="130px"
-      >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.finishStatus" />
-        </template>
-      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -178,9 +167,17 @@
         width="180px"
       />
       <el-table-column align="center" label="创建人" prop="creatorName" width="100px" />
-      <el-table-column align="center" fixed="right" label="操作" width="130px">
+      <el-table-column align="center" fixed="right" label="操作" width="180px">
-        <!-- TODO @puhui999：新建回款 -->
         <template #default="scope">
+          <el-button
+            v-hasPermi="['crm:receivable:create']"
+            link
+            type="success"
+            @click="openReceivableForm(scope.row)"
+            :disabled="scope.row.receivableId"
+          >
+            创建回款
+          </el-button>
           <el-button
             v-hasPermi="['crm:receivable-plan:update']"
             link
@@ -211,6 +208,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ReceivablePlanForm ref="formRef" @success="getList" />
+  <ReceivableForm ref="receivableFormRef" @success="getList" />
 </template>
 
 <script lang="ts" setup>
@@ -222,6 +220,7 @@ import ReceivablePlanForm from './ReceivablePlanForm.vue'
 import * as CustomerApi from '@/api/crm/customer'
 import { erpPriceInputFormatter, erpPriceTableColumnFormatter } from '@/utils'
 import { TabsPaneContext } from 'element-plus'
+import ReceivableForm from '@/views/crm/receivable/ReceivableForm.vue'
 
 defineOptions({ name: 'ReceivablePlan' })
 
@@ -279,6 +278,12 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+/** 创建回款操作 */
+const receivableFormRef = ref()
+const openReceivableForm = (row: ReceivablePlanApi.ReceivablePlanVO) => {
+  receivableFormRef.value.open('create', undefined, row)
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {