Ver Fonte

财务核酸成本增加审核人

Lijy há 3 anos atrás
pai
commit
3ffc74df33

+ 129 - 5
fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -3,10 +3,13 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="财务核算成本 | 月份选择" style="margin-top:5px;">
-                <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM" @change="changeMonth" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
+                <!-- <el-form-item label="财务核算成本 | 月份选择" style="margin-top:5px;"> -->
+                <el-form-item label="月份选择" style="margin-top:5px;">
+                <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM" @change="changeMonth" :clearable="false" type="month" placeholder="选择月份" style="margin-right: 20px"></el-date-picker>
+                <el-link type="primary" :underline="false" @click="audits()">待审核</el-link>
             </el-form-item>
-            <el-radio-group v-model="radio" @change="switchList" style="margin-left:160px;margin-top:5px;">
+            <!-- <el-radio-group v-model="radio" @change="switchList" style="margin-left:160px;margin-top:5px;"> -->
+            <el-radio-group v-model="radio" @change="switchList" style="margin-left:80px;margin-top:5px;">
                 <el-radio-button label="全部人员" >全部人员({{allFinanceList.length}})</el-radio-button>
                 <el-radio-button label="无项目工时人员">无项目工时人员({{noReportUserList.length}})</el-radio-button>
             </el-radio-group>
@@ -28,8 +31,42 @@
             <el-form-item style="float:right;" v-if="user.role == 1 || user.role == 2 || user.role == 4">
                 <el-link type="primary" :underline="false" @click="showItemDialog">自定义薪资项</el-link>
             </el-form-item>
+            <el-form-item style="float:right;" v-if="user.role == 1 || user.role == 2 || user.role == 4">
+                <el-link type="primary" :underline="false" @click="reviewerVisible = true">设置审核人</el-link>
+            </el-form-item>
             </el-form>
         </el-col>
+
+        <!-- 财务报表审核 -->
+        <el-dialog :title="shenhe" :visible.sync="importVisible" width="650px" :before-close="handleClose">
+            <div>
+                 <el-radio-group v-model="tabPosition" style="margin-bottom: 20px;">
+                    <el-radio-button label="1">待审核</el-radio-button>
+                    <el-radio-button label="2">以驳回</el-radio-button>
+                </el-radio-group>
+                
+                <el-table :data="tableData" style="width: 100%" :height="400">
+                    <el-table-column prop="date" label="日期"></el-table-column>
+                    <el-table-column prop="date" label="操作人"></el-table-column>
+                    <el-table-column prop="date" label="操作"></el-table-column>
+                </el-table>
+            </div>
+        </el-dialog>
+
+        <!-- 设置审核人弹窗 -->
+        <el-dialog title="设置审核人" :visible.sync="reviewerVisible" width="350px" :before-close="handleCloses">
+            <el-form :model="reviewerRuleForm" ref="reviewerRuleForm" label-width="100px" class="demo-ruleForm">
+                <el-form-item label="选择审核人" prop="auditorId" :rules="{required: true, message: '审核人不能为空', trigger: 'blur'}">
+                    <el-select v-model="reviewerRuleForm.auditorId" clearable placeholder="请选择审核人" >
+                        <el-option v-for="(item, index) in people" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="submitreviewerRuleForm('reviewerRuleForm')">提交</el-button>
+                </el-form-item>
+            </el-form>
+        </el-dialog>
+
         
         <!--列表-->
         <!-- 222 -->
@@ -289,6 +326,7 @@
 }
 </style>
 <script>
+import { error } from 'dingtalk-jsapi';
     import util from "../../common/js/util";
 
     export default {
@@ -334,11 +372,95 @@
                 myChart: null,
                 params: null,
                 totalPercent:0,
-                
-                
+                importVisible: false,
+                shenhe: '',
+                tabPosition: '1',
+                reviewerVisible: false,
+                reviewerRuleForm: {
+                    auditorId: ''
+                },
+                people: []
             };
         },
         methods: {
+            arrter() {
+                this.http.post('/user/getEmployeeList', {
+                    departmentId: '-1',
+                    pageIndex: 1,
+                    pageSize: 99999
+                },res =>{
+                    if(res.code == 'ok') {
+                        this.people = res.data.records
+                    }
+                },error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                })
+            },
+            addreviewer() {
+                this.http.post('/finance-auditor/get', {
+                    companyId: this.user.companyId
+                },
+                    res => {
+                        if (res.code == "ok") {
+                            console.log(res.data, '数据')
+                            if(res.data) {
+                                this.reviewerRuleForm.auditorId = res.data.auditorId
+                            } else {
+                                this.reviewerRuleForm.auditorId = ''
+                            }
+                        }
+                    },error => {
+                        this.$message({
+                            message: error,
+                            type: "error"
+                        });
+                    }
+                );
+            },
+            // 提交审核人
+            submitreviewerRuleForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        this.reviewerRuleForm.companyId = this.user.companyId
+                        this.http.post('/finance-auditor/save', this.reviewerRuleForm,
+                        res =>{
+                            if(res.code == 'ok') {
+                                this.$message({
+                                    message: '操作成功',
+                                    type: "success"
+                                });
+                                this.addreviewer()
+                            } else {
+                                this.$message({
+                                    message: '操作失败',
+                                    type: "error"
+                                });
+                            }
+                        },error => {
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                        })
+                        this.reviewerVisible = false
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            handleCloses(done) {
+                var formName = 'reviewerRuleForm'
+                this.$refs[formName].resetFields();
+                done()
+            },
+            // 审核
+            audits() {
+                this.shenhe = '导入审核'
+                this.importVisible = true
+            },
             switchCostList() {
                 //已填日报的人员成本
                 if (this.costListRadio == 1) {
@@ -910,6 +1032,8 @@
             this.getCustomColumn();
             this.getList();
             // this.getProjects();
+            this.addreviewer();
+            this.arrter()
         },
         updated() {
             this.$nextTick(() => {

+ 3 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1227,7 +1227,9 @@
                     pageIndex: '1',
                     pageSize: '20',
                     total: 0,
-                }
+                },
+                toViewloadings: false,
+                tabPositionss: 'top'
             };
         },
         filters: {