合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillInvoiceMapper.java

@@ -47,4 +47,8 @@ public interface TpBillInvoiceMapper {
 	TpBillInvoice selectByIdAndUserId(@Param("id") Integer billInvoiceId,@Param("userId") Integer userId,@Param("communityId") Integer communityId);
     
     TpBillInvoice selectByOutTradeNo(@Param("outTradeNo") String outTradeNo);
+
+    List<TpBillInvoice> selectByBuildingOwnerInfoId(@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId);
+
+    int updateBeach(Map<String, Object> map);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -68,6 +68,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaFaceMapper taFaceMapper;
 
+    @Autowired
+    private TpBillInvoiceMapper tpBillInvoiceMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Deprecated
@@ -211,6 +214,15 @@ public class TaUserServiceImpl implements ITaUserService {
             buildingOwnerInfo.setUpdateDate(new Date());
             tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
 
+            // 开始绑定缴费单
+            List<TpBillInvoice> tpBillInvoices = tpBillInvoiceMapper.selectByBuildingOwnerInfoId(buildingOwnerInfo.getId());
+            if (CollectionUtils.isNotEmpty(tpBillInvoices)) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("taUserId", user.getId());
+                map.put("list", tpBillInvoices);
+                tpBillInvoiceMapper.updateBeach(map);
+            }
+
         }
 
         // 更新

CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml

@@ -307,4 +307,21 @@
 	where t.out_trade_no = #{outTradeNo,jdbcType=VARCHAR}
 	and t.status = 1
   </select>
+
+    <select id="selectByBuildingOwnerInfoId" parameterType="integer" resultMap="BaseResultMap" >
+        select
+        <include refid="Base_Column_List"/>
+        from tp_bill_invoice
+        where bill_statement_id = #{buildingOwnerInfoId,jdbcType=INTEGER}
+    </select>
+
+    <update id="updateBeach" parameterType="map" >
+        update tp_bill_invoice
+        set ta_user_id = #{map.taUserId}
+        where id in
+      <foreach collection="map.list" item="item" index="index" separator="," open="(" close=")">
+          #{item.id}
+      </foreach>
+    </update>
+
 </mapper>

CODE/smart-community/property-api/pom.xml

@@ -159,7 +159,15 @@
             <scope>compile</scope>
         </dependency>
 
