提交

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -482,13 +482,13 @@
                     {{scope.row.projectName}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="contractAmount" :label="user.companyId == 4811 ? '项目总收入' : $t('contractamount')" width="100" align="right">
+                <el-table-column prop="contractAmount" :label="$t('contractamount')" width="100" align="right">
                   <template slot-scope="scope">
                         {{scope.row.contractAmount.toFixed(2)}}
                     </template>
                 </el-table-column>
                 <!--开通合同管理模块的显示已回款金额-->
-                <el-table-column prop="payment" :label="$t('yi-hui-kuan-jin-e')" width="100" align="right" v-if="user.company.packageContract==1">
+                <el-table-column prop="payment" :label="$t('yi-hui-kuan-jin-e')" width="100" align="right" v-if="user.company.packageContract==1 && user.companyId != 4811">
                   <template slot-scope="scope">
                         {{scope.row.payment.toFixed(2)}}
                     </template>
@@ -509,7 +509,7 @@
                   </el-table-column>
                 </template>
 
-                <el-table-column  :label="user.companyId == 4811 ? '项目总支出' : $t('totalcostos')"  width="100" align="right">
+                <el-table-column  :label="$t('totalcostos')"  width="100" align="right">
                   <template slot-scope="scope">
                     <template v-if="user.companyId != 4811">{{(scope.row.budget).toFixed(2)}}</template>
                     <template v-else>
@@ -517,7 +517,7 @@
                     </template>
                   </template>
                 </el-table-column>
-                <el-table-column  :label="$t('yiHuiKuanLiRun')"  width="100" align="right" v-if="user.company.packageContract == 1 && user.companyId != 4811">
+                <el-table-column :label="$t('yiHuiKuanLiRun')"  width="100" align="right" v-if="user.company.packageContract == 1 && user.companyId != 4811">
                   <template slot-scope="scope">
                         {{((scope.row.payment==null?0:scope.row.payment) - (scope.row.budget)).toFixed(2)}}
                     </template>
@@ -527,7 +527,7 @@
                         {{(scope.row.payment==null||scope.row.payment==0)?'-':((scope.row.payment - scope.row.budget)*100/scope.row.payment).toFixed(1)+"%"}}
                     </template>
                 </el-table-column>
-                <el-table-column  :label="user.companyId == 4811 ? '结余' : $t('heTongLiRun')"  width="100" align="right">
+                <el-table-column  :label="$t('heTongLiRun')"  width="100" align="right">
                   <template slot-scope="scope">
                         {{((scope.row.contractAmount==null?0:scope.row.contractAmount) - scope.row.budget).toFixed(2)}}
                     </template>

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

@@ -1689,7 +1689,11 @@ export default {
       },
         res => {
           if (res.code == "ok") {
-            this.expenseMainTypes = res.data
+            if(this.user.roleName == '费用管理员') {
+              this.expenseMainTypes = res.data
+            } else {
+              this.expenseMainTypes = res.data.filter(item => item.id != 14454)
+            }
             this.expenseMainTypeValue = this.expenseMainTypes[0].id
           } else {
             this.$message({