Merge remote-tracking branch 'origin/master'

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

@@ -85,6 +85,19 @@ public class TComplainDeal extends BaseEntity
      */
     private String provincialDataFlag;
 
+    /*
+     * 投诉渠道(1-12319热线,2-12345热线)
+     * */
+    private String complaintChannels;
+
+    public String getComplaintChannels() {
+        return complaintChannels;
+    }
+
+    public void setComplaintChannels(String complaintChannels) {
+        this.complaintChannels = complaintChannels;
+    }
+
     public String getProvincialDataFlag() {
         return provincialDataFlag;
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPlanInfoServiceImpl.java

@@ -117,7 +117,7 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
             List<String> collect = tComplainDealTransfers.stream().map(TComplainDealTransfer::getEnterpriseId).collect(Collectors.toList());
             return tPlanInfoMapper.transferEnterpriseList(collect);
         } else {
-            return new ArrayList<>();
+            return tPlanInfoMapper.selectEnterprise();
         }
     }
 }

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="complainType"    column="complain_type" />
         <result property="overtimeSupervision"    column="overtime_supervision" />
         <result property="township"    column="township" />
+        <result property="complaintChannels"    column="complaint_channels" />
     </resultMap>
 
     <sql id="selectTComplainDealVo">
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                update_by,
                update_time,
                is_del,
-               remarks,provincial_data_flag,complain_type,overtime_supervision,township from t_complain_deal
+               remarks,provincial_data_flag,complain_type,overtime_supervision,township,complaint_channels from t_complain_deal
     </sql>
 
     <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null  and complainType != ''"> and complain_type = #{complainType}</if>
             <if test="overtimeSupervision != null  and overtimeSupervision != ''"> and overtime_supervision = #{overtimeSupervision}</if>
             <if test="township != null  and township != ''"> and township = #{township}</if>
+            <if test="complaintChannels != null  and complaintChannels != ''"> and complaint_channels = #{complaintChannels}</if>
         </where>
         order by create_time desc
     </select>
@@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">complain_type,</if>
             <if test="overtimeSupervision != null">overtime_supervision,</if>
             <if test="township != null">township,</if>
+            <if test="complaintChannels != null">complaint_channels,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="complainName != null">#{complainName},</if>
@@ -150,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">#{complainType},</if>
             <if test="overtimeSupervision != null">#{overtimeSupervision},</if>
             <if test="township != null">#{township},</if>
+            <if test="complaintChannels != null">#{complaintChannels},</if>
          </trim>
     </insert>
 
@@ -186,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">complain_type = #{complainType},</if>
             <if test="overtimeSupervision != null">overtime_supervision = #{overtimeSupervision},</if>
             <if test="township != null">township = #{township},</if>
+            <if test="complaintChannels != null">complaint_channels = #{complaintChannels},</if>
         </trim>
         where complain_deal_id = #{complainDealId}
     </update>

zh-baseversion-web/src/views/complainDeal/index.vue

@@ -216,7 +216,7 @@
             @click.native.stop="handleEnterpriseReturn(scope.row)"
           >退回</el-button>
           <el-button
-            v-if="scope.row.complainStatus==4 && deptId==-2"
+            v-if="(scope.row.complainStatus==4 && deptId==-2) || (scope.row.complainStatus==1 && deptId==-2 && scope.row.complainAssignEnterproseId==null)"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -252,6 +252,12 @@
     <!-- 添加或修改投诉处置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="handleBeforClose">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="投诉渠道" prop="complaintChannels">
+          <el-select style="width: 100%" v-model="form.complaintChannels" :disabled="readonly">
+            <el-option label="12319热线" value="1"/>
+            <el-option label="12345热线" value="2"/>
+          </el-select>
+        </el-form-item>
         <div class="division">
           <div style="width: 50%;">
             <el-form-item label="投诉人姓名" prop="complainName">
@@ -383,9 +389,9 @@
     </el-dialog>
 <!-- 超时督办 -->
     <el-dialog title="超时督办" :visible.sync="dialogOvertimeSupervisionVisible" width="600px">
-      <div style="padding-bottom:20px">
+<!--      <div style="padding-bottom:20px">
         <el-button type="info" @click="historyOvertimeSupervisionListButton">历史督办记录</el-button>
-      </div>
+      </div>-->
       <el-form :model="overtimeSupervisionForm">
         <div class="page-header clearfix">
             <div class="leftfix">督办事由</div>
@@ -620,6 +626,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        complaintChannels: null,
         complainName: null,
         complainPhone: null,
         complainMatter: null,
@@ -705,9 +712,9 @@ export default {
         complainMatter: [
           { required: true, message: "投诉事项不能为空", trigger: "blur" }
         ],
-        complainAssignEnterproseId: [
+        /*complainAssignEnterproseId: [
           { required: true, message: "指派单位不能为空", trigger: "blur" }
-        ],
+        ],*/
       }
     };
   },
@@ -779,6 +786,7 @@ export default {
     reset() {
       this.form = {
         complainDealId: null,
+        complaintChannels: null,
         complainName: null,
         complainPhone: null,
         complainMatter: null,
@@ -821,7 +829,7 @@ export default {
       if(row.overtimeSupervision === null || row.overtimeSupervision == '') {
         return '-'
       } else if (row.overtimeSupervision === '0') {
-        return <p style='color: #ff7272'>督办中</p>
+        return <p style='color: #ff7272'>已督办</p>
       } else if (row.overtimeSupervision === '1') {
         return <p style='color: #30B46B'>已回复</p>
       }
@@ -1015,12 +1023,14 @@ export default {
       this.transferForm.complainDealId = row.complainDealId;
       this.transferEnterpriseList = [];
       this.transferForm.complainAssignMan = "";
+      this.peopleList = []; // 清空指派人列表
       transferEnterpriseListMethod(this.transferForm.complainDealId).then(response =>{
         this.transferEnterpriseList = response.data;
         this.dialogTransferVisible = true;
       })
     },
     transferEnterpriseChang(value){
+      this.transferForm.complainAssignMan = ""; // 清空指派人
       let obj = {};
       obj = this.transferEnterpriseList.find((item)=>{
         return item.enterpriseId === value;
@@ -1029,7 +1039,6 @@ export default {
       this.transferForm.complainAssignEnterproseName = obj.enterpriseName;
       this.transferForm.complainAssignEnterproseId = value;
       getUserList(value).then(response => {
-        //console.log(this.peopleList)
         this.peopleList=response.data;
       });
     },
@@ -1039,7 +1048,7 @@ export default {
       obj = this.peopleList.find((item)=>{
         return item.id === value;
       });
-      this.transferForm.complainAssignManId === value;
+      this.transferForm.complainAssignManId = value; // 修复：应该是赋值而不是比较
       this.transferForm.complainAssignMan = obj.nickName;
     },
     //投诉转办 提交按钮
@@ -1269,7 +1278,7 @@ export default {
   .inputstyle{
     min-height: 200px;
     max-height: 300px;
-    width: 100%;
+    width: 100% !important;
     border-color: 0.5px #99a9bf;
     outline:none;
   }