diff --git a/cds-fontend-2025.V1/src/views/mps/market/index.vue b/cds-fontend-2025.V1/src/views/mps/market/index.vue
index 69b5971..c63899e 100644
--- a/cds-fontend-2025.V1/src/views/mps/market/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/market/index.vue
@@ -156,7 +156,7 @@ const {
       align: 'center',
       minWidth: 120,
       ellipsis: true,
-      resizable: true,
+      resizable: true
     },
     {
       key: 'deptName',
@@ -507,7 +507,7 @@ function edit(dataId: CommonType.IdType) {
 function handleExport() {
   download('/mps/market/export', searchParams, `营销数据管理_${new Date().getTime()}.xlsx`);
 }
-//获取子类目下拉框
+// 获取子类目下拉框
 const { startLoading, endLoading } = useLoading();
 
 const subcategoryIdOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
@@ -544,7 +544,7 @@ async function getSubcategoryOptions() {
           :show-export="false"
           @add="handleAdd"
           @delete="handleBatchDelete"
-          @export="handleExport"
+          @export="true"
           @refresh="getData"
         >
 <!--            <template #after>-->
diff --git a/cds-fontend-2025.V1/src/views/report/detail-entry/modules/detail-entry-search.vue b/cds-fontend-2025.V1/src/views/report/detail-entry/modules/detail-entry-search.vue
index e075074..8a51bb8 100644
--- a/cds-fontend-2025.V1/src/views/report/detail-entry/modules/detail-entry-search.vue
+++ b/cds-fontend-2025.V1/src/views/report/detail-entry/modules/detail-entry-search.vue
@@ -135,8 +135,8 @@ if(userInfo.roles.includes('operation')){
             <NFormItemGi span="24 s:12 m:6" label="数据日期" path="date" class="pr-24px">
               <NDatePicker
                 v-model:formatted-value="model.date"
-                type="datetime"
-                value-format="yyyy-MM-dd"
+                type="month"
+                value-format="yyyy-MM"
                 clearable
               />
             </NFormItemGi>
diff --git a/cds-fontend-2025.V1/src/views/report/performance-MD/index.vue b/cds-fontend-2025.V1/src/views/report/performance-MD/index.vue
index 51c3e67..2a9f280 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-MD/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-MD/index.vue
@@ -1263,7 +1263,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/performance-h/index.vue b/cds-fontend-2025.V1/src/views/report/performance-h/index.vue
index c43bb01..4771f91 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-h/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-h/index.vue
@@ -1263,7 +1263,7 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
+
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/performance-m/index.vue b/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
index 7aa1375..3712717 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
@@ -1263,7 +1263,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/performance-q/index.vue b/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
index ac409f5..c0dba93 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
@@ -1263,7 +1263,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/performance-y/index.vue b/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
index 686a930..e65b851 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
@@ -1263,7 +1263,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/performance/index.vue b/cds-fontend-2025.V1/src/views/report/performance/index.vue
index dd5826d..9ed19cc 100644
--- a/cds-fontend-2025.V1/src/views/report/performance/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance/index.vue
@@ -1262,7 +1262,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
index 8174419..77193ca 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
@@ -215,7 +215,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
index b585aff..7c67dc5 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
@@ -215,7 +215,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
index 6a83050..1b94429 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
@@ -215,7 +215,6 @@ const {
 
         return (
           <div class="flex-center gap-8px">
-            {editBtn()}
           </div>
         );
       }
diff --git a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
index 201fd4a..4a15cf1 100644
--- a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
@@ -115,17 +115,17 @@ const {
       ellipsis: true,
       resizable: true
     },
-    {
-      key: 'invalidBusiness',
-      title: '无效的中间业务计价项目',
-      align: 'center',
-      minWidth: 120,
-      ellipsis: true,
-      resizable: true
-    },
+    // {
+    //   key: 'invalidBusiness',
+    //   title: '无效的中间业务计价项目',
+    //   align: 'center',
+    //   minWidth: 120,
+    //   ellipsis: true,
+    //   resizable: true
+    // },
     {
       key: 'validBusiness',
-      title: '有效的中间业务计价项目',
+      title: '中间业务计价项目',
       align: 'center',
       minWidth: 120,
       ellipsis: true,
@@ -226,7 +226,7 @@ const {
           );
         };
 
-        return <div class="flex-center gap-8px">{editBtn()}</div>;
+        return <div class="flex-center gap-8px">{}</div>;
       }
     }
   ]
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsDetailEntryBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsDetailEntryBo.java
index b632196..c6cc618 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsDetailEntryBo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsDetailEntryBo.java
@@ -1,5 +1,7 @@
 package org.dromara.mps.domain.bo;
 
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.mps.domain.MpsDetailEntry;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -64,8 +66,7 @@ public class MpsDetailEntryBo extends BaseEntity {
     /**
      * 数据日期
      */
-    @NotNull(message = "数据日期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date date;
+    private String date;
 
     /**
      * 部门名称
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryVo.java
index 76e825f..c6fa7ee 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryVo.java
@@ -4,7 +4,10 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.mps.domain.MpsDetailEntry;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -79,19 +82,22 @@ public class MpsDetailEntryVo implements Serializable {
      * 数据日期
      */
     @ExcelProperty(value = "数据日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date date;
 
     /**
      * 部门名称
      */
     @ExcelProperty(value = "部门名称")
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
     private String deptName;
 
     /**
      * 部门id
      */
     @ExcelProperty(value = "部门id")
-    private BigDecimal deptId;
+    private Long deptId;
 
     /**
      * 客户类型（1-个人，2-对公）
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
index f1e0d33..cd2e900 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
@@ -45,12 +45,14 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
             "c.old_card_no as oldCardNo , c.new_card_no as newCardNo, c.replace_method as affair ," +
             "t.traffic_no  as trafficNo  ,t.traffic_amt as trafficAmt, " +
             "m.* ," +
-            "d.dept_name AS yxDeptName " +
+            "d.dept_name AS yxDeptName ," +
+            "de.dept_name AS deptName " +
             "from mps_market m " +
             "    left join mps_traffic t on  m.traffic_id = t.traffic_id " +
             "    left join mps_magneticcard c on  m.magnetic_card_id = c.magnetic_card_id " +
-            "   LEFT JOIN sys_user s ON m.yx_id = s.mkt_no "+
-            "   LEFT JOIN sys_dept d ON s.dept_id = d.dept_id "+
+            "   LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and m.del_flag = '0'"+
+            "   inner JOIN sys_dept d ON s.dept_id = d.dept_id "+
+            "   inner JOIN sys_dept de ON m.dept_id = de.dept_id  "+
             "${ew.customSqlSegment}"+
             "and m.del_flag = '0'  order by m.entry_date desc"
     })
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
index ae6ea05..0146256 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
@@ -122,7 +122,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
         lqw.like(StringUtils.isNotBlank(bo.getJbName()), MpsDetailEntry::getJbName, bo.getJbName());
         lqw.eq(StringUtils.isNotBlank(bo.getYxId()), MpsDetailEntry::getYxId, bo.getYxId());
         lqw.eq(StringUtils.isNotBlank(bo.getJbId()), MpsDetailEntry::getJbId, bo.getJbId());
-        lqw.eq(bo.getDate() != null, MpsDetailEntry::getDate, bo.getDate());
+        lqw.like(bo.getDate() != null, MpsDetailEntry::getDate, bo.getDate());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), MpsDetailEntry::getDeptName, bo.getDeptName());
         lqw.eq(bo.getDeptId() != null, MpsDetailEntry::getDeptId, bo.getDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getCustType()), MpsDetailEntry::getCustType, bo.getCustType());
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java
index e6ee19c..fee9c1c 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java
@@ -66,11 +66,11 @@ public class MarketingValidInvalidImportVo implements Serializable {
     @ExcelProperty(value = "客户身份证号")
     private String customerId;
 
-    /**
-     * 无效的中间业务计价项目
-     */
-    @ExcelProperty(value = "无效的中间业务计价项目")
-    private String invalidBusiness;
+//    /**
+//     * 无效的中间业务计价项目
+//     */
+//    @ExcelProperty(value = "无效的中间业务计价项目")
+//    private String invalidBusiness;
 
     /**
      * 有效的中间业务计价项目
@@ -79,9 +79,10 @@ public class MarketingValidInvalidImportVo implements Serializable {
     private String validBusiness;
 
     /**
-     * 有效无效标识
+     * 有效无效标识 1有效 9 无效
      */
-    @ExcelProperty(value = "有效无效标识")
+    @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "report_valid_invalid")
     private String checkFlag;
 
     /**
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
index 79bb37b..f251207 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
@@ -64,22 +64,23 @@ public class MarketingValidInvalidVo implements Serializable {
     @ExcelProperty(value = "客户身份证号")
     private String customerId;
 
-    /**
-     * 无效的中间业务计价项目
-     */
-    @ExcelProperty(value = "无效的中间业务计价项目")
-    private String invalidBusiness;
+//    /**
+//     * 无效的中间业务计价项目
+//     */
+//    @ExcelProperty(value = "无效的中间业务计价项目")
+//    private String invalidBusiness;
 
     /**
      * 有效的中间业务计价项目
      */
-    @ExcelProperty(value = "有效的中间业务计价项目")
+    @ExcelProperty(value = "中间业务计价项目")
     private String validBusiness;
 
     /**
      * 有效无效标识
      */
-    @ExcelProperty(value = "有效无效标识")
+    @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "report_valid_invalid")
     private String checkFlag;
 
     /**