dingxin hace 6 años
padre
commit
8e68faa70b

+ 27
- 0
CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaFeedbackImgMapper.java Ver fichero

@@ -0,0 +1,27 @@
1
+package com.community.huiju.dao;
2
+
3
+
4
+import com.community.huiju.model.TaFeedbackImg;
5
+
6
+import java.util.List;
7
+
8
+public interface TaFeedbackImgMapper {
9
+    int deleteByPrimaryKey(Integer id);
10
+
11
+    int insert(TaFeedbackImg record);
12
+
13
+    int insertSelective(TaFeedbackImg record);
14
+
15
+    TaFeedbackImg selectByPrimaryKey(Integer id);
16
+
17
+    int updateByPrimaryKeySelective(TaFeedbackImg record);
18
+
19
+    int updateByPrimaryKey(TaFeedbackImg record);
20
+
21
+    /**
22
+     * 获取当前图片
23
+     * @param id
24
+     * @return
25
+     */
26
+    List<String> selectImg(Integer id);
27
+}

+ 23
- 0
CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaFeedbackMapper.java Ver fichero

@@ -0,0 +1,23 @@
1
+package com.community.huiju.dao;
2
+
3
+
4
+import com.community.huiju.model.TaFeedback;
5
+import org.apache.ibatis.annotations.Param;
6
+
7
+import java.util.List;
8
+
9
+public interface TaFeedbackMapper {
10
+    int deleteByPrimaryKey(Integer id);
11
+
12
+    int insert(TaFeedback record);
13
+
14
+    int insertSelective(TaFeedback record);
15
+
16
+    TaFeedback selectByPrimaryKey(Integer id);
17
+
18
+    int updateByPrimaryKeySelective(TaFeedback record);
19
+
20
+    int updateByPrimaryKey(TaFeedback record);
21
+
22
+    List<TaFeedback> getFeedback(@Param("content") String content, @Param("tel") String tel, @Param("handleStatus") String handleStatus);
23
+}

+ 125
- 0
CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaFeedback.java Ver fichero

@@ -0,0 +1,125 @@
1
+package com.community.huiju.model;
2
+
3
+import java.util.Date;
4
+
5
+public class TaFeedback {
6
+    private Integer id;
7
+
8
+    private String content;
9
+
10
+    private String taUserTel;
11
+
12
+    private String estateSource;
13
+
14
+    private String handleStatus;
15
+
16
+    private String handleRemark;
17
+
18
+    private String handleUser;
19
+
20
+    private Date handleTime;
21
+
22
+    private Date createDate;
23
+
24
+    private Integer createUser;
25
+
26
+    private Date updateDate;
27
+
28
+    private Integer updateUser;
29
+
30
+    public Integer getId() {
31
+        return id;
32
+    }
33
+
34
+    public void setId(Integer id) {
35
+        this.id = id;
36
+    }
37
+
38
+    public String getContent() {
39
+        return content;
40
+    }
41
+
42
+    public void setContent(String content) {
43
+        this.content = content == null ? null : content.trim();
44
+    }
45
+
46
+    public String getTaUserTel() {
47
+        return taUserTel;
48
+    }
49
+
50
+    public void setTaUserTel(String taUserTel) {
51
+        this.taUserTel = taUserTel == null ? null : taUserTel.trim();
52
+    }
53
+
54
+    public String getEstateSource() {
55
+        return estateSource;
56
+    }
57
+
58
+    public void setEstateSource(String estateSource) {
59
+        this.estateSource = estateSource == null ? null : estateSource.trim();
60
+    }
61
+
62
+    public String getHandleStatus() {
63
+        return handleStatus;
64
+    }
65
+
66
+    public void setHandleStatus(String handleStatus) {
67
+        this.handleStatus = handleStatus == null ? null : handleStatus.trim();
68
+    }
69
+
70
+    public String getHandleRemark() {
71
+        return handleRemark;
72
+    }
73
+
74
+    public void setHandleRemark(String handleRemark) {
75
+        this.handleRemark = handleRemark == null ? null : handleRemark.trim();
76
+    }
77
+
78
+    public String getHandleUser() {
79
+        return handleUser;
80
+    }
81
+
82
+    public void setHandleUser(String handleUser) {
83
+        this.handleUser = handleUser == null ? null : handleUser.trim();
84
+    }
85
+
86
+    public Date getHandleTime() {
87
+        return handleTime;
88
+    }
89
+
90
+    public void setHandleTime(Date handleTime) {
91
+        this.handleTime = handleTime;
92
+    }
93
+
94
+    public Date getCreateDate() {
95
+        return createDate;
96
+    }
97
+
98
+    public void setCreateDate(Date createDate) {
99
+        this.createDate = createDate;
100
+    }
101
+
102
+    public Integer getCreateUser() {
103
+        return createUser;
104
+    }
105
+
106
+    public void setCreateUser(Integer createUser) {
107
+        this.createUser = createUser;
108
+    }
109
+
110
+    public Date getUpdateDate() {
111
+        return updateDate;
112
+    }
113
+
114
+    public void setUpdateDate(Date updateDate) {
115
+        this.updateDate = updateDate;
116
+    }
117
+
118
+    public Integer getUpdateUser() {
119
+        return updateUser;
120
+    }
121
+
122
+    public void setUpdateUser(Integer updateUser) {
123
+        this.updateUser = updateUser;
124
+    }
125
+}

