Commit 50aeb7a2 authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 683e1db7 a451bdac
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
>异常时间:{{ form.errorTime ? form.errorTime : "--" }}</el-col >异常时间:{{ form.errorTime ? form.errorTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12"
>异常结果:{{ form.errorTime ? form.errorTime : "--" }}</el-col >异常结果:{{
form.errorResult ? form.errorResult : "--"
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
...@@ -97,15 +99,26 @@ ...@@ -97,15 +99,26 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -113,7 +126,7 @@ ...@@ -113,7 +126,7 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -121,7 +134,7 @@ ...@@ -121,7 +134,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -112,15 +112,9 @@ ...@@ -112,15 +112,9 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -128,7 +122,24 @@ ...@@ -128,7 +122,24 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -136,7 +147,7 @@ ...@@ -136,7 +147,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -89,15 +89,9 @@ ...@@ -89,15 +89,9 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -105,7 +99,24 @@ ...@@ -105,7 +99,24 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -113,7 +124,7 @@ ...@@ -113,7 +124,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -91,15 +91,9 @@ ...@@ -91,15 +91,9 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -107,7 +101,24 @@ ...@@ -107,7 +101,24 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -115,7 +126,7 @@ ...@@ -115,7 +126,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -87,15 +87,9 @@ ...@@ -87,15 +87,9 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -103,7 +97,24 @@ ...@@ -103,7 +97,24 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -111,7 +122,7 @@ ...@@ -111,7 +122,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -92,15 +92,9 @@ ...@@ -92,15 +92,9 @@
<div class="content"> <div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-form-item label="核查结果:"> <el-form-item label="核查结果:" v-if="form.subAddType == 1">
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1
? "加分/扣分"
: form.checkResult == 2
? "不加分/不扣分"
: "--"
}}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -108,7 +102,24 @@ ...@@ -108,7 +102,24 @@
v-else v-else
> >
<el-radio <el-radio
v-for="(val, i) in dict.checkResult" v-for="(val, i) in dict.checkResultAdd"
:key="i"
:label="val"
>{{ val }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="核查结果:" v-else>
<p v-if="form.view == '查看'">
{{ form.checkResult }}
</p>
<el-radio-group
v-model="form.checkResult"
@input="radioChange"
v-else
>
<el-radio
v-for="(val, i) in dict.checkResultSub"
:key="i" :key="i"
:label="val" :label="val"
>{{ val }}</el-radio >{{ val }}</el-radio
...@@ -116,7 +127,7 @@ ...@@ -116,7 +127,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="form.checkResult == '加分或扣分'"> <div v-if="form.checkResult == '核查扣分' || '核查加分'">
<el-row> <el-row>
<el-form-item <el-form-item
:label="form.view == '查看' ? '绩效规则:' : '修改规则:'" :label="form.view == '查看' ? '绩效规则:' : '修改规则:'"
......
...@@ -109,9 +109,9 @@ export default { ...@@ -109,9 +109,9 @@ export default {
? this.$post("/perform/attend/appeal/list", { ? this.$post("/perform/attend/appeal/list", {
processStatus: this.activeName, processStatus: this.activeName,
}).then((res) => { }).then((res) => {
console.log(res);
if (res.code == 1) { if (res.code == 1) {
this.tableData = res.data; this.tableData = res.data;
this.dict = res.dict;
} }
}) })
: this.getChartsData(); : this.getChartsData();
......
<template> <template>
<div class="page"> <div class="page">
<div style="margin:10px 0"> <div style="margin:10px 0">
<tab-pane :thirdList="thirdList" :activeName="activeName" @handleClick="handleClick"></tab-pane> <tab-pane
:thirdList="thirdList"
:activeName="activeName"
@handleClick="handleClick"
></tab-pane>
</div>
<div class="totalNum flex" v-if="tableData.staff">
<div class="item">
在职员工 <span class="num">{{ tableData.staff.inWorkStaff }}</span>
</div>
<div class="item flex">
<div>
全职 <span class="num">{{ tableData.staff.fullStaff }}</span>
</div> </div>
<div class="totalNum flex" v-if="tableData.staff"> <div>
<div class="item">在职员工 <span class="num">{{tableData.staff.inWorkStaff}}</span></div> 实习 <span class="num">{{ tableData.staff.pricateStaff }}</span>
<div class="item flex"> </div>
<div>全职 <span class="num">{{tableData.staff.fullStaff}}</span></div> <div>
<div>实习 <span class="num">{{tableData.staff.pricateStaff}}</span></div> 兼职 <span class="num">{{ tableData.staff.concurrentlyStaff }}</span>
<div>兼职 <span class="num">{{tableData.staff.concurrentlyStaff}}</span></div>
</div>
<div class="item flex">
<div>试用 <span class="num">{{tableData.staff.onTrialStaff}}</span></div>
<div>正式 <span class="num">{{tableData.staff.formalStaff}}</span></div>
<div>待离职 <span class="num">{{tableData.staff.resignationStaff}}</span></div>
</div>
</div> </div>
<el-row :gutter="20"> </div>
<el-col :span="6" :xs="12" class="mytree">
<div class="titles">选择部门</div>
<!-- default-expand-all -->
<el-scrollbar style="height: 100%">
<el-tree
size="mini"
ref="siteTree"
:data="areaData"
id="el-tree"
node-key="id"
:props="treeProps"
:load="loadNode"
highlight-current
:expand-on-click-node="false"
:render-content="renderContent"
@node-click="handleNodeClick"
>
</el-tree>
</el-scrollbar>
</el-col>
<el-col :span="18" :xs="12">
<el-row> <div class="item flex">
<LayoutTable notDel :data="tableData" :config="tableConfig"> <div>
<el-button type="primary" @click="doExport" :disabled="isExport" 试用 <span class="num">{{ tableData.staff.onTrialStaff }}</span>
size="mini" slot="table-head-left2">导出</el-button> </div>
<el-dropdown class="moreControll" slot="table-head-left2" style="margin-left:20px"> <div>
<el-button type="primary" size="mini"> 正式 <span class="num">{{ tableData.staff.formalStaff }}</span>
更多操作<i class="el-icon-arrow-down el-icon--right"></i> </div>
</el-button> <div>
<el-dropdown-menu slot="dropdown"> 待离职 <span class="num">{{ tableData.staff.resignationStaff }}</span>
<el-dropdown-item> </div>
<el-button type="text">同步数据</el-button> </div>
</el-dropdown-item> </div>
<el-dropdown-item> <el-row :gutter="20">
<el-button type="text" @click="handleImport">导入花名册</el-button> <el-col :span="6" :xs="12" class="mytree">
</el-dropdown-item> <div class="titles">选择部门</div>
<el-dropdown-item> <!-- default-expand-all -->
<el-button type="text" @click="lookDetailHis">历史花名册</el-button> <el-scrollbar style="height:630px;overflow-y: auto;">
</el-dropdown-item> <el-tree
<el-dropdown-item> size="mini"
<el-button type="text" @click="SelectEXport">自定义列表字段</el-button> ref="siteTree"
</el-dropdown-item> :data="areaData"
</el-dropdown-menu> id="el-tree"
</el-dropdown> node-key="id"
:props="treeProps"
:load="loadNode"
highlight-current
:expand-on-click-node="false"
:render-content="renderContent"
@node-click="handleNodeClick"
>
</el-tree>
</el-scrollbar>
</el-col>
<el-col :span="18" :xs="12">
<el-row>
<LayoutTable notDel :data="tableData" :config="tableConfig">
<el-button
type="primary"
@click="doExport"
:disabled="isExport"
size="mini"
slot="table-head-left2"
>导出</el-button
>
<el-dropdown
class="moreControll"
slot="table-head-left2"
style="margin-left:20px"
>
<el-button type="primary" size="mini">
更多操作<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
<el-button type="text">同步数据</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text" @click="handleImport"
>导入花名册</el-button
>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text" @click="lookDetailHis"
>历史花名册</el-button
>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text" @click="SelectEXport"
>自定义列表字段</el-button
>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="freshTime" slot="table-head-left2"> <span class="freshTime" slot="table-head-left2">
<i class="el-icon-refresh"></i> <i class="el-icon-refresh"></i>
<span>上次同步时间:{{tableData.staff.refreshDate}}</span> <span>上次同步时间:{{ tableData.staff.refreshDate }}</span>
</span> </span>
</LayoutTable> </LayoutTable>
</el-row>
</el-col>
</el-row> </el-row>
<!-- 导入对话框 --> </el-col>
<el-dialog </el-row>
:title="upload.title" <!-- 导入对话框 -->
:visible.sync="upload.open" <el-dialog
width="400px" :title="upload.title"
append-to-body :visible.sync="upload.open"
> width="400px"
<el-upload append-to-body
ref="upload" >
:limit="1" <el-upload
accept=".xlsx, .xls" ref="upload"
:headers="upload.headers" :limit="1"
:action="upload.url + '?updateSupport=' + upload.updateSupport" accept=".xlsx, .xls"
:disabled="upload.isUploading" :headers="upload.headers"
:on-progress="handleFileUploadProgress" :action="upload.url + '?updateSupport=' + upload.updateSupport"
:on-success="handleFileSuccess" :disabled="upload.isUploading"
:auto-upload="false" :on-progress="handleFileUploadProgress"
drag :on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处,或
<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的数据
<el-link
type="primary"
style="font-size: 14px"
@click="downloadTemplate"
>下载模板</el-link
> >
<i class="el-icon-upload"></i> </div>
<div class="el-upload__text"> <div class="el-upload__tip" style="color: red" slot="tip">
将文件拖到此处,或 提示:仅允许导入“xls”或“xlsx”格式文件!
<em>点击上传</em> </div>
</div> </el-upload>
<div class="el-upload__tip" slot="tip"> <div slot="footer" class="dialog-footer">
<el-checkbox <el-button type="primary" @click="submitFileForm">确 定</el-button>
v-model="upload.updateSupport" <el-button @click="upload.open = false">取 消</el-button>
/>是否更新已经存在的数据 </div>
<el-link type="primary" style="font-size: 14px" @click="downloadTemplate" </el-dialog>
>下载模板</el-link
>
</div>
<div class="el-upload__tip" style="color: red" slot="tip">
提示:仅允许导入“xls”或“xlsx”格式文件!
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
<!-- 花名册记录查看 --> <!-- 花名册记录查看 -->
<el-drawer <el-drawer title="历史花名册" :visible.sync="drawerhistory" direction="rtl">
title="历史花名册" <div class="hisList">
:visible.sync="drawerhistory" <div class="list mt10" v-for="item in 10" :key="item">
direction="rtl"> <div class="flex flex-align-center flex-pack-justify">
<div class="hisList"> <div>花名册记录</div>
<div class="list mt10" v-for="item in 10" :key="item"> <el-button type="text">查看</el-button>
<div class="flex flex-align-center flex-pack-justify"> </div>
<div>花名册记录</div> <div class="times">
<el-button type="text">查看</el-button> 导出时间:2020-08-13
</div> </div>
<div class="times"> </div>
导出时间:2020-08-13 </div>
</div> </el-drawer>
</div>
</div>
</el-drawer>
<!-- 表格设置 --> <!-- 表格设置 -->
<el-dialog :visible.sync="isdialog" title="自定义列表字段设置"> <el-dialog :visible.sync="isdialog" title="自定义列表字段设置">
<div class="tipsword">请选择表格展示字段,导出的表格中的内容选中的字段将保持一致。</div> <div class="tipsword">
<el-checkbox-group v-model="checkList"> 请选择表格展示字段,导出的表格中的内容选中的字段将保持一致。
<el-checkbox v-for="(item,index) in setcolum" :key="index" :label="item.label"> </div>
</el-checkbox> <el-checkbox-group v-model="checkList">
</el-checkbox-group> <el-checkbox
<div class="mt20" style="text-align:right"> v-for="(item, index) in setcolum"
<el-button>取消</el-button> :key="index"
<el-button type="primary">确定</el-button> :label="item.label"
</div> >
</el-dialog> </el-checkbox>
</el-checkbox-group>
<div class="mt20" style="text-align:right">
<el-button>取消</el-button>
<el-button type="primary">确定</el-button>
</div>
</el-dialog>
<drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" /> <drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" />
</div> </div>
</template> </template>
<script> <script>
import {timestampToTime} from '@/assets/utils/dateFormat.js' import { timestampToTime } from "@/assets/utils/dateFormat.js";
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import tree from "@/assets/mixins/tree"; import tree from "@/assets/mixins/tree";
import TabPane from "@/components/tabPane.vue" import TabPane from "@/components/tabPane.vue";
export default { export default {
name: "StaffList", name: "StaffList",
components: { components: {
drawerShow, drawerShow,
TabPane, TabPane,
},
mixins: [table, tree],
created() {
this.$post("/dept/treeselect", {}).then(({ data }) => {
this.areaData = data.result;
});
},
methods: {
// 自定义字段
SelectEXport() {
this.setcolum = this.config.columns.filter(
(item) => item.label && item.prop
);
this.isdialog = true;
},
/** 导入 */
handleImport() {
this.upload.title = "员工导入";
this.upload.open = true;
},
handleClick(key) {
console.log(key);
this.$store.commit("setThirdPath", key);
this.$router.push({
path: key,
});
},
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
// this.$refs.drawerform.view(row);
// console.log(row)
// this.personData = row
// this.isshowHome = true
this.$router.push({
path: "/staff/view",
query: {
id: row.id,
}, },
mixins: [table,tree], });
created() { },
this.$post("/dept/treeselect", {}).then(({ data }) => {
this.areaData = data.result
})
},
methods: {
// 自定义字段
SelectEXport(){
this.setcolum = this.config.columns.filter(item => item.label&&item.prop)
this.isdialog = true
},
/** 导入 */
handleImport() {
this.upload.title = "员工导入";
this.upload.open = true;
},
handleClick(key){
console.log(key)
this.$store.commit('setThirdPath',key)
this.$router.push({
path:key
})
},
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
// this.$refs.drawerform.view(row);
// console.log(row)
// this.personData = row
// this.isshowHome = true
this.$router.push({
path:'/staff/view',
query:{
id:row.id
}
})
},
handleNodeClick(node) { handleNodeClick(node) {
this.currentNode = node; this.currentNode = node;
this.query = { deptId: node.id }; this.query = { deptId: node.id };
this.getData(); this.getData();
}, },
doExport(){ doExport() {
this.isExport = true; this.isExport = true;
let params = {} let params = {};
for(let value of this.config.search){ for (let value of this.config.search) {
if(this.query[value.name]){ if (this.query[value.name]) {
params[value.name] = this.query[value.name] params[value.name] = this.query[value.name];
} }
} }
if(this.selection.length>0){ if (this.selection.length > 0) {
params['idList'] = this.selection params["idList"] = this.selection;
} }
this.$download("/staff/exportExcel", { this.$download(
...params "/staff/exportExcel",
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { {
this.isExport = false; ...params,
this.$message.error(error.message);
})
},
/** 下载模板操作 */
downloadTemplate() {
this.isExport = true;
this.$download("/staff/downloadTemplate", {}, { type: "excel" })
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
})
},
// 导出花名册
lookDetailHis(){
console.log('1111')
this.drawerhistory = true
},
/** 提交上传文件 */
submitFileForm() {
this.$refs.upload.submit();
},
afterRender(data){
this.tableData.staff.refreshDate = timestampToTime(this.tableData.staff.refreshDate,6)
}
}, },
data() { { type: "excel" }
return { )
// 用户导入参数 .then(() => (this.isExport = false))
upload: { .catch((error) => {
headers:{ this.isExport = false;
Authorization:window.sessionStorage.getItem('token') || '' this.$message.error(error.message);
}, });
// 是否显示弹出层(员工关怀信息导入) },
open: false, /** 下载模板操作 */
// 弹出层标题(员工关怀信息导入) downloadTemplate() {
title: "导入花名册数据", this.isExport = true;
// 是否禁用上传 this.$download("/staff/downloadTemplate", {}, { type: "excel" })
isUploading: false, .then(() => (this.isExport = false))
// 是否更新已经存在的数据 .catch((error) => {
updateSupport: 0, this.isExport = false;
// 上传的地址 this.$message.error(error.message);
url: process.env.VUE_APP_API_BASE_URL+"/staff/importData", });
}, },
config: { // 导出花名册
search: [ lookDetailHis() {
{ console.log("1111");
name: "name", this.drawerhistory = true;
type: "text", },
label: "员工姓名", /** 提交上传文件 */
fuzzy: false submitFileForm() {
}, this.$refs.upload.submit();
{ },
name:'phoneNumber', afterRender(data) {
type:'text', this.tableData.staff.refreshDate = timestampToTime(
label:'手机号', this.tableData.staff.refreshDate,
fuzzy:false 6
} );
], },
columns: [ },
{type: "selection", width: 60}, data() {
{type: "index",label: "序号",width: 50}, return {
{label: "员工姓名", prop: "name"}, // 用户导入参数
{label: "工号", prop: "workNum"}, upload: {
{label: "部门", prop: "deptName"}, headers: {
{label: "职位", prop: "positionName",formatter:this.formatters}, Authorization: window.sessionStorage.getItem("token") || "",
{label: "员工类型", prop: "staffType",formatter: this.formatterType},
{label: "员工状态", prop: "status",formatter: this.formatter},
{label: "是否在政务中心", prop: "source",formatter: this.formatterSource},//未对
{label: "手机号", prop: "phoneNumber",formatter:this.formatters},
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd noDel noEdit row={row} onView={this.toView} />
)
}
}
],
isshowTabPane:false
},
isshowHome:false,
personData:[],
isExport:false,
staffInfo:{},
drawerhistory:false,
checkList:[],
setcolum:[],
isdialog:false
}
}, },
computed:{ // 是否显示弹出层(员工关怀信息导入)
thirdList(){ open: false,
if(!this.$store.state.CurrentThirdArr) return [] // 弹出层标题(员工关怀信息导入)
return this.$store.state.CurrentThirdArr title: "导入花名册数据",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的数据
updateSupport: 0,
// 上传的地址
url: process.env.VUE_APP_API_BASE_URL + "/staff/importData",
},
config: {
search: [
{
name: "name",
type: "text",
label: "员工姓名",
fuzzy: false,
}, },
activeName(){ {
return this.$store.state.ThirdPath name: "phoneNumber",
} type: "text",
} label: "手机号",
fuzzy: false,
},
],
columns: [
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{ label: "员工姓名", prop: "name" },
{ label: "工号", prop: "workNum" },
{ label: "部门", prop: "deptName" },
{ label: "职位", prop: "positionName", formatter: this.formatters },
{
label: "员工类型",
prop: "staffType",
formatter: this.formatterType,
},
{ label: "员工状态", prop: "status", formatter: this.formatter },
{
label: "是否在政务中心",
prop: "source",
formatter: this.formatterSource,
}, //未对
{ label: "手机号", prop: "phoneNumber", formatter: this.formatters },
{
label: "操作",
width: 240,
formatter: (row) => {
return (
<table-buttons
noAdd
noDel
noEdit
row={row}
onView={this.toView}
/>
);
},
},
],
isshowTabPane: false,
},
isshowHome: false,
personData: [],
isExport: false,
staffInfo: {},
drawerhistory: false,
checkList: [],
setcolum: [],
isdialog: false,
}; };
},
computed: {
thirdList() {
if (!this.$store.state.CurrentThirdArr) return [];
return this.$store.state.CurrentThirdArr;
},
activeName() {
return this.$store.state.ThirdPath;
},
},
};
</script> </script>
<style> <style>
.el-card__body { .el-card__body {
padding: 10px; padding: 10px;
...@@ -347,47 +407,47 @@ ...@@ -347,47 +407,47 @@
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.page{ .page {
min-width: 1400px; min-width: 1400px;
} }
.hisList{ .hisList {
padding: 15px; padding: 15px;
.list{ .list {
background-color: rgba(64, 158, 255, 0.1); background-color: rgba(64, 158, 255, 0.1);
font-size: 14px; font-size: 14px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
.times{ .times {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
}
} }
}
} }
.totalNum{ .totalNum {
background: rgba(64, 158, 255,0.2); background: rgba(64, 158, 255, 0.2);
padding: 15px; padding: 15px;
border-left: 4px solid rgb(20, 134, 248); border-left: 4px solid rgb(20, 134, 248);
color: rgb(100, 100, 100); color: rgb(100, 100, 100);
.item{ .item {
padding: 0 10px; padding: 0 10px;
border-right: 1px solid gray; border-right: 1px solid gray;
} }
.item:last-child{ .item:last-child {
border: none; border: none;
} }
.num{ .num {
color: #409EFF; color: #409eff;
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
} }
} }
.controllList{ .controllList {
margin-top: 20px; margin-top: 20px;
.moreControll{ .moreControll {
margin-left: 20px; margin-left: 20px;
} }
} }
.freshTime{ .freshTime {
color: #999; color: #999;
margin-left: 20px; margin-left: 20px;
} }
...@@ -401,16 +461,16 @@ ...@@ -401,16 +461,16 @@
.mytree ::v-deep { .mytree ::v-deep {
padding: 10px; padding: 10px;
.el-tree--highlight-current .el-tree--highlight-current
::v-deep ::v-deep
.el-tree-node.is-checked .el-tree-node.is-checked
> .el-tree-node__content { > .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
.el-tree--highlight-current .el-tree--highlight-current
::v-deep ::v-deep
.el-tree-node.is-current .el-tree-node.is-current
> .el-tree-node__content { > .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
...@@ -472,17 +532,17 @@ ...@@ -472,17 +532,17 @@
width: 24px; width: 24px;
} }
} }
.titles{ .titles {
color: #409EFF; color: #409eff;
font-size: 16px; font-size: 16px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.titles::before{ .titles::before {
content: ''; content: "";
width:6px; width: 6px;
height: 16px; height: 16px;
background-color: #409EFF; background-color: #409eff;
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment