处理冲突

src/views/modules/events/appeal-detail-view.vue

@@ -94,7 +94,7 @@
               <div>{{dataForm.lawDetail.reportTime}}</div>
             </el-form-item>
 
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportAddress" label="报道地点:" prop="assistUnit">
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportAddress" label="报到地点:" prop="assistUnit">
               <div>{{dataForm.lawDetail.reportAddress}}</div>
             </el-form-item>
 

src/views/modules/events/appeal-enforcement-add.vue

@@ -110,7 +110,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="报道地点" prop="reportAddress" label-width="120px">
+        <el-form-item label="报到地点" prop="reportAddress" label-width="120px">
           <el-input v-model="dataForm.reportAddress" type="text" clearable style="width:50%;"></el-input>&emsp;
           <el-button type="primary" @click="searchKeyword()" class="custom-button-default">搜索</el-button>
         </el-form-item>

src/views/modules/events/item-deal-detail.vue

@@ -34,7 +34,7 @@
           <el-input v-model="postDataForm.handleAdvice" type="textarea" placeholder="请您选择居民诉求的处理情况及答复意见，向居民公开展示"></el-input>
       </el-form-item>
       <el-form-item label="项目处理意见:" prop="outHandleAdvice">
-          <el-input v-model="postDataForm.outHandleAdvice" type="textarea" placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>
+          <el-input v-model="postDataForm.outHandleAdvice" type="textarea" placeholder="请您填写项目的实际办理情况(自己处理、吹哨报到、内部协调)，便于相关部门了解项目的实际情况"></el-input>
       </el-form-item>
       <el-form-item label="处理:" prop="handleCategory">
         <el-select v-model="postDataForm.handleCategory" placeholder="请选择">

src/views/modules/events/itemfusingdelay-detail-view.vue

@@ -161,7 +161,7 @@
 <!--                      type="textarea"-->
 <!--                      maxlength="100"-->
 <!--                      show-word-limit-->
-<!--                      placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>-->
+<!--                      placeholder="请您填写项目的实际办理情况(自己处理、吹哨报到、内部协调)，便于相关部门了解项目的实际情况"></el-input>-->
 <!--          </el-form-item>-->
 <!--          <el-form-item label="满意度评价:"-->
 <!--                        prop="evaluateDeptDTOS"-->

src/views/modules/workRecord/question-deal-detail-view.vue

@@ -157,7 +157,7 @@
                       type="textarea"
                       maxlength="100"
                       show-word-limit
-                      placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>
+                      placeholder="请您填写项目的实际办理情况(自己处理、吹哨报到、内部协调)，便于相关部门了解项目的实际情况"></el-input>
           </el-form-item>
           <el-form-item label="满意度评价:"
                         prop="evaluateDeptDTOS"