+ 45
- 0
CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaFeedbackImg.java Ver fichero

@@ -0,0 +1,45 @@
1
+package com.community.huiju.model;
2
+
3
+import java.util.Date;
4
+
5
+public class TaFeedbackImg {
6
+    private Integer id;
7
+
8
+    private Integer feedbackId;
9
+
10
+    private String imgUrl;
11
+
12
+    private Date createDate;
13
+
14
+    public Integer getId() {
15
+        return id;
16
+    }
17
+
18
+    public void setId(Integer id) {
19
+        this.id = id;
20
+    }
21
+
22
+    public Integer getFeedbackId() {
23
+        return feedbackId;
24
+    }
25
+
26
+    public void setFeedbackId(Integer feedbackId) {
27
+        this.feedbackId = feedbackId;
28
+    }
29
+
30
+    public String getImgUrl() {
31
+        return imgUrl;
32
+    }
33
+
34
+    public void setImgUrl(String imgUrl) {
35
+        this.imgUrl = imgUrl == null ? null : imgUrl.trim();
36
+    }
37
+
38
+    public Date getCreateDate() {
39
+        return createDate;
40
+    }
41
+
42
+    public void setCreateDate(Date createDate) {
43
+        this.createDate = createDate;
44
+    }
45
+}

+ 1
- 0
CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java Ver fichero

