冲突

src/views/resumptionEvaluate/evaluate/index.vue

@@ -101,7 +101,6 @@
                 type="primary"
                   icon="el-icon-refresh"
                   size="mini"
-                  type="primary"
                   @click="resetQuery"
                   >重置</el-button
                 >

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -20,14 +20,8 @@
               ref="queryForm"
               size="small"
               :inline="true"
-              v-show="showSearch"
-              
-            >
-<<<<<<< HEAD
-              <el-form-item label="外包评价名称" prop="evaluateName" label-width="50">
-=======
+              v-show="showSearch" >
               <el-form-item label="外包评价名称" prop="evaluateName">
->>>>>>> aaedead37c768ed842c7d1d6f75da0738d019e5d
                 <el-input
                   :maxlength="20"
                   v-model="queryParams.evaluateName"
@@ -81,7 +75,6 @@
                 type="primary"
                   icon="el-icon-refresh"
                   size="mini"
-                  type="primary"
                   @click="resetQuery"
                   >重置</el-button
                 >