Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi...

zouyu

2025-03-18 bc44c8e3c9d85691ce3fa73ef1300a6fae46e365

 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
            })