Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2115,7 +2115,7 @@ export default {
           showClose: true,
           message: '导入明细失败的大字有:'+res.data.lose.toString(),
           type: 'error',
-          duration:100000,
+          duration:10000,
         });
       }
       res.data.list.forEach(item => {

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1853,7 +1853,8 @@ export default {
             numCal(row.subsidy) -
             numCal(row.deductions) +
             numCal(row.insurancePersonage) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage)+
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1853,7 +1853,8 @@ export default {
             numCal(row.subsidy) -
             numCal(row.deductions) +
             numCal(row.insurancePersonage) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage)+
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人

src/views/salaryManagement/kindergarten/detailsPage.vue

@@ -1866,7 +1866,8 @@ export default {
             numCal(row.subsidy) -
             numCal(row.deductions) +
             numCal(row.insurancePersonage) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage)+
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1853,7 +1853,8 @@ export default {
             numCal(row.subsidy) -
             numCal(row.deductions) +
             numCal(row.insurancePersonage) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage)+
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1866,7 +1866,8 @@ export default {
             numCal(row.subsidy) -
             numCal(row.deductions) +
             numCal(row.insurancePersonage) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage)+
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人