功能问题修改

src/components/assessment/assessmentApplicationFrom.vue

@@ -7,21 +7,21 @@
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报编号:</span>
-                            <span>{{receiptMsg.code}}</span>
+                            <span>{{ receiptMsg.code }}</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报部门:</span>
-                            <span>{{receiptMsg.deptName}}</span>
+                            <span>{{ receiptMsg.deptName }}</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报级别:</span>
-                            <span>{{receiptMsg.declarationLevel}}级</span>
+                            <span>{{ receiptMsg.declarationLevel }}级</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报年度:</span>
-                            <span>{{receiptMsg.year}}年</span>
+                            <span>{{ receiptMsg.year }}年</span>
                         </div>
                         <!-- <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
@@ -31,29 +31,29 @@
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">流程状态:</span>
-                            <span>{{receiptMsg.stage}}</span>
+                            <span>{{ receiptMsg.stage }}</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报月份:</span>
-                            <span>{{receiptMsg.month}}月</span>
+                            <span>{{ receiptMsg.month }}月</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">创建日期:</span>
-                            <span>{{receiptMsg.createDate}}</span>
+                            <span>{{ receiptMsg.createDate }}</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
                             <span class="data_tit">评定等级:</span>
-                            <span>{{receiptMsg.ratingGrade}}</span>
+                            <span>{{ receiptMsg.ratingGrade }}</span>
                         </div>
                     </el-col>
                     <el-col :span="18">
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报理由:</span>
-                            <span>{{receiptMsg.des}}</span>
+                            <span>{{ receiptMsg.des }}</span>
                         </div>
                     </el-col>
                 </el-row>
@@ -72,7 +72,7 @@
                                 <img :src="deleteIcon" alt="">
                                 <span>删除</span>
                             </div>
-                            
+
                             <div class="tableBtn import" @click="handleImport" v-if="isShowFn(receiptMsg.stage)">
                                 <img :src="importIcon" alt="">
                                 <span>导入</span>
@@ -82,13 +82,15 @@
                                 <span>导出</span>
                             </div>
                         </div>
-                        <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
-                         style="width: 100%" @select="rowClick" @select-all="rowClick">
+                        <el-table
+                            :data="quantifiedList.slice((pageLeft.currentPage - 1) * pageLeft.pagesize, pageLeft.currentPage * pageLeft.pagesize)"
+                            style="width: 100%" @select="rowClick" @select-all="rowClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="人员编号">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" @blur="employeeNoInputBlur(scope.row.employeeNo, scope.row)" />
+                                    <el-input v-model="scope.row.employeeNo"
+                                        @blur="employeeNoInputBlur(scope.row.employeeNo, scope.row)" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="人员">
@@ -103,17 +105,18 @@
                                         <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
                                         </el-option>
                                     </el-select> -->
-                                    <span>{{scope.row.employeeName}}</span>
+                                    <span>{{ scope.row.employeeName }}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="建议值" v-if="showMessage">
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
+                                    <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1"
+                                        :min="0" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="排序" >
+                            <el-table-column label="排序">
                                 <template #default="scope">
-                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
+                                    <el-input-number v-model="scope.row.serialNumber" :min="1" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="操作" width="120" v-if="isShowFn(receiptMsg.stage)">
@@ -122,11 +125,8 @@
                                 </template>
                             </el-table-column>
                         </el-table>
-                        <el-pagination
-                            @current-change="handleCurrentChangeLeft"
-                            :current-page="pageLeft.currentPage"
-                            :page-size="pageLeft.pagesize"
-                            layout="total, prev, pager, next, jumper"
+                        <el-pagination @current-change="handleCurrentChangeLeft" :current-page="pageLeft.currentPage"
+                            :page-size="pageLeft.pagesize" layout="total, prev, pager, next, jumper"
                             :total="pageLeft.total">
                         </el-pagination>
                     </el-tab-pane>
@@ -145,50 +145,50 @@
                                 <span>删除</span>
                             </div>
                         </div>
-                        <el-table :data="secondWorkSituation.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)"
-                         style="width: 100%" @select="rowSituationClick" @select-all="rowSituationClick">
+                        <el-table
+                            :data="secondWorkSituation.slice((pageRight.currentPage - 1) * pageRight.pagesize, pageRight.currentPage * pageRight.pagesize)"
+                            style="width: 100%" @select="rowSituationClick" @select-all="rowSituationClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="工作内容">
                                 <template #default="scope">
