Merge branch 'Nov16thResetMusic' into online

src/components/save-form/index.vue

@@ -42,9 +42,9 @@ export default {
       })
     },
     resetFields() {
+      this.$refs.form.resetFields()
       this.searchs.update(this.model, undefined, 'form')
       this.searchs.update({}, undefined, 'page')
-      this.$refs.form.resetFields()
     }
   },
 }

src/views/auditList/index.vue

@@ -54,7 +54,9 @@
         </el-form-item>
         <el-form-item>
           <el-button @click="search"
-                     type="danger">搜索</el-button>
+                     type="primary">搜索</el-button>
+          <el-button @click="reset"
+                     type="danger">重置</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -119,9 +121,10 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="memo"
+                           width="200px"
                            label="备注">
             <template slot-scope="scope">
-              <tooltip :content="scope.row.memo" />
+              <overflow-text width="200px" :text="scope.row.memo" />
             </template>
           </el-table-column>
           <el-table-column align="center"
@@ -187,6 +190,12 @@ import { getEmployeeOrgan } from "@/api/buildTeam";
 import Tooltip from "@/components/Tooltip/index";
 import { auditTypeList, auditPaymentTypeList } from "@/utils/searchArray";
 
+const initSearch = {
+  search: null,
+  paymentType: null,
+  status: 'AUDITING',
+  organId: null,
+}
 export default {
   components: { pagination, Tooltip, review },
   name: "helpCategory",
@@ -195,12 +204,7 @@ export default {
       paymentTypeList: auditPaymentTypeList,
       organList: [],
       statusList: auditTypeList,
-      searchForm: {
-        search: null,
-        paymentType: null,
-        status: 'AUDITING',
-        organId: null,
-      },
+      searchForm: {...initSearch},
       tableList: [],
 
       pageInfo: {
@@ -225,6 +229,10 @@ export default {
       this.$refs.searchForm.save(this.pageInfo, 'page')
       this.getList()
     },
+    reset() {
+      this.searchForm = {...initSearch}
+      this.search()
+    },
     getList () {
       let params = {
         page: this.pageInfo.page,