Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -126,4 +126,5 @@ public class TpTransaction implements Serializable {
      * 1代表物业端发帖子，0代表app端发帖子
      */
     private String releaseIdentity;
+
 }

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

@@ -1078,8 +1078,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             roomInfoList.add(roomInfo.getPhaseName()
             +roomInfo.getBuildingName()
             +roomInfo.getUnitName()
-            +roomInfo.getLevelName()
-            +roomInfo.getRoomNoName());
+            +roomInfo.getLevelName());
         }
         Map<String, Object> map = Maps.newHashMap();
         /*当前房产信息*/

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

@@ -189,6 +189,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             responseBean.addError("审核数据不存在！");
             return responseBean;
         }
+        //判断审核数据是否冲突
+        hasUserVerify(userElement,  userVerify,  true);
+
         // 被审核的用户(APP端)
         TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         // 物业人员

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

@@ -107,6 +107,13 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	public ResponseBean getTransactionInfo(Integer id) {
 		ResponseBean responseBean = new ResponseBean();
 		TpTransaction tpTransaction = tpTransactionMapper.selectById(id);
+		//查询回复总数
+		QueryWrapper<TransactionReply> transactionReply= new QueryWrapper<>();
+		transactionReply.eq("transaction_id",tpTransaction.getId());
+		transactionReply.eq("community_id",tpTransaction.getCommunityId());
+		Integer report= transactionReplyMapper.selectCount(transactionReply);
+		tpTransaction.setReplySum(report);
+
 		QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("uuid", id);
 		queryWrapper.eq("type", "transaction");

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -61,6 +61,7 @@
     <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
         SELECT
             t.id,
+            t.room_no_name,
             u.id as userVerifyId,
             t.community_id as communityId,
             t.owner_tel as ownerTel,

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

@@ -61,7 +61,6 @@
     <div class="operation">
       <div>
         <el-button type="primary" @click="addBuilding">添加</el-button>
-        <el-button type="warning" @click="ediBuilding(-1)">修改</el-button>
         <el-button type="danger" @click="deleteData">删除</el-button>
       </div>
       <div>
@@ -83,6 +82,7 @@
       </el-table-column>
       <el-table-column prop="ownerTel" label="手机号" align="center" />
       <el-table-column prop="idCard" label="身份证号" align="center" />
+      <el-table-column prop="roomNoName" label="房间号" align="center" />
       <el-table-column prop="roleName" label="身份" align="center" />
       <el-table-column prop="verifyStatus" label="审核状态" align="center" >
         <template slot-scope="scope">

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

@@ -30,13 +30,14 @@
         </el-form-item>
         <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>  
         <el-form-item label="在当前房屋">
-            <table style="transform:translateY(20%);">
+          <span style="transform:translateY(80%);">{{ listQuery.roomNoName }}</span>
+            <table style="transform:translateY(20%);">   
             <tr>
               <td>身份</td>
               <td style="color:#888888" v-if="listQuery.off=='1'">{{ listQuery.description }}</td>
               <td v-if="listQuery.off=='2'">
                 <el-select v-model="listQuery.roleId" placeholder="请选择">
-                  <el-option label="业主" value="1"/>
+                  <el-option label="户主" value="1"/>
                   <el-option label="租客" value="2"/>
                   <el-option label="家属" value="3"/>
                 </el-select>
@@ -65,7 +66,7 @@
         </el-form-item>
         <div>
          <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>     
-         <div style="transform:translateY(120%);"><span>关联本小区其他房屋</span></div> 
+         <div style="transform:translateY(120%);"><span style="font-size: 8px; color: #606266;">关联本小区其他房屋</span></div> 
          <el-form-item>
           <table >
             <tr style="transform:translateY(-10%);">
@@ -80,7 +81,7 @@
          </el-form-item>
         <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>
         </div>
-        <span style="color:#A9A9A9">
+        <span style="color:#A9A9A9;font-size: 14px; color: #606266;">
         若想修改业主登录手机号，需要业主自己登录APP在个人中心修改。或者联系荟房网络运营人员核实后修改，因为此手机号可能在其他社区在用。
         若想修改成员为其他成员的手机号，请删除此成员后添加新成员。
         </span>  
@@ -106,6 +107,7 @@ export default {
         verifyStatus: '',
         faceImg: '',
         roomInfoList: '',
+        roomNoName: '',
         off: '1', // 控制按钮的展示
         type: '', 
         roleId:'',
@@ -135,6 +137,7 @@ export default {
        this.listQuery.verifyStatus = res.data.taUserVerify.verifyStatus + ''
        this.listQuery.status = res.data.taUserVerify.verifyStatus + ''
        this.listQuery.faceImg = res.data.taUserVerify.faceImg
+       this.listQuery.roomNoName = res.data.taUserVerify.roomNoName
        this.listQuery.roomInfoList  = res.data.roomInfoList
        this.listQuery.roleId = res.data.taUserVerify.roleId + ''
        console.log('')
@@ -157,6 +160,12 @@ export default {
           })
           this.$router.push({ name: 'building-index' })
         }
+        if (resCode === '1') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+        }
       }).catch(() => {
         console.log('UserVerifyAudit error')
       })

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

