|
@@ -21,11 +21,11 @@
|
|
|
<a-month-picker format="YYYY-MM" placeholder="请输入考勤月份" v-model="headMonth" @change="onDateChange"/>
|
|
|
<!-- <a style="font-weight: 600;margin-left: 6px" @click="onClearSelected"> > </a> -->
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i>
|
|
|
- <a style="margin-left: 40px" @click="errorInfoShow()">异常打卡</a>
|
|
|
+ <a style="margin-left: 20px" @click="errorInfoShow()">异常打卡</a>
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i>
|
|
|
- <a style="margin-left: 40px" @click="jiaBanInfoShow()">加班打卡</a>
|
|
|
+ <a style="margin-left: 20px" @click="jiaBanInfoShow()">加班打卡</a>
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i>
|
|
|
- <a-dropdown style="margin-left: 40px" v-has="'viewClockUserInfo:more'">
|
|
|
+ <a-dropdown style="margin-left: 20px" v-has="'viewClockUserInfo:more'">
|
|
|
<a class="ant-dropdown-link">
|
|
|
更多操作 <a-icon type="down"/>
|
|
|
</a>
|
|
@@ -48,7 +48,8 @@
|
|
|
</a-menu-item>
|
|
|
</a-menu>
|
|
|
</a-dropdown>
|
|
|
- <a style="margin-left: 40px" @click="handleExportXlsBegin('员工考勤信息')">导出</a>
|
|
|
+ <a style="margin-left: 20px" @click="handleExportXlsBegin('员工考勤信息')">导出</a>
|
|
|
+ <a style="margin-left: 20px" @click="showModal4()">导出加班</a>
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i>
|
|
|
</div>
|
|
|
|
|
@@ -198,9 +199,44 @@
|
|
|
>
|
|
|
<j-dict-select-tag style="width:100%;" v-model="multiple" placeholder="请选择倍数"
|
|
|
dictCode="multiple" />
|
|
|
-
|
|
|
+ </a-modal>
|
|
|
+
|
|
|
+ <a-modal style="z-index:999"
|
|
|
+ title="请选择导出条件"
|
|
|
+ :visible="visibleShowModal4"
|
|
|
+ :confirm-loading="confirmLoading"
|
|
|
+ @ok="handleOk4"
|
|
|
+ @cancel="handleCancel4"
|
|
|
+ >
|
|
|
+ 姓名:
|
|
|
+ <a-input placeholder="请输入姓名" v-model="par_name" style="width:100%;margin-bottom: 10px;" />
|
|
|
+ 工号:
|
|
|
+ <a-input placeholder="请输入工号" v-model="par_code" style="width:100%;margin-bottom: 10px;" />
|
|
|
+ 部门:
|
|
|
+ <j-tree-select style="width:100%;margin-bottom: 10px;" v-model="par_departIds" dict="sys_depart,depart_name,id"
|
|
|
+ pid-field="parent_id" placeholder="请选择部门">
|
|
|
+ </j-tree-select>
|
|
|
+ 加班事由:
|
|
|
+ <j-dict-select-tag style="width:100%;margin-bottom: 10px;" v-model="par_works_type" placeholder="请选择加班类型"
|
|
|
+ dictCode="works_type" />
|
|
|
+ 时间:
|
|
|
+ <a-range-picker
|
|
|
+ style="width:100%;margin-bottom: 10px;"
|
|
|
+ format="YYYY-MM-DD"
|
|
|
+ :placeholder="['开始时间', '结束时间']"
|
|
|
+ @change="onDateChange2"
|
|
|
+ @ok="onDateOk2"
|
|
|
+ />
|
|
|
+ 支付类型:
|
|
|
+ <j-dict-select-tag style="width:100%;margin-bottom: 10px;" v-model="par_pay_type" placeholder="请选择支付类型"
|
|
|
+ dictCode="pay_type" />
|
|
|
+ 支付倍数:
|
|
|
+ <j-dict-select-tag style="width:100%;margin-bottom: 10px;" v-model="par_multiple" placeholder="请选择倍数"
|
|
|
+ dictCode="multiple" />
|
|
|
</a-modal>
|
|
|
+
|
|
|
</a-card>
|
|
|
+
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
@@ -225,6 +261,14 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ par_name:'',//导出加班 姓名
|
|
|
+ par_code:'',//导出加班 工号
|
|
|
+ par_departIds:'',//导出加班 部门
|
|
|
+ par_works_type:'',//导出加班 加班事由
|
|
|
+ par_pay_type:'',//导出加班 支付类型
|
|
|
+ par_multiple:'',//导出加班 支付倍数
|
|
|
+ par_begin:'',//导出加班 开始时间
|
|
|
+ par_end:'',//导出加班 结束时间
|
|
|
errorViewDate:'',
|
|
|
errorSt:'',
|
|
|
errorUserId:'',
|
|
@@ -238,6 +282,7 @@
|
|
|
demo:'',//加班事由
|
|
|
modal2Visible: false,//加班信息详情
|
|
|
visibleShowModal3:false,//薪资倍数选择框
|
|
|
+ visibleShowModal4:false,//加班导出弹框
|
|
|
multiple:1,//薪资倍数选择框倍数
|
|
|
area:'',//点击倍数弹框的区域 top/right/in
|
|
|
recordPar:'',//弹框参数
|
|
@@ -426,6 +471,7 @@
|
|
|
return;
|
|
|
}
|
|
|
this.queryParam.userType=this.userType;
|
|
|
+ this.queryParam.excelType = "0";
|
|
|
this.handleExportXls(name);
|
|
|
},
|
|
|
handleInfo(st){
|
|
@@ -466,6 +512,14 @@
|
|
|
that.selectedRowKeys = [];
|
|
|
})
|
|
|
},
|
|
|
+ onDateChange2: function (value, dateString) {
|
|
|
+ // console.log(dateString[0],dateString[1]);
|
|
|
+ this.par_begin=dateString[0];
|
|
|
+ this.par_end=dateString[1];
|
|
|
+ },
|
|
|
+ onDateOk2(value) {
|
|
|
+ // console.log(value);
|
|
|
+ },
|
|
|
errorInfoShow(){
|
|
|
this.queryParam.showState=1;
|
|
|
this.loadData(1);
|
|
@@ -493,6 +547,9 @@
|
|
|
this.area = area;
|
|
|
this.recordPar = record;
|
|
|
this.visibleShowModal3 = true;
|
|
|
+ },
|
|
|
+ showModal4() {//加班导出选择框
|
|
|
+ this.visibleShowModal4 = true;
|
|
|
},
|
|
|
handleOk(e) {
|
|
|
if(this.errorSt == 0){
|
|
@@ -532,10 +589,28 @@
|
|
|
|
|
|
}
|
|
|
},
|
|
|
+ handleOk4(e) {
|
|
|
+ this.queryParam.par_name = this.par_name;//导出加班 姓名
|
|
|
+ this.queryParam.par_code = this.par_code;//导出加班 工号
|
|
|
+ this.queryParam.par_departIds = this.par_departIds;//导出加班 部门
|
|
|
+ this.queryParam.par_works_type = this.par_works_type;//导出加班 加班事由
|
|
|
+ this.queryParam.par_pay_type = this.par_pay_type;//导出加班 支付类型
|
|
|
+ this.queryParam.par_multiple = this.par_multiple;//导出加班 支付倍数
|
|
|
+ this.queryParam.par_begin = this.par_begin;//导出加班 开始时间
|
|
|
+ this.queryParam.par_end = this.par_end;//导出加班 结束时间
|
|
|
+
|
|
|
+ this.queryParam.excelType = "1";
|
|
|
+ this.handleExportXls('员工加班信息');
|
|
|
+ this.visibleShowModal4 = false;
|
|
|
+ },
|
|
|
handleCancel3(e) {
|
|
|
this.multiple = 1;
|
|
|
this.visibleShowModal3 = false;
|
|
|
|
|
|
+ },
|
|
|
+ handleCancel4(e) {
|
|
|
+ this.visibleShowModal4 = false;
|
|
|
+
|
|
|
},
|
|
|
handleCancel(e) {
|
|
|
console.log('Clicked cancel button');
|