From 27ed55b62d15f6456b1789380469458ea04574c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 2 Sep 2021 10:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     |  31 +--
 .../com/jero/mail/entity/PayMailBill.java     |  22 +-
 .../jero/mail/mapper/PayMailBillMapper.java   |   7 +-
 .../mail/mapper/xml/PayMailBillMapper.xml     |  19 +-
 .../mail/service/IPayMailBillService.java     |  23 +-
 .../service/impl/PayMailBillServiceImpl.java  |   9 +-
 .../java/com/jero/mail/vo/MailBillVO.java     |  15 --
 .../com/jero/mail/vue/PayMailBillList.vue     | 210 ------------------
 .../jero/mail/vue/PayMailBillProjectList.vue  | 183 ---------------
 .../jero/mail/vue/modules/PayMailBillForm.vue | 134 -----------
 .../mail/vue/modules/PayMailBillModal.vue     |  60 -----
 .../PayMailBillModal__Style#Drawer.vue        |  84 -------
 .../vue/modules/PayMailBillProjectForm.vue    | 114 ----------
 .../vue/modules/PayMailBillProjectModal.vue   |  60 -----
 .../PayMailBillProjectModal__Style#Drawer.vue |  84 -------
 .../jero/payment/vue/PayPaymentRecordList.vue | 192 ----------------
 .../vue/modules/PayPaymentRecordForm.vue      | 119 ----------
 .../vue/modules/PayPaymentRecordModal.vue     |  60 -----
 .../PayPaymentRecordModal__Style#Drawer.vue   |  84 -------
 .../PayCommonProjectController.java           |   4 +-
 .../controller/PayWorkingGroupController.java |   9 +-
 .../PayWorkingGroupSubItemController.java     |   4 +-
 .../vue/PayCompanyManagementTemporaryList.vue |   0
 .../PayContactsManagementTemporaryList.vue    |   0
 .../PayCompanyManagementTemporaryForm.vue     | 164 --------------
 .../PayCompanyManagementTemporaryModal.vue    |  60 -----
 ...ManagementTemporaryModal__Style#Drawer.vue |   0
 .../PayContactsManagementTemporaryForm.vue    | 159 -------------
 .../PayContactsManagementTemporaryModal.vue   |  60 -----
 ...ManagementTemporaryModal__Style#Drawer.vue |  84 -------
 30 files changed, 70 insertions(+), 1984 deletions(-)
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayCompanyManagementTemporaryList.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayContactsManagementTemporaryList.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 69675e92..d40325ab 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
-import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.mail.entity.PayMailBill;
@@ -22,14 +20,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 票据邮寄
+ * @Description: pay_mail_bill
  * @Author: jeecg-boot
- * @Date:   2021-08-31
+ * @Date:   2021-09-02
  * @Version: V1.0
  */
-@Api(tags="票据邮寄")
+@Api(tags="pay_mail_bill")
 @RestController
