Lijy преди 2 години
родител
ревизия
b605878054

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -151,6 +151,7 @@
                     {{scope.row.name}}
                   </template>
                 </el-table-column>
+                <el-table-column prop="executor_name" label="执行人"  width="200"></el-table-column>
                 <el-table-column prop="plan_hours" label="计划工时(h)"  width="150">
                   <template slot-scope="scope">
                         {{scope.row.plan_hours == null? 0:scope.row.plan_hours.toFixed(1)}}

+ 2 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -769,7 +769,7 @@
                     return;
                 } else if (this.radio == this.namess) {
                     url = '/project/getDegreeCost'
-                }
+                } 
                 this.http.post(url, param,
                 res => {
                     if (res.code == "ok") {
@@ -1021,6 +1021,7 @@
                     });
                 });
             },
+
             // 左右滚动
             scrollFunction () {
                 this.domObj = document.getElementById('clearfix') // 通过id获取要设置的div