瀏覽代碼

修改bug

QuKatie 3 年之前
父節點
當前提交
57195e2dff

+ 2 - 2
src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1322,7 +1322,7 @@ export default {
         column.property == "subsidy" ||
         column.property == "deductions" ||
         column.property == "salary" ||
-        column.property == "wage"
+        column.property == "fSalary"
       ) {
         return "headerCellClass";
       }
@@ -1785,7 +1785,7 @@ export default {
           numCal(row.reservedFundsPersonage);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.wage =
+      row.fSalary =
         numCal(row.salary) -
         numCal(row.personageTaxes) -
         numCal(row.insurancePersonage) -

+ 1 - 1
src/views/salaryManagement/highSchool/js/optionList.js

@@ -1387,7 +1387,7 @@ export const optionList = {
     },
     {
       label: "实发工资",
-      prop: "wage",
+      prop: "fSalary",
       width: 100,
       overHidden: true,
       rules: [{

+ 2 - 2
src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1322,7 +1322,7 @@ export default {
         column.property == "subsidy" ||
         column.property == "deductions" ||
         column.property == "salary" ||
-        column.property == "wage"
+        column.property == "fSalary"
       ) {
         return "headerCellClass";
       }
@@ -1785,7 +1785,7 @@ export default {
           numCal(row.reservedFundsPersonage);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.wage =
+      row.fSalary =
         numCal(row.salary) -
         numCal(row.personageTaxes) -
         numCal(row.insurancePersonage) -

+ 1 - 1
src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -1387,7 +1387,7 @@ export const optionList = {
     },
     {
       label: "实发工资",
-      prop: "wage",
+      prop: "fSalary",
       width: 100,
       overHidden: true,
       rules: [{

+ 2 - 2
src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1322,7 +1322,7 @@ export default {
         column.property == "subsidy" ||
         column.property == "deductions" ||
         column.property == "salary" ||
-        column.property == "wage"
+        column.property == "fSalary"
       ) {
         return "headerCellClass";
       }
@@ -1785,7 +1785,7 @@ export default {
           numCal(row.reservedFundsPersonage);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.wage =
+      row.fSalary =
         numCal(row.salary) -
         numCal(row.personageTaxes) -
         numCal(row.insurancePersonage) -

+ 1 - 1
src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -1387,7 +1387,7 @@ export const optionList = {
     },
     {
       label: "实发工资",
-      prop: "wage",
+      prop: "fSalary",
       width: 100,
       overHidden: true,
       rules: [{

+ 3 - 3
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -150,7 +150,7 @@
           <template slot="salaryLabel">
             <el-tag>应发工资:</el-tag>
           </template>
-          <template slot="wageLabel">
+          <template slot="fSalaryLabel">
             <el-tag>实发工资:</el-tag>
           </template>
           <!-- 1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数) -->
@@ -1326,7 +1326,7 @@ export default {
         column.property == "subsidy" ||
         column.property == "deductions" ||
         column.property == "salary" ||
-        column.property == "wage"
+        column.property == "fSalary"
       ) {
         return "headerCellClass";
       }
@@ -1789,7 +1789,7 @@ export default {
           numCal(row.reservedFundsPersonage);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.wage =
+      row.fSalary =
         numCal(row.salary) -
         numCal(row.personageTaxes) -
         numCal(row.insurancePersonage) -

+ 1 - 1
src/views/salaryManagement/primarySchool/js/optionList.js

@@ -1387,7 +1387,7 @@ export const optionList = {
     },
     {
       label: "实发工资",
-      prop: "wage",
+      prop: "fSalary",
       width: 100,
       overHidden: true,
       rules: [{

+ 1 - 1
src/views/statisticAnalysis/salaryInquiry/js/optionList.js

@@ -913,7 +913,7 @@ export const optionList = {
     },
     {
       label: "实发工资",
-      prop: "wage",
+      prop: "fSalary",
       width: 100,
       overHidden: true,
       span: 4