From 4e859ca3c7ce3e78f8c7b5c12df44a70e5186273 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Fri, 10 Jan 2025 16:27:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AF=BB=E8=BD=A6=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=EF=BC=8C=E5=B9=B4=E9=99=90=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 99 +++++++++++-----------
.../controller/CarrentApplyController.java | 2 +-
.../modules/carrentApply/entity/CarrentApply.java | 8 +-
.../carrentApply/mapper/CarrentApplyMapper.java | 2 +-
.../carrentApply/service/ICarrentApplyService.java | 2 +-
.../service/impl/CarrentApplyServiceImpl.java | 2 +-
.../modules/carrentApply/vue/CarrentApplyList.vue | 7 +-
.../carrentApply/vue/modules/CarrentApplyForm.vue | 2 +-
.../modules/carrentApply/vue3/CarrentApply.data.ts | 7 +-
9 files changed, 61 insertions(+), 70 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aff4052..646fd1f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,23 +4,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -162,7 +153,7 @@
-
+
1731385713383
@@ -283,7 +274,14 @@
1736255981275
-
+
+ 1736421140462
+
+
+
+ 1736421140462
+
+
@@ -320,7 +318,8 @@
-
+
+
@@ -339,62 +338,62 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -403,10 +402,10 @@
-
+
-
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
index 1148d8e..d7ae840 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Api(tags="寻车申请表")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java
index f490adc..795e184 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Data
@@ -57,11 +57,9 @@ public class CarrentApply implements Serializable {
@ApiModelProperty(value = "车辆型号")
private java.lang.String model;
/**年限*/
- @Excel(name = "年限", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "年限", width = 15)
@ApiModelProperty(value = "年限")
- private java.util.Date carTime;
+ private java.lang.Integer carTime;
/**公里数*/
@Excel(name = "公里数", width = 15)
@ApiModelProperty(value = "公里数")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java
index 67f7291..522f450 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-10
* @Version: V1.0
*/
public interface CarrentApplyMapper extends BaseMapper {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java
index b869b5b..64cbb1f 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-10
* @Version: V1.0
*/
public interface ICarrentApplyService extends IService {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java
index af00bb6..6c0666d 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Service
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue
index aab1188..c3345cb 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue
@@ -135,10 +135,7 @@
{
title:'年限',
align:"center",
- dataIndex: 'carTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
+ dataIndex: 'carTime'
},
{
title:'公里数',
@@ -201,7 +198,7 @@
let fieldList=[];
fieldList.push({type:'string',value:'categorytwoId',text:'关联二级分类id',dictCode:"carrent_categorytwo,name,id"})
fieldList.push({type:'string',value:'model',text:'车辆型号',dictCode:''})
- fieldList.push({type:'date',value:'carTime',text:'年限'})
+ fieldList.push({type:'int',value:'carTime',text:'年限',dictCode:''})
fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''})
fieldList.push({type:'string',value:'name',text:'联系人',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue
index e0f25f8..837bb73 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts
index 936f55a..a293baa 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts
@@ -17,10 +17,7 @@ export const columns: BasicColumn[] = [
{
title: '年限',
align:"center",
- dataIndex: 'carTime',
- customRender:({text}) =>{
- return !text?"":(text.length>10?text.substr(0,10):text)
- },
+ dataIndex: 'carTime'
},
{
title: '公里数',
@@ -69,7 +66,7 @@ export const formSchema: FormSchema[] = [
{
label: '年限',
field: 'carTime',
- component: 'DatePicker',
+ component: 'InputNumber',
},
{
label: '公里数',