薪资记录

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -34,9 +34,51 @@
             <el-form-item style="float:right;" v-if="(user.role == 1 || user.role == 2 || user.role == 4) && user.timeType.financeAudit == '1'">
                 <el-link type="primary" :underline="false" @click="reviewerVisible = true">设置审核人</el-link>
             </el-form-item>
+            <el-form-item style="float:right;" v-if="(user.role == 1 || user.role == 2 || user.role == 4) && user.timeType.financeAudit == '1'">
+                <el-link type="primary" :underline="false" @click="xzjl(),xzImportVisible = true">上传记录</el-link>
+            </el-form-item>
             </el-form>
         </el-col>
-
+        <!-- 上传记录 -->
+        <el-dialog title="薪资上传记录" :visible.sync="xzImportVisible" width="1100px" :before-close="handleClose">
+            <div>
+                <el-table :data="xzList" style="width: 100%" :height="400">
+                    <el-table-column prop="userName" label="操作人"></el-table-column>
+                    <el-table-column prop="ymonth" label="所属月份"></el-table-column>
+                    <el-table-column prop="fileName" label="文件名">
+                        <template slot-scope="scope">
+                            <div>
+                                <el-link type="primary" @click="downloadByA({name:scope.row.fileName,url:scope.row.serverName})"> {{scope.row.fileName}}</el-link>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="recoverReport" label="是否覆盖日报成本" width="150">
+                        <template slot-scope="scope">
+                            <div>
+                                {{scope.row.recoverReport == 1? '是' : '否'}}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="recoverMonthcost" label="是否覆盖人员月成本" width="150">
+                        <template slot-scope="scope">
+                            <div>
+                                {{scope.row.recoverMonthcost == 1? '是' : '否'}}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="indate" label="上传时间"></el-table-column>
+                    <!-- <el-table-column prop="date" label="操作" v-if="(tabPosition == 1 || tabPosition == 0) && (reviewerRuleForm.auditorId == user.id || user.role == 1 || user.role == 2)">
+                        <template slot-scope="scope">
+                            <div>
+                                <el-button type="primary" size="small" v-if="tabPosition == 0" @click="operationList(0, scope.row.id)">通过</el-button>
+                                <el-button type="warning" size="small" v-if="tabPosition == 0" @click="operationList(1, scope.row.id)">驳回</el-button>
+                                <el-button type="warning" size="small" v-if="tabPosition == 1" @click="operationList(2, scope.row.id)">撤销</el-button>
+                            </div>
+                        </template>
+                    </el-table-column> -->
+                </el-table>
+            </div>
+        </el-dialog>
         <!-- 财务报表审核 -->
         <el-dialog :title="shenhe" :visible.sync="importVisible" width="1100px" :before-close="handleClose">
             <div>
@@ -414,7 +456,9 @@ import { error } from 'dingtalk-jsapi';
                 people: [],
                 revaelse: '',
                 reviewLis: [],
-                ovReviewLis: []
+                ovReviewLis: [],
+                xzImportVisible: false,
+                xzList: []
             };
         },
         methods: {
@@ -1213,6 +1257,31 @@ import { error } from 'dingtalk-jsapi';
                         type: "error"
                     });
                 });
+            },
+            // 获取薪资上传记录
+            xzjl() {
+                this.http.post('/finance-import/list', {
+                    companyId: this.user.companyId,
+                    // pageIndex:1,
+                    // pageSize: 9999
+                },
+                res => {
+                    if (res.code == "ok") {
+                       console.log('123',res.data)
+                       this.xzList = res.data.passList
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
             }
 
         },

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

@@ -3,13 +3,21 @@
         <!--列表-->
         <div>
             <el-card class="box-card daily" shadow="never">
-                <div slot="header" class="clearfix" id="clearfix" style="padding-left: 255px;">
-                    <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;">
+                <div style="position: relative;margin-top: -20px;margin-bottom: 20px">
+                <!-- <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;"> -->
+                <div class="jjk" style="display:inline-block;position:absolute;top:10px;background:#fff;left:0px;">
                         <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM"
                          style="width:190px;"
                          @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
                          <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
                     </div>
+                <div slot="header" class="clearfix" id="clearfix" style="padding-left: 255px;">
+                    <!-- <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;">
+                        <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM"
+                         style="width:190px;"
+                         @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
+                         <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
+                    </div> -->
                         <span v-for="(item,index) in allDate" :id="'day'+index" :class="index==choseDay?'chooseDate date_item':'date_item'" 
                         @click="choseDate(index, item)" :key="index" >
                         <div :style="'display:inline-block;'+(item.state == null?'padding:0px 6px;':'')" >
@@ -20,6 +28,7 @@
                         <i v-if="item.state != null" class="iconfont firerock-icondot" :class="statusStyle[item.state]"></i>
                         </span>
                 </div>
+                </div>
                 <div style="display:flex;">
                 <div v-if="user.role > 0 || user.manageDeptId != 0" >
                     <div style="width:190px;">