Selaa lähdekoodia

调整加班时长成本的显示

Lijy 3 vuotta sitten
vanhempi
commit
32f68f0c19

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

@@ -299,7 +299,7 @@
                 <!-- <el-table-column prop="workingTime" label="加班时长" width="180"></el-table-column>  -->
                 <el-table-column prop="overtimeHours" label="加班时长" width="180"></el-table-column> 
                 <el-table-column prop="cost" label="成本" width="180" v-if="permissions.reportCost"></el-table-column> 
-                <el-table-column prop="cost" label="操作" width="180" v-if="permissions.reportCost">
+                <el-table-column prop="cost" label="操作" width="180">
                     <template slot-scope="scope">
                       <div>
                         <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>
@@ -431,7 +431,7 @@
                 <el-table-column prop="workingTime" label="当天工作时长(h)" width="160"></el-table-column>
                 <el-table-column prop="username" label="姓名" width="120"></el-table-column>
                 <el-table-column prop="overtimeHours" label="加班时长(h)" width="130"></el-table-column>
-                <el-table-column prop="cost" label="加班成本" width="120"></el-table-column>
+                <el-table-column prop="cost" label="加班成本" width="120" v-if="permissions.reportCost"></el-table-column>
              </el-table>
           </div>
         </el-dialog>

+ 7 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -532,7 +532,13 @@
                     highlight-current-row
                     max-height="240"
                     style="width: 100%;margin-top:10px;margin-bottom:15px">
-                    <el-table-column label="序号" prop="documentType" min-width="40" align="center"></el-table-column>
+                    <el-table-column label="序号" prop="documentType" min-width="40" align="center">
+                        <template slot-scope="scope">
+                            <div>
+                                {{scope.$index + 1}}
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="文件名称" prop="documentName" min-width="180"></el-table-column>
                     <el-table-column label="文件大小" prop="size" min-width="60" align="center"></el-table-column>
                     <el-table-column label="创建人" prop="creatorName" min-width="60" align="center"></el-table-column>