提交相关代码

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

@@ -482,7 +482,7 @@
                     {{scope.row.projectName}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="contractAmount" :label="$t('contractamount')" width="100" align="right">
+                <el-table-column prop="contractAmount" :label="user.companyId == 4811 ? '项目总收入' : $t('contractamount')" width="100" align="right">
                   <template slot-scope="scope">
                         {{scope.row.contractAmount.toFixed(2)}}
                     </template>
@@ -509,7 +509,7 @@
                   </el-table-column>
                 </template>
 
-                <el-table-column  :label="$t('totalcostos')"  width="100" align="right">
+                <el-table-column  :label="user.companyId == 4811 ? '项目总支出' : $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,17 +517,17 @@
                     </template>
                   </template>
                 </el-table-column>
-                <el-table-column  :label="$t('yiHuiKuanLiRun')"  width="100" align="right" v-if="user.company.packageContract == 1">
+                <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>
                 </el-table-column>
-                <el-table-column  :label="$t('yiHuiKuanLiRunShuai')"  width="120" align="right" v-if="user.company.packageContract==1">
+                <el-table-column  :label="$t('yiHuiKuanLiRunShuai')"  width="120" align="right" v-if="user.company.packageContract==1 && user.companyId != 4811">
                   <template slot-scope="scope">
                         {{(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="$t('heTongLiRun')"  width="100" align="right">
+                <el-table-column  :label="user.companyId == 4811 ? '结余' : $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/project/list.vue

@@ -5608,7 +5608,8 @@ a {
                             formData.append('reviwerId', this.addForm.reviwerId);
                         }
 
-                        formData.append('deptIds', this.addForm.deptIds)
+                        const deptListNew = this.addForm.deptIds.filter(item => item)
+                        formData.append('deptIds', deptListNew.join(','))
                         this.http.uploadFile(this.port.project.add,formData,
                         res => {
                             this.addLoading = false;