修改bug

src/views/basicData/facultyManagement/detailsPage.vue

@@ -351,14 +351,14 @@ export default {
             controls: false,
             span: 6
           },
-          // {
-          //   label: "领导干部补贴工资",
-          //   prop: "leadingCadreSubsidy",
-          //   precision: 2,
-          //   type: "number",
-          //   controls: false,
-          //   span: 6
-          // },
+          {
+            label: "领导干部补贴工资",
+            prop: "leadingCadreSubsidy",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
           {
             label: "领导干部考核补贴工资",
             prop: "assessLeadingCadreSubsidy",
@@ -367,32 +367,32 @@ export default {
             controls: false,
             span: 6
           },
-          // {
-          //   label: "备课组长补贴",
-          //   prop: "prepareLessons",
-          //   precision: 2,
-          //   type: "number",
-          //   controls: false,
-          //   span: 6
-          // },
           {
-            label: "备课组长考核补贴标准",
+            label: "备课组长补贴",
+            prop: "prepareLessons",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
+            label: "备课组长考核补贴",
             prop: "assessPrepareLessons",
             precision: 2,
             type: "number",
             controls: false,
             span: 6
           },
-          // {
-          //   label: "教研组长补贴",
-          //   prop: "teachingResearch",
-          //   precision: 2,
-          //   type: "number",
-          //   controls: false,
-          //   span: 6
-          // },
           {
             label: "教研组长补贴",
+            prop: "teachingResearch",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
+            label: "教研组长审核补贴",
             prop: "assessTeachingResearch",
             precision: 2,
             type: "number",
@@ -567,20 +567,20 @@ export default {
             },
             span: 6
           },
-          // {
-          //   label: "领导干部补贴标准",
-          //   prop: "leadingCadreSubsidyName",
-          //   type: "select",
-          //   dicUrl:
-          //     "/api/blade-system/dict-biz/dictionary?code=Standards_for_subsidies_for_leading_cadres",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictValue"
-          //   },
-          //   span: 6
-          // },
           {
             label: "领导干部补贴标准",
+            prop: "leadingCadreSubsidyName",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Standards_for_subsidies_for_leading_cadres",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "领导干部审核补贴标准",
             prop: "assessLeadingCadreSubsidyName",
             type: "select",
             dicUrl:
@@ -591,20 +591,20 @@ export default {
             },
             span: 6
           },
-          // {
-          //   label: "备课组长补贴标准",
-          //   prop: "prepareLessonsName",
-          //   type: "select",
-          //   dicUrl:
-          //     "/api/blade-system/dict-biz/dictionary?code=Standard_for_Leader_of_Lesson_Preparation",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictValue"
-          //   },
-          //   span: 6
-          // },
           {
             label: "备课组长补贴标准",
+            prop: "prepareLessonsName",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Leader_of_Lesson_Preparation",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "备课组长审核补贴标准",
             prop: "assessPrepareLessonsName",
             type: "select",
             dicUrl:
@@ -615,18 +615,18 @@ export default {
             },
             span: 6
           },
-          // {
-          //   label: "教研组长补贴标准",
-          //   prop: "teachingResearchName",
-          //   type: "select",
-          //   dicUrl:
-          //     "/api/blade-system/dict-biz/dictionary?code=Standard_for_Teacher-Leader",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictValue"
-          //   },
-          //   span: 6
-          // },
+          {
+            label: "教研组长补贴标准",
+            prop: "teachingResearchName",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Teacher-Leader",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
           {
             label: "教研组长考核补贴标准",
             prop: "assessTeachingResearchName",

src/views/basicData/facultyManagement/index.vue

@@ -15,6 +15,7 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         :cell-style="cellStyle"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
           <el-button
@@ -134,7 +135,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 8,
         align: "center",
         searchSpan: 8,
         border: true,
@@ -152,22 +153,53 @@ export default {
         stripe: true,
         column: [
           {
+            label: "所在部门",
+            prop: "inSection",
+            width: "100",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_section",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            search: true,
+            overHidden: true,
+            span: 6
+          },
+          {
+            label: "级部",
+            prop: "department",
+            width: "100",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=department",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            search: true,
+            overHidden: true,
+            span: 8
+          },
+          {
             label: "姓名",
             prop: "cname",
             width: "80",
             search: true,
+            overHidden: true,
             span: 8
           },
           {
             label: "身份证",
             prop: "idNumber",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "性别",
             prop: "gender",
             width: "80",
             search: true,
+            overHidden: true,
             span: 8
           },
           {
@@ -175,33 +207,27 @@ export default {
             prop: "code",
             width: "80",
             search: true,
+            overHidden: true,
             span: 8
           },
           {
             label: "入职日期",
             prop: "joiningDate",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "入职日期",
             prop: "createTime",
             search: true,
             hide: true,
-            showColumn: false,
+            overHidden: true,
             span: 8
           },
-          // {
-          //   label: "入职日期结束",
-          //   prop: "createTimeEnd",
-          //   type: "date",
-          //   valueFormat: "yyyy-MM-dd",
-          //   search: true,
-          //   hide: true,
-          //   showColumn: false
-          // },
           {
             label: "转正日期",
             prop: "birthdate",
+            overHidden: true,
             width: "100"
           },
           {
@@ -209,141 +235,136 @@ export default {
             prop: "dateValidity",
             search: true,
             hide: true,
-            showColumn: false,
+            overHidden: true,
             span: 8
           },
-          // {
-          //   label: "转正日期结束",
-          //   prop: "dateValidityEnd",
-          //   type: "date",
-          //   valueFormat: "yyyy-MM-dd",
-          //   search: true,
-          //   hide: true,
-          //   showColumn: false,
-          //   span: 8
-          // },
           {
             label: "校龄日期",
             prop: "schoolAgeSalaryDate",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "校龄日期",
             prop: "schoolAgeSalaryDateSerch",
             search: true,
             hide: true,
-            showColumn: false,
+            overHidden: true,
             span: 8
           },
-          // {
-          //   label: "校龄日期结束",
-          //   prop: "schoolAgeSalaryDateEnd",
-          //   type: "date",
-          //   valueFormat: "yyyy-MM-dd",
-          //   search: true,
-          //   hide: true,
-          //   showColumn: false,
-          //   span: 8
-          // },
           {
             label: "校龄",
             prop: "schoolAge",
-            width: "80"
-          },
-          {
-            label: "所在部门",
-            prop: "inSection",
-            width: "80"
+            width: "80",
+            overHidden: true
           },
           {
             label: "是否班主任",
             prop: "doubleTeachers",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "职务",
             prop: "compileCategory",
-            width: "80"
+            width: "80",
+            overHidden: true
           },
           {
             label: "工资拨付标准",
             prop: "salaryWithdrawalStandard",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "职级拨付标准",
             prop: "rankWithdrawalStandard",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "履约奖标准",
             prop: "performanceAward",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "校龄工资标准",
             prop: "schoolAgeSalary",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "增资标准",
             prop: "capitalIncrease",
-            width: "80"
+            width: "80",
+            overHidden: true
           },
           {
             label: "学历工资标准",
             prop: "educationSalary",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "职级工资",
             prop: "rankSalary",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "工资基数",
             prop: "salaryBase",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "工作量工资",
             prop: "workloadSalary",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "日常考核标准",
             prop: "dailyAssessmentCriteria",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "日常考核等级工资",
             prop: "dailyAssessmentSalary",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "学期绩效工资",
             prop: "termPerformanceSalary",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "领导干部补贴标准",
             prop: "leadingCadreSubsidy",
-            width: "120"
+            width: "120",
+            overHidden: true
           },
           {
             label: "备课组长标准",
             prop: "prepareLessons",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "教研组长标准",
             prop: "teachingResearch",
-            width: "100"
+            width: "100",
+            overHidden: true
           },
           {
             label: "是否享受公办待遇",
             prop: "enjoyOfficeTreatment",
-            width: "120"
+            width: "120",
+            overHidden: true
           }
         ]
       },
@@ -380,7 +401,18 @@ export default {
   components: {
     detailsPage
   },
+  created() {
+    this.option.height = window.innerHeight - 210;
+  },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 92;
+      } else {
+        this.option.height = this.option.height + 92;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -435,9 +467,6 @@ export default {
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 350;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -148,6 +148,7 @@
             <span v-else>{{ row.parameter }}</span>
           </template>
         </avue-crud>
+        
       </basic-container>
     </div>
   </div>

src/views/basicData/salaryConfiguration/index.vue

@@ -17,6 +17,7 @@
         :cell-style="cellStyle"
         @expand-change="expandChange"
         @selection-change="selectionChange"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot-scope="{ row }" slot="expand">
           <avue-crud
@@ -72,6 +73,7 @@ import {
   remove,
   detailItem
 } from "@/api/basicData/salaryConfiguration";
+
 export default {
   name: "index",
   data() {
@@ -232,7 +234,18 @@ export default {
   components: {
     detailsPage
   },
+  created() {
+    this.option.height = window.innerHeight - 210;
+  },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -270,9 +283,6 @@ export default {
           }
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 350;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/exportTrade/customerInquiry/index.vue

@@ -243,6 +243,7 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
+    this.option.height = window.innerHeight - 210;
   },
   filters: {
     IntegerFormat(num) {
@@ -250,22 +251,24 @@ export default {
     }
   },
   methods: {
-    searchCriteriaSwitch(type){
-      if (type){
-        this.option.height = this.option.height-190
-      }else {
-        this.option.height = this.option.height+190
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 189;
+      } else {
+        this.option.height = this.option.height + 189;
       }
-      this.$refs.crud.getTableHeight()
+      this.$refs.crud.getTableHeight();
     },
     cellStyle() {
       return "padding:0;height:40px;";
     },
     expandChange(row) {
       if (!row.itemData) {
-        getGoodsInfo({ id: row.id, tradeType: "CK" }).then(res => {
+        getGoodsInfo({ id: row.id, tradeType: "CK" })
+          .then(res => {
             this.dataList[row.$index].itemData = res.data.data;
-          }).finally(() => {
+          })
+          .finally(() => {
             this.dataList[row.$index].itemLoading = false;
           });
       }
@@ -366,7 +369,8 @@ export default {
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
-      getList(page.currentPage, page.pageSize, params).then(res => {
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
           if (res.data.data.records) {
             res.data.data.records.forEach(e => {
               e.itemLoading = true;
@@ -374,10 +378,8 @@ export default {
           }
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 210;
-          }
-        }).finally(() => {
+        })
+        .finally(() => {
           this.loading = false;
         });
     },

src/views/exportTrade/purchaseContract/index.vue

@@ -18,6 +18,7 @@
         @resetColumn="resetColumn"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="createTimeSearch">
           <el-date-picker
@@ -173,6 +174,7 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
+    this.option.height = window.innerHeight - 210;
   },
   filters: {
     IntegerFormat(num) {
@@ -180,6 +182,14 @@ export default {
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 138;
+      } else {
+        this.option.height = this.option.height + 138;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -275,9 +285,6 @@ export default {
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 350;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/exportTrade/purchaseInquiry/index.vue

@@ -19,6 +19,7 @@
         :summary-method="summaryMethod"
         @selection-change="selectionChange"
         :cell-style="cellStyle"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
           <el-button
@@ -164,6 +165,7 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
+    this.option.height = window.innerHeight - 210;
   },
   filters: {
     IntegerFormat(num) {
@@ -171,6 +173,14 @@ export default {
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 143;
+      } else {
+        this.option.height = this.option.height + 143;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -271,9 +281,6 @@ export default {
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 350;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/exportTrade/salesContract/index.vue

@@ -19,6 +19,7 @@
         :summary-method="summaryMethod"
         @expand-change="expandChange"
         @selection-change="selectionChange"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot-scope="{ row }" slot="expand">
           <avue-crud
@@ -248,6 +249,14 @@ export default {
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 189;
+      } else {
+        this.option.height = this.option.height + 189;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -347,7 +356,7 @@ export default {
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         if (this.page.total) {
-          this.option.height = window.innerHeight - 400;
+          this.option.height = window.innerHeight - 210;
         }
       });
     },

src/views/salaryManagement/primarySchool/index.vue

@@ -17,6 +17,7 @@
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
         :cell-style="cellStyle"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot-scope="{ row }" slot="updateUser">
           <span>{{ row.updateUserName }}</span>
@@ -172,9 +173,17 @@ export default {
       }
     };
   },
+  created() {
+    this.option.height = window.innerHeight - 210;
+  },
   methods: {
-    cellStyle() {
-      return "padding:0;height:40px;";
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
     },
     //点击搜索按钮触发
     searchChange(params, done) {
@@ -198,9 +207,6 @@ export default {
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 260;
-          }
         })
         .finally(() => {
           this.loading = false;