Merge branch 'tmp_meeting_needs' into online

.gitignore

@@ -17,3 +17,4 @@ tests/**/coverage/
 debug.log
 *.log
 debug.log
+debug.log

src/components/save-form/index.vue

@@ -3,6 +3,8 @@
     class="save-form"
     v-bind="{...$attrs, ...$props}"
     v-on="$listeners"
+    @submit.stop.native="submit"
+    @reset.stop.native="reset"
     ref="form"
   >
     <slot/>
@@ -30,6 +32,25 @@ export default {
     }
   },
   methods: {
+    submit(evt) {
+      evt.stopPropagation()
+      evt.stopImmediatePropagation()
+      evt.preventDefault()
+      this.searchs.update(this.model, undefined, 'form')
+      if (this.$listeners.submit) {
+        this.$listeners.submit(evt)
+      }
+    },
+    reset() {
+      if (this.$listeners.reset) {
+        this.$listeners.reset()
+        this.$nextTick(() => {
+          this.resetFields()
+        })
+      } else {
+        this.resetFields()
+      }
+    },
     save(search = null, type = 'form') {
       this.searchs.update(search, undefined, type)
     },

src/views/save-form-test/README.md

@@ -14,3 +14,17 @@ demo/modals // 模块需要的弹窗放在这里
 ###### 列表注意点
 1. 列表最多不超过两行，多余的鼠标移入显示
 1. 操作按钮尽量右边fliex显示
+
+
+###### 推荐使用原生submit提交
+
+按照以下代码使用会默认保存数据，也会默认清空，不需要额外保存
+
+``` html
+<save-form ref="form" :model.sync="form" inline>
+  <el-form-item>
+    <el-button type="primary" native-type="submit">提交</el-button>
+    <el-button type="danger" native-type="reset">重置</el-button>
+  </el-form-item>
+</save-form>
+```

src/views/save-form-test/index.vue

@@ -4,7 +4,7 @@
       <div class="squrt"></div>保存表单演示
     </h2>
     <div class="m-core">
-      <save-form ref="form" :model.sync="form" inline>
+      <save-form ref="form" :model.sync="form" inline @submit="submit" @reset="reset">
         <el-form-item
           prop="input"
         >
@@ -54,8 +54,8 @@
           </el-date-picker>
         </el-form-item>
         <div>
-          <el-button type="primary" @click="submit">提交</el-button>
-          <el-button type="danger" @click="reset">重置</el-button>
+          <el-button type="primary" native-type="submit">提交</el-button>
+          <el-button type="danger" native-type="reset">重置</el-button>
         </div>
       </save-form>
     </div>
@@ -148,10 +148,8 @@ export default {
     getList() {
       return Promise.resolve()
     },
-    submit() {
-      this.$refs.form.validate(valid => {
-        console.log(valid)
-      })
+    submit(evt) {
+      console.log(evt)
     },
     reset() {
       this.$refs.form.resetFields()

src/views/studentManager/studentList.vue

@@ -10,12 +10,13 @@
       <div class="newBand"
            @click="onCreateQRCode">学员激活列表</div>
       <!-- 搜索标题 -->
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
+               @submit="onSearch"
+               @reset="onReSet"
+               :model.sync="searchForm">
         <el-form-item>
           <el-input placeholder="学生姓名或电话"
-                    @keyup.enter.native="onSearch"
                     v-model.trim="searchForm.search"></el-input>
         </el-form-item>
         <el-form-item prop="organId">
@@ -109,15 +110,15 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSearch"
+          <el-button native-type="submit"
                      type="danger">搜索</el-button>
-          <el-button @click="onReSet"
+          <el-button native-type="reset"
                      type="primary">重置</el-button>
           <el-button type="primary"
                      v-permission="'export/studentHasCourse'"
                      @click="downLoadStudent">导出名单</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data="tableList"