-@RequestMapping("/mailBill/payMailBill")
+@RequestMapping("/mail/payMailBill")
 @Slf4j
 public class PayMailBillController extends JeroController<PayMailBill, IPayMailBillService> {
 	@Autowired
@@ -44,9 +42,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-分页列表查询")
-	@ApiOperation(value="票据邮寄-分页列表查询", notes="票据邮寄-分页列表查询")
-	@DictPoint
+	@ApiOperation(value="pay_mail_bill-分页列表查询", notes="pay_mail_bill-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayMailBill payMailBill,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -64,8 +60,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param payMailBill
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-添加")
-	@ApiOperation(value="票据邮寄-添加", notes="票据邮寄-添加")
+	@ApiOperation(value="pay_mail_bill-添加", notes="pay_mail_bill-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayMailBill payMailBill) {
 		payMailBillService.save(payMailBill);
@@ -78,8 +73,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param payMailBill
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-编辑")
-	@ApiOperation(value="票据邮寄-编辑", notes="票据邮寄-编辑")
+	@ApiOperation(value="pay_mail_bill-编辑", notes="pay_mail_bill-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayMailBill payMailBill) {
 		payMailBillService.updateById(payMailBill);
@@ -92,8 +86,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-通过id删除")
-	@ApiOperation(value="票据邮寄-通过id删除", notes="票据邮寄-通过id删除")
+	@ApiOperation(value="pay_mail_bill-通过id删除", notes="pay_mail_bill-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payMailBillService.removeById(id);
@@ -106,8 +99,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-批量删除")
-	@ApiOperation(value="票据邮寄-批量删除", notes="票据邮寄-批量删除")
+	@ApiOperation(value="pay_mail_bill-批量删除", notes="pay_mail_bill-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payMailBillService.removeByIds(Arrays.asList(ids.split(",")));
@@ -120,8 +112,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "票据邮寄-通过id查询")
-	@ApiOperation(value="票据邮寄-通过id查询", notes="票据邮寄-通过id查询")
+	@ApiOperation(value="pay_mail_bill-通过id查询", notes="pay_mail_bill-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayMailBill payMailBill = payMailBillService.getById(id);
@@ -139,7 +130,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMailBill payMailBill) {
-        return super.exportXls(request, payMailBill, PayMailBill.class, "票据邮寄");
+        return super.exportXls(request, payMailBill, PayMailBill.class, "pay_mail_bill");
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
index 6b376c98..cba52bf0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: pay_mail_bill
  * @Author: jeecg-boot
- * @Date:   2021-08-31
+ * @Date:   2021-09-02
  * @Version: V1.0
  */
 @Data
@@ -67,6 +67,20 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
     private java.lang.String postNo;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String liaisonMan;
+	/**联系人手机号*/
+	@Excel(name = "联系人手机号", width = 15)
+    @ApiModelProperty(value = "联系人手机号")
+    private java.lang.String mobile;
+	/**缴费时间*/
+	@Excel(name = "缴费时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "缴费时间")
+    private java.util.Date paymentDate;
 	/**邮寄时间*/
 	@Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -77,4 +91,8 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+	/**项目名称*/
+	@Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String projectName;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
index a6eeb72a..90ac71c3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
@@ -3,15 +3,14 @@ package com.jero.mail.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.vo.MailBillVO;
-import org.apache.ibatis.annotations.Param;
+import io.lettuce.core.dynamic.annotation.Param;
 
 import java.util.List;
 
 /**
  * @Description: pay_mail_bill
  * @Author: jeecg-boot
- * @Date:   2021-08-31
+ * @Date:   2021-09-02
  * @Version: V1.0
  */
 public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
@@ -23,6 +22,6 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
      * @Return
      * @Exception
      */
-    List<MailBillVO> selectCommonProjectMailBillVO(@Param("projectId") String projectId);
+    List<PayMailBill> selectCommonProjectMailBillVO(@Param("projectId") String projectId);
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index c279d38a..fa6aea78 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.mail.mapper.PayMailBillMapper">
-    <resultMap id="MailBillVO" type="com.jero.mail.vo.MailBillVO">
+    <resultMap id="MailBillVO" type="com.jero.mail.entity.PayMailBill">
         <result property="id" column="id"></result>
         <result property="createBy" column="create_by"></result>
         <result property="createTime" column="create_time"></result>
@@ -12,11 +12,13 @@
         <result property="postStatus" column="post_status"></result>
         <result property="sendMethod" column="send_method"></result>
         <result property="postNo" column="post_no"></result>
+        <result property="postNo" column="post_no"></result>
+        <result property="liaisonMan" column="liaison_man"></result>
+        <result property="mobile" column="mobile"></result>
+        <result property="paymentDate" column="payment_date"></result>
         <result property="sendDate" column="send_date"></result>
         <result property="remark" column="remark"></result>
-        <collection property="list" ofType="String">
-            <result column="projectName"></result>
-        </collection>
+        <result property="projectName" column="project_name"></result>
     </resultMap>
     <select id="selectCommonProjectMailBillVO" resultMap="MailBillVO">
         SELECT
@@ -30,12 +32,13 @@
             pmb.post_status,
             pmb.send_method,
             pmb.post_no,
+            pmb.liaison_man,
+            pmb.mobile,
+            pmb.payment_date,
             pmb.send_date,
             pmb.remark,
-            pcp.charge_project AS projectName
+            pmb.project_name
         FROM pay_mail_bill pmb
-        LEFT JOIN pay_mail_bill_project pmbp ON pmb.id = pmbp.bill_id
-        LEFT JOIN pay_common_project pcp ON pcp.id = pmbp.project_id
-        WHERE pmb.id = (SELECT id FROM pay_mail_bill_project WHERE project_id=#{projectId})
+        WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId})
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
index 7e22f308..9335f270 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
@@ -2,26 +2,25 @@ package com.jero.mail.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.vo.MailBillVO;
 
 import java.util.List;
 
 /**
  * @Description: pay_mail_bill
  * @Author: jeecg-boot
- * @Date:   2021-08-31
+ * @Date:   2021-09-02
  * @Version: V1.0
  */
 public interface IPayMailBillService extends IService<PayMailBill> {
-    /**
-    * @Description
-    * @Author  lqt
-    * @Date   2021/8/31
-    * @Param  projectId 项目id
-    * @Param  projectType 项目类型
-    * @Return
-    * @Exception
-    */
-    List<MailBillVO> selectMailBillVO(String projectId, String projectType);
 
+    /**
+     * @Description
+     * @Author  lqt
+     * @Date   2021/8/31
+     * @Param  projectId 项目id
+     * @Param  projectType 项目类型
+     * @Return
+     * @Exception
+     */
+    List<PayMailBill> selectMailBillVO(String projectId, String projectType);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index dcfb559b..710fdff2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -5,7 +5,6 @@ import com.jero.mail.common.MailBillCommon;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.mapper.PayMailBillMapper;
 import com.jero.mail.service.IPayMailBillService;
-import com.jero.mail.vo.MailBillVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -15,18 +14,17 @@ import java.util.List;
 /**
  * @Description: pay_mail_bill
  * @Author: jeecg-boot
- * @Date:   2021-08-31
+ * @Date:   2021-09-02
  * @Version: V1.0
  */
 @Service
 public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMailBill> implements IPayMailBillService {
-
     @Resource
     private PayMailBillMapper payMailBillMapper;
 
     @Override
-    public List<MailBillVO> selectMailBillVO(String projectId, String projectType) {
-        List<MailBillVO> list = new ArrayList<>();
+    public List<PayMailBill> selectMailBillVO(String projectId, String projectType) {
+        List<PayMailBill> list = new ArrayList<>();
         switch (projectType){
             case MailBillCommon.PROJECT_TYPE1: list = payMailBillMapper.selectCommonProjectMailBillVO(projectId);break;
             case MailBillCommon.PROJECT_TYPE2:break;
@@ -36,4 +34,5 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         }
         return list;
     }
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java
deleted file mode 100644
index fe8cd40f..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jero.mail.vo;
-
-import com.jero.mail.entity.PayMailBill;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-@Data
-public class MailBillVO extends PayMailBill implements Serializable{
-    /**
-     * 项目名称
-     */
-    private List<String> list;
-
-}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue
deleted file mode 100644
index 2f7c2379..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('pay_mail_bill')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <pay-mail-bill-modal ref="modalForm" @ok="modalFormOk"></pay-mail-bill-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayMailBillModal from './modules/PayMailBillModal'
-
-  export default {
-    name: 'PayMailBillList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayMailBillModal
-    },
-    data () {
-      return {
-        description: 'pay_mail_bill管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'票号',
-            align:"center",
-            dataIndex: 'billNo'
-          },
-          {
-            title:'开票金额',
-            align:"center",
-            dataIndex: 'invoiceAmount'
-          },
-          {
-            title:'邮寄状态(0:未邮寄，1::已邮寄)',
-            align:"center",
-            dataIndex: 'postStatus'
-          },
-          {
-            title:'快递公司(1:EMS,2:顺丰)',
-            align:"center",
-            dataIndex: 'sendMethod'
-          },
-          {
-            title:'快递单号',
-            align:"center",
-            dataIndex: 'postno'
-          },
-          {
-            title:'邮寄时间',
-            align:"center",
-            dataIndex: 'senddate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/mailBill/payMailBill/list",
-          delete: "/mailBill/payMailBill/delete",
-          deleteBatch: "/mailBill/payMailBill/deleteBatch",
-          exportXlsUrl: "/mailBill/payMailBill/exportXls",
-          importExcelUrl: "mailBill/payMailBill/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'billNo',text:'票号'})
-        fieldList.push({type:'int',value:'invoiceAmount',text:'开票金额'})
-        fieldList.push({type:'int',value:'postStatus',text:'邮寄状态(0:未邮寄，1::已邮寄)'})
-        fieldList.push({type:'int',value:'sendMethod',text:'快递公司(1:EMS,2:顺丰)'})
-        fieldList.push({type:'string',value:'postno',text:'快递单号'})
-        fieldList.push({type:'date',value:'senddate',text:'邮寄时间'})
-        fieldList.push({type:'string',value:'remark',text:'备注'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue
deleted file mode 100644
index 91535658..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('pay_mail_bill_project')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <pay-mail-bill-project-modal ref="modalForm" @ok="modalFormOk"></pay-mail-bill-project-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayMailBillProjectModal from './modules/PayMailBillProjectModal'
-
-  export default {
-    name: 'PayMailBillProjectList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayMailBillProjectModal
-    },
-    data () {
-      return {
-        description: 'pay_mail_bill_project管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'票据id',
-            align:"center",
-            dataIndex: 'billId'
-          },
-          {
-            title:'项目id',
-            align:"center",
-            dataIndex: 'projectId'
-          },
-          {
-            title:'项目类型',
-            align:"center",
-            dataIndex: 'projectType'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/mailBill/payMailBillProject/list",
-          delete: "/mailBill/payMailBillProject/delete",
-          deleteBatch: "/mailBill/payMailBillProject/deleteBatch",
-          exportXlsUrl: "/mailBill/payMailBillProject/exportXls",
-          importExcelUrl: "mailBill/payMailBillProject/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'billId',text:'票据id'})
-        fieldList.push({type:'string',value:'projectId',text:'项目id'})
-        fieldList.push({type:'int',value:'projectType',text:'项目类型'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue
deleted file mode 100644
index c9549965..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="票号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billNo">
-              <a-input v-model="model.billNo" placeholder="请输入票号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="开票金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoiceAmount">
-              <a-input-number v-model="model.invoiceAmount" placeholder="请输入开票金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮寄状态(0:未邮寄，1::已邮寄)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postStatus">
-              <a-input-number v-model="model.postStatus" placeholder="请输入邮寄状态(0:未邮寄，1::已邮寄)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="快递公司(1:EMS,2:顺丰)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sendMethod">
-              <a-input-number v-model="model.sendMethod" placeholder="请输入快递公司(1:EMS,2:顺丰)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="快递单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postno">
-              <a-input v-model="model.postno" placeholder="请输入快递单号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮寄时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="senddate">
-              <j-date placeholder="请选择邮寄时间" v-model="model.senddate"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayMailBillForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/mailBill/payMailBill/add",
-          edit: "/mailBill/payMailBill/edit",
-          queryById: "/mailBill/payMailBill/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue
deleted file mode 100644
index 6f26f767..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-mail-bill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-mail-bill-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayMailBillForm from './PayMailBillForm'
-  export default {
-    name: 'PayMailBillModal',
-    components: {
-      PayMailBillForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue
deleted file mode 100644
index 43f6ada0..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-mail-bill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-mail-bill-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayMailBillForm from './PayMailBillForm'
-
-  export default {
-    name: 'PayMailBillModal',
-    components: {
-      PayMailBillForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue
deleted file mode 100644
index 5d9e1401..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="票据id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billId">
-              <a-input v-model="model.billId" placeholder="请输入票据id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="项目id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
-              <a-input v-model="model.projectId" placeholder="请输入项目id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="项目类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectType">
-              <a-input-number v-model="model.projectType" placeholder="请输入项目类型" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayMailBillProjectForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/mailBill/payMailBillProject/add",
-          edit: "/mailBill/payMailBillProject/edit",
-          queryById: "/mailBill/payMailBillProject/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue
deleted file mode 100644
index 32a6222b..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-mail-bill-project-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-mail-bill-project-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayMailBillProjectForm from './PayMailBillProjectForm'
-  export default {
-    name: 'PayMailBillProjectModal',
-    components: {
-      PayMailBillProjectForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue
deleted file mode 100644
index 3d4cc14c..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-mail-bill-project-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-mail-bill-project-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayMailBillProjectForm from './PayMailBillProjectForm'
-
-  export default {
-    name: 'PayMailBillProjectModal',
-    components: {
-      PayMailBillProjectForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue
deleted file mode 100644
index d5270c15..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('pay_payment_record')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <pay-payment-record-modal ref="modalForm" @ok="modalFormOk"></pay-payment-record-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayPaymentRecordModal from './modules/PayPaymentRecordModal'
-
-  export default {
-    name: 'PayPaymentRecordList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayPaymentRecordModal
-    },
-    data () {
-      return {
-        description: 'pay_payment_record管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'项目id',
-            align:"center",
-            dataIndex: 'projectId'
-          },
-          {
-            title:'到账金额',
-            align:"center",
-            dataIndex: 'amountReceived'
-          },
-          {
-            title:'来款日期',
-            align:"center",
-            dataIndex: 'paymentDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/paymentRecord/payPaymentRecord/list",
-          delete: "/paymentRecord/payPaymentRecord/delete",
-          deleteBatch: "/paymentRecord/payPaymentRecord/deleteBatch",
-          exportXlsUrl: "/paymentRecord/payPaymentRecord/exportXls",
-          importExcelUrl: "paymentRecord/payPaymentRecord/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'projectId',text:'项目id'})
-        fieldList.push({type:'int',value:'amountReceived',text:'到账金额'})
-        fieldList.push({type:'date',value:'paymentDate',text:'来款日期'})
-        fieldList.push({type:'string',value:'remark',text:'备注'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue
deleted file mode 100644
index f1ed3dd6..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="项目id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
-              <a-input v-model="model.projectId" placeholder="请输入项目id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="到账金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amountReceived">
-              <a-input-number v-model="model.amountReceived" placeholder="请输入到账金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="来款日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentDate">
-              <j-date placeholder="请选择来款日期" v-model="model.paymentDate"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayPaymentRecordForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/paymentRecord/payPaymentRecord/add",
-          edit: "/paymentRecord/payPaymentRecord/edit",
-          queryById: "/paymentRecord/payPaymentRecord/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue
deleted file mode 100644
index 09547fe0..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-payment-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-payment-record-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayPaymentRecordForm from './PayPaymentRecordForm'
-  export default {
-    name: 'PayPaymentRecordModal',
-    components: {
-      PayPaymentRecordForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue
deleted file mode 100644
index ce2a4e82..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-payment-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-payment-record-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayPaymentRecordForm from './PayPaymentRecordForm'
-
-  export default {
-    name: 'PayPaymentRecordModal',
-    components: {
-      PayPaymentRecordForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 0bdc5a36..c88a3783 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -12,8 +12,8 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
+import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.service.IPayMailBillService;
-import com.jero.mail.vo.MailBillVO;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
@@ -270,7 +270,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
 		json.put("payPaymentRecord",payPaymentRecordList);
 		// 开票邮寄记录
-		List<MailBillVO> listMailBillVO = payMailBillService.selectMailBillVO(payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1);
+		List<PayMailBill> listMailBillVO = payMailBillService.selectMailBillVO(payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1);
 		json.put("mailBill",listMailBillVO);
 		return Result.OK(json);
 	}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 64f3b06c..f9fd8121 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -84,15 +84,18 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 						PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment();
 						// 已付全款
 						List<PayWorkingGroupSubItem> listAllPayment = listPayWorkingGroupSubItem.stream()
-								.filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList());
+								.filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount())
+										== (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList());
 						payWorkingGroupPayment.setAllPayment(listAllPayment.size());
 						// 部分付款
 						List<PayWorkingGroupSubItem> listPartPayment = listPayWorkingGroupSubItem.stream()
-								.filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList());
+								.filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount())
+										< (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList());
 						payWorkingGroupPayment.setPartPayment(listPartPayment.size());
 						// 未付款
 						List<PayWorkingGroupSubItem> listNotPayment = listPayWorkingGroupSubItem.stream()
-								.filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 )
+								.filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) == 0
+										&& (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount()) != 0 )
 								.collect(Collectors.toList());
 						payWorkingGroupPayment.setNotPayment(listNotPayment.size());
 						p.setObj(payWorkingGroupPayment);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 629f2168..008bacf7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -13,8 +13,8 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.ValidUtil;
+import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.service.IPayMailBillService;
-import com.jero.mail.vo.MailBillVO;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
@@ -281,7 +281,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
 		json.put("payPaymentRecord",payPaymentRecordList);
 		// 开票邮寄记录
-		List<MailBillVO> listMailBillVO = payMailBillService.selectMailBillVO(payWorkingGroupSubitem.getId(), PayProjectCommon.PROJECT_TYPE2);
+		List<PayMailBill> listMailBillVO = payMailBillService.selectMailBillVO(payWorkingGroupSubitem.getId(), PayProjectCommon.PROJECT_TYPE2);
 		json.put("mailBill",listMailBillVO);
 		return Result.OK(payWorkingGroupSubitem);
 	}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayCompanyManagementTemporaryList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayCompanyManagementTemporaryList.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayContactsManagementTemporaryList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayContactsManagementTemporaryList.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue
deleted file mode 100644
index 1fb26cb9..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="项目id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
-              <a-input v-model="model.projectId" placeholder="请输入项目id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="项目类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectType">
-              <a-input-number v-model="model.projectType" placeholder="请输入项目类型" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
-              <a-input v-model="model.companyName" placeholder="请输入企业名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="公司地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyAddress">
-              <a-input v-model="model.companyAddress" placeholder="请输入公司地址"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="公司电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyPhone">
-              <a-input v-model="model.companyPhone" placeholder="请输入公司电话"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postalCode">
-              <a-input v-model="model.postalCode" placeholder="请输入邮编"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="银行户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankAccountName">
-              <a-input v-model="model.bankAccountName" placeholder="请输入银行户名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openingBank">
-              <a-input v-model="model.openingBank" placeholder="请输入开户行"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="银行账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankAccount">
-              <a-input v-model="model.bankAccount" placeholder="请输入银行账号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="税号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dutyCode">
-              <a-input v-model="model.dutyCode" placeholder="请输入税号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数据来源(1：管理端，2：报名)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dataSource">
-              <a-input-number v-model="model.dataSource" placeholder="请输入数据来源(1：管理端，2：报名)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="报名新增（1：是，0：否）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signingUp">
-              <a-input-number v-model="model.signingUp" placeholder="请输入报名新增（1：是，0：否）" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remarks">
-              <a-input v-model="model.remarks" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayCompanyManagementTemporaryForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/companyTemporary/payCompanyManagementTemporary/add",
-          edit: "/companyTemporary/payCompanyManagementTemporary/edit",
-          queryById: "/companyTemporary/payCompanyManagementTemporary/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue
deleted file mode 100644
index 99145580..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-company-management-temporary-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-company-management-temporary-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayCompanyManagementTemporaryForm from './PayCompanyManagementTemporaryForm'
-  export default {
-    name: 'PayCompanyManagementTemporaryModal',
-    components: {
-      PayCompanyManagementTemporaryForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue
deleted file mode 100644
index 63950fe6..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="企业id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyId">
-              <a-input v-model="model.companyId" placeholder="请输入企业id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
-              <a-input v-model="model.companyName" placeholder="请输入企业名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="性别（1：男，2：女）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gender">
-              <a-input-number v-model="model.gender" placeholder="请输入性别（1：男，2：女）" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="post">
-              <a-input v-model="model.post" placeholder="请输入职务"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-              <a-input v-model="model.email" placeholder="请输入邮箱"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="通讯地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contactAddress">
-              <a-input v-model="model.contactAddress" placeholder="请输入通讯地址"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postalCode">
-              <a-input v-model="model.postalCode" placeholder="请输入邮政编码"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数据来源(1：管理端，2：报名)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dataSource">
-              <a-input-number v-model="model.dataSource" placeholder="请输入数据来源(1：管理端，2：报名)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="报名新增（0：否，1：:是）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signingUp">
-              <a-input-number v-model="model.signingUp" placeholder="请输入报名新增（0：否，1：:是）" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remarks">
-              <a-input v-model="model.remarks" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayContactsManagementTemporaryForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/companyTemporary/payContactsManagementTemporary/add",
-          edit: "/companyTemporary/payContactsManagementTemporary/edit",
-          queryById: "/companyTemporary/payContactsManagementTemporary/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue
deleted file mode 100644
index b34d441e..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-contacts-management-temporary-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-contacts-management-temporary-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayContactsManagementTemporaryForm from './PayContactsManagementTemporaryForm'
-  export default {
-    name: 'PayContactsManagementTemporaryModal',
-    components: {
-      PayContactsManagementTemporaryForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue
deleted file mode 100644
index 23070992..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-contacts-management-temporary-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-contacts-management-temporary-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayContactsManagementTemporaryForm from './PayContactsManagementTemporaryForm'
-
-  export default {
-    name: 'PayContactsManagementTemporaryModal',
-    components: {
-      PayContactsManagementTemporaryForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file