-                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.jobContent" :rows="2" type="textarea" />
-                                    <pre v-else>{{scope.row.jobContent}}</pre>
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.jobContent" :rows="2"
+                                        type="textarea" />
+                                    <pre v-else>{{ scope.row.jobContent }}</pre>
                                 </template>
                             </el-table-column>
                             <el-table-column label="完成情况">
                                 <template #default="scope">
-                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.completionStatus" :rows="2" type="textarea" />
-                                    <pre v-else>{{scope.row.completionStatus}}</pre>
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.completionStatus"
+                                        :rows="2" type="textarea" />
+                                    <pre v-else>{{ scope.row.completionStatus }}</pre>
                                 </template>
                             </el-table-column>
                             <el-table-column label="相关处室" width="200">
                                 <template #default="scope">
                                     <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.relatedOffice" />
-                                    <span v-else>{{scope.row.relatedOffice}}</span>
+                                    <span v-else>{{ scope.row.relatedOffice }}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="经办人" width="200">
                                 <template #default="scope">
                                     <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.handlePeopleName" />
-                                    <span v-else>{{scope.row.handlePeopleName}}</span>
+                                    <span v-else>{{ scope.row.handlePeopleName }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="排序" >
+                            <el-table-column label="排序">
                                 <template #default="scope">
-                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
+                                    <el-input-number v-model="scope.row.serialNumber" :min="1" />
                                 </template>
                             </el-table-column>
                         </el-table>
-                        <el-pagination
-                            @current-change="handleCurrentChangeRight"
-                            :current-page="pageRight.currentPage"
-                            :page-size="pageRight.pagesize"
-                            layout="total, prev, pager, next, jumper"
+                        <el-pagination @current-change="handleCurrentChangeRight" :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize" layout="total, prev, pager, next, jumper"
                             :total="pageRight.total">
                         </el-pagination>
                     </el-tab-pane>
                 </el-tabs>
-                
+
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -202,8 +202,10 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,apiGetevaluationdeptadUpdateComplete,
-apiPostevaluationdeptadDetailsHead, apiGetuserPageList,apiGetevaluationdeptadDeleteComplete,apiGetUserPostList} from '../../api/api'
+import {
+    apiPostevaluationdeptadDetails, apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete, apiGetevaluationdeptadUpdateComplete,
+    apiPostevaluationdeptadDetailsHead, apiGetuserPageList, apiGetevaluationdeptadDeleteComplete, apiGetUserPostList
+} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -246,12 +248,12 @@ export default {
             indicItemoptions: [],
             sectionNameArr: [],
             deptNameArr: [],
-            pageLeft:{
+            pageLeft: {
                 pagesize: 15,
                 currentPage: 1,
                 total: 0
             },
-            pageRight:{
+            pageRight: {
                 pagesize: 15,
                 currentPage: 1,
                 total: 0
@@ -271,7 +273,7 @@ export default {
             this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
             this.getUserPostList()
             this.rowMsg = row
-            this.$nextTick(() =>{
+            this.$nextTick(() => {
                 this.receiptMsg = {
                     code: row.orderNumber,
                     des: row.declarationReason,
@@ -311,10 +313,10 @@ export default {
             }).then(() => {
                 let that = this
                 let paramsArr = []
-                that.changeDateSelect.forEach(it =>{
+                that.changeDateSelect.forEach(it => {
                     paramsArr.push(it.id)
                 })
-                apiGetevaluationdeptadDelete(paramsArr.join(',')).then(datas =>{
+                apiGetevaluationdeptadDelete(paramsArr.join(',')).then(datas => {
                     if (datas) {
                         that.$message({
                             type: 'success',
@@ -335,7 +337,7 @@ export default {
         //获取详情头数据
         getDetailsHeader(id) {
             let that = this
-            apiPostevaluationdeptadDetailsHead(id).then(datas =>{
+            apiPostevaluationdeptadDetailsHead(id).then(datas => {
                 if (datas && datas.data) {
                     let row = datas.data
                     that.receiptMsg = {
@@ -344,7 +346,7 @@ export default {
                         stage: row.stage,
                         createName: row.createName,
                         createDate: row.createTime,
-                        type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                        type: row.checkCycle === 'YDKP' ? '月度考评' : row.checkCycle === 'JDKP' ? '季度考评' : '年度考评',
                         year: row.appraisalYear,
                         month: row.declarationMonth,
                         recStage: '有效'
@@ -357,10 +359,10 @@ export default {
             let that = this
             that.quantifiedList = []
             that.secondWorkSituation = []
-            apiPostevaluationdeptadDetails(id).then(datas =>{
+            apiPostevaluationdeptadDetails(id).then(datas => {
                 if (datas && datas.data) {
                     if (datas.data['ygydkhxs'][0]) {
-                        datas.data['ygydkhxs'][0].forEach(it =>{
+                        datas.data['ygydkhxs'][0].forEach(it => {
                             it.serialNumber = it.serialNumber.toString()
                         })
                         that.quantifiedList = datas.data['ygydkhxs'][0]
@@ -381,12 +383,12 @@ export default {
                 current: 1,
                 size: 10
             }
-            apiGetUserPostList(params).then(datas =>{
-                if (datas.data && datas.data.records.length>0) {
-                    datas.data.records.forEach(it =>{
+            apiGetUserPostList(params).then(datas => {
+                if (datas.data && datas.data.records.length > 0) {
+                    datas.data.records.forEach(it => {
                         if (it.posName.indexOf('主任') !== -1 || it.posName.indexOf('副主任') !== -1
-                         || it.posName.indexOf('组织人事部') !== -1
-                         || it.udeptName.indexOf('组织人事部') !== -1) {
+                            || it.posName.indexOf('组织人事部') !== -1
+                            || it.udeptName.indexOf('组织人事部') !== -1) {
                             that.showMessage = true
                         }
                     })
@@ -408,7 +410,7 @@ export default {
             let params = {
                 no: val
             }
-            apiGetuserPageList(params).then(datas =>{
+            apiGetuserPageList(params).then(datas => {
                 if (datas && datas.data) {
                     row.employeeName = datas.data.name
                     row.employeeId = datas.data.id
@@ -430,7 +432,7 @@ export default {
         saveDetail() {
             let that = this
             let params = []
-            that.quantifiedList.forEach(item =>{
+            that.quantifiedList.forEach(item => {
                 // let emName = ''
                 // let emNo = ''
                 // that.deptLeaderOptionDet.forEach(it =>{
@@ -444,7 +446,7 @@ export default {
                     employeeId: item.employeeId ? item.employeeId : '',
                     employeeName: item.employeeName ? item.employeeName : '',
                     employeeNo: item.employeeNo ? item.employeeNo : '',
-                    suggestedValue: (item.suggestedValue*1).toString(),
+                    suggestedValue: (item.suggestedValue * 1).toString(),
                     serialNumber: item.serialNumber
                 }
                 if (!item.showInput) {
@@ -452,7 +454,7 @@ export default {
                 }
                 params.push(obj)
             })
-            apiGetevaluationdeptadUpdate(params).then(datas =>{
+            apiGetevaluationdeptadUpdate(params).then(datas => {
                 if (datas) {
                     if (datas.success) {
                         that.$message({
@@ -480,7 +482,7 @@ export default {
                 if (!row.id) {
                     that.quantifiedList.splice(index, 1)
                 } else {
-                    apiGetevaluationdeptadDelete(row.id).then(datas =>{
+                    apiGetevaluationdeptadDelete(row.id).then(datas => {
                         if (datas) {
                             that.$message({
                                 type: 'success',
@@ -495,14 +497,14 @@ export default {
         },
         handleImport() {
             this.$refs.importPage.upload.title = "绩效结果考核申报导入"
-            this.$refs.importPage.upload.data = {id: this.rowMsg.id}
+            this.$refs.importPage.id = this.rowMsg.id || ""
             this.$refs.importPage.upload.open = true
             this.$refs.importPage.upload.url = '/evaluation-dept-ad/import'
         },
         successImport(val) {
             this.$message({
                 type: 'success',
-                message: val.message
+                message: val.data.message || "导入成功"
             });
             this.getDetails(this.rowMsg.id)
         },
@@ -553,7 +555,7 @@ export default {
         saveSecondWork() {
             let that = this
             let params = []
-            that.secondWorkSituation.forEach(item =>{
+            that.secondWorkSituation.forEach(item => {
                 let obj = {
                     assessmentDeclarationId: that.rowMsg.id,
                     jobContent: item.jobContent,
@@ -567,7 +569,7 @@ export default {
                 }
                 params.push(obj)
             })
-            apiGetevaluationdeptadUpdateComplete(params).then(datas =>{
+            apiGetevaluationdeptadUpdateComplete(params).then(datas => {
                 if (datas) {
                     if (datas.success) {
                         that.$message({
@@ -593,9 +595,9 @@ export default {
             }).then(() => {
                 let that = this
                 let paramsArr = []
-                that.changeSituationSelect.forEach(item =>{
+                that.changeSituationSelect.forEach(item => {
                     if (!item.id) {
-                        that.secondWorkSituation.forEach((it, index) =>{
+                        that.secondWorkSituation.forEach((it, index) => {
                             if (it === item) {
                                 that.secondWorkSituation.splice(index, 1)
                             }
@@ -604,8 +606,8 @@ export default {
                         paramsArr.push(item.id)
                     }
                 })
-                if (paramsArr.length>0) {
-                    apiGetevaluationdeptadDeleteComplete(paramsArr.join(',')).then(datas =>{
+                if (paramsArr.length > 0) {
+                    apiGetevaluationdeptadDeleteComplete(paramsArr.join(',')).then(datas => {
                         if (datas) {
                             that.$message({
                                 type: 'success',
@@ -624,14 +626,16 @@ export default {
 </script>
 
 <style lang="less">
-.applicationFrom{
-    .el-overlay{
-        .el-dialog{
+.applicationFrom {
+    .el-overlay {
+        .el-dialog {
+
             // margin-top: 7vh;
-            .el-dialog__body{
+            .el-dialog__body {
                 padding: 0 20px !important;
-                .startDetail{
-                    .starttitleSty{
+
+                .startDetail {
+                    .starttitleSty {
                         font-size: 18px;
                         font-family: Microsoft YaHei;
                         font-weight: bold;
@@ -639,60 +643,76 @@ export default {
                         // line-height: 12px;
                         margin: 20px 0 20px 10px;
                     }
-                    .danjuMsg{
+
+                    .danjuMsg {
                         border: 1px solid #D6DBEA;
                         padding: 10px 20px;
                         border-radius: 10px;
                         margin-bottom: 10px;
-                        .danjuMsg_data{
+
+                        .danjuMsg_data {
                             padding: 5px 0 10px 0;
-                            .data_tit{
+
+                            .data_tit {
                                 margin-right: 10px;
                                 font-weight: bold;
                                 font-size: 14px;
                                 font-family: Microsoft YaHei;
                                 color: #8991B0;
                             }
-                            .data_tit_wd{
+
+                            .data_tit_wd {
                                 display: inline-block;
                                 width: 90px;
                             }
-                            .el-form-item--small{
-                                .el-input{
+
+                            .el-form-item--small {
+                                .el-input {
                                     height: 25px;
                                     width: 160px;
                                 }
+
                                 margin-bottom: 0;
-                                .el-input-number{
+
+                                .el-input-number {
                                     height: 25px;
-                                    .el-input-number__decrease, .el-input-number__increase{
+
+                                    .el-input-number__decrease,
+                                    .el-input-number__increase {
                                         right: -39px;
                                     }
                                 }
                             }
                         }
                     }
-                    .el-select, .el-input{
+
+                    .el-select,
+                    .el-input {
                         width: 100%;
                     }
-                    .el-tabs{
+
+                    .el-tabs {
                         margin-top: 20px;
-                        .detaTableBtns{
+
+                        .detaTableBtns {
                             display: flex;
                             justify-content: flex-end;
                             width: 100%;
                             margin-top: 5px;
+
                             .tableBtn {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
                                 // width: 20%;
                                 width: fit-content;
-                                img{
+
+                                img {
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
-                                span{
+
+                                span {
                                     width: 35px;
                                     display: inline-block;
                                     font-size: 14px;
@@ -700,52 +720,65 @@ export default {
                                     font-weight: 400;
                                 }
                             }
-                            .add{
+
+                            .add {
                                 cursor: pointer;
-                                span{
+
+                                span {
                                     color: #3B7AD1;
                                 }
                             }
-                            .save{
+
+                            .save {
                                 cursor: pointer;
-                                span{
+
+                                span {
                                     color: #50C14E;
                                 }
                             }
-                            .edit{
-                                span{
+
+                            .edit {
+                                span {
                                     color: #F5A623;
                                 }
                             }
-                            .delete{
+
+                            .delete {
                                 cursor: pointer;
-                                span{
+
+                                span {
                                     color: #F65177;
                                 }
                             }
-                            .import{
+
+                            .import {
                                 cursor: pointer;
-                                span{
+
+                                span {
                                     color: #ce1e78;
                                 }
                             }
-                            .export{
+
+                            .export {
                                 cursor: pointer;
-                                span{
+
+                                span {
                                     color: #2baa8a;
                                 }
                             }
                         }
-                        .el-tabs__header{
-                            .el-tabs__nav{
-                                .el-tabs__item{
+
+                        .el-tabs__header {
+                            .el-tabs__nav {
+                                .el-tabs__item {
                                     font-size: 18px;
                                     font-family: Microsoft YaHei;
                                     font-weight: bold;
-                                    margin: 0 10px;                                    
+                                    margin: 0 10px;
                                     color: #8991B0;
                                 }
-                                .is-active{
+
+                                .is-active {
                                     font-size: 18px;
                                     font-family: Microsoft YaHei;
                                     font-weight: bold;
@@ -754,28 +787,33 @@ export default {
                                 }
                             }
                         }
-                        
-                        .el-table{
+
+                        .el-table {
                             margin-bottom: 10px;
-                            .el-table__body-wrapper{
+
+                            .el-table__body-wrapper {
                                 height: 45vh;
                             }
-                            .el-table__row{
-                                .cell{
-                                    .el-input{
+
+                            .el-table__row {
+                                .cell {
+                                    .el-input {
                                         height: 24px;
-                                        .el-input__inner{
+
+                                        .el-input__inner {
                                             height: 24px;
                                         }
                                     }
                                 }
                             }
-                            .indicitem{
+
+                            .indicitem {
                                 color: #F65177;
                                 font-size: 12px;
                                 margin-right: 20px;
-                                cursor:pointer;
-                                &:hover{
+                                cursor: pointer;
+
+                                &:hover {
                                     text-decoration: underline;
                                 }
                             }
@@ -783,11 +821,13 @@ export default {
                     }
                 }
             }
-            .el-dialog__footer{
-                .dialog-footer{
+
+            .el-dialog__footer {
+                .dialog-footer {
                     display: flex;
                     justify-content: center;
-                    .el-button{
+
+                    .el-button {
                         width: 180px !important;
                         height: 40px !important;
                     }
@@ -795,6 +835,6 @@ export default {
             }
         }
     }
-    
+
 }
 </style>

src/components/assessment/evaluationYearPage.vue

@@ -366,7 +366,7 @@ export default {
                             background: 'rgba(0, 0, 0, 0.7)'
                         });
                         params.mark = true;
-                        apiGetgenerateUnitMonthEvaluation(params).then(reEvaRes => {
+                        apiGetgenerateUnitYearEvaluation(params).then(reEvaRes => {
                             if (reEvaRes.code === 200) {
                                 that.$message({
                                     message: '考评数据已重新生成',

src/components/assessment/monthQuarterYearFrom.vue

@@ -836,7 +836,7 @@ export default {
 
                                 .headerLeft {
                                     display: flex;
-                                    width: 65%;
+                                    width: 60%;
                                     overflow-x: auto;
 
                                     .tagArr {
@@ -865,7 +865,9 @@ export default {
                                 .headerRight {
                                     display: flex;
                                     justify-content: end;
-                                    width: 35%;
+                                    align-items: center;
+                                    flex-wrap: nowrap;
+                                    width: 40%;
                                     margin-bottom: 5px;
 
                                     .seachFor {
@@ -893,6 +895,9 @@ export default {
 
                                     .tableBtn {
                                         display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                        flex-wrap: nowrap;
                                         height: 20px;
                                         margin: 5px 8px 0 8px;
                                         // width: 20%;
@@ -908,6 +913,7 @@ export default {
                                             font-size: 14px;
                                             font-family: Microsoft YaHei;
                                             font-weight: 400;
+                                            white-space: nowrap;
                                         }
                                     }
 

src/components/evaluationSystem/evaluationMultiSequencePage.vue

@@ -12,72 +12,51 @@
                 <!-- :showAdd="$utils.havePurview('multiSequence:oneLevel:add')"
                 :showSave="$utils.havePurview('multiSequence:oneLevel:save')"
                 :showDelete="$utils.havePurview('multiSequence:oneLevel:delete')" -->
-                <btns
-                :showImport="false"
-                :showExport="false"
-                :showAdd="true"
-                :showSave="true"
-                :showDelete="true"
-                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                :disDelete="changeDateSelect.length === 0"
-                :disImport="true"
-                :disExport="true"
-                @handleAdd="handleAdd"
-                @handleEdit="handleEdit"
-                @handleDelete="handleDelete"
-                ></btns>
+                <btns :showImport="false" :showExport="false" :showAdd="true" :showSave="true" :showDelete="true"
+                    :disSave="changeDateSelect.length === 0 || changeDateSelect.length > 1"
+                    :disDelete="changeDateSelect.length === 0" :disImport="true" :disExport="true" @handleAdd="handleAdd"
+                    @handleEdit="handleEdit" @handleDelete="handleDelete"></btns>
             </div>
             <div class="evaluationCombinationDataC">
                 <el-table :data="evaluationCombinationData" style="width: 100%" :class="multisequenceTableSty()"
-                 @select="rowClick" @select-all="rowClick">
+                    @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="名称" prop="citeCalculationName" />
                     <el-table-column label="参与差值板块" prop="binSectionName" />
                     <!-- <el-table-column label="指标名称" prop="indicatorNames" /> -->
                     <el-table-column label="排序" prop="orderNum" />
                 </el-table>
-                <el-pagination
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :current-page="page.currentPage"
-                    :page-size="page.pagesize"
-                    layout="total, prev, pager, next, jumper"
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="page.currentPage" :page-size="page.pagesize" layout="total, prev, pager, next, jumper"
                     :total="page.total">
                 </el-pagination>
             </div>
             <el-dialog :title="title" v-model="dialogVisible" width="600px" :close-on-click-modal="false">
                 <div class="periodFrom">
-                    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
+                    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"
+                        :validate-on-rule-change="false">
                         <el-form-item label="组合名称" prop="combination">
-                            <el-input v-model="ruleForm.combination" @blur="changeIndicItem" placeholder="请输入组合名称"></el-input>
+                            <el-input v-model="ruleForm.combination" @blur="changeIndicItem"
+                                placeholder="请输入组合名称"></el-input>
                         </el-form-item>
                         <el-form-item label="业务属性" prop="sectionName">
                             <el-select v-model="ruleForm.sectionName" multiple collapse-tags placeholder="请选择业务属性">
-                                <el-option
-                                v-for="item in binSectionOptions"
-                                :key="item.id"
-                                :label="item.sectionName"
-                                :value="item.id">
+                                <el-option v-for="item in binSectionOptions" :key="item.id" :label="item.sectionName"
+                                    :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="指标名称" prop="indicItemName">
                             <el-select v-model="ruleForm.indicItemName" multiple collapse-tags placeholder="请选择指标名称">
-                                <el-option
-                                v-for="item in indicItemoptions"
-                                :key="item.id"
-                                :label="item.indicatorName"
-                                :value="item.id">
-                                <span style="float: left">{{ item.indicatorName }}</span>
-                                <span
-                                    style="
+                                <el-option v-for="item in indicItemoptions" :key="item.id" :label="item.indicatorName"
+                                    :value="item.id">
+                                    <span style="float: left">{{ item.indicatorName }}</span>
+                                    <span style="
                                     margin-left: 20px;
                                     float: right;
                                     color: var(--el-text-color-secondary);
                                     font-size: 13px;
-                                    "
-                                    >{{ item.binSectionName }}</span
-                                >
+                                    ">{{ item.binSectionName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -103,10 +82,12 @@
 <script>
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import {apiGetcitecalculationList, apiPostcitecalculationSave, apiPostcitecalculationRemove,
- apiGetbinsectionList, apiGetindicatorListAll} from '../../api/api'
+import {
+    apiGetcitecalculationList, apiPostcitecalculationSave, apiPostcitecalculationRemove,
+    apiGetbinsectionList, apiGetindicatorListAll
+} from '../../api/api'
 export default {
-  components: { btns, seachs },
+    components: { btns, seachs },
     data() {
         return {
             dialogVisible: false,
@@ -114,7 +95,7 @@ export default {
             isSave: false,
             changeDateSelect: [],
             combinationS: '',
-            evaluationCombinationData:[],
+            evaluationCombinationData: [],
             ruleForm: {
                 combination: '',
                 sectionName: [],
@@ -136,7 +117,7 @@ export default {
                     { required: true, message: '请输入描述', trigger: 'blur' }
                 ],
             },
-            page:{
+            page: {
                 pagesize: 12,
                 currentPage: 1,
                 total: 0
@@ -153,16 +134,17 @@ export default {
         this.getcitecalculationData()
         this.getDataBinSection()
     },
-    methods:{
+    methods: {
         // 查询人员配置数据
         getcitecalculationData() {
             let that = this
             let params = {
+                citeCalculationName: that.combinationS || "",
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 // personnelName: that.combinationS
             }
-            apiGetcitecalculationList(params).then(datas =>{
+            apiGetcitecalculationList(params).then(datas => {
                 if (datas && datas.data) {
                     that.evaluationCombinationData = datas.data.records
                     that.page.total = datas.data.total
@@ -175,7 +157,7 @@ export default {
             let params = {
                 type: '1'
             }
-            apiGetbinsectionList().then(datas =>{
+            apiGetbinsectionList().then(datas => {
                 if (datas && datas.data) {
                     that.binSectionOptions = datas.data
                 }
@@ -190,7 +172,7 @@ export default {
             let params = {
                 indicatorName: val
             }
-            apiGetindicatorListAll(params).then(datas =>{
+            apiGetindicatorListAll(params).then(datas => {
                 if (datas && datas.data) {
                     that.indicItemoptions = datas.data
                 }
@@ -200,7 +182,7 @@ export default {
             this.dialogVisible = true
             this.isSave = false
             this.title = '新增多序列计算指标'
-            this.$nextTick(() =>{
+            this.$nextTick(() => {
                 this.ruleForm = {
                     combination: '',
                     sectionName: [],
@@ -235,8 +217,8 @@ export default {
             let that = this
             let indNames = []
             // let binSectionName = []
-            that.ruleForm.indicItemName.forEach(iv =>{
-                that.indicItemoptions.forEach(it =>{
+            that.ruleForm.indicItemName.forEach(iv => {
+                that.indicItemoptions.forEach(it => {
                     if (iv === it.id) {
                         indNames.push(it.indicatorName)
                     }
@@ -260,7 +242,7 @@ export default {
             if (that.isSave) {
                 params.id = that.evalradio.id
             }
-            apiPostcitecalculationSave(params).then(datas =>{
+            apiPostcitecalculationSave(params).then(datas => {
                 if (!datas.success) {
                     that.$message({
                         message: datas.message,
@@ -293,10 +275,10 @@ export default {
             }).then(() => {
                 let that = this
                 let paramsArr = []
-                that.changeDateSelect.forEach(it =>{
+                that.changeDateSelect.forEach(it => {
                     paramsArr.push(it.id)
                 })
-                apiPostcitecalculationRemove(paramsArr.join(',')).then(datas =>{
+                apiPostcitecalculationRemove(paramsArr.join(',')).then(datas => {
                     if (datas) {
                         that.$message({
                             type: 'success',
@@ -307,7 +289,7 @@ export default {
                     }
                 })
             })
-        },        
+        },
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
@@ -320,12 +302,12 @@ export default {
             this.combinationS = ''
             this.getcitecalculationData()
         },
-        handleSizeChange(val){
+        handleSizeChange(val) {
             this.page.pagesize = val
             this.getcitecalculationData()
         },
-        handleCurrentChange(val){
-            this.page.currentPage =val
+        handleCurrentChange(val) {
+            this.page.currentPage = val
             this.getcitecalculationData()
         },
         multisequenceTableSty() {
@@ -340,74 +322,91 @@ export default {
 </script>
 
 <style lang="less">
-.evaluationCombination{
-  .evaluationCombinationBtn{
-        .collectSeach{
+.evaluationCombination {
+    .evaluationCombinationBtn {
+        .collectSeach {
             display: flex;
             padding: 24px 20px;
             border-bottom: 1px solid#D6DBEA;
-                .exceed{
-                    display: flex;
-                    .exceedSpan{
-                        width: 100px;
-                        height: 12px;
-                        font-size: 14px;
-                        font-family: Microsoft YaHei;
-                        font-weight: 400;
-                        color: #8991B0;
-                        line-height: 12px;
-                        margin-top: 14px;
+
+            .exceed {
+                display: flex;
+
+                .exceedSpan {
+                    width: 100px;
+                    height: 12px;
+                    font-size: 14px;
+                    font-family: Microsoft YaHei;
+                    font-weight: 400;
+                    color: #8991B0;
+                    line-height: 12px;
+                    margin-top: 14px;
+                }
+
+                .el-input {
+                    margin-right: 10px;
+
+                    .el-input__inner {
+                        height: 30px;
                     }
-                    .el-input{
-                        margin-right:10px;
-                        .el-input__inner{
-                            height:30px;
-                        }
-                        .el-input__suffix{
-                            .el-select__caret{
-                                line-height:30px;
-                            }
+
+                    .el-input__suffix {
+                        .el-select__caret {
+                            line-height: 30px;
                         }
                     }
                 }
-                .el-select{
-                    margin-right:10px;
-                    .el-input__inner{
-                        height:30px;
-                    }
-                    .el-input__suffix{
-                        .el-select__caret{
-                            line-height:30px;
-                        }
+            }
+
+            .el-select {
+                margin-right: 10px;
+
+                .el-input__inner {
+                    height: 30px;
+                }
+
+                .el-input__suffix {
+                    .el-select__caret {
+                        line-height: 30px;
                     }
                 }
+            }
         }
-        span{
-            font-size:14px;
+
+        span {
+            font-size: 14px;
         }
-        .PeriodBtn{
+
+        .PeriodBtn {
             display: flex;
             justify-content: flex-end;
             padding: 20px 0;
         }
-        .el-button{
+
+        .el-button {
             height: 30px;
             // width:100px;
-            padding: 0 30px ;
+            padding: 0 30px;
+
             // padding-top: 8px;
-            span{
-                margin:0;
+            span {
+                margin: 0;
             }
         }
-        .el-overlay{
-            .el-dialog{
-                .el-dialog__body{
+
+        .el-overlay {
+            .el-dialog {
+                .el-dialog__body {
                     padding: 30px 60px 30px 20px !important;
-                    .periodFrom{
-                        .el-select, .el-input{
+
+                    .periodFrom {
+
+                        .el-select,
+                        .el-input {
                             width: 100%;
                         }
-                        .el-input{
+
+                        .el-input {
                             height: 30px;
                         }
                     }
@@ -415,41 +414,46 @@ export default {
             }
         }
     }
-  .evaluationCombinationDataC{
-      .multisequence125Table{
-          .el-table__body-wrapper{
-              height: 53vh !important;
-          }
-      }
-      .multisequence100Table{
-          .el-table__body-wrapper{
-              height: 60vh !important;
-          }
-      }
-    .el-table{
-        .el-input__inner{
-            height: 30px !important;
+
+    .evaluationCombinationDataC {
+        .multisequence125Table {
+            .el-table__body-wrapper {
+                height: 53vh !important;
+            }
         }
-        .el-radio__label{
-            display: none;
+
+        .multisequence100Table {
+            .el-table__body-wrapper {
+                height: 60vh !important;
+            }
         }
-        
-        .indicitem{
-            color: #409EFF;
-            font-size: 12px;
-            margin-right: 20px;
-            cursor:pointer;
-            &:hover{
-                text-decoration: underline;
+
+        .el-table {
+            .el-input__inner {
+                height: 30px !important;
+            }
+
+            .el-radio__label {
+                display: none;
+            }
+
+            .indicitem {
+                color: #409EFF;
+                font-size: 12px;
+                margin-right: 20px;
+                cursor: pointer;
+
+                &:hover {
+                    text-decoration: underline;
+                }
             }
         }
+
+        .el-pagination {
+            margin-top: 20px;
+            text-align: end;
+            position: relative;
+        }
     }
-    .el-pagination{
-        margin-top: 20px;
-        text-align: end;
-        position: relative;
-    }
-    }
-    
-}
-</style>
+
+}</style>

src/components/gatewaynNewPage.vue

@@ -533,6 +533,8 @@
                     year: that.changeYear,
                     season: that.seasonStr === '第一季度' ? '1' : that.seasonStr === '第二季度' ? '2' : '3'
                 }
+                console.log(111,params)
+                console.log(222,that.seasonStr)
                 apiGetevaluationportallist(params).then(datas => {
                     if (datas && datas.data) {
                         let secArr = ['HD', 'SD', 'XNYFG', 'GJYW', 'MDYTH']

src/components/importPage/importDailog.vue

@@ -76,6 +76,7 @@ export default {
             selectFile: null,
             binSection: "",
             year: "",
+            id: "",
         }
     },
     methods: {
@@ -129,14 +130,15 @@ export default {
             formData.append("file", this.selectFile);
             formData.append("binSection", this.binSection);
             formData.append("year", this.year);
-            formData.append("userId", userInfo.importExcelId);
-            formData.append("userName", userInfo.importExcelName);
+            formData.append("id", this.id || "");
+            formData.append("userId", userInfo.importExcelId || "");
+            formData.append("userName", userInfo.importExcelName || "");
             axios.post(`${this.upload.processurl}${this.upload.url}`, formData, {
                 headers: {
                     "Content-Type": "application/octet-stream"
                 }
             }).then(res => {
-                ElMessage[res.data.success ? "success" : "error"](res.data.code === 200 ? "导入成功" : (res.data.message || "请求出错"));
+                // ElMessage[res.data.success ? "success" : "error"]((res.data.code === 200 ? (res.data.message || "导入成功") : (res.data.message || "请求出错")));
                 this.upload.open = false;
                 this.upload.isUploading = false;
                 this.$refs.upload.clearFiles();

src/request/index.js

@@ -10,7 +10,7 @@ const baseUrl = require('../utils/baseUrl.js')
 const service = axios.create({
     // baseURL: process.env.VUE_APP_BASE_API, // 所有的请求地址前缀部分
     baseURL: process.env.NODE_ENV === "production" ? baseUrl.ROOT : baseUrl.ROOT, // 所有的请求地址前缀部分
-    timeout: 60000, // 请求超时时间毫秒
+    timeout: 3600000, // 请求超时时间毫秒
     // withCredentials: true, // 异步请求携带cookie
     headers: {
         // 设置后端需要的传参类型