From 5d187bac9e3d6521fee19d2655255a5e7e8c4e0b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 17:07:00 +0800
Subject: [PATCH] 人员考勤：导出日期选择调整&不合格处理展示供应商编码字段
---
src/views/performance/attendance/index.vue | 49 +++++++++++++++++++++----------------------------
src/views/business/unpass/index-manage.vue | 10 ++++++----
2 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index 1ed6b55..f2aa6c7 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -221,7 +221,8 @@
{ label: '鎵瑰彿', prop: 'updateBatchNo',width:'160' },
{ label: '闆朵欢鍙�', prop: 'partNo',width:'140' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
- { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
+ { label: '渚涘簲鍟嗙紪鐮�', prop: 'supplierId',width:'140' },
+ { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName',width:'140' },
{ label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc',width:'160' },
{
dataType: 'tag',
@@ -372,8 +373,8 @@
{ label: '鐗╂枡鍚嶇О', prop: 'materialName',width: "160px" },
{ label: '鐢熶骇鎵规', prop: 'productionBatch',width: "160px" },
{ label: '鍒拌揣鏁伴噺', prop: 'cargoQuantity' },
- { label: '瑙勬牸鍨嬪彿', prop: 'specsModels' },
- { label: '鎶ユ鏃ユ湡', prop: 'inspectTime' },
+ { label: '瑙勬牸鍨嬪彿', prop: 'specsModels',width:'140' },
+ { label: '鎶ユ鏃ユ湡', prop: 'inspectTime',width:'120' },
{ label: '鐘舵��', prop: 'statusDB' },
{ label: '鍙嶉浜�', prop: 'feedbackUser' },
{ label: '瑕佹楠岀殑閲囪喘鏁伴噺', prop: 'qtyToInspect',width: "140px" },
@@ -402,7 +403,8 @@
}
},
},
- { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
+ { label: '渚涘簲鍟嗙紪鐮�', prop: 'supplierId',width:'140' },
+ { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName',width:'140' },
{
label: "涓嶅悎鏍煎綊灞�",
prop: "offGradeAscription",
diff --git a/src/views/performance/attendance/index.vue b/src/views/performance/attendance/index.vue
index c5865eb..93bb3a5 100644
--- a/src/views/performance/attendance/index.vue
+++ b/src/views/performance/attendance/index.vue
@@ -220,7 +220,7 @@
<label>缁熻缁村害:</label>
</el-col>
<el-col :span="20">
- <el-radio-group v-model="reportType" size="mini" disabled>
+ <el-radio-group @change="()=>{this.reportDate = null}" v-model="reportType" size="mini">
<el-radio label="YEAR">骞村害</el-radio>
<el-radio label="MONTH">鏈堝害</el-radio>
</el-radio-group>
@@ -232,16 +232,24 @@
</el-col>
<el-col :span="20">
<el-date-picker
+ v-if="reportType==='YEAR'"
size="small"
- v-model="reportDateRange"
+ v-model="reportDate"
style="width:100%"
- @change="changeReportDateRange"
- type="datetimerange"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00','23:59:59']"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ type="year"
+ format="yyyy"
+ value-format="yyyy"
+ placeholder="璇烽�夋嫨骞翠唤">
+ </el-date-picker>
+ <el-date-picker
+ v-if="reportType==='MONTH'"
+ size="small"
+ v-model="reportDate"
+ style="width:100%"
+ type="month"
+ format="yyyy-MM"
+ value-format="yyyy-MM"
+ placeholder="璇烽�夋嫨鏈堜唤">
</el-date-picker>
</el-col>
</el-row>
@@ -274,7 +282,7 @@
},
data() {
return {
- reportDateRange:[],
+ reportDate: null,
reportType:"MONTH",
attendanceRecordVisible:false,
syncDateRange:[],
@@ -358,31 +366,16 @@
window.removeEventListener("resize",this.resizeHandler)
},
methods: {
- changeReportDateRange(val){
- //鍒ゆ柇鏃堕棿鍖洪棿鏄惁瓒呰繃涓�涓湀
- if(val && val.length===2){
- const flag = isOverOneMonth(val[0],val[1]);
- this.reportType = flag?'YEAR':'MONTH'
- }
- },
openAttendanceRecordDialog (){
- this.reportDateRange = getTimeRange()
- this.$nextTick(()=>{
- this.attendanceRecordVisible = true
- })
+ this.attendanceRecordVisible = true
},
//瀵煎嚭鑰冨嫟璁板綍
exportStaffAttendanceRecords(){
this.exportLoading = true
let params = {
attendanceReportType:this.reportType,
- }
- if (this.reportDateRange && this.reportDateRange.length === 2) {
- params.startDate = this.reportDateRange[0];
- params.endDate = this.reportDateRange[1];
- } else {
- params.startDate = "";
- params.endDate = "";
+ reportDate: this.reportDate,
+ keyword: this.queryParams.keyword
}
exportStaffAttendanceRecords({...params}).then(res=>{
transformExcel(res, "涓ぉ鑰愪笣璐ㄩ噺鑰冨嫟姹囨��.xlsx")
--
Gitblit v1.9.3