From 913b455b5d695ac7d60f7ca72630a46687779ff5 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 30 Sep 2025 18:41:11 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AssessmentPayLogController.java | 2 +- .../assessmentPayLog/entity/AssessmentPayLog.java | 14 +---- .../mapper/AssessmentPayLogMapper.java | 2 +- .../service/IAssessmentPayLogService.java | 2 +- .../service/impl/AssessmentPayLogServiceImpl.java | 2 +- .../assessmentPayLog/vue/AssessmentPayLogList.vue | 50 ++++++++++------ .../vue/modules/AssessmentPayLogForm.vue | 19 ------- .../assessmentPayLog/vue3/AssessmentPayLog.data.ts | 66 ++++++++++------------ 8 files changed, 67 insertions(+), 90 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/controller/AssessmentPayLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/controller/AssessmentPayLogController.java index 670c2a6..3168288 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/controller/AssessmentPayLogController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/controller/AssessmentPayLogController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 支付记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-09-30 * @Version: V1.0 */ @Api(tags="支付记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/entity/AssessmentPayLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/entity/AssessmentPayLog.java index 4ff663d..a478443 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/entity/AssessmentPayLog.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/entity/AssessmentPayLog.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 支付记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-09-30 * @Version: V1.0 */ @Data @@ -72,18 +72,6 @@ public class AssessmentPayLog implements Serializable { @Excel(name = "支付时间", width = 15) @ApiModelProperty(value = "支付时间") private java.util.Date payTime; - /**姓名*/ - @Excel(name = "姓名", width = 15) - @ApiModelProperty(value = "姓名") - private java.lang.String name; - /**手机号*/ - @Excel(name = "手机号", width = 15) - @ApiModelProperty(value = "手机号") - private java.lang.String phone; - /**公司名称*/ - @Excel(name = "公司名称", width = 15) - @ApiModelProperty(value = "公司名称") - private java.lang.String company; /**关联用户*/ @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/mapper/AssessmentPayLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/mapper/AssessmentPayLogMapper.java index 0ba3bc3..263e3bb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/mapper/AssessmentPayLogMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/mapper/AssessmentPayLogMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 支付记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-09-30 * @Version: V1.0 */ public interface AssessmentPayLogMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/IAssessmentPayLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/IAssessmentPayLogService.java index 6a94a61..c1dbcf9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/IAssessmentPayLogService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/IAssessmentPayLogService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 支付记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-09-30 * @Version: V1.0 */ public interface IAssessmentPayLogService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/impl/AssessmentPayLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/impl/AssessmentPayLogServiceImpl.java index 4b09418..a72d1fc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/impl/AssessmentPayLogServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/impl/AssessmentPayLogServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 支付记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-09-30 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/AssessmentPayLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/AssessmentPayLogList.vue index 2da7336..dc98ff0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/AssessmentPayLogList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/AssessmentPayLogList.vue @@ -4,6 +4,38 @@
+ + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -152,21 +184,6 @@ align:"center", dataIndex: 'payTime' }, - { - title:'姓名', - align:"center", - dataIndex: 'name' - }, - { - title:'手机号', - align:"center", - dataIndex: 'phone' - }, - { - title:'公司名称', - align:"center", - dataIndex: 'company' - }, { title:'关联用户', align:"center", @@ -212,9 +229,6 @@ fieldList.push({type:'BigDecimal',value:'discountAmount',text:'优惠金额',dictCode:''}) fieldList.push({type:'string',value:'status',text:'支付状态',dictCode:'status_pay'}) fieldList.push({type:'datetime',value:'payTime',text:'支付时间'}) - fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'手机号',dictCode:''}) - fieldList.push({type:'Text',value:'company',text:'公司名称',dictCode:''}) fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/modules/AssessmentPayLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/modules/AssessmentPayLogForm.vue index d4003ae..b2afdfa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/modules/AssessmentPayLogForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/modules/AssessmentPayLogForm.vue @@ -33,21 +33,6 @@ - - - - - - - - - - - - - - - @@ -90,10 +75,6 @@ }, confirmLoading: false, validatorRules: { - phone: [ - { required: false}, - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, - ], }, url: { add: "/assessmentPayLog/assessmentPayLog/add", diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue3/AssessmentPayLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue3/AssessmentPayLog.data.ts index 923cd99..877857d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue3/AssessmentPayLog.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue3/AssessmentPayLog.data.ts @@ -34,21 +34,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'payTime' }, - { - title: '姓名', - align:"center", - dataIndex: 'name' - }, - { - title: '手机号', - align:"center", - dataIndex: 'phone' - }, - { - title: '公司名称', - align:"center", - dataIndex: 'company' - }, { title: '关联用户', align:"center", @@ -57,6 +42,36 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "批次标识", + field: "batchNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "兑换码", + field: "code", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "支付状态", + field: "status", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"status_pay" + }, + colProps: {span: 6}, + }, + { + label: "关联用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -93,27 +108,6 @@ export const formSchema: FormSchema[] = [ field: 'payTime', component: 'Input', }, - { - label: '姓名', - field: 'name', - component: 'Input', - }, - { - label: '手机号', - field: 'phone', - component: 'Input', - dynamicRules: ({model,schema}) => { - return [ - { required: false}, - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, - ]; - }, - }, - { - label: '公司名称', - field: 'company', - component: 'Input', - }, { label: '关联用户', field: 'userId',