Merge branch 'master' of http://47.100.37.243:10191/quyueting/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-yzr/src/views/expense/expense.vue

@@ -284,7 +284,8 @@
                     currentClick == '2-1' &&
                     (user.roleName == '超级管理员' ||
                       user.roleName == '系统管理员' ||
-                      user.roleName == '财务管理员')
+                      user.roleName == '财务管理员' ||
+                      user.roleName == '人事财务')
                   "
                 >
                   <el-button @click="showSyncFeiShuDialog = true" size="small"

fhKeeper/formulahousekeeper/timesheet-yzr/src/views/paymentApplication/paymentApplication.vue

@@ -148,6 +148,8 @@
             v-loading="listLoading"
             :height="tableHeight - currentClickNum"
             style="width: 100%"
+            :summary-method="getSummaries"
+            show-summary
           >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column prop="code" label="单据编号" width="120">
@@ -2071,7 +2073,7 @@ export default {
           sums[index] = this.$t("benYeJineheJi"); //this.$t('other.totals');
           return;
         }
-        if (index === 4) {
+        if (index === 9) {
           const values = data.map((item) => Number(item[column.property]));
           console.log("amount=" + values);
           if (!values.every((value) => isNaN(value))) {