修改bug

src/views/salaryManagement/highSchool/js/optionList.js

@@ -67,6 +67,20 @@ export const option = {
       search: true
     },
     {
+      label: "教师人数",
+      prop: "personNumber",
+      overHidden: true,
+      index: 3,
+      width: 100
+    },
+    {
+      label: "学生人数",
+      prop: "studentNumber",
+      overHidden: true,
+      index: 4,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -78,7 +92,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 3,
+      index: 5,
       search: true
     },
     {
@@ -86,14 +100,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 4,
+      index: 6,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 5,
+      index: 7,
       width: 100
     },
     {
@@ -101,14 +115,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 8,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 7,
+      index: 9,
       props: {
         label: "name",
         value: "code"
@@ -135,7 +149,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 8,
+      index: 10,
       search: true
     }
   ]
@@ -153,7 +167,498 @@ export const optionList = {
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
+  showSummary: true,
   dialogFullscreen: true,
+  summaryText: "合计",
+  sumColumnList: [{
+      name: "salaryWithdrawalStandard",
+      type: "sum",
+    },
+    {
+      name: "rankWithdrawalStandard",
+      type: "sum"
+    },
+    {
+      name: "performanceAwardName",
+      type: "sum",
+    },
+    {
+      name: "performanceAward",
+      type: "sum"
+    },
+    {
+      name: "schoolAge",
+      type: "sum"
+    },
+    {
+      name: "schoolAgeSalary",
+      type: "sum"
+    },
+    {
+      name: "capitalIncreaseName",
+      type: "sum"
+    },
+    {
+      name: "capitalIncrease",
+      type: "sum"
+    },
+    {
+      name: "salaryStandard",
+      type: "sum"
+    },
+    {
+      name: "educationSalary",
+      type: "sum"
+    },
+    {
+      name: "rankSalaryName",
+      type: "sum"
+    },
+    {
+      name: "rankSalary",
+      type: "sum"
+    },
+    {
+      name: "salaryBaseName",
+      type: "sum"
+    },
+    {
+      name: "salaryBase",
+      type: "sum"
+    },
+    {
+      name: "basicsSalary",
+      type: "sum"
+    },
+    {
+      name: "workloadSalaryCritertion",
+      type: "sum"
+    },
+    {
+      name: "virtualWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "doubleCease",
+      type: "sum"
+    },
+    {
+      name: "virtualDoubleCease",
+      type: "sum"
+    },
+    {
+      name: "monthHour",
+      type: "sum"
+    },
+    {
+      name: "monthPrice",
+      type: "sum"
+    },
+    {
+      name: "momthWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "custom",
+      type: "sum"
+    },
+    {
+      name: "customOne",
+      type: "sum"
+    },
+    {
+      name: "customTwo",
+      type: "sum"
+    },
+    {
+      name: "doubleHour",
+      type: "sum"
+    },
+    {
+      name: "doublePrice",
+      type: "sum"
+    },
+    {
+      name: "doubleMoney",
+      type: "sum"
+    },
+    {
+      name: "customThree",
+      type: "sum"
+    },
+    {
+      name: "customFour",
+      type: "sum"
+    },
+    {
+      name: "customFive",
+      type: "sum"
+    },
+    {
+      name: "customSix",
+      type: "sum"
+    },
+    {
+      name: "customSeven",
+      type: "sum"
+    },
+    {
+      name: "workloadSalary",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "virtualDailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayTwo",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalaryName",
+      type: "sum"
+    },
+    {
+      name: "customEight",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalary",
+      type: "sum"
+    },
+    {
+      name: "customNine",
+      type: "sum"
+    },
+    {
+      name: "customize",
+      type: "sum"
+    },
+    {
+      name: "customizeOne",
+      type: "sum"
+    },
+    {
+      name: "customizeTwo",
+      type: "sum"
+    },
+    {
+      name: "customizeThree",
+      type: "sum"
+    },
+    {
+      name: "customizeFour",
+      type: "sum"
+    },
+    {
+      name: "customAward",
+      type: "sum"
+    },
+    {
+      name: "customAwardOne",
+      type: "sum"
+    },
+    {
+      name: "customAwardTwo",
+      type: "sum"
+    },
+    {
+      name: "customAwardThree",
+      type: "sum"
+    },
+    {
+      name: "customAwardFour",
+      type: "sum"
+    },
+    {
+      name: "customAwardFive",
+      type: "sum"
+    },
+    {
+      name: "customAwardSix",
+      type: "sum"
+    },
+    {
+      name: "customAwardSeven",
+      type: "sum"
+    },
+    {
+      name: "customAwardEight",
+      type: "sum"
+    },
+    {
+      name: "customAwardNine",
+      type: "sum"
+    },
+    {
+      name: "awardSalary",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidy",
+      type: "sum"
+    },
+    {
+      name: "assessLeadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "customizeFive",
+      type: "sum"
+    },
+    {
+      name: "prepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "prepareLessons",
+      type: "sum"
+    },
+    {
+      name: "assessPrepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "customizeSix",
+      type: "sum"
+    },
+    {
+      name: "teachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "teachingResearch",
+      type: "sum"
+    },
+    {
+      name: "assessTeachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "customizeSeven",
+      type: "sum"
+    },
+    {
+      name: "dutyAllowances",
+      type: "sum"
+    },
+    {
+      name: "teacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "classTeacherFee",
+      type: "sum"
+    },
+    {
+      name: "classes",
+      type: "sum"
+    },
+    {
+      name: "adjustTheBalance",
+      type: "sum"
+    },
+    {
+      name: "payrollCredit",
+      type: "sum"
+    },
+    {
+      name: "paid",
+      type: "sum"
+    },
+    {
+      name: "teacherAssessSubsidy",
+      type: "sum"
+    },
+    {
+      name: "customizeEight",
+      type: "sum"
+    },
+    {
+      name: "classTeacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "wx",
+      type: "sum"
+    },
+    {
+      name: "maternityLeaveSalary",
+      type: "sum"
+    },
+    {
+      name: "customizeNine",
+      type: "sum"
+    },
+    {
+      name: "ribbon",
+      type: "sum"
+    },
+    {
+      name: "overtimeAtWeekend",
+      type: "sum"
+    },
+    {
+      name: "yearUpPerformance",
+      type: "sum"
+    },
+    {
+      name: "yearDownPerformance",
+      type: "sum"
+    },
+    {
+      name: "cadreAllowanceReservation",
+      type: "sum"
+    },
+    {
+      name: "vacationOvertimePay",
+      type: "sum"
+    },
+    {
+      name: "newPostTrain",
+      type: "sum"
+    },
+    {
+      name: "winningPrize",
+      type: "sum"
+    },
+    {
+      name: "classMinister",
+      type: "sum"
+    },
+    {
+      name: "monthViceClassFee",
+      type: "sum"
+    },
+    {
+      name: "safetyFees",
+      type: "sum"
+    },
+    {
+      name: "reserveReplacement",
+      type: "sum"
+    },
+    {
+      name: "subsidy",
+      type: "sum"
+    },
+    {
+      name: "attendance",
+      type: "sum"
+    },
+    {
+      name: "inspectorFines",
+      type: "sum"
+    },
+    {
+      name: "telephoneBill",
+      type: "sum"
+    },
+    {
+      name: "learningPower",
+      type: "sum"
+    },
+    {
+      name: "dormitoryManagementFee",
+      type: "sum"
+    },
+    {
+      name: "childbirthAllowance",
+      type: "sum"
+    },
+    {
+      name: "androidIt",
+      type: "sum"
+    },
+    {
+      name: "ribbonOne",
+      type: "sum"
+    },
+    {
+      name: "ribbonTwo",
+      type: "sum"
+    },
+    {
+      name: "ribbonThree",
+      type: "sum"
+    },
+    {
+      name: "ribbonFour",
+      type: "sum"
+    },
+    {
+      name: "ribbonFive",
+      type: "sum"
+    },
+    {
+      name: "ribbonSix",
+      type: "sum"
+    },
+    {
+      name: "ribbonSeven",
+      type: "sum"
+    },
+    {
+      name: "ribbonEight",
+      type: "sum"
+    },
+    {
+      name: "ribbonNine",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPay",
+      type: "sum"
+    },
+    {
+      name: "deductions",
+      type: "sum"
+    },
+    {
+      name: "insuranceUnit",
+      type: "sum"
+    },
+    {
+      name: "insurancePersonage",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsUnit",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsPersonage",
+      type: "sum"
+    },
+    {
+      name: "salary",
+      type: "sum"
+    },
+    {
+      name: "personageTaxes",
+      type: "sum"
+    },
+    {
+      name: "fSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayOne",
+      type: "sum"
+    }
+  ],
   column: [{
       label: "学科",
       prop: "discipline",
@@ -311,7 +816,7 @@ export const optionList = {
       label: "学历",
       prop: "code",
       type: "select",
-      dicData:[],
+      dicData: [],
       props: {
         label: "dictValue",
         value: "dictValue"

src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -67,6 +67,20 @@ export const option = {
       search: true
     },
     {
+      label: "教师人数",
+      prop: "personNumber",
+      overHidden: true,
+      index: 3,
+      width: 100
+    },
+    {
+      label: "学生人数",
+      prop: "studentNumber",
+      overHidden: true,
+      index: 4,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -78,7 +92,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 3,
+      index: 5,
       search: true
     },
     {
@@ -86,14 +100,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 4,
+      index: 6,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 5,
+      index: 7,
       width: 100
     },
     {
@@ -101,14 +115,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 8,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 7,
+      index: 9,
       props: {
         label: "name",
         value: "code"
@@ -135,7 +149,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 8,
+      index: 10,
       search: true
     }
   ]
@@ -153,7 +167,498 @@ export const optionList = {
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
+  showSummary: true,
   dialogFullscreen: true,
+  summaryText: "合计",
+  sumColumnList: [{
+      name: "salaryWithdrawalStandard",
+      type: "sum",
+    },
+    {
+      name: "rankWithdrawalStandard",
+      type: "sum"
+    },
+    {
+      name: "performanceAwardName",
+      type: "sum",
+    },
+    {
+      name: "performanceAward",
+      type: "sum"
+    },
+    {
+      name: "schoolAge",
+      type: "sum"
+    },
+    {
+      name: "schoolAgeSalary",
+      type: "sum"
+    },
+    {
+      name: "capitalIncreaseName",
+      type: "sum"
+    },
+    {
+      name: "capitalIncrease",
+      type: "sum"
+    },
+    {
+      name: "salaryStandard",
+      type: "sum"
+    },
+    {
+      name: "educationSalary",
+      type: "sum"
+    },
+    {
+      name: "rankSalaryName",
+      type: "sum"
+    },
+    {
+      name: "rankSalary",
+      type: "sum"
+    },
+    {
+      name: "salaryBaseName",
+      type: "sum"
+    },
+    {
+      name: "salaryBase",
+      type: "sum"
+    },
+    {
+      name: "basicsSalary",
+      type: "sum"
+    },
+    {
+      name: "workloadSalaryCritertion",
+      type: "sum"
+    },
+    {
+      name: "virtualWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "doubleCease",
+      type: "sum"
+    },
+    {
+      name: "virtualDoubleCease",
+      type: "sum"
+    },
+    {
+      name: "monthHour",
+      type: "sum"
+    },
+    {
+      name: "monthPrice",
+      type: "sum"
+    },
+    {
+      name: "momthWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "custom",
+      type: "sum"
+    },
+    {
+      name: "customOne",
+      type: "sum"
+    },
+    {
+      name: "customTwo",
+      type: "sum"
+    },
+    {
+      name: "doubleHour",
+      type: "sum"
+    },
+    {
+      name: "doublePrice",
+      type: "sum"
+    },
+    {
+      name: "doubleMoney",
+      type: "sum"
+    },
+    {
+      name: "customThree",
+      type: "sum"
+    },
+    {
+      name: "customFour",
+      type: "sum"
+    },
+    {
+      name: "customFive",
+      type: "sum"
+    },
+    {
+      name: "customSix",
+      type: "sum"
+    },
+    {
+      name: "customSeven",
+      type: "sum"
+    },
+    {
+      name: "workloadSalary",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "virtualDailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayTwo",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalaryName",
+      type: "sum"
+    },
+    {
+      name: "customEight",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalary",
+      type: "sum"
+    },
+    {
+      name: "customNine",
+      type: "sum"
+    },
+    {
+      name: "customize",
+      type: "sum"
+    },
+    {
+      name: "customizeOne",
+      type: "sum"
+    },
+    {
+      name: "customizeTwo",
+      type: "sum"
+    },
+    {
+      name: "customizeThree",
+      type: "sum"
+    },
+    {
+      name: "customizeFour",
+      type: "sum"
+    },
+    {
+      name: "customAward",
+      type: "sum"
+    },
+    {
+      name: "customAwardOne",
+      type: "sum"
+    },
+    {
+      name: "customAwardTwo",
+      type: "sum"
+    },
+    {
+      name: "customAwardThree",
+      type: "sum"
+    },
+    {
+      name: "customAwardFour",
+      type: "sum"
+    },
+    {
+      name: "customAwardFive",
+      type: "sum"
+    },
+    {
+      name: "customAwardSix",
+      type: "sum"
+    },
+    {
+      name: "customAwardSeven",
+      type: "sum"
+    },
+    {
+      name: "customAwardEight",
+      type: "sum"
+    },
+    {
+      name: "customAwardNine",
+      type: "sum"
+    },
+    {
+      name: "awardSalary",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidy",
+      type: "sum"
+    },
+    {
+      name: "assessLeadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "customizeFive",
+      type: "sum"
+    },
+    {
+      name: "prepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "prepareLessons",
+      type: "sum"
+    },
+    {
+      name: "assessPrepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "customizeSix",
+      type: "sum"
+    },
+    {
+      name: "teachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "teachingResearch",
+      type: "sum"
+    },
+    {
+      name: "assessTeachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "customizeSeven",
+      type: "sum"
+    },
+    {
+      name: "dutyAllowances",
+      type: "sum"
+    },
+    {
+      name: "teacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "classTeacherFee",
+      type: "sum"
+    },
+    {
+      name: "classes",
+      type: "sum"
+    },
+    {
+      name: "adjustTheBalance",
+      type: "sum"
+    },
+    {
+      name: "payrollCredit",
+      type: "sum"
+    },
+    {
+      name: "paid",
+      type: "sum"
+    },
+    {
+      name: "teacherAssessSubsidy",
+      type: "sum"
+    },
+    {
+      name: "customizeEight",
+      type: "sum"
+    },
+    {
+      name: "classTeacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "wx",
+      type: "sum"
+    },
+    {
+      name: "maternityLeaveSalary",
+      type: "sum"
+    },
+    {
+      name: "customizeNine",
+      type: "sum"
+    },
+    {
+      name: "ribbon",
+      type: "sum"
+    },
+    {
+      name: "overtimeAtWeekend",
+      type: "sum"
+    },
+    {
+      name: "yearUpPerformance",
+      type: "sum"
+    },
+    {
+      name: "yearDownPerformance",
+      type: "sum"
+    },
+    {
+      name: "cadreAllowanceReservation",
+      type: "sum"
+    },
+    {
+      name: "vacationOvertimePay",
+      type: "sum"
+    },
+    {
+      name: "newPostTrain",
+      type: "sum"
+    },
+    {
+      name: "winningPrize",
+      type: "sum"
+    },
+    {
+      name: "classMinister",
+      type: "sum"
+    },
+    {
+      name: "monthViceClassFee",
+      type: "sum"
+    },
+    {
+      name: "safetyFees",
+      type: "sum"
+    },
+    {
+      name: "reserveReplacement",
+      type: "sum"
+    },
+    {
+      name: "subsidy",
+      type: "sum"
+    },
+    {
+      name: "attendance",
+      type: "sum"
+    },
+    {
+      name: "inspectorFines",
+      type: "sum"
+    },
+    {
+      name: "telephoneBill",
+      type: "sum"
+    },
+    {
+      name: "learningPower",
+      type: "sum"
+    },
+    {
+      name: "dormitoryManagementFee",
+      type: "sum"
+    },
+    {
+      name: "childbirthAllowance",
+      type: "sum"
+    },
+    {
+      name: "androidIt",
+      type: "sum"
+    },
+    {
+      name: "ribbonOne",
+      type: "sum"
+    },
+    {
+      name: "ribbonTwo",
+      type: "sum"
+    },
+    {
+      name: "ribbonThree",
+      type: "sum"
+    },
+    {
+      name: "ribbonFour",
+      type: "sum"
+    },
+    {
+      name: "ribbonFive",
+      type: "sum"
+    },
+    {
+      name: "ribbonSix",
+      type: "sum"
+    },
+    {
+      name: "ribbonSeven",
+      type: "sum"
+    },
+    {
+      name: "ribbonEight",
+      type: "sum"
+    },
+    {
+      name: "ribbonNine",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPay",
+      type: "sum"
+    },
+    {
+      name: "deductions",
+      type: "sum"
+    },
+    {
+      name: "insuranceUnit",
+      type: "sum"
+    },
+    {
+      name: "insurancePersonage",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsUnit",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsPersonage",
+      type: "sum"
+    },
+    {
+      name: "salary",
+      type: "sum"
+    },
+    {
+      name: "personageTaxes",
+      type: "sum"
+    },
+    {
+      name: "fSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayOne",
+      type: "sum"
+    }
+  ],
   column: [{
       label: "学科",
       prop: "discipline",
@@ -311,7 +816,7 @@ export const optionList = {
       label: "学历",
       prop: "code",
       type: "select",
-      dicData:[],
+      dicData: [],
       props: {
         label: "dictValue",
         value: "dictValue"

src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -67,6 +67,20 @@ export const option = {
       search: true
     },
     {
+      label: "教师人数",
+      prop: "personNumber",
+      overHidden: true,
+      index: 3,
+      width: 100
+    },
+    {
+      label: "学生人数",
+      prop: "studentNumber",
+      overHidden: true,
+      index: 4,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -78,7 +92,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 3,
+      index: 5,
       search: true
     },
     {
@@ -86,14 +100,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 4,
+      index: 6,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 5,
+      index: 7,
       width: 100
     },
     {
@@ -101,14 +115,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 8,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 7,
+      index: 9,
       props: {
         label: "name",
         value: "code"
@@ -135,7 +149,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 8,
+      index: 10,
       search: true
     }
   ]
@@ -153,7 +167,498 @@ export const optionList = {
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
+  showSummary: true,
   dialogFullscreen: true,
+  summaryText: "合计",
+  sumColumnList: [{
+      name: "salaryWithdrawalStandard",
+      type: "sum",
+    },
+    {
+      name: "rankWithdrawalStandard",
+      type: "sum"
+    },
+    {
+      name: "performanceAwardName",
+      type: "sum",
+    },
+    {
+      name: "performanceAward",
+      type: "sum"
+    },
+    {
+      name: "schoolAge",
+      type: "sum"
+    },
+    {
+      name: "schoolAgeSalary",
+      type: "sum"
+    },
+    {
+      name: "capitalIncreaseName",
+      type: "sum"
+    },
+    {
+      name: "capitalIncrease",
+      type: "sum"
+    },
+    {
+      name: "salaryStandard",
+      type: "sum"
+    },
+    {
+      name: "educationSalary",
+      type: "sum"
+    },
+    {
+      name: "rankSalaryName",
+      type: "sum"
+    },
+    {
+      name: "rankSalary",
+      type: "sum"
+    },
+    {
+      name: "salaryBaseName",
+      type: "sum"
+    },
+    {
+      name: "salaryBase",
+      type: "sum"
+    },
+    {
+      name: "basicsSalary",
+      type: "sum"
+    },
+    {
+      name: "workloadSalaryCritertion",
+      type: "sum"
+    },
+    {
+      name: "virtualWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "doubleCease",
+      type: "sum"
+    },
+    {
+      name: "virtualDoubleCease",
+      type: "sum"
+    },
+    {
+      name: "monthHour",
+      type: "sum"
+    },
+    {
+      name: "monthPrice",
+      type: "sum"
+    },
+    {
+      name: "momthWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "custom",
+      type: "sum"
+    },
+    {
+      name: "customOne",
+      type: "sum"
+    },
+    {
+      name: "customTwo",
+      type: "sum"
+    },
+    {
+      name: "doubleHour",
+      type: "sum"
+    },
+    {
+      name: "doublePrice",
+      type: "sum"
+    },
+    {
+      name: "doubleMoney",
+      type: "sum"
+    },
+    {
+      name: "customThree",
+      type: "sum"
+    },
+    {
+      name: "customFour",
+      type: "sum"
+    },
+    {
+      name: "customFive",
+      type: "sum"
+    },
+    {
+      name: "customSix",
+      type: "sum"
+    },
+    {
+      name: "customSeven",
+      type: "sum"
+    },
+    {
+      name: "workloadSalary",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "virtualDailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayTwo",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalaryName",
+      type: "sum"
+    },
+    {
+      name: "customEight",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalary",
+      type: "sum"
+    },
+    {
+      name: "customNine",
+      type: "sum"
+    },
+    {
+      name: "customize",
+      type: "sum"
+    },
+    {
+      name: "customizeOne",
+      type: "sum"
+    },
+    {
+      name: "customizeTwo",
+      type: "sum"
+    },
+    {
+      name: "customizeThree",
+      type: "sum"
+    },
+    {
+      name: "customizeFour",
+      type: "sum"
+    },
+    {
+      name: "customAward",
+      type: "sum"
+    },
+    {
+      name: "customAwardOne",
+      type: "sum"
+    },
+    {
+      name: "customAwardTwo",
+      type: "sum"
+    },
+    {
+      name: "customAwardThree",
+      type: "sum"
+    },
+    {
+      name: "customAwardFour",
+      type: "sum"
+    },
+    {
+      name: "customAwardFive",
+      type: "sum"
+    },
+    {
+      name: "customAwardSix",
+      type: "sum"
+    },
+    {
+      name: "customAwardSeven",
+      type: "sum"
+    },
+    {
+      name: "customAwardEight",
+      type: "sum"
+    },
+    {
+      name: "customAwardNine",
+      type: "sum"
+    },
+    {
+      name: "awardSalary",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidy",
+      type: "sum"
+    },
+    {
+      name: "assessLeadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "customizeFive",
+      type: "sum"
+    },
+    {
+      name: "prepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "prepareLessons",
+      type: "sum"
+    },
+    {
+      name: "assessPrepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "customizeSix",
+      type: "sum"
+    },
+    {
+      name: "teachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "teachingResearch",
+      type: "sum"
+    },
+    {
+      name: "assessTeachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "customizeSeven",
+      type: "sum"
+    },
+    {
+      name: "dutyAllowances",
+      type: "sum"
+    },
+    {
+      name: "teacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "classTeacherFee",
+      type: "sum"
+    },
+    {
+      name: "classes",
+      type: "sum"
+    },
+    {
+      name: "adjustTheBalance",
+      type: "sum"
+    },
+    {
+      name: "payrollCredit",
+      type: "sum"
+    },
+    {
+      name: "paid",
+      type: "sum"
+    },
+    {
+      name: "teacherAssessSubsidy",
+      type: "sum"
+    },
+    {
+      name: "customizeEight",
+      type: "sum"
+    },
+    {
+      name: "classTeacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "wx",
+      type: "sum"
+    },
+    {
+      name: "maternityLeaveSalary",
+      type: "sum"
+    },
+    {
+      name: "customizeNine",
+      type: "sum"
+    },
+    {
+      name: "ribbon",
+      type: "sum"
+    },
+    {
+      name: "overtimeAtWeekend",
+      type: "sum"
+    },
+    {
+      name: "yearUpPerformance",
+      type: "sum"
+    },
+    {
+      name: "yearDownPerformance",
+      type: "sum"
+    },
+    {
+      name: "cadreAllowanceReservation",
+      type: "sum"
+    },
+    {
+      name: "vacationOvertimePay",
+      type: "sum"
+    },
+    {
+      name: "newPostTrain",
+      type: "sum"
+    },
+    {
+      name: "winningPrize",
+      type: "sum"
+    },
+    {
+      name: "classMinister",
+      type: "sum"
+    },
+    {
+      name: "monthViceClassFee",
+      type: "sum"
+    },
+    {
+      name: "safetyFees",
+      type: "sum"
+    },
+    {
+      name: "reserveReplacement",
+      type: "sum"
+    },
+    {
+      name: "subsidy",
+      type: "sum"
+    },
+    {
+      name: "attendance",
+      type: "sum"
+    },
+    {
+      name: "inspectorFines",
+      type: "sum"
+    },
+    {
+      name: "telephoneBill",
+      type: "sum"
+    },
+    {
+      name: "learningPower",
+      type: "sum"
+    },
+    {
+      name: "dormitoryManagementFee",
+      type: "sum"
+    },
+    {
+      name: "childbirthAllowance",
+      type: "sum"
+    },
+    {
+      name: "androidIt",
+      type: "sum"
+    },
+    {
+      name: "ribbonOne",
+      type: "sum"
+    },
+    {
+      name: "ribbonTwo",
+      type: "sum"
+    },
+    {
+      name: "ribbonThree",
+      type: "sum"
+    },
+    {
+      name: "ribbonFour",
+      type: "sum"
+    },
+    {
+      name: "ribbonFive",
+      type: "sum"
+    },
+    {
+      name: "ribbonSix",
+      type: "sum"
+    },
+    {
+      name: "ribbonSeven",
+      type: "sum"
+    },
+    {
+      name: "ribbonEight",
+      type: "sum"
+    },
+    {
+      name: "ribbonNine",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPay",
+      type: "sum"
+    },
+    {
+      name: "deductions",
+      type: "sum"
+    },
+    {
+      name: "insuranceUnit",
+      type: "sum"
+    },
+    {
+      name: "insurancePersonage",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsUnit",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsPersonage",
+      type: "sum"
+    },
+    {
+      name: "salary",
+      type: "sum"
+    },
+    {
+      name: "personageTaxes",
+      type: "sum"
+    },
+    {
+      name: "fSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayOne",
+      type: "sum"
+    }
+  ],
   column: [{
       label: "学科",
       prop: "discipline",
@@ -311,7 +816,7 @@ export const optionList = {
       label: "学历",
       prop: "code",
       type: "select",
-      dicData:[],
+      dicData: [],
       props: {
         label: "dictValue",
         value: "dictValue"

src/views/salaryManagement/primarySchool/js/optionList.js

@@ -67,6 +67,20 @@ export const option = {
       search: true
     },
     {
+      label: "教师人数",
+      prop: "personNumber",
+      overHidden: true,
+      index: 3,
+      width: 100
+    },
+    {
+      label: "学生人数",
+      prop: "studentNumber",
+      overHidden: true,
+      index: 4,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -78,7 +92,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 3,
+      index: 5,
       search: true
     },
     {
@@ -86,14 +100,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 4,
+      index: 6,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 5,
+      index: 7,
       width: 100
     },
     {
@@ -101,14 +115,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 8,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 7,
+      index: 9,
       props: {
         label: "name",
         value: "code"
@@ -135,7 +149,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 8,
+      index: 10,
       search: true
     }
   ]
@@ -153,7 +167,498 @@ export const optionList = {
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
+  showSummary: true,
   dialogFullscreen: true,
+  summaryText: "合计",
+  sumColumnList: [{
+      name: "salaryWithdrawalStandard",
+      type: "sum",
+    },
+    {
+      name: "rankWithdrawalStandard",
+      type: "sum"
+    },
+    {
+      name: "performanceAwardName",
+      type: "sum",
+    },
+    {
+      name: "performanceAward",
+      type: "sum"
+    },
+    {
+      name: "schoolAge",
+      type: "sum"
+    },
+    {
+      name: "schoolAgeSalary",
+      type: "sum"
+    },
+    {
+      name: "capitalIncreaseName",
+      type: "sum"
+    },
+    {
+      name: "capitalIncrease",
+      type: "sum"
+    },
+    {
+      name: "salaryStandard",
+      type: "sum"
+    },
+    {
+      name: "educationSalary",
+      type: "sum"
+    },
+    {
+      name: "rankSalaryName",
+      type: "sum"
+    },
+    {
+      name: "rankSalary",
+      type: "sum"
+    },
+    {
+      name: "salaryBaseName",
+      type: "sum"
+    },
+    {
+      name: "salaryBase",
+      type: "sum"
+    },
+    {
+      name: "basicsSalary",
+      type: "sum"
+    },
+    {
+      name: "workloadSalaryCritertion",
+      type: "sum"
+    },
+    {
+      name: "virtualWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "doubleCease",
+      type: "sum"
+    },
+    {
+      name: "virtualDoubleCease",
+      type: "sum"
+    },
+    {
+      name: "monthHour",
+      type: "sum"
+    },
+    {
+      name: "monthPrice",
+      type: "sum"
+    },
+    {
+      name: "momthWorkloadSalary",
+      type: "sum"
+    },
+    {
+      name: "custom",
+      type: "sum"
+    },
+    {
+      name: "customOne",
+      type: "sum"
+    },
+    {
+      name: "customTwo",
+      type: "sum"
+    },
+    {
+      name: "doubleHour",
+      type: "sum"
+    },
+    {
+      name: "doublePrice",
+      type: "sum"
+    },
+    {
+      name: "doubleMoney",
+      type: "sum"
+    },
+    {
+      name: "customThree",
+      type: "sum"
+    },
+    {
+      name: "customFour",
+      type: "sum"
+    },
+    {
+      name: "customFive",
+      type: "sum"
+    },
+    {
+      name: "customSix",
+      type: "sum"
+    },
+    {
+      name: "customSeven",
+      type: "sum"
+    },
+    {
+      name: "workloadSalary",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "virtualDailyAssessmentCriteria",
+      type: "sum"
+    },
+    {
+      name: "dailyAssessmentSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayTwo",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalaryName",
+      type: "sum"
+    },
+    {
+      name: "customEight",
+      type: "sum"
+    },
+    {
+      name: "termPerformanceSalary",
+      type: "sum"
+    },
+    {
+      name: "customNine",
+      type: "sum"
+    },
+    {
+      name: "customize",
+      type: "sum"
+    },
+    {
+      name: "customizeOne",
+      type: "sum"
+    },
+    {
+      name: "customizeTwo",
+      type: "sum"
+    },
+    {
+      name: "customizeThree",
+      type: "sum"
+    },
+    {
+      name: "customizeFour",
+      type: "sum"
+    },
+    {
+      name: "customAward",
+      type: "sum"
+    },
+    {
+      name: "customAwardOne",
+      type: "sum"
+    },
+    {
+      name: "customAwardTwo",
+      type: "sum"
+    },
+    {
+      name: "customAwardThree",
+      type: "sum"
+    },
+    {
+      name: "customAwardFour",
+      type: "sum"
+    },
+    {
+      name: "customAwardFive",
+      type: "sum"
+    },
+    {
+      name: "customAwardSix",
+      type: "sum"
+    },
+    {
+      name: "customAwardSeven",
+      type: "sum"
+    },
+    {
+      name: "customAwardEight",
+      type: "sum"
+    },
+    {
+      name: "customAwardNine",
+      type: "sum"
+    },
+    {
+      name: "awardSalary",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "leadingCadreSubsidy",
+      type: "sum"
+    },
+    {
+      name: "assessLeadingCadreSubsidyName",
+      type: "sum"
+    },
+    {
+      name: "customizeFive",
+      type: "sum"
+    },
+    {
+      name: "prepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "prepareLessons",
+      type: "sum"
+    },
+    {
+      name: "assessPrepareLessonsName",
+      type: "sum"
+    },
+    {
+      name: "customizeSix",
+      type: "sum"
+    },
+    {
+      name: "teachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "teachingResearch",
+      type: "sum"
+    },
+    {
+      name: "assessTeachingResearchName",
+      type: "sum"
+    },
+    {
+      name: "customizeSeven",
+      type: "sum"
+    },
+    {
+      name: "dutyAllowances",
+      type: "sum"
+    },
+    {
+      name: "teacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "classTeacherFee",
+      type: "sum"
+    },
+    {
+      name: "classes",
+      type: "sum"
+    },
+    {
+      name: "adjustTheBalance",
+      type: "sum"
+    },
+    {
+      name: "payrollCredit",
+      type: "sum"
+    },
+    {
+      name: "paid",
+      type: "sum"
+    },
+    {
+      name: "teacherAssessSubsidy",
+      type: "sum"
+    },
+    {
+      name: "customizeEight",
+      type: "sum"
+    },
+    {
+      name: "classTeacherSubsidy",
+      type: "sum"
+    },
+    {
+      name: "wx",
+      type: "sum"
+    },
+    {
+      name: "maternityLeaveSalary",
+      type: "sum"
+    },
+    {
+      name: "customizeNine",
+      type: "sum"
+    },
+    {
+      name: "ribbon",
+      type: "sum"
+    },
+    {
+      name: "overtimeAtWeekend",
+      type: "sum"
+    },
+    {
+      name: "yearUpPerformance",
+      type: "sum"
+    },
+    {
+      name: "yearDownPerformance",
+      type: "sum"
+    },
+    {
+      name: "cadreAllowanceReservation",
+      type: "sum"
+    },
+    {
+      name: "vacationOvertimePay",
+      type: "sum"
+    },
+    {
+      name: "newPostTrain",
+      type: "sum"
+    },
+    {
+      name: "winningPrize",
+      type: "sum"
+    },
+    {
+      name: "classMinister",
+      type: "sum"
+    },
+    {
+      name: "monthViceClassFee",
+      type: "sum"
+    },
+    {
+      name: "safetyFees",
+      type: "sum"
+    },
+    {
+      name: "reserveReplacement",
+      type: "sum"
+    },
+    {
+      name: "subsidy",
+      type: "sum"
+    },
+    {
+      name: "attendance",
+      type: "sum"
+    },
+    {
+      name: "inspectorFines",
+      type: "sum"
+    },
+    {
+      name: "telephoneBill",
+      type: "sum"
+    },
+    {
+      name: "learningPower",
+      type: "sum"
+    },
+    {
+      name: "dormitoryManagementFee",
+      type: "sum"
+    },
+    {
+      name: "childbirthAllowance",
+      type: "sum"
+    },
+    {
+      name: "androidIt",
+      type: "sum"
+    },
+    {
+      name: "ribbonOne",
+      type: "sum"
+    },
+    {
+      name: "ribbonTwo",
+      type: "sum"
+    },
+    {
+      name: "ribbonThree",
+      type: "sum"
+    },
+    {
+      name: "ribbonFour",
+      type: "sum"
+    },
+    {
+      name: "ribbonFive",
+      type: "sum"
+    },
+    {
+      name: "ribbonSix",
+      type: "sum"
+    },
+    {
+      name: "ribbonSeven",
+      type: "sum"
+    },
+    {
+      name: "ribbonEight",
+      type: "sum"
+    },
+    {
+      name: "ribbonNine",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPay",
+      type: "sum"
+    },
+    {
+      name: "deductions",
+      type: "sum"
+    },
+    {
+      name: "insuranceUnit",
+      type: "sum"
+    },
+    {
+      name: "insurancePersonage",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsUnit",
+      type: "sum"
+    },
+    {
+      name: "reservedFundsPersonage",
+      type: "sum"
+    },
+    {
+      name: "salary",
+      type: "sum"
+    },
+    {
+      name: "personageTaxes",
+      type: "sum"
+    },
+    {
+      name: "fSalary",
+      type: "sum"
+    },
+    {
+      name: "pauseNoPayOne",
+      type: "sum"
+    }
+  ],
   column: [{
       label: "学科",
       prop: "discipline",
@@ -311,7 +816,7 @@ export const optionList = {
       label: "学历",
       prop: "code",
       type: "select",
-      dicData:[],
+      dicData: [],
       props: {
         label: "dictValue",
         value: "dictValue"

src/views/wel/home/tongjiSchool.vue

@@ -556,21 +556,21 @@ export default {
       }).then(res => {
         let data = res.data.data;
         this.option.data.forEach(e => {
-          if (e.title == "工资总额") {
+          if (e.title == "年工资总额") {
             e.count = data.salaryRental;
           } else if (e.title == "年工资额增长率(%)") {
             e.count = data.annualWageGrowth;
-          } else if (e.title == "人均工资") {
+          } else if (e.title == "年人均工资") {
             e.count = data.averageWage;
           } else if (e.title == "年人均工资增长率(%)") {
             e.count = data.averageWageGrowthRate;
-          } else if (e.title == "保险总额") {
+          } else if (e.title == "年保险总额") {
             e.count = data.insuredSum;
-          } else if (e.title == "保险总额同比(%)") {
+          } else if (e.title == "年保险总额同比(%)") {
             e.count = data.insuredSumYear;
-          } else if (e.title == "人均保险") {
+          } else if (e.title == "年人均保险") {
             e.count = data.insuredMean;
-          } else if (e.title == "人均保险同比(%)") {
+          } else if (e.title == "年人均保险同比(%)") {
             e.count = data.insuredMeanYear;
           }
         });
@@ -589,6 +589,30 @@ export default {
           trigger: "axis",
           axisPointer: {
             type: "shadow"
+          },
+          formatter: function(param) {
+            let obj = param[0].name + "<br/>";
+            param.forEach(el => {
+              if (
+                el.seriesName == "工资增加率" ||
+                el.seriesName == "人数增长率"
+              ) {
+                obj +=
+                  el.marker +
+                  el.seriesName +
+                  ":" +
+                  Number(el.data).toFixed(2) +
+                  "%<br/>";
+              } else {
+                obj +=
+                  el.marker +
+                  el.seriesName +
+                  ":" +
+                  Number(el.data).toFixed(2) +
+                  "<br/>";
+              }
+            });
+            return obj;
           }
         },
         legend: {
@@ -722,6 +746,30 @@ export default {
           trigger: "axis",
           axisPointer: {
             type: "shadow"
+          },
+          formatter: function(param) {
+            let obj = param[0].name + "<br/>";
+            param.forEach(el => {
+              if (
+                el.seriesName == "工资增加率" ||
+                el.seriesName == "人数增长率"
+              ) {
+                obj +=
+                  el.marker +
+                  el.seriesName +
+                  ":" +
+                  Number(el.data).toFixed(2) +
+                  "%<br/>";
+              } else {
+                obj +=
+                  el.marker +
+                  el.seriesName +
+                  ":" +
+                  Number(el.data).toFixed(2) +
+                  "<br/>";
+              }
+            });
+            return obj;
           }
         },
         legend: {