@@ -398,6 +398,7 @@ public class ToUserServerImpl implements IToUserService {
398 398
         ResponseBean response= new ResponseBean<>();
399 399
         Page<TaFeedback> page = PageHelper.startPage(pageNum,pageSize);
400 400
         List<TaFeedback> phoneList = taFeedbackMapper.getFeedback(content, tel, handleStatus);
401
+        ArrayList<String>
401 402
         for (TaFeedback taFeedback : phoneList){
402 403
              List<String> String= taFeedbackImgMapper.selectImg(taFeedback.getId());
403 404
         }

+ 86
- 0
CODE/smart-community/operate-api/src/main/resources/mapper/TaFeedbackImgMapper.xml Ver fichero

@@ -0,0 +1,86 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3
+<mapper namespace="com.community.huiju.dao.TaFeedbackImgMapper" >
4
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedbackImg" >
5
+    <id column="id" property="id" jdbcType="INTEGER" />
6
+    <result column="feedback_id" property="feedbackId" jdbcType="INTEGER" />
7
+    <result column="img_url" property="imgUrl" jdbcType="VARCHAR" />
8
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
9
+  </resultMap>
10
+  <sql id="Base_Column_List" >
11
+    id, feedback_id, img_url, create_date
12
+  </sql>
13
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
14
+    select 
15
+    <include refid="Base_Column_List" />
16
+    from ta_feedback_img
17
+    where id = #{id,jdbcType=INTEGER}
18
+  </select>
19
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
20
+    delete from ta_feedback_img
21
+    where id = #{id,jdbcType=INTEGER}
22
+  </delete>
23
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedbackImg" >
24
+    insert into ta_feedback_img (id, feedback_id, img_url, 
25
+      create_date)
26
+    values (#{id,jdbcType=INTEGER}, #{feedbackId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, 
27
+      #{createDate,jdbcType=TIMESTAMP})
28
+  </insert>
29
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
30
+    insert into ta_feedback_img
31
+    <trim prefix="(" suffix=")" suffixOverrides="," >
32
+      <if test="id != null" >
33
+        id,
34
+      </if>
35
+      <if test="feedbackId != null" >
36
+        feedback_id,
37
+      </if>
38
+      <if test="imgUrl != null" >
39
+        img_url,
40
+      </if>
41
+      <if test="createDate != null" >
42
+        create_date,
43
+      </if>
44
+    </trim>
45
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
46
+      <if test="id != null" >
47
+        #{id,jdbcType=INTEGER},
48
+      </if>
49
+      <if test="feedbackId != null" >
50
+        #{feedbackId,jdbcType=INTEGER},
51
+      </if>
52
+      <if test="imgUrl != null" >
53
+        #{imgUrl,jdbcType=VARCHAR},
54
+      </if>
55
+      <if test="createDate != null" >
56
+        #{createDate,jdbcType=TIMESTAMP},
57
+      </if>
58
+    </trim>
59
+  </insert>
60
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
61
+    update ta_feedback_img
62
+    <set >
63
+      <if test="feedbackId != null" >
64
+        feedback_id = #{feedbackId,jdbcType=INTEGER},
65
+      </if>
66
+      <if test="imgUrl != null" >
67
+        img_url = #{imgUrl,jdbcType=VARCHAR},
68
+      </if>
69
+      <if test="createDate != null" >
70
+        create_date = #{createDate,jdbcType=TIMESTAMP},
71
+      </if>
72
+    </set>
73
+    where id = #{id,jdbcType=INTEGER}
74
+  </update>
75
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedbackImg" >
76
+    update ta_feedback_img
77
+    set feedback_id = #{feedbackId,jdbcType=INTEGER},
78
+      img_url = #{imgUrl,jdbcType=VARCHAR},
79
+      create_date = #{createDate,jdbcType=TIMESTAMP}
80
+    where id = #{id,jdbcType=INTEGER}
81
+  </update>
82
+
83
+  <select id="selectImg" resultType="string">
84
+    select img_url from  ta_feedback_img where id =  #{id,jdbcType=INTEGER},
85
+  </select>
86
+</mapper>

+ 195
- 0
CODE/smart-community/operate-api/src/main/resources/mapper/TaFeedbackMapper.xml Ver fichero

@@ -0,0 +1,195 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3
+<mapper namespace="com.community.huiju.dao.TaFeedbackMapper" >
4
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedback" >
5
+    <id column="id" property="id" jdbcType="INTEGER" />
6
+    <result column="content" property="content" jdbcType="VARCHAR" />
7
+    <result column="ta_user_tel" property="taUserTel" jdbcType="VARCHAR" />
8
+    <result column="estate_source" property="estateSource" jdbcType="VARCHAR" />
9
+    <result column="handle_status" property="handleStatus" jdbcType="VARCHAR" />
10
+    <result column="handle_remark" property="handleRemark" jdbcType="VARCHAR" />
11
+    <result column="handle_user" property="handleUser" jdbcType="VARCHAR" />
12
+    <result column="handle_time" property="handleTime" jdbcType="TIMESTAMP" />
13
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
14
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
15
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
16
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
17
+  </resultMap>
18
+  <sql id="Base_Column_List" >
19
+    id, content, ta_user_tel, estate_source, handle_status, handle_remark, handle_user, 
20
+    handle_time, create_date, create_user, update_date, update_user
21
+  </sql>
22
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
23
+    select 
24
+    <include refid="Base_Column_List" />
25
+    from ta_feedback
26
+    where id = #{id,jdbcType=INTEGER}
27
+  </select>
28
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
29
+    delete from ta_feedback
30
+    where id = #{id,jdbcType=INTEGER}
31
+  </delete>
32
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedback" >
33
+    insert into ta_feedback (id, content, ta_user_tel, 
34
+      estate_source, handle_status, handle_remark, 
35
+      handle_user, handle_time, create_date, 
36
+      create_user, update_date, update_user
37
+      )
38
+    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{taUserTel,jdbcType=VARCHAR}, 
39
+      #{estateSource,jdbcType=VARCHAR}, #{handleStatus,jdbcType=VARCHAR}, #{handleRemark,jdbcType=VARCHAR}, 
40
+      #{handleUser,jdbcType=VARCHAR}, #{handleTime,jdbcType=TIMESTAMP}, #{createDate,jdbcType=TIMESTAMP}, 
41
+      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
42
+      )
43
+  </insert>
44
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedback" >
45
+    insert into ta_feedback
46
+    <trim prefix="(" suffix=")" suffixOverrides="," >
47
+      <if test="id != null" >
48
+        id,
49
+      </if>
50
+      <if test="content != null" >
51
+        content,
52
+      </if>
53
+      <if test="taUserTel != null" >
54
+        ta_user_tel,
55
+      </if>
56
+      <if test="estateSource != null" >
57
+        estate_source,
58
+      </if>
59
+      <if test="handleStatus != null" >
60
+        handle_status,
61
+      </if>
62
+      <if test="handleRemark != null" >
63
+        handle_remark,
64
+      </if>
65
+      <if test="handleUser != null" >
66
+        handle_user,
67
+      </if>
68
+      <if test="handleTime != null" >
69
+        handle_time,
70
+      </if>
71
+      <if test="createDate != null" >
72
+        create_date,
73
+      </if>
74
+      <if test="createUser != null" >
75
+        create_user,
76
+      </if>
77
+      <if test="updateDate != null" >
78
+        update_date,
79
+      </if>
80
+      <if test="updateUser != null" >
81
+        update_user,
82
+      </if>
83
+    </trim>
84
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
85
+      <if test="id != null" >
86
+        #{id,jdbcType=INTEGER},
87
+      </if>
88
+      <if test="content != null" >
89
+        #{content,jdbcType=VARCHAR},
90
+      </if>
91
+      <if test="taUserTel != null" >
92
+        #{taUserTel,jdbcType=VARCHAR},
93
+      </if>
94
+      <if test="estateSource != null" >
95
+        #{estateSource,jdbcType=VARCHAR},
96
+      </if>
97
+      <if test="handleStatus != null" >
98
+        #{handleStatus,jdbcType=VARCHAR},
99
+      </if>
100
+      <if test="handleRemark != null" >
101
+        #{handleRemark,jdbcType=VARCHAR},
102
+      </if>
103
+      <if test="handleUser != null" >
104
+        #{handleUser,jdbcType=VARCHAR},
105
+      </if>
106
+      <if test="handleTime != null" >
107
+        #{handleTime,jdbcType=TIMESTAMP},
108
+      </if>
109
+      <if test="createDate != null" >
110
+        #{createDate,jdbcType=TIMESTAMP},
111
+      </if>
112
+      <if test="createUser != null" >
113
+        #{createUser,jdbcType=INTEGER},
114
+      </if>
115
+      <if test="updateDate != null" >
116
+        #{updateDate,jdbcType=TIMESTAMP},
117
+      </if>
118
+      <if test="updateUser != null" >
119
+        #{updateUser,jdbcType=INTEGER},
120
+      </if>
121
+    </trim>
122
+  </insert>
123
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedback" >
124
+    update ta_feedback
125
+    <set >
126
+      <if test="content != null" >
127
+        content = #{content,jdbcType=VARCHAR},
128
+      </if>
129
+      <if test="taUserTel != null" >
130
+        ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
131
+      </if>
132
+      <if test="estateSource != null" >
133
+        estate_source = #{estateSource,jdbcType=VARCHAR},
134
+      </if>
135
+      <if test="handleStatus != null" >
136
+        handle_status = #{handleStatus,jdbcType=VARCHAR},
137
+      </if>
138
+      <if test="handleRemark != null" >
139
+        handle_remark = #{handleRemark,jdbcType=VARCHAR},
140
+      </if>
141
+      <if test="handleUser != null" >
142
+        handle_user = #{handleUser,jdbcType=VARCHAR},
143
+      </if>
144
+      <if test="handleTime != null" >
145
+        handle_time = #{handleTime,jdbcType=TIMESTAMP},
146
+      </if>
147
+      <if test="createDate != null" >
148
+        create_date = #{createDate,jdbcType=TIMESTAMP},
149
+      </if>
150
+      <if test="createUser != null" >
151
+        create_user = #{createUser,jdbcType=INTEGER},
152
+      </if>
153
+      <if test="updateDate != null" >
154
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
155
+      </if>
156
+      <if test="updateUser != null" >
157
+        update_user = #{updateUser,jdbcType=INTEGER},
158
+      </if>
159
+    </set>
160
+    where id = #{id,jdbcType=INTEGER}
161
+  </update>
162
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedback" >
163
+    update ta_feedback
164
+    set content = #{content,jdbcType=VARCHAR},
165
+      ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
166
+      estate_source = #{estateSource,jdbcType=VARCHAR},
167
+      handle_status = #{handleStatus,jdbcType=VARCHAR},
168
+      handle_remark = #{handleRemark,jdbcType=VARCHAR},
169
+      handle_user = #{handleUser,jdbcType=VARCHAR},
170
+      handle_time = #{handleTime,jdbcType=TIMESTAMP},
171
+      create_date = #{createDate,jdbcType=TIMESTAMP},
172
+      create_user = #{createUser,jdbcType=INTEGER},
173
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
174
+      update_user = #{updateUser,jdbcType=INTEGER}
175
+    where id = #{id,jdbcType=INTEGER}
176
+  </update>
177
+
178
+  <select id="getFeedback" resultMap="BaseResultMap">
179
+    select * from  ta_feedback
180
+    <where>
181
+      <if test="tel != null and tel !=''">
182
+        and tel like CONCAT('%', #{tel,jdbcType=VARCHAR}, '%')
183
+      </if>
184
+
185
+      <if test="remark != null and remark !=''">
186
+        and to_operate_tel.remark like CONCAT('%', #{remark,jdbcType=VARCHAR}, '%')
187
+      </if>
188
+
189
+      <if test="handleStatus != null and handleStatus !=''">
190
+        and handle_status like CONCAT('%', #{handleStatus,jdbcType=VARCHAR}, '%')
191
+      </if>
192
+    </where>
193
+    ORDER BY update_date desc
194
+  </select>
195
+</mapper>

+ 9
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java Ver fichero

@@ -299,6 +299,15 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
299 299
             tdImagesMapper.delete(tdImages);
300 300
         }
301 301
 
302
+        if(radio==1){
303
+            TdImages tdImages= new TdImages();
304
+            tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
305
+            tdImages.setUuid(tpActivity.getId());
306
+            tdImages.setType("activityCode");
307
+            tdImages.setCreateUser(userElement.getId());
308
+            tdImages.setCreateTime(LocalDateTime.now());
309
+            tdImagesMapper.insert(tdImages);
310
+        }
302 311
         TpActivity selectTpActivity = tpActivityMapper.selectById(tpActivity.getId());
303 312
         if (null == selectTpActivity) {
304 313
             responseBean.addError("活动不存在!");

+ 277
- 0
VUECODE/smart-operate-manage/src/views/banner/feedback/index.vue Ver fichero

@@ -0,0 +1,277 @@
1
+<template>
2
+<div>
3
+<el-form :inline="true" :model="listQuery" :rules="rules" style="margin-top:25px;margin-left:2%">
4
+  <el-form-item label="反馈内容">
5
+    <el-input v-model="listQuery.content" placeholder="反馈内容"></el-input>
6
+  </el-form-item>
7
+  <el-form-item label="用户手机号">
8
+    <el-input v-model="listQuery.tel" placeholder="用户手机号" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
9
+  </el-form-item>
10
+ <el-form-item label="处理状态">
11
+    <el-select v-model="listQuery.handleStatus" placeholder="选择类型">
12
+        <el-option label="选择状态" value="" />
13
+        <el-option label="未处理" value="2"/>
14
+        <el-option label="正在处理" value="3"/>
15
+        <el-option label="已处理" value="1"/>
16
+    </el-select>
17
+  </el-form-item>
18
+
19
+  <el-form-item>
20
+    <el-button type="primary" @click="onSubmit">查询</el-button>
21
+  </el-form-item>
22
+  <el-form-item>
23
+    <el-button type="info" @click="empty">清空</el-button>
24
+  </el-form-item>
25
+
26
+</el-form>
27
+  <el-row>
28
+  <el-button type="primary" plain style="margin-top:25px;margin-left:2%" @click="TransactionReplyOpen">处理</el-button>
29
+  </el-row>
30
+<div style="margin-top:25px;">
31
+  <el-table
32
+    v-loading="listLoading"
33
+      ref="multipleTable"
34
+      :data="tableData"
35
+      border
36
+      tooltip-effect="dark"
37
+      style="width: 100%; margin-top: 20px;"
38
+      @selection-change="handleSelectionChange">
39
+    <el-table-column
40
+      type="selection"
41
+      width="55">
42
+    </el-table-column>
43
+    <el-table-column
44
+     prop="content"
45
+      label="反馈内容">
46
+    </el-table-column>
47
+    <el-table-column
48
+      prop="tel"
49
+      label="反馈截图">
50
+    </el-table-column>
51
+    <el-table-column
52
+      prop="taUserTel"
53
+      label="用户手机号">
54
+    </el-table-column>
55
+    <el-table-column
56
+      prop="estateSource"
57
+      label="来源房产">
58
+    </el-table-column>
59
+    <el-table-column
60
+      prop="updateDate"
61
+      label="反馈时间">
62
+      <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
63
+    </el-table-column>
64
+    <el-table-column
65
+      prop="handleStatus"
66
+      label="已处理状态">
67
+      <template slot-scope="scope">
68
+          <span v-if="scope.row.handleStatus ==1">已处理</span>
69
+          <span v-if="scope.row.handleStatus ==2">未处理</span>
70
+          <span v-if="scope.row.handleStatus ==3">正在处理</span>
71
+      </template>
72
+    </el-table-column>
73
+    <el-table-column
74
+      prop="handleRemark"
75
+      label="处理备注">
76
+    </el-table-column>
77
+    <el-table-column
78
+      prop="handleUser"
79
+      label="处理人">
80
+    </el-table-column>
81
+     <el-table-column
82
+      prop="handleTime"
83
+      label="处理时间">
84
+      <template slot-scope="scope">{{ formatDate(scope.row.handleTime) }}</template>
85
+    </el-table-column>
86
+  </el-table>
87
+  <div class="footer-page">
88
+      <el-pagination
89
+        :current-page.sync="listQuery.pageNum"
90
+        :page-sizes="[10, 20, 40, 100]"
91
+        :page-size.sync="listQuery.pageSize"
92
+        :total="total"
93
+        layout="total, sizes, prev, pager, next, jumper"
94
+        @size-change="handleSizeChange"
95
+        @current-change="handleCurrentChange"/>
96
+    </div>
97
+</div>
98
+<el-dialog title="处理反馈" :visible.sync="listQuery.dialogFormVisible" :show-close="listQuery.close" :rules="rules">
99
+      <el-form :model="listQuery" >
100
+        <el-form-item label="处理状态 *" style="margin-top:25px;margin-left:16.2%" prop="name">
101
+          <el-select v-model="listQuery.handleStatus"  placeholder="选择类型">
102
+            <el-option label="未处理" value="2"/>
103
+            <el-option label="正在处理" value="3"/>
104
+            <el-option label="已处理" value="1"/>
105
+         </el-select>
106
+        </el-form-item>
107
+        <el-form-item label="处理备注 *"   prop="name" style="margin-left:16.2%">
108
+          <textarea v-model="listQuery.handleRemark" style="width:70%"   rows="8"></textarea> 
109
+        </el-form-item>
110
+      </el-form>
111
+      <div slot="footer" class="dialog-footer">
112
+        <el-button @click="TransactionReplyOff">取 消</el-button>
113
+        <el-button type="primary" @click="feedbackupdate()">确 定</el-button>
114
+      </div>
115
+    </el-dialog>
116
+</div>
117
+</template>
118
+
119
+<script>
120
+export default {
121
+
122
+}
123
+</script>
124
+
125
+<style>
126
+
127
+</style>
128
+
129
+<script>
130
+  export default {
131
+    data() {
132
+      return {
133
+        listQuery: {
134
+          dialogFormVisible: false,  
135
+          id: '',  
136
+          content: '',
137
+          handleStatus: '',
138
+          tel: '',
139
+          handleRemark: '',
140
+          pageNum: 1,
141
+          pageSize: 10,
142
+          allId: [],
143
+          close: false
144
+        },
145
+        total: 0, // 总数
146
+        tableData: [],
147
+        selectId: [], // 表格选择框
148
+        listLoading: false, // 表格加载框
149
+        rules: {
150
+        name: [
151
+          { required: true, message: '请输入名称', trigger: 'blur' }
152
+        ],
153
+        tel: [
154
+          { required: true, message: '请输入手机号', trigger: 'blur' },
155
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
156
+        ],
157
+        remark: [
158
+          { required: false, message: '请输入备注', trigger: 'blur' }
159
+        ]
160
+      }
161
+      }
162
+    },
163
+    mounted() {
164
+    this.getFeedback()
165
+  },
166
+    methods: {
167
+    getFeedback() { // 查询Role列表
168
+      this.listLoading = true
169
+      this.$store.dispatch('Feedback', this.listQuery).then((response) => {
170
+          this.tableData = response.data.item
171
+          this.total = response.data.total
172
+          this.listLoading = false
173
+          return
174
+        this.listLoading = false
175
+      }).catch(() => {
176
+        console.log('error Feedback')
177
+        this.listLoading = false
178
+      })
179
+    },
180
+
181
+      onSubmit() {
182
+       this.getFeedback()
183
+      },
184
+      // 表格批量选择
185
+      handleSelectionChange(rows) {
186
+      this.selectId = []
187
+      for (const i in rows) {
188
+        this.selectId.push(rows[i].id)
189
+      }
190
+    },
191
+     handleSizeChange(val) {
192
+      console.log(`每页 ${val} 条`)
193
+      this.listQuery.pageSize = val
194
+      this.getFeedback()
195
+    },
196
+    handleCurrentChange(val) {
197
+      console.log(`当前页: ${val}`)
198
+      this.listQuery.pageNum = val
199
+      console.log('val',val)
200
+      this.getFeedback()
201
+    },
202
+    // 时间
203
+    formatDate(val) {
204
+      if (val === null) {
205
+        return
206
+      }
207
+      var value = new Date(val)
208
+      var year = value.getFullYear()
209
+      var month = value.getMonth() + 1
210
+      var day = value.getDate()
211
+      var hour = value.getHours()
212
+      var minutes = value.getMinutes()
213
+      var seconds = value.getSeconds()
214
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
215
+      return year + '-' + month + '-' + day
216
+    },
217
+    addPhone(){
218
+         this.$router.push({ name: 'phoneconfig-phoneconfigAdd'})
219
+    },
220
+
221
+    empty(){
222
+        this.listQuery.handleRemark = ''
223
+        this.listQuery.handleStatus = ''
224
+        this.listQuery.tel = ''
225
+        this.listQuery.pageNum = 1
226
+        this.listQuery.pageSize = 10
227
+        this.getFeedback()
228
+    },
229
+     // 弹出层
230
+    TransactionReplyOpen(id){
231
+       if(this.selectId.length < 1){
232
+            this.$message.error("请至少选择一条数据");
233
+            this.listLoading = false
234
+            return
235
+        }
236
+      this.listQuery.handleRemark = ''
237
+      this.listQuery.handleStatus = ''     
238
+      this.listQuery.dialogFormVisible = true
239
+      this.listQuery.id = id
240
+    },
241
+    //关闭
242
+    TransactionReplyOff(){
243
+    this.listQuery.handleRemark = ''
244
+    this.listQuery.handleStatus = ''      
245
+     this.listQuery.dialogFormVisible = false    
246
+    },
247
+    // 处理
248
+    feedbackupdate(){
249
+        this.listQuery.allId = this.selectId
250
+        this.$store.dispatch('Updfeedback', this.listQuery).then((response) => {
251
+        this.listQuery.dialogFormVisible = false
252
+        this.listQuery.handleRemark = ''
253
+        this.listQuery.handleStatus = ''
254
+        this.getFeedback()        
255
+        this.listLoading = false
256
+      }).catch(() => {
257
+        console.log('error Feedback')
258
+        this.listLoading = false
259
+      })
260
+    
261
+    }
262
+  }
263
+}
264
+</script>
265
+<style>
266
+.footer-page {
267
+  display: flex;
268
+  justify-content: flex-end;
269
+}
270
+.textarea-inherit {
271
+        width: 70%;
272
+        overflow: auto;
273
+        word-break: break-all; 
274
+        margin-left: 11.5%;
275
+        
276
+    }
277
+</style>

+ 2
- 2
VUECODE/smart-property-manage/src/views/social/activity/info/index.vue Ver fichero

@@ -19,8 +19,8 @@
19 19
     <span>
20 20
     <div style="display: flex;">
21 21
           <span class="activityTile" style="width: 200px;transform:translateY(70%);">是否需要报名人扫码签到</span>
22
-          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(70%);">需要</el-radio>
23
-          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(70%);">不需要</el-radio> 
22
+          <el-radio v-model="ruleForm.signInCode" disabled label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(70%);">需要</el-radio>
23
+          <el-radio v-model="ruleForm.signInCode" disabled label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(70%);">不需要</el-radio> 
24 24
           <span style="padding-left:20%"><el-button type="primary" style="float:left;transform:translateY(30%)" @click="singn">查看签到名单</el-button></span> 
25 25
     </div>
26 26
     <div style="padding-left:30%;" v-if="ruleForm.activityCode !=null">