处理冲突

src/views/modules/events/appeal-list.vue

@@ -32,15 +32,6 @@
                           style="width:200px;"
                   ></el-input>
               </el-form-item>
-
-              <el-form-item label="满意度" prop="evaluationScoreType" label-width="80px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
-                      <el-option label="不满意" value="0"> </el-option>
-                      <el-option label="基本满意" value="1"> </el-option>
-                      <el-option label="非常满意" value="2"> </el-option>
-                  </el-select>
-              </el-form-item>
-
               <br>
               <div>
                   <el-form-item label="上报起始时间" prop="startTime" label-width="100px">
@@ -97,7 +88,7 @@
               ></el-table-column>
               <el-table-column
                       prop="itemContent"
-                      label="诉求内容"
+                      label="项目内容"
                       header-align="center"
                       min-width="400"
                       align="left"
@@ -110,30 +101,9 @@
                       min-width="150"
                       align="center"
               ></el-table-column>
-              <el-table-column
-                      prop="peopleFlagName"
-                      label="诉求类型"
-                      header-align="center"
-                      min-width="150"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      prop="itemStateName"
-                      label="项目状态"
-                      header-align="center"
-                      min-width="150"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      prop="evaluationScoreName"
-                      label="满意度"
-                      header-align="center"
-                      min-width="150"
-                      align="center"
-              ></el-table-column>
               <el-table-column
                       prop="createdTime"
-                      label="上报时间"
+                      label="转成项目时间"
                       header-align="center"
                       width="180"
                       align="center"
@@ -208,8 +178,7 @@ export default {
         itemContent: '',
         nickName: '',
         mobile: '',
-        appealType: '',
+        appealType: ''
-          evaluationScore:''
 
       },
       addOrUpdateVisible: false,