@@ -7,7 +7,7 @@
       <el-form-item  prop="activityCarouselImg">
         <div >
         <div style="transform:translateY(250%);">活动轮播图</div>
-        <div  style="width: 500px;padding-left:20%;">
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -16,7 +16,7 @@
           name="uploadFiles"
           action="http://106.14.20.193:8086/property-api/uploadimage">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+          <i v-else  class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
         </div>
         </div>

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

@@ -2,25 +2,25 @@
   <div id="root">
     <div>公告标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
     <div >
-        <div style="transform:translateY(250%);">活动轮播图</div>
+        <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
         <div  style="width: 500px;padding-left:20%;">
     <img :src="ruleForm.activityCarouselImg" width="100" height="100">
     </div>
     </div>
     <div class="activityContext">
-      <div><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
+      <div class="activityTile"><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
     </div>
     <div class="activityContextImg">
         <div >
-        <div style="transform:translateY(250%);">活动轮播图</div>
+        <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
         <div  style="width: 500px;padding-left:20%;">
       <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" />
         </div>
         </div>
     </div>
-    <span v-if="ruleForm.signInCode=='1'">
+    <span>
     <div style="display: flex;">
-          <span style="width: 200px;transform:translateY(25%);">是否需要报名人扫码签到</span>
+          <span class="activityTile" style="width: 200px;transform:translateY(25%);">是否需要报名人扫码签到</span>
           <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
           <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
           <span style="padding-left:20%"><el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button></span> 
@@ -40,7 +40,8 @@
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
       <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
     </div>
-    <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
+    <span class="activityTile">报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
+    <span class="activityTile" style="transform:translateY(150%);">权重值&emsp;&emsp;&emsp;&emsp;{{ ruleForm.sort }}</span>
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
     </div>
