付款计划优化

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

@@ -15,6 +15,7 @@ export interface ReceivablePlanVO {
   deptName?: string
   contractId?: number
   contractNo?: string
+  status: number
   type: number
   auditStatus: number
   processInstanceId: string

src/utils/dict.ts

@@ -207,6 +207,7 @@ export enum DICT_TYPE {
   CRM_RECEIVABLE_RETURN_TYPE = 'crm_receivable_return_type', // CRM 付款的付款方式
   CRM_RECEIVABLE_TRANSACTION_TYPE = 'crm_receivable_transaction_type', // CRM 付款的收支方向
   CRM_RECEIVABLE_TYPE = 'crm_receivable_type', // CRM 付款类型
+  CRM_RECEIVABLE_PLAN_STATUS = 'crm_receivable_plan_status', // CRM 付款计划状态
   CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry', // CRM 客户所属行业
   CRM_CUSTOMER_DEAL_STATUS = 'crm_customer_deal_status', // CRM 客户成交状态
   CRM_CUSTOMER_LEVEL = 'crm_customer_level', // CRM 客户级别
@@ -222,7 +223,6 @@ export enum DICT_TYPE {
   CRM_CONTRACT_ATTRIBUTE = 'crm_contract_attribute', // CRM 合同属性
   CRM_PROJECT_TYPE = 'crm_project_type', // CRM 项目类型
 
-
   // ========== ERP - 企业资源计划模块  ==========
   ERP_AUDIT_STATUS = 'erp_audit_status', // ERP 审批状态
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型

src/views/crm/receivable/PaymentForm.vue

@@ -190,6 +190,9 @@ const open = async (
   id?: number,
   receivablePlan?: ReceivablePlanApi.ReceivablePlanVO
 ) => {
+  const a = getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE)
+  console.log(a)
+  console.log('a')
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type

src/views/crm/receivable/index.vue

@@ -233,7 +233,7 @@
           <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
         </template>
       </el-table-column> -->
-      <el-table-column align="center" fixed="right" label="操作" min-width="180px">
+      <el-table-column align="center" fixed="right" label="操作" width="180px">
         <template #default="scope">
           <el-button
             v-hasPermi="['crm:receivable:query']"

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

@@ -35,6 +35,23 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="类型" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择类型"
+          clearable
+          class="!w-240px"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_PLAN_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+          
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -119,6 +136,11 @@
           </el-link>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="类型" prop="status" width="160">
+          <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_PLAN_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         label="计划付款金额（元）"
@@ -164,7 +186,7 @@
       </el-table-column> -->
       <!-- v-if ="(scope.row.type ===  1 && scope.row.auditStatus === 20) || (scope.row.type === 0)" -->
        <!-- v-if="(scope.row.price - ((scope.row.receivable && Array.isArray(scope.row.receivable) && scope.row.receivable.length > 0) ? scope.row.receivable.reduce((sum, r) => sum + (r.price || 0), 0) : 0) > 0)" -->
-      <el-table-column align="center" fixed="right" label="操作" min-width="180px">
+      <el-table-column align="center" fixed="right" label="操作" width="180px">
         <template #default="scope">
           <el-button 
             
@@ -209,7 +231,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE,getIntDictOptions } from '@/utils/dict'
 import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
@@ -231,7 +253,8 @@ const queryParams = reactive({
   pageSize: 10,
   sceneType: undefined, // 默认和 activeName 相等
   customerId: undefined,
-  contractNo: undefined
+  contractNo: undefined,
+  status: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中

src/views/crm/stationsite/index.vue

@@ -87,7 +87,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="场地名称" fixed="left" align="center" prop="name"  width="250px">
+      <el-table-column label="场地名称" fixed="left" align="center" prop="name"  min-width="250px">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
@@ -117,7 +117,7 @@
         </template>
       </el-table-column>
       <el-table-column label="责任人" align="center" prop="ownerUserName" width="150px" />
-      <el-table-column label="操作" fixed="right"  align="center" min-width="150px">
+      <el-table-column label="操作" fixed="right"  align="center" width="150px">
         <template #default="scope">
           <el-button
             link