合并

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

@@ -317,6 +317,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         tpTransactions.stream().forEach(e->{
             // 角色
+            taUserVerifyMapper.selectByPrimaryKey()
             TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserId());
             e.setRoleId(taSysRole.getId());
             e.setRoleName(taSysRole.getRoleName());

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -103,7 +103,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
     public ResponseBean addUser(@RequestBody String parameter,HttpSession session){
         UserElement userElement = getUserElement(session);
-        ResponseBean  responseBean = iToUserService.addUser(parameter,userElement.getId());
+        ResponseBean  responseBean = iToUserService.addUser(parameter,userElement.getId(),userElement.getCommunityId());
         return responseBean;
     }
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TpUser.java

@@ -29,6 +29,16 @@ public class TpUser {
 
     private Date updateDate;
 
+    private  Integer taUserId;
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
     public Integer getId() {
         return id;
     }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -36,7 +36,7 @@ public interface IToUserService {
      * @param UserID
      * @return
      */
-    ResponseBean addUser(String parameter,Integer UserID);
+    ResponseBean addUser(String parameter,Integer UserID,Integer communityId);
 
     /**
      * 修改成员

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -7,12 +7,8 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
-import com.community.huiju.dao.ToSysRoleMapper;
-import com.community.huiju.dao.ToSysUserRoleMapper;
-import com.community.huiju.dao.ToUserMapper;
-import com.community.huiju.model.ToSysRole;
-import com.community.huiju.model.ToSysUserRole;
-import com.community.huiju.model.ToUser;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
 import com.github.pagehelper.Page;
@@ -41,6 +37,12 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToSysUserRoleMapper toSysUserRoleMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpUserMapper tpUserMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -176,7 +178,7 @@ public class ToUserServerImpl implements IToUserService {
     }
 
     @Override
-    public ResponseBean addUser(String parameter,Integer userID) {
+    public ResponseBean addUser(String parameter,Integer userID,Integer communityId) {
         ResponseBean response= new ResponseBean<>();
         JSONObject object= JSONObject.parseObject(parameter);
         ToUser toUser= new ToUser();
@@ -212,6 +214,27 @@ public class ToUserServerImpl implements IToUserService {
             toSysUserRole.setRoleId(roleID);
             toSysUserRoleMapper.insert(toSysUserRole);
         }
+
+        //时维护ta_user（发帖需要）
+        TaUser taUser= new TaUser();
+        taUser.setLoginName(loginName);
+        taUser.setCreateUser(userID);
+        taUser.setCreateDate(new Date());
+        taUser .setUserName(userName);
+        taUser .setStatus("1");
+
+        taUserMapper.insert(taUser);
+        TpUser tpUser= new TpUser();
+        tpUser.setTaUserId(taUser.getId());
+        tpUser.setUserName(userName);
+        tpUser.setLoginName(loginName);
+        tpUser.setRemark(remark);
+        tpUser.setStatus("1");
+
+        tpUser.setCreateUser(userID);
+        tpUser.setCreateDate(new Date());
+        tpUser.setCommunityId(communityId);
+        tpUserMapper.insertSelective(tpUser);
          response.addSuccess("成功");
         return response;
     }

CODE/smart-community/operate-api/src/main/resources/mapper/TaUserMapper.xml

@@ -27,6 +27,7 @@
     <result column="id_card" property="idCard" jdbcType="INTEGER"/>
     <result column="openid" property="openid" jdbcType="VARCHAR" />
     <result column="nickname" property="nickname" jdbcType="VARCHAR" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
@@ -137,9 +138,13 @@
       <if test="openid != null" >
         openid,
       </if>
+
       <if test="nickname != null" >
         nickname,
       </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -92,7 +92,7 @@ public class TransactionController extends BaseController {
 		return addAnnouncement;
 	}
 
-	@ApiOperation(value = "添加二手租赁",nickname ="添加二手租赁")
+	@ApiOperation(value = "修改二手租赁",nickname ="修改二手租赁")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
 					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})

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

@@ -122,7 +122,7 @@ export const constantRouterMap = [
         path: '/social/transaction',
         component: () => import('@/views/social/transaction/index'),
         name: 'transaction-import',
-        meta: { title: '二手等管理', icon: 'table' }
+        meta: { title: '二手话题', icon: 'table' }
       },
       {
         path: '/transaction/transaction',

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

@@ -7,6 +7,7 @@
       </div>
     </div>
     <el-tree
+      :default-expanded-keys="liste"
       :props="defaultProps"
       :load="loadTree"
       lazy
@@ -35,8 +36,9 @@ export default {
       },
       defaultProps: {
         label: 'name', 
-        isLeaf: 'leaf'
+        isLeaf: 'leaf',
       },
+      liste: []
     }
   },
   computed: {
@@ -64,6 +66,7 @@ export default {
     }
   },
   mounted() {
+    
   },
   methods: {
     append(data) {
@@ -87,17 +90,26 @@ export default {
         console.log('当前名称',data.name)
         console.log('当前类型',data.type)
         console.log('输入的值',this.treeQuery.nodeNumber)
-        this.aAddNode()
+        this.aAddNode(data.id)
         }) 
     },
-      aAddNode(){
+      aAddNode(id){
       // 添加当前节点
       this.$store.dispatch('AddNode', this.treeQuery).then((res) => {
-          location.reload()
+         
+          
+          this.$router.go(0)
+           
+           this.suo()
+
       }).catch(() => {
         console.log('error addNode')
       })
       },
+      suo(){
+        this.liste=[177,26,25]
+         console.log('1111'); 
+      },
       //删除当前节点
       remove(data){
       this.treeQuery.id = data.id

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

@@ -1,10 +1,13 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="活动标题" prop="activityTitle">
-        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
+      <el-form-item  prop="activityTitle">
+        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 80%;padding-left:3.5%;"/></div>
       </el-form-item>
-      <el-form-item label="活动轮播图" prop="activityCarouselImg">
+      <el-form-item  prop="activityCarouselImg">
+        <div >
+        <div style="transform:translateY(250%);">活动轮播图</div>
+        <div  style="width: 500px;padding-left:20%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -15,11 +18,16 @@
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
+        </div>
+        </div>
       </el-form-item>
-      <el-form-item label="活动详细描述">
-        <el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      <el-form-item>
+        <div><span style="position:relative;top:-100px">活动详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="活动配图">
+      <el-form-item>
+        <div >
+          <div style="transform:translateY(250%);">活动配图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -29,6 +37,8 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>

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

@@ -1,10 +1,13 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="活动标题" prop="activityTitle">
-        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
+      <el-form-item  prop="activityTitle">
+        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="15字以内" style="width: 80%;padding-left:3.5%;"/></div>
       </el-form-item>
-      <el-form-item label="活动轮播图" prop="activityCarouselImg">
+      <el-form-item  prop="activityCarouselImg">
+        <div >
+          <div style="transform:translateY(250%);">活动轮播图</div>
+        <div  style="width: 500px;padding-left:20%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -15,11 +18,16 @@
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
+        </div>
+        </div>
       </el-form-item>
-      <el-form-item label="活动详细描述">
-        <el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      <el-form-item >
+        <div><span style="position:relative;top:-100px">活动详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="活动配图">
+      <el-form-item >
+        <div >
+          <div style="transform:translateY(250%);">公告轮播图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -30,6 +38,8 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>

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

@@ -1,9 +1,9 @@
 
 <template>
   <div id="root">
-    <el-form :inline="true" :model="listQuery" class="form-inline">
+    <el-form :inline="true" :model="listQuery" label-width="50px" class="form-inline">
       <el-form-item label="活动编号">
-        <el-input v-model="listQuery.id" placeholder="活动编号"/>
+        <div>公告标题&nbsp;&nbsp;<el-input v-model="listQuery.id" placeholder="活动编号" style="width: 80%;padding-left:3.5%"/></div>
       </el-form-item>
       <el-form-item label="活动标题">
         <el-input v-model="listQuery.activityTitle" placeholder="活动标题"/>

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

@@ -1,12 +1,22 @@
 <template>
   <div id="root">
-    <span class="activityTile">{{ ruleForm.activityTitle }}</span>
-    <img :src="ruleForm.activityCarouselImg" width="700" height="500">
+    <div>公告标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
+    <div >
+        <div 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">
-      {{ ruleForm.activityContent }}
+      <div><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
     </div>
     <div class="activityContextImg">
+        <div >
+        <div 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'">
     <div style="display: flex;">
@@ -169,11 +179,10 @@ export default {
 }
 .activityTile{
   text-align: center;
-  font-size: 30px;
+  font-size: 20px;
   margin-bottom: 10px;
 }
 .activityContext{
-  margin-top: 20px;
   margin-bottom: 20px;
   font-size: 20px;
   justify-items: center;

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

@@ -1,11 +1,15 @@
 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="公告标题" prop="announcementTitle">
-        <el-input v-model="ruleForm.announcementTitle" placeholder="15字以内"/>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="50px" class="ruleForm">
+      <el-form-item  prop="announcementTitle">
+        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内"  style="width: 80%;padding-left:3.5%;"/></div>
+        
       </el-form-item>
-      <el-form-item label="公告轮播图" prop="announcementCarouselImg">
-        <el-upload
+      <el-form-item  prop="announcementCarouselImg" >
+        <div >
+          <div style="transform:translateY(250%);">公告轮播图</div>
+        <div  style="width: 500px;padding-left:20%;">
+        <el-upload 
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           :before-upload="beforeAvatarUpload"
@@ -15,11 +19,17 @@
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
+          </div>
+        </div>
       </el-form-item>
-      <el-form-item label="公告详细描述">
-        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容"/>
+      <el-form-item label="">
+        
+        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="公告配图">
+      <el-form-item>
+         <div >
+          <div style="transform:translateY(250%);">公告轮播图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -29,14 +39,17 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      <el-form-item  prop="sort">
+        <div>权重值&nbsp;&nbsp;<el-input-number  v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
+        
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:13%">
         <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
@@ -63,7 +76,7 @@ export default {
       rules: {
         announcementTitle: [
           { required: true, message: '请输入公告名称', trigger: 'blur' },
-          { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
+          { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
           { required: true, message: '公告详细描述', trigger: 'blur' }

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

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
     <el-form ref="form" label-width="100px" label-position="left">
-      <el-form-item label="公共标题">
+      <el-form-item label="公告标题">
         <span class="activityTile">{{ ruleForm.announcementTitle }}</span>
       </el-form-item>
       <el-form-item label="公告轮播图">

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

@@ -1,10 +1,13 @@
 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="公告标题" prop="announcementTitle">
-        <el-input v-model="ruleForm.announcementTitle" placeholder="15字以内"/>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="50px" class="ruleForm">
+      <el-form-item  prop="announcementTitle">
+        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 80%;padding-left:3.5%;"/></div>
       </el-form-item>
-      <el-form-item label="公告轮播图" prop="announcementCarouselImg">
+      <el-form-item  prop="announcementCarouselImg">
+        <div >
+          <div style="transform:translateY(250%);">公告轮播图</div>
+          <div  style="width: 500px;padding-left:20%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -15,11 +18,16 @@
           <img v-if="Urlimage" :src="Urlimage" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
+        </div>
+        </div>
       </el-form-item>
-      <el-form-item label="公告详细描述">
-        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容"/>
+      <el-form-item >
+        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="公告配图">
+      <el-form-item >
+       <div >
+          <div style="transform:translateY(250%);">公告轮播图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -30,12 +38,14 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+       </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      <el-form-item  prop="sort">
+        <div>权重值&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
@@ -65,7 +75,7 @@ export default {
       rules: {
         announcementTitle: [
           { required: true, message: '请输入公告名称', trigger: 'blur' },
-          { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
+          { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
           { required: true, message: '公告详细描述', trigger: 'blur' }

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

@@ -42,7 +42,14 @@
         type="selection"
         width="55"/>
       <el-table-column prop="id" label="话题编号" align="center"/>
-       <el-table-column prop="type" label="话题类型" align="center"/>
+       <el-table-column prop="type" label="话题类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type=='0'">议事大厅</span>
+            <span v-if="scope.row.type=='1'">友令互助</span>
+            <span v-if="scope.row.type=='2'">二手租赁</span>
+            <span v-if="scope.row.type=='3'">其他</span>
+            </template>
+       </el-table-column>
       <el-table-column prop="transactionTitle" label="话题标题" align="center">
       <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.transactionTitle }}</span></a></template>
       </el-table-column>

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

@@ -2,23 +2,26 @@
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
 
-    <el-form-item class="filter-item" label="话题类型" >
-        <el-select v-model="ruleForm.type" placeholder="请选择">
-         <el-option label="选择状态" value="" />
-         <el-option label="议事大厅" value="0"/>
-         <el-option label="友令互助" value="1"/>
+    <el-form-item class="filter-item" >
+        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
+         <el-option label="议事大厅(投诉，建议，表扬，社区明星评比，业委员会选举，组织活动等)" value="0"/>
+         <el-option label="友令互助(借物，宠物寄养，搭伙用餐，搭手帮忙，邻里提醒，组织春游等)" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
-         <el-option label="二手租赁" value="-1"/>
-         <el-option label="其他" value="3"/>
+         <el-option label="二手租赁(咸鱼太贵，快递费太贵，想租个车位？小区里面就能买卖)" value="-1"/>
+         <el-option label="其他(还有其他的？畅所欲言吧)" value="3"/>
         </el-select>
+        </div>
       </el-form-item>
-      <el-form-item label="话题标题" prop="transactionTitle">
-        <el-input v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
+      <el-form-item  prop="transactionTitle">
+        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
       </el-form-item>
-      <el-form-item label="话题详细描述">
-        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
+      <el-form-item >
+        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="话题配图">
+      <el-form-item>
+        <div >
+          <div style="transform:translateY(250%);">话题配图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -28,12 +31,17 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      <el-form-item prop="sort" >
+        <div style="display: flex; justify-content: flex-start;">
+          <span style="width: 120px;">权重值</span>
+          <el-input-number style="width: 130px;margin-left:-2%" v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+        </div>
       </el-form-item>
       <el-form-item>
         <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
@@ -76,7 +84,7 @@ export default {
       rules: {
         announcementTitle: [
           { required: true, message: '请输入公告名称', trigger: 'blur' },
-          { min: 1, max: 20, message: '长度在 15 个字符以内', trigger: 'blur' }
+          { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
           { required: true, message: '公告详细描述', trigger: 'blur' }
@@ -100,7 +108,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
+            this.$message.error('话题内容描述 和 话题配图至少要存在一个!')
             return
           }
           this.ruleForm.status = status // 发布状态

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

@@ -2,8 +2,8 @@
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
 
-    <el-form-item class="filter-item" label="话题类型" >
-        <el-select v-model="ruleForm.type" placeholder="请选择">
+    <el-form-item class="filter-item" >
+        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
          <el-option label="友令互助" value="1"/>
@@ -11,14 +11,18 @@
          <el-option label="二手租赁" value="-1"/>
          <el-option label="其他" value="3"/>
         </el-select>
+        </div>
       </el-form-item>
-      <el-form-item label="话题标题" prop="transactionTitle">
-        <el-input v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
+      <el-form-item  prop="transactionTitle">
+        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
       </el-form-item>
-      <el-form-item label="话题详细描述">
-        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
+      <el-form-item >
+        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等" style="width: 80%;"/></div>
       </el-form-item>
-      <el-form-item label="话题配图">
+      <el-form-item>
+        <div >
+          <div style="transform:translateY(250%);">话题配图</div>
+        <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -29,15 +33,22 @@
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
+        </div>
+        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      <el-form-item  prop="sort">
+        <div style="display: flex; justify-content: flex-start;">
+          <span style="width: 120px;">权重值</span>
+          <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+        </div>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
+        <div style="padding-left:15%;">
+        <el-button type="primary" @click="submitForm('1')" >发布</el-button>
+        </div>
       </el-form-item>
     </el-form>
   </div>
@@ -94,7 +105,7 @@ export default {
     this.transactionById()
   },
   methods: {
-    submitForm(formName, status) {
+    submitForm(status) {
       console.log(status)
       // 加载框
     //   const loading = this.$loading({
@@ -103,26 +114,21 @@ export default {
     //     spinner: 'el-icon-loading',
     //     background: 'rgba(0, 0, 0, 0.7)'
     //   })
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
+
           if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('内容描述 和 图至少要存在一个!')
             return
           }
           this.ruleForm.status = status // 发布状态
           this.$store.dispatch('transaction/TransactionsEdit', this.ruleForm).then((res) => {
-            
+            this.$router.push({ name: 'transaction-import' })
             // this.$message.error(res.message)
             // loading.close()
           }).catch(() => {
             console.log('error AddActivity')
           })
-        } else {
-          console.log('error submit!!')
-          // loading.close()
-          return false
-        }
-      })
+        
+  
       // 关闭加载框
       // loading.close()
     },

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

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