考评规则配置，考评规则配置页面，增加导入模板（配合后台联调服务）；业绩考核系数配置：取消首页时间的默认，修改详情页中标签“权重分配”为“业绩考核系数明细”；党建考核系数配置：增加可按照单位进行搜索的功能；单位营业收入：列表数据按照时间倒序排；搜索可按照年度进行搜索；

src/components/baseInfomation/moreBrandPage.vue

@@ -24,6 +24,10 @@
                         </el-option>
                     </el-select>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan" style="width: 60px">时间：</span>
+                    <el-date-picker v-model="resAnnual"  value-format="YYYY" type="year" placeholder="选择时间" />
+                </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
@@ -173,6 +177,7 @@ export default {
             periodData: [],
             moduleStr: '',
             checkCycleStr: '',
+            resAnnual: '',
             moreBrandData:[],
             companyDatas: [],
             addType: '',
@@ -223,7 +228,8 @@ export default {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 binSection: that.moduleStr,
-                checkCycle: that.checkCycleStr
+                checkCycle: that.checkCycleStr,
+                year: that.resAnnual
             }
             apiGetmultiplebrandtreeList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -385,6 +391,7 @@ export default {
             this.page.currentPage = 1
             this.moduleStr = ''
             this.checkCycleStr = ''
+            this.resAnnual = ''
             this.getMoreBrandData()
         },
         handleSizeChange(val){
@@ -436,6 +443,18 @@ export default {
                             }
                         }
                     }
+                    .el-input{
+                        margin-right:10px;
+                        height: 40px;
+                        .el-input__inner{
+                            height:40px;
+                        }
+                        .el-input__suffix{
+                            .el-select__caret{
+                                line-height:30px;
+                            }
+                        }
+                    }
                 }
                 .el-select{
                     margin-right:10px;

src/components/evaluationSystem/achievementKDetail.vue

@@ -34,7 +34,7 @@
                     </div>
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                    <el-tab-pane label="权重分配" name="first">
+                    <el-tab-pane label="业绩考核系数明细" name="first">
                          <!-- @select="rowClick" @select-all="rowClick" -->
                         <el-table :data="weightAllocation" style="width: 100%" ref="report-table_day">
                             <!-- <el-table-column type="selection" label="操作" align="center"></el-table-column> -->
@@ -172,26 +172,37 @@ export default {
                 { header: '填报人', key: 'createName', width: 26 },
                 { header: '填报日期', key: 'createTime', width: 26 },
             ]
-            worksheet.getColumn(3).values = ['资产管理系数', '资产总额'];
-            worksheet.getColumn(4).values = ['', 'K1'];
-            worksheet.getColumn(5).values = ['幅度管理系数', '机组'];
-            worksheet.getColumn(6).values = ['', 'K2'];
-            worksheet.getColumn(7).values = ['效益贡献系数', '账面利润总额'];
-            worksheet.getColumn(8).values = ['', '发电量'];
-            worksheet.getColumn(9).values = ['', '度电利润'];
-            worksheet.getColumn(10).values = ['', 'K3'];
-            worksheet.getColumn(11).values = ['定员管理系数', '定员'];
-            worksheet.getColumn(12).values = ['', 'K4'];
+            // worksheet.getColumn(3).values = ['资产管理系数', '资产总额'];
+            // worksheet.getColumn(4).values = ['', 'K1'];
+            // worksheet.getColumn(5).values = ['幅度管理系数', '机组'];
+            // worksheet.getColumn(6).values = ['', 'K2'];
+            // worksheet.getColumn(7).values = ['效益贡献系数', '账面利润总额'];
+            // worksheet.getColumn(8).values = ['', '发电量'];
+            // worksheet.getColumn(9).values = ['', '度电利润'];
+            // worksheet.getColumn(10).values = ['', 'K3'];
+            // worksheet.getColumn(11).values = ['定员管理系数', '定员'];
+            // worksheet.getColumn(12).values = ['', 'K4'];
+            worksheet.getColumn(4).values = ['资产管理系数', '资产总额'];
+            worksheet.getColumn(5).values = ['', 'K1'];
+            worksheet.getColumn(6).values = ['幅度管理系数', '机组'];
+            worksheet.getColumn(7).values = ['', 'K2'];
+            worksheet.getColumn(8).values = ['效益贡献系数', '账面利润总额'];
+            worksheet.getColumn(9).values = ['', '发电量'];
+            worksheet.getColumn(10).values = ['', '度电利润'];
+            worksheet.getColumn(11).values = ['', 'K3'];
+            worksheet.getColumn(12).values = ['定员管理系数', '定员'];
+            worksheet.getColumn(13).values = ['', 'K4'];
             //合并单元格
             worksheet.mergeCells('A1:A2');
             worksheet.mergeCells('B1:B2');
-            worksheet.mergeCells('C1:D1');
-            worksheet.mergeCells('E1:F1');
-            worksheet.mergeCells('G1:H1:I1:G1');
-            worksheet.mergeCells('K1:L1');
-            worksheet.mergeCells('M1:M2');
+            worksheet.mergeCells('C1:C2');
+            worksheet.mergeCells('D1:E1');
+            worksheet.mergeCells('F1:G1');
+            worksheet.mergeCells('H1:I1:G1:K1');
+            worksheet.mergeCells('L1:M1');
             worksheet.mergeCells('N1:N2');
             worksheet.mergeCells('O1:O2');
+            worksheet.mergeCells('P1:P2');
             worksheet.getRow(1).font = {
                 size: 12,
                 bold: true

src/components/evaluationSystem/achievementKPage.vue

@@ -275,7 +275,7 @@ export default {
         }
     },
     created() {
-        this.resAnnual = new Date().getFullYear().toString()
+        // this.resAnnual = new Date().getFullYear().toString()
         this.getachievementData()
         this.getDepartmentFromTreeData()
         this.getOrganizetionData()

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -383,6 +383,8 @@
                 this.$refs.importPage.upload.title = "考评规则数据导入"
                 this.$refs.importPage.upload.open = true
                 this.$refs.importPage.upload.url = `/evaluate-rule/importExcel`
+                this.$refs.importPage.upload.showModel = true
+                this.$refs.importPage.showModelObj.url = '/evaluate-rule/importTemplate'
             },
             handleExport() {
                 let that = this

src/components/evaluationSystem/partyBuildingKPage.vue

@@ -3,6 +3,10 @@
         <div class="partyBuildingBtn">
             <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
+                    <span class="exceedSpan" style="width: 100px">单位名称：</span>
+                    <el-input v-model="companyStr" placeholder="请输入单位名称"></el-input>
+                </div>
+                <div class="exceed">
                     <span class="exceedSpan">业务属性：</span>
                     <el-select v-model="sectionStr" placeholder="请选择业务属性">
                         <el-option
@@ -128,6 +132,7 @@ export default {
             title: '',
             isSave: false,
             changeDateSelect: [],
+            companyStr: '',
             sectionStr: '',
             resAnnual: '',
             partyBuildingData:[],
@@ -181,6 +186,7 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
+                organizationName: that.companyStr,
                 sectionId: that.sectionStr,
                 year: that.resAnnual
             }
@@ -327,6 +333,7 @@ export default {
         },
         resetSeach() {
             this.page.currentPage = 1
+            this.companyStr = ''
             this.sectionStr = ''
             this.resAnnual = ''
             this.getpartyBuildingData()