Merge remote-tracking branch 'origin/release/epdc' into release/epdc

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

@@ -38,11 +38,11 @@
                         prop="mobile">
             <div>{{dataForm.mobile}}</div>
           </el-form-item>
-          <el-form-item label="所属类别:"
+          <!-- <el-form-item label="所属类别:"
                         prop="categoryName">
             <div>{{dataForm.categoryName}}</div>
-          </el-form-item>
+          </el-form-item> -->
-          <el-form-item label="项目态度:">
+          <!-- <el-form-item label="项目态度:">
             <span>表达态度 {{dataForm.approveNum + dataForm.opposeNum + dataForm.commentNum}}</span>&nbsp;&nbsp;
             <span>评论 {{dataForm.commentNum}}</span>&nbsp;&nbsp;
             <span>支持 {{dataForm.approveNum}}</span>&nbsp;&nbsp;
@@ -51,7 +51,7 @@
           <el-form-item label="项目评论:">
             <el-button type="text"
                        @click="innerVisible = true">查看评论</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <div class="container">
           <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div>
@@ -188,15 +188,16 @@
                         prop="handleAdvice" v-if="showAdvice">
             <el-input v-model="postDataForm.handleAdvice"
                       type="textarea"
+                      :rows="6"
                       maxlength="100"
                       show-word-limit
-                      placeholder="请您填写项目的实际办理情况(自己处理、吹哨报到、内部协调)，便于相关部门了解项目的实际情况"></el-input>
+                      placeholder="网格层面无法办理，请点击“吹哨报到”，写明当前办理情况及无法办理的原因。网格层面已办理完成，请上传照片，点击“结案申请”，写明答复依据、办理结果等要素（态度要真诚、容易接受，语言要朴实简练，杜绝出现错字别字、表述不清等现象，此内容经区级平台核查后，反馈给诉求人）。"></el-input>
           </el-form-item>
-          <el-form-item label="" prop="handleAdvice" v-if="!isShowDeal  && typeKey == 'grid_party'" >
+          <!-- <el-form-item label="" prop="handleAdvice" v-if="!isShowDeal  && typeKey == 'grid_party'" >
                 <span>网格层面无法办理，请点击“吹哨报到”，写明当前办理情况及无法办理的原因。<br/>
                       网格层面已办理完成，请上传照片，点击“结案申请”，写明答复依据、办理结果等要素（态度要真诚、容易接受，语言要朴实简练，杜绝出现错字别字、表述不清等现象，此内容经区级平台核查后，反馈给诉求人）。
                 </span>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="" prop="handleAdvice" v-if="!isShowDeal && typeKey == 'community_party'" >
                 <span>社区层面无法办理，请点击“吹哨报到”，写明当前办理情况及无法办理的原因。<br/>
@@ -232,7 +233,7 @@
                     <el-input v-model="postDataForm.handlePeopleMobile"></el-input>
                 </el-form-item>
 
-          <el-form-item label="处理意见图片:" v-loading="loadingIn" prop="handleImagesPC">
+          <el-form-item label="处置照片:" v-loading="loadingIn" prop="handleImagesPC">
             <el-upload
                     :action="uploadUrl"
                     :disabled="isAble"
@@ -358,7 +359,7 @@ export default {
       isShowDeal: false,
       checkParentName: '',
       timeloading: true,
-      disabledCategory:false,
+      disabledCategory: false,
       map: '',
       innerVisible: false,
       showAdvice: true,
@@ -676,7 +677,7 @@ export default {
         .catch(() => {})
     },
     getCategoryList () {
-      this.disabledCategory = true;
+      this.disabledCategory = true
       return this.$http
         .get('/events/category/list')
         .then(({ data: res }) => {
@@ -687,7 +688,7 @@ export default {
 
           this.getSelectedNode(data, data)
           this.categoryOptions = data
-          this.disabledCategory = false;
+          this.disabledCategory = false
         })
         .catch(() => {})
     },

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

@@ -190,8 +190,9 @@
                             @click="dealAction(scope.row.id)">{{ $t('deal') }}
                         </el-button>
                         <!--<el-button type="text" size="small" @click="openHandle(scope.row.id)">{{ '操作' }}</el-button>-->
-                        <el-button :disabled="scope.row.isDelay === '1'" type="text" size="small" @click="openDialogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期' }}</el-button>
+                        <!-- 9-8现场屏蔽相关 -->
-                        <el-button :disabled="scope.row.isDelay !== '1'" type="text" size="small" @click="openLogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期记录' }}</el-button>
+                        <!-- <el-button :disabled="scope.row.isDelay === '1'" type="text" size="small" @click="openDialogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期' }}</el-button>
+                        <el-button :disabled="scope.row.isDelay !== '1'" type="text" size="small" @click="openLogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期记录' }}</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>