1.0.61 回款阶段添加付款节点、付款条款模板字段

src/api/oa/base/paymentStage/types.ts

@@ -19,6 +19,16 @@ export interface PaymentStageVO {
    */
   collectionStage: string;
 
+  /**
+   * 付款节点
+   */
+  paymentMethod: string;
+
+  /**
+   * 付款条款模板
+   */
+  paymentTemplate: string;
+
   /**
    * 排序号
    */
@@ -72,6 +82,16 @@ export interface PaymentStageForm extends BaseEntity {
    */
   collectionStage?: string;
 
+  /**
+   * 付款节点
+   */
+  paymentMethod?: string;
+
+  /**
+   * 付款条款模板
+   */
+  paymentTemplate?: string;
+
   /**
    * 排序号
    */
@@ -101,6 +121,11 @@ export interface PaymentStageQuery extends PageQuery {
    */
   collectionStage?: string;
 
+  /**
+   * 付款节点
+   */
+  paymentMethod?: string;
+
   /**
    * 排序号
    */

src/views/oa/base/paymentStage/index.vue

@@ -4,9 +4,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-<!--            <el-form-item label="阶段编码" prop="stageCode">-->
+            <!--            <el-form-item label="阶段编码" prop="stageCode">-->
-<!--              <el-input v-model="queryParams.stageCode" placeholder="请输入阶段编码" clearable @keyup.enter="handleQuery" />-->
+            <!--              <el-input v-model="queryParams.stageCode" placeholder="请输入阶段编码" clearable @keyup.enter="handleQuery" />-->
-<!--            </el-form-item>-->
+            <!--            </el-form-item>-->
             <el-form-item label="阶段名称" prop="stageName">
               <el-input v-model="queryParams.stageName" placeholder="请输入阶段名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -15,6 +15,9 @@
                 <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
+            <!--            <el-form-item label="付款节点" prop="paymentMethod">-->
+            <!--              <el-input v-model="queryParams.paymentMethod" placeholder="请输入付款节点" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -57,16 +60,18 @@
             <dict-tag :options="collection_stage" :value="scope.row.collectionStage" />
           </template>
         </el-table-column>
-        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[5].visible" />
+        <el-table-column label="付款节点" align="center" prop="paymentMethod" width="130" v-if="columns[5].visible" />
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible" />
+        <el-table-column label="付款条款模板" align="center" prop="paymentTemplate" v-if="columns[6].visible" min-width="200" show-overflow-tooltip />
-        <el-table-column label="创建者" align="center" prop="createBy" v-if="columns[9].visible" />
+        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[7].visible" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[10].visible">
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible" />
+        <el-table-column label="创建者" align="center" prop="createBy" v-if="columns[11].visible" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="更新者" align="center" prop="updateBy" v-if="columns[11].visible" />
+        <el-table-column label="更新者" align="center" prop="updateBy" v-if="columns[13].visible" />
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[12].visible">
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[14].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
@@ -88,9 +93,9 @@
     <!-- 添加或修改回款阶段对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="paymentStageFormRef" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="阶段编码" prop="stageCode">-->
+        <!--        <el-form-item label="阶段编码" prop="stageCode">-->
-<!--          <el-input v-model="form.stageCode" placeholder="请输入阶段编码" />-->
+        <!--          <el-input v-model="form.stageCode" placeholder="请输入阶段编码" />-->
-<!--        </el-form-item>-->
+        <!--        </el-form-item>-->
         <el-form-item label="阶段名称" prop="stageName">
           <el-input v-model="form.stageName" placeholder="请输入阶段名称" />
         </el-form-item>
@@ -99,8 +104,14 @@
             <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="付款节点" prop="paymentMethod">
+          <el-input v-model="form.paymentMethod" placeholder="请输入付款节点" />
+        </el-form-item>
+        <el-form-item label="付款条款模板" prop="paymentTemplate">
+          <el-input v-model="form.paymentTemplate" type="textarea" :rows="4" placeholder="请输入付款条款模板" />
+        </el-form-item>
         <el-form-item label="排序号" prop="sortOrder">
-          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+          <el-input-number v-model="form.sortOrder" placeholder="请输入排序号" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -147,14 +158,16 @@ const columns = ref<FieldOption[]>([
   { key: 2, label: `阶段编码`, visible: false },
   { key: 3, label: `阶段名称`, visible: true },
   { key: 4, label: `回款阶段`, visible: true },
-  { key: 5, label: `排序号`, visible: true },
+  { key: 5, label: `付款节点`, visible: true },
-  { key: 6, label: `备注`, visible: false },
+  { key: 6, label: `付款条款模板`, visible: true },
-  { key: 7, label: `删除标志`, visible: false },
+  { key: 7, label: `排序号`, visible: true },
-  { key: 8, label: `创建部门`, visible: false },
+  { key: 8, label: `备注`, visible: false },
-  { key: 9, label: `创建者`, visible: false },
+  { key: 9, label: `删除标志`, visible: false },
-  { key: 10, label: `创建时间`, visible: true },
+  { key: 10, label: `创建部门`, visible: false },
-  { key: 11, label: `更新者`, visible: false },
+  { key: 11, label: `创建者`, visible: false },
-  { key: 12, label: `更新时间`, visible: true }
+  { key: 12, label: `创建时间`, visible: true },
+  { key: 13, label: `更新者`, visible: false },
+  { key: 14, label: `更新时间`, visible: true }
 ]);
 
 const initFormData: PaymentStageForm = {
@@ -162,6 +175,8 @@ const initFormData: PaymentStageForm = {
   stageCode: undefined,
   stageName: undefined,
   collectionStage: undefined,
+  paymentMethod: undefined,
+  paymentTemplate: undefined,
   sortOrder: undefined,
   remark: undefined
 };
@@ -173,6 +188,7 @@ const data = reactive<PageData<PaymentStageForm, PaymentStageQuery>>({
     stageCode: undefined,
     stageName: undefined,
     collectionStage: undefined,
+    paymentMethod: undefined,
     sortOrder: undefined,
     params: {}
   },