From 883c48767e301242bef64e8423a769225b04284f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 06 九月 2024 09:13:25 +0800
Subject: [PATCH] 1.日工资计时开发完成
---
src/api/attendanceModule.js | 27 ++
src/views/attendanceModule/attendanceDay.vue | 591 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 615 insertions(+), 3 deletions(-)
diff --git a/src/api/attendanceModule.js b/src/api/attendanceModule.js
index a47fcdb..07dae77 100644
--- a/src/api/attendanceModule.js
+++ b/src/api/attendanceModule.js
@@ -80,3 +80,30 @@
data
})
}
+
+// 鏃ヨ鏃跺伐璧勬姤琛ㄦ煡璇�
+export function DailyWageReportSearch(data) {
+ return request({
+ url: 'HourlyWage/DailyWageReportSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鏃ヨ鏃跺伐璧勪慨鏀规墸闄ゆ椂闀裤�佹墸闄よ柂璧�
+export function DailyWageReportUpdate(data) {
+ return request({
+ url: 'HourlyWage/DailyWageReportUpdate',
+ method: 'post',
+ data
+ })
+}
+
+// 鏃ヨ鏃跺伐璧勬姤琛ㄥ鍑�
+export function DailyWageReportExcelSearch(data) {
+ return request({
+ url: 'HourlyWage/DailyWageReportExcelSearch',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/attendanceModule/attendanceDay.vue b/src/views/attendanceModule/attendanceDay.vue
index 1ba3a7f..c4f94ea 100644
--- a/src/views/attendanceModule/attendanceDay.vue
+++ b/src/views/attendanceModule/attendanceDay.vue
@@ -1,13 +1,598 @@
<template>
- <div>322222</div>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="success"-->
+ <!-- icon="el-icon-download"-->
+ <!-- @click="$router.push('./../systemSetting/dataImport?fileCode=1')"-->
+ <!-- >瀵煎叆-->
+ <!-- </el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshop_code"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎵撳崱浜哄憳" style=" display: flex;">
+ <el-select
+ v-model="form.creatusercode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in creatuserArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎵撳崱鏃ユ湡" style=" display: flex;">
+ <el-date-picker
+ v-model="form.creatdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ </el-form-item>
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="getDailyWageReportSearch">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ style="height:5px"
+ >
+ <!-- <svg-icon-->
+ <!-- v-show="mouseHoverType==='mouseout'"-->
+ <!-- style="cursor: pointer"-->
+ <!-- :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
+ <!-- @mouseenter="mouseHoverType=$event.type"-->
+ <!-- />-->
+ <!-- <svg-icon-->
+ <!-- v-show="mouseHoverType==='mouseenter'"-->
+ <!-- style="cursor: pointer"-->
+ <!-- :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
+ <!-- @click="isExpandForm=!isExpandForm"-->
+ <!-- @mouseout="mouseHoverType=$event.type"-->
+ <!-- />-->
+ </div>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="wkshop_name"
+ label="鎵�灞炶溅闂�"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="username"
+ label="鎵撳崱浜哄憳"
+ sortable="custom"
+ width="110"
+ />
+ <el-table-column
+ prop="checkindate"
+ label="鎵撳崱鏃ユ湡"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.checkindate?row.checkindate.substring(0,11):'/' }}
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="workcount"
+ label="涓婄彮鏃堕暱(灏忔椂)"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="workprice"
+ label="宸ヤ环(鍏�/灏忔椂)"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="overcount"
+ label="鍔犵彮鏃堕暱(灏忔椂)"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="overprice"
+ label="鍔犵彮宸ヤ环(鍏�/灏忔椂)"
+ sortable="custom"
+ width="160"
+ />
+ <el-table-column
+ prop="deductcount"
+ label="鎵ｉ櫎鏃堕暱(灏忔椂)"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="deductmoney"
+ label="鎵ｉ櫎钖祫(鍏�)"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="timimoney"
+ label="璁℃椂宸ヨ祫(鍏�)"
+ sortable="custom"
+ />
+ <el-table-column
+ label="缁撶畻宸ヨ祫(鍏�)"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ parseFloat((parseFloat(row.timimoney)-parseFloat(row.deductmoney)).toFixed(2)) }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+ <!-- <i-->
+ <!-- v-if="row.leve!==0"-->
+ <!-- class="el-icon-delete"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- @click="del(row)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getDailyWageReportSearch"
+ />
+ </div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="900px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form
+ ref="dialogForm"
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="140px"
+ >
+ <el-form-item label="杞﹂棿鍚嶇О" prop="wkshop_code">
+ <el-select
+ v-model="dialogForm.wkshop_code"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ disabled
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鎵撳崱鏃ユ湡" prop="checkindate">
+ <el-date-picker
+ v-model="dialogForm.checkindate"
+ type="date"
+ style="width: 200px"
+ disabled
+ placeholder="閫夋嫨鏃ユ湡"
+ format="yyyy-MM-dd"
+ />
+ </el-form-item>
+
+ <el-form-item label="鎵撳崱浜哄憳" prop="usercode">
+ <el-select
+ v-model="dialogForm.usercode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ disabled
+ >
+ <el-option
+ v-for="item in creatuserArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヤ綔鏃堕暱" prop="workcount">
+ <el-input
+ v-model="dialogForm.workcount"
+ style="width: 200px"
+ disabled
+ />
+ </el-form-item>
+ <el-form-item label="鍔犵彮鏃堕暱" prop="overcount">
+ <el-input
+ v-model="dialogForm.overcount"
+ disabled
+ style="width: 200px"
+ />
+ </el-form-item>
+
+ <el-form-item label="鎵ｉ櫎鏃堕暱" prop="deductcount">
+ <el-input
+ v-model="dialogForm.deductcount"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="鎵ｉ櫎钖祫" prop="deductmoney">
+ <el-input
+ v-model="dialogForm.deductmoney"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
+ </el-form-item>
+
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ </div>
</template>
<script>
+import Pagination from '@/components/Pagination'
+import { handleDatetime } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { PersonPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+import {
+ DailyWageReportUpdate,
+ AttendanceSettDelete,
+ DailyWageReportSearch,
+ DailyWageReportExcelSearch
+} from '@/api/attendanceModule'
+
export default {
- name: 'AttendanceDay'
+ name: 'AttendanceDay',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wkshop_code: '',
+ creatusercode: '',
+ creatdate: '',
+ prop: 'wkshop_code', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ total: 10,
+ tableData: [],
+
+ wkshopArr: [],
+ creatuserArr: [],
+
+ dialogVisible: false,
+ dialogForm: {
+ // 'wkshop_code': '',
+ // 'checkindate': '',
+ // 'usercode': '',
+ // 'workcount': '',
+ // 'overcount': '',
+ // 'deductcount': '',
+ // 'deductmoney': ''
+ },
+ operation: '',
+ dialogFormRules: {
+ wkshop_code: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
+ ],
+ checkindate: [
+ { required: true, message: '璇烽�夋嫨鎵撳崱鏃ユ湡', trigger: ['blur', 'change'] }
+ ],
+ usercode: [
+ { required: true, message: '璇烽�夋嫨鎵撳崱浜哄憳', trigger: ['blur', 'change'] }
+ ],
+ workcount: [
+ { required: true, message: '璇疯緭鍏ュ伐浣滄椂闀�', trigger: ['blur', 'change'] }
+ ],
+ overcount: [
+ { required: true, message: '璇疯緭鍏ュ姞鐝椂闀�', trigger: ['blur', 'change'] }
+ ],
+ deductcount: [
+ { required: true, message: '璇疯緭鍏ユ墸闄ゆ椂闀�', trigger: ['blur', 'change'] }
+ ],
+ deductmoney: [
+ { required: true, message: '璇疯緭鍏ユ墸闄よ柂璧�', trigger: ['blur', 'change'] }
+ ]
+
+ }
+
+ }
+ },
+ activated() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ created() {
+ this.getDailyWageReportSearch()
+ },
+ async mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ await this.getPrentOrganizationNoCompany()
+ await this.getPersonPermissions()
+ },
+ methods: {
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopArr = res
+ },
+ async getPersonPermissions() {
+ const { data: res } = await PersonPermissions()
+ this.creatuserArr = res
+ },
+
+ async getDailyWageReportSearch() {
+ let tempDate = this.form.creatdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ wkshop_code: this.form.wkshop_code,
+ creatusercode: this.form.creatusercode,
+ creatdate: tempDate,
+ prop: this.form.prop,
+ order: this.form.order,
+ page: this.form.page,
+ rows: this.form.rows
+ }
+ const res = await DailyWageReportSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+ },
+
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getDailyWageReportSearch()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.wkshop_code = ''
+ this.form.creatusercode = ''
+ this.form.creatdate = ''
+ this.getDailyWageReportSearch()
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.$nextTick(() => {
+ this.dialogForm = { ...row }
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ // async del(row) {
+ // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning'
+ // }).then(() => {
+ // const data = {
+ // 'wkshop_code': row.wkshop_code,
+ // 'workhouse': row.workhouse,
+ // 'closehouse': row.closehouse,
+ // 'workprice': row.workprice,
+ // 'overprice': row.overprice,
+ // 'uphouse': row.uphouse,
+ // 'downhouse': row.downhouse
+ // }
+ // AttendanceSettDelete(data).then(res => {
+ // if (res.code === '200') {
+ // this.$notify.success('鍒犻櫎鎴愬姛!')
+ // if (this.form.page > 1 && this.tableData.length === 1) {
+ // this.form.page--
+ // }
+ // this.getDailyWageReportSearch()
+ // }
+ // })
+ // }).catch(() => {
+ // this.$notify.info('宸插彇娑堝垹闄�')
+ // })
+ // },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm = {}
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
+ DailyWageReportUpdate(this.dialogForm, this.operation === 'add' ? 'Add' : 'Update').then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getDailyWageReportSearch()
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ async download() {
+ let tempDate = this.form.creatdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ wkshop_code: this.form.wkshop_code,
+ creatusercode: this.form.creatusercode,
+ creatdate: tempDate
+ }
+ const { data: res } = await DailyWageReportExcelSearch(data)
+ window.location.href = res
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
+ })
+ }
+ }
}
</script>
+<style scoped lang="scss">
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
-<style scoped>
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+::v-deep .el-progress-bar__innerText {
+ display: none !important;
+}
+
+//.custom-table-class {
+// ::v-deep .el-table__row {
+// height: 80px;
+// line-height:80px;
+// }
+//}
</style>
--
Gitblit v1.9.3