Skip to content

A
attendance-performance-platform
Commit 50aeb7a2 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 683e1db7 a451bdac
Show whitespace changes
Inline Side-by-side
Showing with 538 additions and 410 deletions
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @ 50aeb7a2
...@@ -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 == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1 </p>
? "加分/扣分" <el-radio-group
: form.checkResult == 2 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 == '查看'">
{{ form.checkResult }}
</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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @ 50aeb7a2
...@@ -112,15 +112,26 @@ ...@@ -112,15 +112,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 == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1 </p>
? "加分/扣分" <el-radio-group
: form.checkResult == 2 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 == '查看'">
{{ form.checkResult }}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -128,7 +139,7 @@ ...@@ -128,7 +139,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
...@@ -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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ 50aeb7a2
...@@ -89,15 +89,26 @@ ...@@ -89,15 +89,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 == '查看'"> <p v-if="form.view == '查看'">
{{ {{ form.checkResult }}
form.checkResult == 1 </p>
? "加分/扣分" <el-radio-group
: form.checkResult == 2 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 == '查看'">
{{ form.checkResult }}
</p> </p>
<el-radio-group <el-radio-group
v-model="form.checkResult" v-model="form.checkResult"
...@@ -105,7 +116,7 @@ ...@@ -105,7 +116,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
...@@ -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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @ 50aeb7a2
...@@ -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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @ 50aeb7a2
...@@ -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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @ 50aeb7a2
...@@ -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 == '查看' ? '绩效规则：' : '修改规则：'"
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
View file @ 50aeb7a2
...@@ -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();
......
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @ 50aeb7a2
<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>
<div class="totalNum flex" v-if="tableData.staff"> <div class="totalNum flex" v-if="tableData.staff">
<div class="item">在职员工 <span class="num">{{tableData.staff.inWorkStaff}}</span></div> <div class="item">
在职员工 <span class="num">{{ tableData.staff.inWorkStaff }}</span>
</div>
<div class="item flex"> <div class="item flex">
<div>全职 <span class="num">{{tableData.staff.fullStaff}}</span></div> <div>
<div>实习 <span class="num">{{tableData.staff.pricateStaff}}</span></div> 全职 <span class="num">{{ tableData.staff.fullStaff }}</span>
<div>兼职 <span class="num">{{tableData.staff.concurrentlyStaff}}</span></div> </div>
<div>
实习 <span class="num">{{ tableData.staff.pricateStaff }}</span>
</div>
<div>
兼职 <span class="num">{{ tableData.staff.concurrentlyStaff }}</span>
</div>
</div> </div>
<div class="item flex"> <div class="item flex">
<div>试用 <span class="num">{{tableData.staff.onTrialStaff}}</span></div> <div>
<div>正式 <span class="num">{{tableData.staff.formalStaff}}</span></div> 试用 <span class="num">{{ tableData.staff.onTrialStaff }}</span>
<div>待离职 <span class="num">{{tableData.staff.resignationStaff}}</span></div> </div>
<div>
正式 <span class="num">{{ tableData.staff.formalStaff }}</span>
</div>
<div>
待离职 <span class="num">{{ tableData.staff.resignationStaff }}</span>
</div>
</div> </div>
</div> </div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="12" class="mytree"> <el-col :span="6" :xs="12" class="mytree">
<div class="titles">选择部门</div> <div class="titles">选择部门</div>
<!-- default-expand-all --> <!-- default-expand-all -->
<el-scrollbar style="height: 100%"> <el-scrollbar style="height:630px;overflow-y: auto;">
<el-tree <el-tree
size="mini" size="mini"
ref="siteTree" ref="siteTree"
...@@ -36,16 +54,24 @@ ...@@ -36,16 +54,24 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
> >
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</el-col> </el-col>
<el-col :span="18" :xs="12"> <el-col :span="18" :xs="12">
<el-row> <el-row>
<LayoutTable notDel :data="tableData" :config="tableConfig"> <LayoutTable notDel :data="tableData" :config="tableConfig">
<el-button type="primary" @click="doExport" :disabled="isExport" <el-button
size="mini" slot="table-head-left2">导出</el-button> type="primary"
<el-dropdown class="moreControll" slot="table-head-left2" style="margin-left:20px"> @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"> <el-button type="primary" size="mini">
更多操作<i class="el-icon-arrow-down el-icon--right"></i> 更多操作<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
...@@ -54,20 +80,26 @@ ...@@ -54,20 +80,26 @@
<el-button type="text">同步数据</el-button> <el-button type="text">同步数据</el-button>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" @click="handleImport">导入花名册</el-button> <el-button type="text" @click="handleImport"
>导入花名册</el-button
>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" @click="lookDetailHis">历史花名册</el-button> <el-button type="text" @click="lookDetailHis"
>历史花名册</el-button
>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" @click="SelectEXport">自定义列表字段</el-button> <el-button type="text" @click="SelectEXport"
>自定义列表字段</el-button
>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </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-row>
...@@ -98,10 +130,11 @@ ...@@ -98,10 +130,11 @@
<em>点击上传</em> <em>点击上传</em>
</div> </div>
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的数据
v-model="upload.updateSupport" <el-link
/>是否更新已经存在的数据 type="primary"
<el-link type="primary" style="font-size: 14px" @click="downloadTemplate" style="font-size: 14px"
@click="downloadTemplate"
>下载模板</el-link >下载模板</el-link
> >
</div> </div>
...@@ -116,10 +149,7 @@ ...@@ -116,10 +149,7 @@
</el-dialog> </el-dialog>
<!-- 花名册记录查看 --> <!-- 花名册记录查看 -->
<el-drawer <el-drawer title="历史花名册" :visible.sync="drawerhistory" direction="rtl">
title="历史花名册"
:visible.sync="drawerhistory"
direction="rtl">
<div class="hisList"> <div class="hisList">
<div class="list mt10" v-for="item in 10" :key="item"> <div class="list mt10" v-for="item in 10" :key="item">
<div class="flex flex-align-center flex-pack-justify"> <div class="flex flex-align-center flex-pack-justify">
...@@ -135,9 +165,15 @@ ...@@ -135,9 +165,15 @@
<!-- 表格设置 --> <!-- 表格设置 -->
<el-dialog :visible.sync="isdialog" title="自定义列表字段设置"> <el-dialog :visible.sync="isdialog" title="自定义列表字段设置">
<div class="tipsword">请选择表格展示字段，导出的表格中的内容选中的字段将保持一致。</div> <div class="tipsword">
请选择表格展示字段，导出的表格中的内容选中的字段将保持一致。
</div>
<el-checkbox-group v-model="checkList"> <el-checkbox-group v-model="checkList">
<el-checkbox v-for="(item,index) in setcolum" :key="index" :label="item.label"> <el-checkbox
v-for="(item, index) in setcolum"
:key="index"
:label="item.label"
>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<div class="mt20" style="text-align:right"> <div class="mt20" style="text-align:right">
...@@ -151,41 +187,43 @@ ...@@ -151,41 +187,43 @@
</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], mixins: [table, tree],
created() { created() {
this.$post("/dept/treeselect", {}).then(({ data }) => { this.$post("/dept/treeselect", {}).then(({ data }) => {
this.areaData = data.result this.areaData = data.result;
}) });
}, },
methods: { methods: {
// 自定义字段 // 自定义字段
SelectEXport(){ SelectEXport() {
this.setcolum = this.config.columns.filter(item => item.label&&item.prop) this.setcolum = this.config.columns.filter(
this.isdialog = true (item) => item.label && item.prop
);
this.isdialog = true;
}, },
/** 导入 */ /** 导入 */
handleImport() { handleImport() {
this.upload.title = "员工导入"; this.upload.title = "员工导入";
this.upload.open = true; this.upload.open = true;
}, },
handleClick(key){ handleClick(key) {
console.log(key) console.log(key);
this.$store.commit('setThirdPath',key) this.$store.commit("setThirdPath", key);
this.$router.push({ this.$router.push({
path:key path: key,
}) });
}, },
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -202,11 +240,11 @@ ...@@ -202,11 +240,11 @@
// this.personData = row // this.personData = row
// this.isshowHome = true // this.isshowHome = true
this.$router.push({ this.$router.push({
path:'/staff/view', path: "/staff/view",
query:{ query: {
id:row.id id: row.id,
} },
}) });
}, },
handleNodeClick(node) { handleNodeClick(node) {
...@@ -214,23 +252,29 @@ ...@@ -214,23 +252,29 @@
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 => { {
...params,
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}) });
}, },
/** 下载模板操作 */ /** 下载模板操作 */
downloadTemplate() { downloadTemplate() {
...@@ -240,27 +284,30 @@ ...@@ -240,27 +284,30 @@
.catch((error) => { .catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}) });
}, },
// 导出花名册 // 导出花名册
lookDetailHis(){ lookDetailHis() {
console.log('1111') console.log("1111");
this.drawerhistory = true this.drawerhistory = true;
}, },
/** 提交上传文件 */ /** 提交上传文件 */
submitFileForm() { submitFileForm() {
this.$refs.upload.submit(); this.$refs.upload.submit();
}, },
afterRender(data){ afterRender(data) {
this.tableData.staff.refreshDate = timestampToTime(this.tableData.staff.refreshDate,6) this.tableData.staff.refreshDate = timestampToTime(
} this.tableData.staff.refreshDate,
6
);
},
}, },
data() { data() {
return { return {
// 用户导入参数 // 用户导入参数
upload: { upload: {
headers:{ headers: {
Authorization:window.sessionStorage.getItem('token') || '' Authorization: window.sessionStorage.getItem("token") || "",
}, },
// 是否显示弹出层（员工关怀信息导入） // 是否显示弹出层（员工关怀信息导入）
open: false, open: false,
...@@ -271,7 +318,7 @@ ...@@ -271,7 +318,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_API_BASE_URL+"/staff/importData", url: process.env.VUE_APP_API_BASE_URL + "/staff/importData",
}, },
config: { config: {
search: [ search: [
...@@ -279,61 +326,74 @@ ...@@ -279,61 +326,74 @@
name: "name", name: "name",
type: "text", type: "text",
label: "员工姓名", label: "员工姓名",
fuzzy: false fuzzy: false,
}, },
{ {
name:'phoneNumber', name: "phoneNumber",
type:'text', type: "text",
label:'手机号', label: "手机号",
fuzzy:false fuzzy: false,
} },
], ],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "员工姓名", prop: "name"}, { label: "员工姓名", prop: "name" },
{label: "工号", prop: "workNum"}, { label: "工号", prop: "workNum" },
{label: "部门", prop: "deptName"}, { label: "部门", prop: "deptName" },
{label: "职位", prop: "positionName",formatter:this.formatters}, { label: "职位", prop: "positionName", formatter: this.formatters },
{label: "员工类型", prop: "staffType",formatter: this.formatterType}, {
{label: "员工状态", prop: "status",formatter: this.formatter}, label: "员工类型",
{label: "是否在政务中心", prop: "source",formatter: this.formatterSource},//未对 prop: "staffType",
{label: "手机号", prop: "phoneNumber",formatter:this.formatters}, formatter: this.formatterType,
},
{ label: "员工状态", prop: "status", formatter: this.formatter },
{
label: "是否在政务中心",
prop: "source",
formatter: this.formatterSource,
}, //未对
{ label: "手机号", prop: "phoneNumber", formatter: this.formatters },
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd noDel noEdit row={row} onView={this.toView} /> <table-buttons
) noAdd
} noDel
} noEdit
], row={row}
isshowTabPane:false onView={this.toView}
/>
);
}, },
isshowHome:false,
personData:[],
isExport:false,
staffInfo:{},
drawerhistory:false,
checkList:[],
setcolum:[],
isdialog:false
}
}, },
computed:{ ],
thirdList(){ isshowTabPane: false,
if(!this.$store.state.CurrentThirdArr) return []
return this.$store.state.CurrentThirdArr
}, },
activeName(){ isshowHome: false,
return this.$store.state.ThirdPath 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;
} }
...@@ -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