提交搜索条件

1

src/views/accompaniment/index.vue

@@ -82,10 +82,12 @@
             @change="changeCategor"
           ></el-cascader>
         </el-form-item>
-        <el-form-item
-          prop="subjectId"
-        >
-          <el-select v-model="searchForm.subjectId" clearable placeholder="请选择声部">
+        <el-form-item prop="subjectId">
+          <el-select
+            v-model="searchForm.subjectId"
+            clearable
+            placeholder="请选择声部"
+          >
             <el-option
               v-for="item in selects.subjects"
               :value="item.id"
@@ -140,6 +142,20 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column align="center" prop="organName" label="所属分部" width="180px">
+          <template slot-scope="scope">
+            <div>
+              <Tooltip :content="scope.row.organName" />
+            </div>
+          </template>
+        </el-table-column>
+                <el-table-column align="center" prop="subjectName" label="所属声部" width="180px">
+          <template slot-scope="scope">
+            <div>
+              <Tooltip :content="scope.row.subjectName" />
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="type" label="类型">
           <template slot-scope="scope">
             {{ scope.row.type | songUseTypeFormat }}
@@ -311,12 +327,14 @@ import form from "./modals/form";
 import { vaildTeachingUrl } from "@/utils/validate";
 import { getToken } from "@/utils/auth";
 import deepClone from "@/helpers/deep-clone/";
+import Tooltip from "@/components/Tooltip/index";
 export default {
   name: "accompaniment",
   components: {
     saveform,
     pagination,
     "submit-form": form,
+    Tooltip
   },
   data() {
     return {
@@ -371,7 +389,7 @@ export default {
       this.searchForm.categoriesId = [params.categoriesId];
     }
     this.$store.dispatch("setSubjects");
-       this.$store.dispatch("setBranchs");
+    this.$store.dispatch("setBranchs");
     await this.FetchTree();
     await this.FetchList();
 
@@ -386,10 +404,10 @@ export default {
     },
     async FetchList() {
       try {
-        let { categoriesId,organId, ...search } = deepClone(this.searchForm);
+        let { categoriesId, organId, ...search } = deepClone(this.searchForm);
         const res = await QueryPage({
           ...search,
-          organId:organId.join(','),
+          organId: organId.join(","),
           categoriesId:
             categoriesId && categoriesId.length > 0 ? categoriesId.pop() : null,
           page: this.rules.page,