From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue
index 6ef1c26..5725459 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue
@@ -11,8 +11,8 @@
<el-button size="small" @click="clearYear">娓呯┖</el-button>
</div>
<!-- <UploadExcel v-if="isShowButton" @upload="getYearPlanList"></UploadExcel> -->
- <el-upload ref="upload" v-if="isShowButton" :action="action" :data="uploadData"
- :headers="uploadHeader" :before-upload="beforeUpload" :on-success="onSuccess">
+ <el-upload ref="upload" :action="action" :data="uploadData" :headers="uploadHeader"
+ :before-upload="beforeUpload" :on-success="onSuccess">
<el-button size="small" type="primary">瀵煎叆</el-button>
</el-upload>
@@ -100,8 +100,8 @@
},
yearTableData: [], // 骞磋〃
yearPage: {
- curent: 1,
- pageSize: 20,
+ current: 1,
+ size: 20,
total: 0
},
yearColumnData: [
@@ -199,8 +199,8 @@
},
yearDetailTableData: [], // 骞存槑缁嗚〃
yearDeatilPage: {
- curent: 1,
- pageSize: 20,
+ current: 1,
+ size: 20,
total: 0
},
yearDetailColumnData: [
@@ -298,8 +298,8 @@
async getYearPlanList() {
this.yearLoading = true
const { code, data } = await yearPlanList({
- current: this.yearPage.curent,
- size: this.yearPage.pageSize,
+ current: this.yearPage.current,
+ size: this.yearPage.size,
organizationPerson: this.yearForm.organizationPerson,
departId: this.departId
})
@@ -357,8 +357,8 @@
this.yearDetailLoading = true
const { code, data } = await yearPlanDetailList({
planId: this.planId,
- current: this.yearDeatilPage.curent,
- size: this.yearDeatilPage.pageSize,
+ current: this.yearDeatilPage.current,
+ size: this.yearDeatilPage.size,
date: this.yearDetailForm.date,
project: this.yearDetailForm.project
})
--
Gitblit v1.9.3