Merge branch 'dev'

@@ -38,8 +38,8 @@
       </el-col>
       </el-col>
     </el-row>
     </el-row>
     <div style="text-align:center">
     <div style="text-align:center">
+      <el-button @click="$popupCacel">取消</el-button>
       <el-button type="primary" @click="submitForm('ruleForm')">新增</el-button>
       <el-button type="primary" @click="submitForm('ruleForm')">新增</el-button>
-      <el-button @click="resetForm('ruleForm')">取消</el-button>
     </div>
     </div>
   </el-form>
   </el-form>
 </template>
 </template>