再次提交

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -108,9 +108,11 @@
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && (item1.state == 0 || item1.state == -1)" type="primary" :loading="logining" size="small" @click="approve(item1.id, item1)">通过</el-button>
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && (item1.state == 0 || item1.state == -1)" type="danger" :loading="logining" size="small" @click="showDenyDialog(item1.id,0, item1)">驳回</el-button>
                                 <!--自己可以撤回待审核状态的报告 -->
-                                <el-button v-if="(user.id == item1.id || user.role == 1 || user.role == 2 || user.manageDeptId != 0) && (item1.state == 0 || item1.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">撤回</el-button>
+                                <el-button v-if="user.id == item1.id && (item1.state == 0 || item1.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">撤回</el-button>
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && item1.state == 1" type="normal" :loading="logining" size="small" @click="showDenyDialog(item1.id,1, item1)">撤销</el-button>
-                                <el-button v-if="item1.state >= 2 && (user.id == item1.id || user.role == 1 || user.role == 2 || user.manageDeptId != 0)" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
+                                <el-button v-if="item1.state >= 2 && user.id == item1.id" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
+                                <el-button v-if="(user.role == 1 || user.role == 2 || user.manageDeptId != 0) && item1.state != 1" size="small" @click="guanli(item1, item1)" style="float: right;">删除</el-button>
+                                
                             </div>
                             <div class="one_daily_body">
                                 <el-timeline>
@@ -1751,7 +1753,7 @@
                 .then(() => {
                     this.listLoading = true;
                     this.http.post('/report/delete',{ 
-                        userId: item.creatorId,
+                        userId: item.id,
                         date: this.workForm.createDate
                     },
                     res => {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue

@@ -105,12 +105,12 @@
             </el-table-column>
             <el-table-column prop="project" label="项目" >
             </el-table-column>
-            <el-table-column prop="time" label="工作时长(h)" align="right">
+            <el-table-column prop="time" label="工作时长(h)">
                 <template slot-scope="scope">
                     <span>{{scope.row.time.toFixed(1)}}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="cost" label="成本(元)" align="right">
+            <el-table-column prop="cost" label="成本(元)">
             </el-table-column>
             <el-table-column prop="state" label="状态">
                 <template slot-scope="scope">