修改bug

src/views/basicData/facultyManagement/index.vue

@@ -219,14 +219,68 @@ export default {
       this.findObject(this.option.column, "status").dicData = res.data.data;
       this.$refs.crud.init();
     });
+
+    this.getWorkDicts("in_staff_room").then(res => {
+      this.findObject(this.option.column, "inStaffRoom").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("compile_category").then(res => {
+      this.findObject(this.option.column, "compileCategory").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("staff_type").then(res => {
+      this.findObject(this.option.column, "staffType").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("class_type").then(res => {
+      this.findObject(this.option.column, "classType").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("Salary_allocation_standard").then(res => {
+      this.findObject(
+        this.option.column,
+        "salaryWithdrawalStandardName"
+      ).dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+
+    this.getWorkDicts("marital_status").then(res => {
+      this.findObject(this.option.column, "code").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("job_title").then(res => {
+      this.findObject(this.option.column, "rankType").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("Grade_salary").then(res => {
+      this.findObject(this.option.column, "rankSalaryName").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("daily_assessment_level").then(res => {
+      this.findObject(this.option.column, "dailyGrade").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("daily_assessment_level").then(res => {
+      this.findObject(this.option.column, "performanceGrade").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
+    this.getWorkDicts("double_teachers").then(res => {
+      this.findObject(this.option.column, "doubleTeachers").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
     this.option.height = window.innerHeight - 210;
   },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 143;
+        this.option.height = this.option.height - 328;
       } else {
-        this.option.height = this.option.height + 143;
+        this.option.height = this.option.height + 328;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/basicData/facultyManagement/js/optionList.js

@@ -1,6 +1,6 @@
 export const option = {
   searchShow: true,
-  searchMenuSpan: 16,
+  searchMenuSpan: 24,
   align: "center",
   searchSpan: 8,
   border: true,
@@ -80,7 +80,13 @@ export const option = {
       label: "学历",
       prop: "code",
       width: "80",
+      type: "select",
+      dicData:[],
       search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:6,
       span: 8
@@ -141,7 +147,7 @@ export const option = {
       prop: "status",
       type: "select",
       dataType: "number",
-      dicUrl:[],
+      dicData:[],
       props: {
         label: "dictValue",
         value: "dictKey"
@@ -169,7 +175,8 @@ export const option = {
       label: "班级",
       prop: "inStaffRoom",
       type: "select",
-      dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_staff_room",
+      dicData:[],
+      search: true,
       props: {
         label: "dictValue",
         value: "dictValue"
@@ -181,6 +188,13 @@ export const option = {
     {
       label: "岗位",
       prop: "compileCategory",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       width: "100",
       overHidden: true,
       index:17,
@@ -188,6 +202,13 @@ export const option = {
     {
       label: "教师类别",
       prop: "staffType",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       width: "100",
       overHidden: true,
       index:18, 
@@ -195,6 +216,13 @@ export const option = {
     {
       label: "授课类别",
       prop: "classType",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       width: "100",
       overHidden: true,
       index:19,
@@ -203,20 +231,27 @@ export const option = {
       label: "类别",
       prop: "salaryWithdrawalStandardName",
       width: "100",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:20, 
     },
     {
-      label: "学历",
-      prop: "code",
-      width: "100",
-      overHidden: true,
-      index:21,
-    },
-    {
       label: "职称",
       prop: "rankType",
       width: "100",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:22, 
     },
@@ -224,6 +259,13 @@ export const option = {
       label: "职级等级",
       prop: "rankSalaryName",
       width: "100",
+      type: "select",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:23,
     },
@@ -231,6 +273,14 @@ export const option = {
       label: "日常考核等级",
       prop: "dailyGrade",
       width: "100",
+      type: "select",
+      dataType: "string",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:24,
     },
@@ -238,6 +288,14 @@ export const option = {
       label: "学期绩效等级",
       prop: "performanceGrade",
       width: "100",
+      type: "select",
+      dataType: "string",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:25,
     },
@@ -252,6 +310,14 @@ export const option = {
       label: "班主任",
       prop: "doubleTeachers",
       width: "100",
+      type: "select",
+      dataType: "string",
+      dicData:[],
+      search: true,
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
       overHidden: true,
       index:27,
     },