@@ -176,11 +177,11 @@ export default {
   margin-top: 50px;
   margin-left: auto;
   margin-right: auto;
+  font-size: 1px;
+
 }
 .activityTile{
-  text-align: center;
-  font-size: 20px;
-  margin-bottom: 10px;
+  font-size: 5px;
 }
 .activityContext{
   margin-bottom: 20px;

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -169,6 +169,7 @@ export default {
     getById() { // 页面初始化后调用此方法根据ID获取公告信息
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
         const resData = res.data
+        console.log('resData',res)
         this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle// 标题
         this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent// 内容
         this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -191,8 +191,8 @@ export default {
         if(this.listQuery.status == 0){
           this.$message.error('已作废不可以修改')
           return
-        }
-       this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+        } 
+       this.$router.push({ name: 'announcement-edit', query: { id: ide }})
       }) 
       },
     deleteAnnouncement(){

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -60,10 +60,10 @@
       <el-table-column prop="transactionLikeSum" label="点赞数" align="center"/>
       <el-table-column prop="transactionNoLikeSum" label="点衰数" align="center"/>
       <el-table-column prop="replySum" label="回复数" align="center">
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickReply(scope.row.id)">{{ scope.row.replySum }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickReply(scope.row.replySum,scope.row.id)">{{ scope.row.replySum }}</span></a></template>
       </el-table-column>
       <el-table-column prop="reportSum" label="举报数量" align="center">
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="report(scope.row.id)">{{ scope.row.reportSum }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="report(scope.row.reportSum,scope.row.id)">{{ scope.row.reportSum }}</span></a></template>
       </el-table-column>
     </el-table>
     <div class="block">
@@ -106,7 +106,7 @@ export default {
       total: 0, // 数据总数
       transactionsList: [],
       deleteIds: [], // 选择的id集合
-      listLoading: true // 加载圈
+      listLoading: true, // 加载圈
     }
   },
   mounted() {
@@ -247,7 +247,10 @@ export default {
       this.$router.push({ name: 'transaction-info', query: { id: id }})
     },
       // 回复列表
-    clickReply(id) {
+    clickReply(sum,id) {
+      if(sum == '0'){
+        return
+      }
       console.log('id',id)
       this.$router.push({ name: 'transactionreply-index', query: { id: id }})
     },
@@ -262,7 +265,11 @@ export default {
       return year + '-' + month + '-' + day
     },
     // 举报数量
-    report(id){
+    report(sum,id){
+      console.log('sum',sum)
+      if(sum =='0'){
+        return
+      }
       console.log('id',id)
       this.$router.push({ name: 'transactionReport-index', query: { id: id }})
     }

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -9,9 +9,8 @@
         <el-input v-model.trim="listQuery.replyTaUserName" placeholder="被回复人姓名" />
       </el-form-item>
 
-      <el-form-item class="filter-item" label="话题类型" >
+      <el-form-item class="filter-item" label="筛选" >
         <el-select v-model="listQuery.status" placeholder="请选择">
-         <el-option label="选择状态" value="" />
          <el-option label="回复我的" value="0"/>
          <el-option label="回复全部物业人员的" value="1"/>
          <el-option label="全部物业人员回复的" value="2"/>

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -29,7 +29,7 @@
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="edi">修改</el-button>
       <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="replyAdd">回复帖子</el-button>
-      <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="replyList">查看全部N条回复</el-button>
+      <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="replyList">查看全部{{ ruleForm.replySum }}条回复</el-button>
     </div>
     <el-dialog title="回复发帖人" :visible.sync="ruleForm.dialogFormVisible" :show-close="ruleForm.close">
       <el-form :model="ruleForm">
@@ -86,7 +86,8 @@ export default {
         sort: 1, // 权重
         dialogFormVisible: false,
         close: false,
-        replyType: 1 
+        replyType: 1,
+        replySum: '' 
       },
       dialogVisible: false,
       dialogImageUrl: '',
@@ -104,6 +105,7 @@ export default {
         this.ruleForm.transactionTitle = res.data.tpTransaction.transactionTitle
          this.ruleForm.type = res.data.tpTransaction.type
          this.ruleForm.transactionContent = res.data.tpTransaction.transactionContent
+         this.ruleForm.replySum = res.data.tpTransaction.replySum
          this.ruleForm.sort = res.data.tpTransaction.sort
         //  this.contentImgList = res.data.list
          console.log(' res.data.tpTransaction.list', res.data.list)

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -1,5 +1,5 @@
 <template>
-<div id="app" style="margin-top:30px;">
+<div id="app" style="margin-top:30px;font-size: 14px; color: #606266;">
  <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <div style="transform:translateY(-70%);">
          <span style="padding-right:0%;font-weight:bold;font-size:12px;">工单详情</span>