修改冲突

src/views/second/taskSummary/reward.vue

         :flat="true"
         @current-change="getDataList()"
       />
-      <el-dialog
-        title="编辑考核内容"
-        :visible.sync="showEdit"
-        width="400px"
-        custom-class="ele-dialog-form"
-        :lock-scroll="false"
-        :destroy-on-close="true"
-        @closed="form = {}"
+    <el-dialog
+      title="编辑考核内容"
+      :visible.sync="showEdit"
+      width="400px"
+      custom-class="ele-dialog-form"
+      :lock-scroll="false"
+      :destroy-on-close="true"
+      @closed="form = {}"
+    >
+      <el-form
+        :model="form"
+        label-width="82px"
+        custom-class="editForm"
+        @keyup.enter.native="save"
+        @submit.native.prevent
+        ref="editForm"
       >
         <el-form-item label="小条内容：">
           <el-input