diff --git a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts index 07f06534..db26204c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts @@ -96,6 +96,10 @@ export const getUsersalaryPage = (params: PageParam) => { export const exportsalaryexcel = (params) => { return request.download({ url: '/system/user/export-salary-excel', params }) } +//导出明细/biz/task-report/export-salary-detail-excel +export const exportsalaryDetailexcel = (params) => { + return request.download({ url: '/biz/task-report/export-salary-detail-excel', params }) +} //列表增加明细编辑接口/biz/salary-month/save export const updateUserSalaryMonth = async (data) => { return await request.post({ url: `/biz/salary-month/save`, data }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue index a8c7a2bd..3dee6b3b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue @@ -62,6 +62,15 @@ > 导出 + + 导出明细 + @@ -275,9 +284,37 @@ const handleExport = async () => { } } + +//导出明细handleExportDetail +const handleExportDetail = async () => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出 + exportLoading.value = true + const data = await UserApi.exportsalaryDetailexcel(queryParams) + download.excel(data, '员工工资明细.xls') + } catch { + } finally { + exportLoading.value = false + } +} /** 初始化 **/ onMounted(() => { getList() + // 创建一个新的 Date 对象,它会自动设置为当前的日期和时间 + const now = new Date() + + // 获取当前的年份(四位数) + const year = now.getFullYear() + + // 获取当前的月份(注意 getMonth() 返回的月份是从 0 开始的,所以需要 +1) + const month = (now.getMonth() + 1).toString().padStart(2, '0') + + // 拼接成 "YYYYMM" 格式的字符串 + const formattedDate = `${year}${month}` + + queryParams.yearMonth = formattedDate }) //接收车间传递的数据 diff --git a/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue b/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue index 0fcdb1d0..06eca669 100644 --- a/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue +++ b/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue @@ -32,6 +32,7 @@ const queryParams: Required = { dispatchType: 'PRODUCTION', // 派工类型 isReport: 1, // 是否需要报工 // dispatchStatus: 2 + projectSubCodeOrName: undefined } const dataList = ref([]) const total = ref() @@ -107,17 +108,9 @@ const onRefresherrefresh = async () => { const searchVal = ref('') // const dataListDefault = ref([]) const handleSearch = async () => { - console.log(searchVal) - - // const code = searchVal.value - // if (code) { - // dataListDefault.value = dataList.value - // dataList.value = dataList.value.filter((e) => { - // return e.code == code - // }) - // } else { - // dataList.value = dataListDefault.value - // } + const code = searchVal.value + queryParams.projectSubCodeOrName = code + getListData() } const flag = ref(true) const selectedItemId = ref([]) @@ -396,7 +389,7 @@ const handleOk = async () => { .statusText { position: absolute; right: 30rpx; - top: 100rpx; + top: 73rpx; border-radius: 10rpx; font-size: 24rpx; padding: 10rpx 30rpx; @@ -610,7 +603,7 @@ const handleOk = async () => { top: 17rpx; // background: linear-gradient(142deg, #feb34a 14%, #fe9b12 83%); position: absolute; - right: 180rpx; + right: 50rpx; padding: 5rpx 10rpx; border-radius: 10rpx; font-size: 24rpx;