-    </dependencies>
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>1.1.2-beat1</version>
+		</dependency>
+
+
+	</dependencies>
 
 	<dependencyManagement>
 		<dependencies>

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -69,15 +69,19 @@ public class BaseController {
     protected void setResponseHeader(HttpServletResponse response, String fileName) {
         try {
             try {
-                fileName = new String(fileName.getBytes(),"ISO8859-1");
+                fileName = new String(fileName.getBytes(),"utf-8");
             } catch (UnsupportedEncodingException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-            response.setContentType("application/octet-stream;charset=ISO8859-1");
-            response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
-            response.addHeader("Pargam", "no-cache");
-            response.addHeader("Cache-Control", "no-cache");
+//            response.setContentType("application/octet-stream;charset=ISO8859-1");
+//            response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
+//            response.addHeader("Pargam", "no-cache");
+//            response.addHeader("Cache-Control", "no-cache");
+
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+fileName);
         } catch (Exception ex) {
             ex.printStackTrace();
         }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -143,14 +143,13 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "下载Excel模板", notes = "下载Excel模板")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
-//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
-    @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.POST)
-    public void exportExcel(HttpServletResponse response, HttpSession session, @RequestBody String parameter) {
-        ResponseBean responseBean = new ResponseBean();
-//        UserElement userElement = getUserElement(session);
-        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(parameter).getData();
+    @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
         this.setResponseHeader(response, "缴费单模板.xls");
         //响应到客户端
         try {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillService.java

@@ -81,8 +81,8 @@ public interface IBillService extends IService<Bill> {
 
 	/**
 	 * 下载 excel 模板
-	 * @param parameter
+	 * @param userElement
 	 * @return
 	 */
-	ResponseBean downloadExcel(String parameter);
+	ResponseBean downloadExcel(UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -226,12 +226,12 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         Double payPrice = jsonObject.getDouble("payPrice");
 
         // 判断是不是已经 收费完成
-        Bill bill = billMapper.selectById(billId);
-        if ("1".equals(bill.getBillStatus())) {
-            // 状态 收费完成, 不允许添加收费单
-            responseBean.addError("不能给收费已完成的收费组添加收费单!");
-            return responseBean;
-        }
+//        Bill bill = billMapper.selectById(billId);
+//        if ("1".equals(bill.getBillStatus())) {
+//            // 状态 收费完成, 不允许添加收费单
+//            responseBean.addError("不能给收费已完成的收费组添加收费单!");
+//            return responseBean;
+//        }
 
         // 楼栋资料库
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -14,6 +14,7 @@ import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
+import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.zxing.common.detector.MathUtils;
@@ -31,10 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -81,6 +79,8 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private IBuildingOwnerInfoService iBuildingOwnerInfoService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -229,10 +229,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         bill.setPayedNum(0);
         bill.setBillStatus(billStatus);
-        bill.setCreateUser(userElement.getId());
         //为草稿时不创建时间
         if(!"2".equals(billStatus)) {
             bill.setCreateDate(new Date());
+            bill.setCreateUser(userElement.getId());
         }
         bill.setCommunityId(userElement.getCommunityId());
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
@@ -250,6 +250,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         if (billId != null) {
             bill.setCreateUser(null);
             bill.setCreateDate(null);
+            if(!"2".equals(billStatus)) {
+                bill.setCreateDate(new Date());
+                bill.setCreateUser(userElement.getId());
+            }
             // 设置主键, 表示修改
             bill.setId(billId);
         }
@@ -271,8 +275,15 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 queryWrapper.eq("room_no", e.getRoomNo());
                 queryWrapper.eq("community_id", userElement.getCommunityId());
                 TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+                if (null == buildingOwnerInfo) {
+                    throw new WisdomException("请输入正确的用户信息! ");
+                }
+
+                /**
+                 * 如果用户不在 app 里面,没有关联, 那么就设置 taUserId
+                 * 等业主第一次登陆的时候, 再去自动匹配上去
+                 */
 
-                // TODO 如果用户不在 app 里面,没有关联, 怎么处理?
                 // 查询app用户id
                 QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
                 userQueryWrapper.eq("community_id", userElement.getCommunityId());
@@ -280,7 +291,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
 
                 billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
-                billInvoice.setTaUserId(taUser.getId());
+                if (null != taUser) {
+                    billInvoice.setTaUserId(taUser.getId());
+                }
                 billInvoice.setBillInvoiceExplain(bill.getBillExplain());
                 billInvoice.setPayPrice(e.getMoney());
                 billInvoice.setBillStatus("0");
@@ -468,62 +481,69 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean downloadExcel(String parameter) {
+    public ResponseBean downloadExcel(UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
+        inputStream = this.getClass().getResourceAsStream("/缴费单模板.xls");
+
         HSSFWorkbook workbook = null;
         try {
-            inputStream = new FileInputStream("缴费单模板.xls");
             workbook = new HSSFWorkbook(inputStream);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-       
-        HSSFSheet sheet = workbook.createSheet("缴费单");
+        HSSFSheet sheet = workbook.getSheetAt(0);
         // 创建行
-        HSSFRow row = sheet.createRow(0);
+        HSSFRow row = null;
         // 创建列
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue("1.第1行到第4行为模板说明。第5行为列头。第6行为示例。第7行及以后行中的金额部分为需要您填写的区域。请不要删除任何列、说明以及示例等。");
-        row = sheet.createRow(1);
-        cell = row.createCell(0);
-        cell.setCellValue("2.下表中 栋/单元/楼层/房号/业主姓名为系统生成，自行增加、修改无效，只能修改金额！！！如果没有内容或缺失内容，请先登录物业系统，在 社区管理——业主/楼盘——楼盘库中添加楼盘信息，在社区管理——业主/楼盘——业主资料库中添加业主信息，完成后再重新下载账单模板。");
-        row = sheet.createRow(2);
-        cell = row.createCell(0);
-        cell.setCellValue("3.无需缴费的户可以直接在户所在行最左侧行号上点击右键删除行。");
-        row = sheet.createRow(3);
-        cell = row.createCell(0);
-        cell.setCellValue("4.需要缴费的户，在金额列中填写金额，默认单位为人民币元，请输入大于0的数字，小数点请用英文小数点，更不能使用句号。最多保留小数点后两位。若是复制粘贴的金额，请在粘贴后检查金额是否正确，系统暂时无法退费，请仔细核对账单");
-        row = sheet.createRow(4);
-        cell = row.createCell(0);
-        cell.setCellValue("期/区");
-        cell = row.createCell(1);
-        cell.setCellValue("栋");
-        cell = row.createCell(2);
-        cell.setCellValue("单元");
-        cell = row.createCell(3);
-        cell.setCellValue("楼层");
-        cell = row.createCell(4);
-        cell.setCellValue("房号");
-        cell = row.createCell(5);
-        cell.setCellValue("业主姓名");
-        cell = row.createCell(6);
-        cell.setCellValue("金额(元)");
-
-        String [] [] data = new String[][] {{"1区","0", "0", "0", "0", "示例忽删", "12.34", "<-示例"}};
-        int crrentRow = 5;
-        // 行数
-        for (int i = 0; i < data.length; i++) {
-            row = sheet.createRow(i + crrentRow);
-            for (int t = 0; t < data[i].length; t++) {
-                cell = row.createCell(t);
-                cell.setCellValue(data[i][t]);
+        HSSFCell cell = null;
+
+        Integer pageNum = 1;
+        Integer pageSize = 10;
+        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
+        // 分页查询
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
+        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
+        List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
+        // 总页数
+        Long pages = infoIPage.getPages();
+        do {
+
+        } while (false);
+
+
+        // 行数 默认从 第 6 行开始
+        int currentRow = 6;
+        // 记录坐标
+        int index = 0;
+
+        do {
+            TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
+            row = sheet.createRow(currentRow);
+            cell = row.createCell(0);
+            cell.setCellValue(buildingOwnerInfo.getPhase());
+            cell = row.createCell(1);
+            cell.setCellValue(buildingOwnerInfo.getBuilding());
+            cell = row.createCell(2);
+            cell.setCellValue(buildingOwnerInfo.getUnit());
+            cell = row.createCell(3);
+            cell.setCellValue(buildingOwnerInfo.getLevel());
+            cell = row.createCell(4);
+            cell.setCellValue(buildingOwnerInfo.getRoomNo());
+            cell = row.createCell(5);
+            cell.setCellValue(buildingOwnerInfo.getOwnerName());
+            currentRow ++;
+            index ++;
+            if (index == records.size()) {
+                index = 0;
+                page = new Page(infoIPage.getCurrent() + 1,pageSize);
+                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
+                records = infoIPage.getRecords();
             }
-        }
+        } while (infoIPage.getCurrent() <= pages);
 
         responseBean.addSuccess(workbook);
         return responseBean;

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,21 +14,16 @@ import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 
-import com.community.huiju.dao.TaSysUserRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.UserMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.TaSysUserRole;
-import com.community.huiju.model.TaUser;
+import com.community.huiju.model.*;
 
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-
-import com.community.huiju.model.User;
+import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.community.huiju.service.ITaUserService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -78,6 +72,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private ITaUserService iTaUserService;
+
+    @Autowired
+    private BillInvoiceMapper billInvoiceMapper;
+
+    @Autowired
+    private IBillInvoiceService iBillInvoiceService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -232,6 +232,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
+
+            // 绑定 缴费单
+            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
         }
 
 
@@ -321,6 +324,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
+
+            // 绑定 缴费单
+            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
+
         }
 
 
@@ -349,6 +356,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taSysUserRoleMapper.insert(taSysUserRole);
     }
 
+    /**
+     * 绑定 缴费单
+     * @param taUserId
+     */
+    private void bingBillInvoice(Integer taUserId, Integer buildingOwnerInfoId) {
+        // 开始绑定缴费单
+        QueryWrapper<BillInvoice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_owner_info_id", buildingOwnerInfoId);
+        List<BillInvoice> tpBillInvoices = billInvoiceMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(tpBillInvoices)) {
+            tpBillInvoices.forEach(e -> e.setTaUserId(taUserId));
+            iBillInvoiceService.updateBatchById(tpBillInvoices);
+        }
+    }
+
     @Override
     public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
 

VUECODE/smart-property-manage/src/api/bill.js

@@ -47,3 +47,11 @@ export function deleteBillBeach(data) {
   })
 }
 
+// 下载excel模板
+export function billDownloadExcel() {
+  return request({
+    url: '/bill/downloadExcel',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -221,7 +221,7 @@ export const constantRouterMap = [
         meta: { title: '收费组管理', icon: 'table' }
       },
       {
-        path: '/bill/management/info/:id',
+        path: '/bill/management/info',
         component: () => import('@/views/bill/info/index'),
         name: 'bill-info',
         hidden: true,
@@ -235,14 +235,14 @@ export const constantRouterMap = [
         meta: { title: '新增收费组', icon: 'table' }
       },
       {
-        path: '/bill/management/edi/:id',
+        path: '/bill/management/edi',
         component: () => import('@/views/bill/edi/index'),
         name: 'bill-edi',
         hidden: true,
         meta: { title: '修改收费组', icon: 'table' }
       },
       {
-        path: '/bill/management/info/bill-edi/:id',
+        path: '/bill/management/info/bill-edi',
         component: () => import('@/views/bill/info/bill-edi/index'),
         name: 'bill-info-edi',
         hidden: true,

VUECODE/smart-property-manage/src/store/modules/bill.js

@@ -1,4 +1,4 @@
-import { fetchBillList, billUploadExcelAdd, updateBillStatus, deleteBillBeach } from '@/api/bill'
+import { fetchBillList, billUploadExcelAdd, updateBillStatus, deleteBillBeach, billDownloadExcel } from '@/api/bill'
 
 const transaction = {
   namespaced: true,
@@ -56,6 +56,15 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    BillDownloadExcel({ commit }) { // 下载Excel模板
+      return new Promise((resolve, reject) => {
+        billDownloadExcel().then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -29,7 +29,7 @@
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
           如果还未制作账单，请先下载账单模板，按规则填写费用后再上传
-          <el-button type="primary" size="small" icon="el-icon-download" @click="submitForm('ruleForm')">下载模板</el-button>
+          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
         </span>
       </div>
       <span style="color: #99a9bf; font-size: 13px;">如果想修改下表的内容，请重新下载excel模板填写金额后上传，系统会直接删除下表所有旧数据，以新的excel内容为准</span>
@@ -296,6 +296,19 @@ export default {
         str += obj.roomNo
       }
       return str
+    },
+    downloadExcel() {
+      this.$store.dispatch('bill/BillDownloadExcel').then(res => {
+        const url = window.URL.createObjectURL(new Blob([res]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '缴费单模板.xls')
+        document.body.appendChild(link)
+        link.click()
+      }).catch(() => {
+        console.log('error BillDownloadExcel')
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/bill/edi/index.vue

@@ -29,7 +29,7 @@
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
           如果还未制作账单，请先下载账单模板，按规则填写费用后再上传
-          <el-button type="primary" size="small" icon="el-icon-download" @click="submitForm('ruleForm')">下载模板</el-button>
+          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
         </span>
       </div>
       <el-table
@@ -130,7 +130,7 @@ export default {
     }
   },
   created() {
-    this.listQuery.billId = this.$route.params.id
+    this.listQuery.billId = this.$route.query.id
     this.billInvoiceGetInvoiceInvalid()
     // this.getMenuList()
   },
@@ -323,6 +323,19 @@ export default {
         str += obj.roomNo
       }
       return str
+    },
+    downloadExcel() {
+      this.$store.dispatch('bill/BillDownloadExcel').then(res => {
+        const url = window.URL.createObjectURL(new Blob([res]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '缴费单模板.xls')
+        document.body.appendChild(link)
+        link.click()
+      }).catch(() => {
+        console.log('error BillDownloadExcel')
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/bill/index.vue

@@ -162,9 +162,9 @@ export default {
     },
     getInfo(billId, billStatus) {
       if (billStatus === '2') {
-        this.$router.push({ name: 'bill-edi', params: { id: billId }})
+        this.$router.push({ name: 'bill-edi', query: { id: billId }})
       } else {
-        this.$router.push({ name: 'bill-info', params: { id: billId }})
+        this.$router.push({ name: 'bill-info', query: { id: billId }})
       }
     },
     addBill() {

VUECODE/smart-property-manage/src/views/bill/info/add/index.vue

@@ -116,7 +116,7 @@ export default {
   mounted() {
     // 获取期
     this.getPhase()
-    this.formInline.billId = this.$route.params.id
+    this.formInline.billId = this.$route.query.id
     // 查询数据
     this.getTempBillInvoice()
   },

VUECODE/smart-property-manage/src/views/bill/info/bill-edi/index.vue

@@ -45,7 +45,7 @@ export default {
     }
   },
   mounted() {
-    this.ruleForm.id = this.$route.params.id
+    this.ruleForm.id = this.$route.query.id
     this.getBillByIdInfo()
   },
   methods: {

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -206,7 +206,7 @@ export default {
   mounted() {
     // 获取期
     this.getPhase()
-    this.formInline.billId = this.$route.params.id
+    this.formInline.billId = this.$route.query.id
     this.getBillInvoice()
   },
   methods: {
@@ -345,7 +345,7 @@ export default {
       this.getBillInvoice()
     },
     updateBill() { // 跳转修改bill标题页面 bill-info-edi
-      this.$router.push({ name: 'bill-info-edi', params: { id: this.formInline.billId }})
+      this.$router.push({ name: 'bill-info-edi', query: { id: this.formInline.billId }})
     },
     deleteBeachIds() { // 批量删除
       if (this.deleteIds.length <= 0) {
@@ -434,19 +434,21 @@ export default {
     },
     addBillInvoice() {
       // 如果是 收费已完成 的收费项, 则不允许跳进添加页面
-      this.$store.dispatch('GetBillByIdInfo', this.formInline.billId).then(res => {
-        const resCode = res.code
-        if (resCode === '0') {
-          const billStatus = res.data.billStatus
-          if (billStatus === '1') {
-            this.$message.error('不能给收费已完成的收费组添加收费单!')
-            return
-          }
-          this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
-        }
-      }).catch(() => {
-        console.log('GetBillByIdInfo error')
-      })
+      // this.$store.dispatch('GetBillByIdInfo', this.formInline.billId).then(res => {
+      //   const resCode = res.code
+      //   if (resCode === '0') {
+      //     const billStatus = res.data.billStatus
+      //     if (billStatus === '1') {
+      //       this.$message.error('不能给收费已完成的收费组添加收费单!')
+      //       return
+      //     }
+      //     this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
+      //   }
+      // }).catch(() => {
+      //   console.log('GetBillByIdInfo error')
+      // })
+
+      this.$router.push({ name: 'bill-info-add', query: { id: this.formInline.billId }})
     },
     showPayPrice(payPrice) { //  转换金额
       const price = payPrice / 100