提交

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

@@ -770,11 +770,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            TaUserVerify userVerify = taUserVerifyMapper.selectById(e);
-            if ("1".equals(userVerify.getVerifyStatus())) {
-                throw new WisdomException("不能删除已审核的资料!");
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
+            if (null != tpBuildingOwnerInfo) {
+                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getUserVerifyId());
             }
-            taUserVerifyMapper.deleteById(e);
+            tpBuildingOwnerInfoMapper.deleteById(e);
         });
 
         responseBean.addSuccess("操作成功!");

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

@@ -327,7 +327,7 @@ export const constantRouterMap = [
         path: '/bill/management/statement/index',
         component: () => import('@/views/bill/statement/index'),
         name: 'bill-statement-index',
-        meta: { title: '流水信息', icon: 'table' }
+        meta: { title: '订单列表', icon: 'table' }
       }
     ]
   },

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

@@ -72,7 +72,7 @@
       <el-button type="danger" @click="deleteBeachIds">删除</el-button>
       <el-button type="primary" @click="offlinePayment">设置为已线下缴费</el-button>
       <el-button type="success" @click="exportExcel">导出数据</el-button>
-      <div style="height: 40px; line-height: 40px; margin-left: 10px; color: #99a9bf;">未缴户主费用可以直接点击 收费金额数字 修改，已缴费业主无法修改，需要线下多退少补</div>
+      <div style="height: 40px; line-height: 40px; margin-left: 10px; font-size: 14px; color: #606266;">未缴户主费用可以直接点击 收费金额数字 修改，已缴费业主无法修改，需要线下多退少补</div>
     </div>
     <el-table
       v-loading="tableLoading"

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

@@ -1,8 +1,8 @@
 <template>
   <div id="root">
     <el-form :model="formInline" inline class="form-inline">
-      <el-form-item label="流水号">
-        <el-input v-model="formInline.id" placeholder="流水号"/>
+      <el-form-item label="订单号">
+        <el-input v-model="formInline.id" placeholder="订单号"/>
       </el-form-item>
       <el-form-item label="缴费项目编号">
         <el-input v-model="formInline.billId" placeholder="缴费项目编号"/>
@@ -34,7 +34,7 @@
       <!--align="center"-->
       <!--width="55"/>-->
       <el-table-column
-        label="流水号"
+        label="订单号"
         prop="id"
         align="center">
         <!--<template slot-scope="scope">{{ scope.row.date }}</template>-->
@@ -84,7 +84,7 @@
       <el-table-column
         prop="createTime"
         align="center"
-        label="流水生成时间">
+        label="订单生成时间">
         <template slot-scope="scope">{{ formatDate(scope.row.createTime) }}</template>
       </el-table-column>
     </el-table>

VUECODE/smart-property-manage/src/views/building/audit/index.vue

@@ -145,7 +145,7 @@ export default {
         console.log('UserVerifyAll error')
       })
     },
-    userVerifyAudit(verifyId,vstatus){
+    userVerifyAudit(verifyId, vstatus) {
       this.formInline.userVerifyId = verifyId
       this.formInline.verifyStatus = vstatus
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {

VUECODE/smart-property-manage/src/views/building/buildingdata/BuildingBatchImport.vue

@@ -3,12 +3,14 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
-        <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
+        <div style="display: flex;">
           <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1556098137"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
-          <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
+          <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
+            <el-button slot="trigger" size="large" type="primary" style="margin-left: 10px;">选取文件并预览</el-button>
+          </el-upload>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>
-        </el-upload>
+        </div>
       </el-form-item>
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">

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

@@ -3,7 +3,7 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
-        <el-select v-model="listQuery.phaseId" placeholder="期/区" @change="buildSelectChange(0)">
+        <el-select v-model="listQuery.phaseId" style="width: 120px;" placeholder="期/区" @change="buildSelectChange(0)" >
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in phaseList"
@@ -11,7 +11,7 @@
             :label="item.name"
             :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.buildingId" placeholder="栋" @change="buildSelectChange(1)">
+        <el-select v-model="listQuery.buildingId" style="width: 120px;" placeholder="栋" @change="buildSelectChange(1)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in buildingList"
@@ -19,7 +19,7 @@
             :label="item.name"
             :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.unitId" placeholder="单元" @change="buildSelectChange(2)">
+        <el-select v-model="listQuery.unitId" style="width: 120px;" placeholder="单元" @change="buildSelectChange(2)">
           <!--<el-option label="选择单元" value="-1" />-->
           <el-option
             v-for="item in unitList"
@@ -27,7 +27,7 @@
             :label="item.name"
             :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.levelId" placeholder="楼层" @change="buildSelectChange(3)">
+        <el-select v-model="listQuery.levelId" style="width: 120px;" placeholder="楼层" @change="buildSelectChange(3)">
           <!--<el-option label="选择楼层" value="-1" />-->
           <el-option
             v-for="item in levelList"
@@ -35,7 +35,7 @@
             :label="item.name"
             :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.roomNoId" placeholder="户号">
+        <el-select v-model="listQuery.roomNoId" style="width: 120px;" placeholder="户号">
           <!--<el-option label="选择户号" value="-1" />-->
           <el-option
             v-for="item in roomNoList"
@@ -64,7 +64,7 @@
         <el-button type="danger" @click="deleteData">删除</el-button>
       </div>
       <div>
-        <el-button type="success" @click="dialogBatchImport">批量导入楼栋信息</el-button>
+        <el-button type="success" @click="dialogBatchImport">批量导入业主资料</el-button>
       </div>
     </div>
     <el-table
@@ -197,7 +197,7 @@ export default {
       // 设置为 空
       this.deleteIds = []
       for (let i = 0; i < data.length; i++) {
-        this.deleteIds.push(data[i].userVerifyId)
+        this.deleteIds.push(data[i].id)
       }
     },
     getPhase() { // 获取期
@@ -311,7 +311,7 @@ export default {
       this.$router.push({ name: 'building-info-index', query: { id: id }})
     },
     deleteData() { // 删除
-      this.$confirm('您确定要删除吗?')
+      this.$confirm('请确认是否真的需要删除?')
         .then(_ => {
           this.$store.dispatch('DeleteBuilding', this.deleteIds).then((res) => {
             if (res.code === '0') {