修改bug

src/components/crop-select/main.vue

@@ -67,6 +67,7 @@
               @on-load="onLoad"
               @tree-load="treeLoad"
               @saveColumn="saveColumn"
+              @resetColumn="resetColumn"
               @refresh-change="refreshChange"
               :table-loading="loading"
             >
@@ -260,6 +261,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(51), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/page/index/index.vue

@@ -74,7 +74,7 @@
     props: [],
     methods: {
       showCollapse() {
-        // this.$store.commit("SET_COLLAPSE");
+        this.$store.commit("SET_COLLAPSE");
       },
       // 初始化
       init() {

src/styles/media.scss

@@ -110,7 +110,7 @@
 }
 
 @media screen and (max-width: 992px) {
-  $width: 180px;
+  $width: 140px;
   // ele的自适应
   .el-dialog,
   .el-message-box {
@@ -139,21 +139,21 @@
     width: 100% !important;
   }
   //主框架
-  // .avue-tags {
-  //   display: none;
-  // }
-  // .avue-left,
-  // .avue-logo {
-  //   left: -$width;
-  // }
-  // .avue-main {
-  //   left: 0;
-  //   width: 100%;
-  // }
-  // .avue-header {
-  //   margin-bottom: 15px;
-  //   padding-left: 0px;
-  // }
+  .avue-tags-show {
+    display: none;
+  }
+  .avue-left,
+  .avue-logo {
+    left: -$width;
+  }
+  .avue-main {
+    left: 0;
+    width: 100%;
+  }
+  .avue-header {
+    // margin-bottom: 15px;
+    padding-left: 0px;
+  }
   .top-bar__item {
     display: none;
   }
@@ -171,7 +171,7 @@
 
     .avue-header {
       padding: 0;
-      transform: translate3d(230px, 0, 0);
+      transform: translate3d(140px, 0, 0);
     }
 
     .avue-shade {

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -42,6 +42,7 @@
           @size-change="sizeChange"
           @search-change="searchChange"
           @saveColumn="saveColumn"
+          @refresh-change="refreshChange"
           :cell-style="cellStyle"
           :header-cell-class-name="headerCellClassName"
         >
@@ -263,7 +264,7 @@ export default {
         viewBtn: false,
         editBtn: false,
         delBtn: false,
-        refreshBtn: false,
+        // refreshBtn: false,
         menuWidth: 100,
         column: [
           {
@@ -272,30 +273,35 @@ export default {
             width: 100,
             searchSpan: 8,
             search: false,
+            overHidden: true,
             cell: true
           },
           {
             label: "职级拨付标准",
             prop: "rankWithdrawalStandard",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "身份证号",
             prop: "idNumber",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "学科",
             prop: "discipline",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "类别",
             prop: "itemType",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
@@ -304,636 +310,742 @@ export default {
             type: "date",
             valueFormat: "yyyy-MM-dd",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "职务",
             prop: "position",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "工资拨付标准",
             prop: "salaryWithdrawalStandard",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "履约奖",
             prop: "performanceAward",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "校龄工资",
             prop: "schoolAgeSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "增资",
             prop: "capitalIncrease",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "学历工资",
             prop: "educationSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "职级标准",
             prop: "rankStandard",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "职级工资",
             prop: "rankSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "工资基数",
             prop: "salaryBase",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "基础工资",
             prop: "basicsSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "工作量工资标准",
             prop: "workloadSalaryCritertion",
             width: 120,
+            overHidden: true,
             cell: true
           },
           {
             label: "月份课时",
             prop: "monthHour",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "月工作量工资",
             prop: "momthWorkloadSalary",
             width: 120,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "custom",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customOne",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customTwo",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customThree",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customFour",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customFive",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customSix",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customSeven",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customEight",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customNine",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "工作量工资",
             prop: "workloadSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "日常考核标准",
             prop: "dailyAssessmentCriteria",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "日常考核工资",
             prop: "dailyAssessmentSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "学期绩效工资",
             prop: "termPerformanceSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAward",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardOne",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardTwo",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardThree",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardFour",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardFive",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardSix",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardSeven",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardEight",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义奖励",
             prop: "customAwardNine",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "奖励工资",
             prop: "awardSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "领导干部补贴",
             prop: "leadingCadreSubsidy",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "备课组长",
             prop: "prepareLessons",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "教研组长",
             prop: "teachingResearch",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "职务津贴",
             prop: "dutyAllowances",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "班主任费",
             prop: "classTeacherFee",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "班额",
             prop: "classes",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "班主任津贴",
             prop: "classTeacherSubsidy",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "微信",
             prop: "wx",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "产假工资",
             prop: "maternityLeaveSalary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "周末加班",
             prop: "overtimeAtWeekend",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "年上学期绩效",
             prop: "yearUpPerformance",
             width: 130,
+            overHidden: true,
             cell: true
           },
           {
             label: "年下学期绩效",
             prop: "yearDownPerformance",
             width: 130,
+            overHidden: true,
             cell: true
           },
           {
             label: "干部补贴预留",
             prop: "cadreAllowanceReservation",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "假期加班费",
             prop: "vacationOvertimePay",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "新岗岗前培训",
             prop: "newPostTrain",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "期中期末考试学科优胜奖（预留发放）",
             prop: "winningPrize",
             width: 240,
+            overHidden: true,
             cell: true
           },
           {
             label: "级部长（预留发放）",
             prop: "classMinister",
             width: 200,
+            overHidden: true,
             cell: true
           },
           {
             label: "月副班费（预留补发）",
             prop: "monthViceClassFee",
             width: 160,
+            overHidden: true,
             cell: true
           },
           {
             label: "餐车、周五测温、周五安全岗（预留补发）",
             prop: "safetyFees",
             width: 250,
+            overHidden: true,
             cell: true
           },
           {
             label: "预留补发",
             prop: "reserveReplacement",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "调整差额",
             prop: "adjustTheBalance",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customize",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeOne",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeTwo",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeThree",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeFour",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeFive",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeSix",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeSeven",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeEight",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "customizeNine",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "补贴项",
             prop: "subsidy",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "出勤",
             prop: "attendance",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "督查罚款",
             prop: "inspectorFines",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "电话费",
             prop: "telephoneBill",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "学习强国",
             prop: "learningPower",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "宿舍管理费",
             prop: "dormitoryManagementFee",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "生育津贴",
             prop: "childbirthAllowance",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "五险一金个人",
             prop: "androidIt",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "扣除项",
             prop: "deductions",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "保险（单位部分）",
             prop: "insuranceUnit",
             width: 120,
+            overHidden: true,
             cell: true
           },
           {
             label: "保险（个人部分）",
             prop: "insurancePersonage",
             width: 120,
+            overHidden: true,
             cell: true
           },
           {
             label: "公积金（单位部分）",
             prop: "reservedFundsUnit",
             width: 140,
+            overHidden: true,
             cell: true
           },
           {
             label: "公积金（个人部分）",
             prop: "reservedFundsPersonage",
             width: 140,
+            overHidden: true,
             cell: true
           },
           {
             label: "应发工资",
             prop: "salary",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "个税",
             prop: "personageTaxes",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "实发工资（减去个人）",
             prop: "fsalary",
             width: 150,
+            overHidden: true,
             cell: true
           },
           {
             label: "备注",
             prop: "remarks",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbon",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonOne",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonTwo",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonThree",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonFour",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonFive",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonSix",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonSeven",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonEight",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "自定义",
             prop: "ribbonNine",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "日照银行代发最终",
             prop: "payrollCredit",
             width: 120,
+            overHidden: true,
             cell: true
           },
           {
             label: "已付",
             prop: "paid",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "冲借款",
             prop: "rushedToBorrow",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "现金付款",
             prop: "cashPayment",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付",
             prop: "pauseNoPay",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付1",
             prop: "pauseNoPayOne",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付2",
             prop: "pauseNoPayTwo",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付3",
             prop: "pauseNoPayThree",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付4",
             prop: "pauseNoPayFour",
             width: 100,
+            overHidden: true,
             cell: true
           },
 
@@ -941,36 +1053,42 @@ export default {
             label: "暂不付5",
             prop: "pauseNoPayFive",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付6",
             prop: "pauseNoPaySix",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付7",
             prop: "pauseNoPaySeven",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付8",
             prop: "pauseNoPayEight",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "暂不付9",
             prop: "pauseNoPayNine",
             width: 100,
+            overHidden: true,
             cell: true
           },
           {
             label: "备注",
             prop: "pauseNoPayRemark",
             width: 100,
+            overHidden: true,
             cell: true
           }
         ]
@@ -1098,12 +1216,13 @@ export default {
       this.page.pageSize = val;
       this.getItemDetail();
     },
+    refreshChange(){
+      this.getItemDetail()
+    },
     uploadAfter(res, done, loading, column) {
       this.excelBox = false;
-      this.$message.success("导入成功！");
-      if (this.detailData.id) {
-        this.getDetail(this.detailData.id);
-      }
+      // this.$message.success("导入成功！");
+      this.getItemDetail();
       done();
     },
     //修改提交触发
@@ -1275,6 +1394,26 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "3":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/workloadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/workloadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "4":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/postAllowance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/postAllowance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           case "5":
             this.exportUrl =
               "/api/blade-school/salaryitem/export/teacherSubsidy";
@@ -1294,6 +1433,15 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "7":
+            this.exportUrl = "/api/blade-school/salaryitem/export/zhaPingExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/zhaPingExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           case "9":
             this.exportUrl = "/api/blade-school/salaryitem/export/overtime";
             this.findObject(this.excelOption.column, "excelFile").action =
@@ -1340,6 +1488,36 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "14":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/insuranceExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/insuranceExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "15":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/reservedFunds";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/reservedFunds";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "16":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/personalInsurance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/personalInsurance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           case "17":
             this.exportUrl =
               "/api/blade-school/salaryitem/export/attendanceExcel";
@@ -1350,6 +1528,54 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "19":
+            this.exportUrl = "/api/blade-school/salaryitem/export/payTaxes";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/payTaxes";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "20":
+            this.exportUrl = "/api/blade-school/salaryitem/export/awardExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/awardExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "21":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/performanceExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/performanceExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "22":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/vacationExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/vacationExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "23":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/postTrainExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/postTrainExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

src/views/salaryManagement/primarySchool/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :cell-style="cellStyle"
       >
         <template slot-scope="{ row }" slot="updateUser">