eweee

src/views/components/common/cascaderSelect.vue

 <template>
-  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" v-if="changeOnSelect" :changeOnSelect="changeOnSelect" :show-search="{ filter }" slot-scope="{labels, selectedOptions}" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
-  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" v-else :changeOnSelect="changeOnSelect" :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
+  <!-- <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" v-if="changeOnSelect" :changeOnSelect="changeOnSelect" :show-search="{ filter }" slot-scope="{labels, selectedOptions}" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" /> -->
+  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" :changeOnSelect="changeOnSelect" :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
 </template>
 <script>
 //import { specList, getSpecArray } from "@/views/components/common/config"

src/views/peAssign/components/projectSelectIntoGroup.vue

 <template>
-  <div style="height: 60vh; overflow: auto;">
+  <div style="height: 70vh; overflow: auto;">
     <a-form :form="form" :model="searchForm" layout="inline" class="search_form">
       <a-form-item>
         <a-input placeholder="项目名称" v-model="searchForm.projName" :maxLength="100" style="width: 120px" />
@@ -8,7 +8,7 @@
         <a-input placeholder="申请编号" v-model="searchForm.appNo" :maxLength="100" style="width: 120px" />
       </a-form-item>
       <a-form-item>
-        <knowledge-select ref="knowledgeSelectRef" v-model="searchForm.knowledgeId"></knowledge-select>
+        <cascader-select v-model="searchForm.knowledgeId" :changeOnSelect="true"/>
       </a-form-item>
       <a-form-item>
         <a-select default-value="" placeholder="项目类别" v-model="searchForm.projClass" style="width: 160px">
@@ -17,9 +17,6 @@
           <a-select-option value="2">重点项目</a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item>
-        <a-input v-model="searchForm.certId" placeholder="申报人证件号" :maxLength="100" style="width: 160px" />
-      </a-form-item>
       <a-form-item>
         <a-input v-model="searchForm.appPersonName" placeholder="申报人" :maxLength="100" style="width: 80px" />
       </a-form-item>
@@ -44,7 +41,7 @@
 <script>
 import { getType } from '@/views/utils/auth'
 import { isEmptyParams, hideIdCard } from '@/views/utils/common'
-import knowledgeSelect from '@/views/components/common/knowledgeSelect.vue'
+import cascaderSelect from '@/views/components/common/cascaderSelect'
 
 
 export default {
@@ -58,9 +55,9 @@ export default {
     }
   },
   components: {
-    knowledgeSelect
+    cascaderSelect
   },
-  data() {
+  data () {
     return {
       form: this.$form.createForm(this, { name: 'projSearch' }),
       loading: false,
@@ -89,7 +86,7 @@ export default {
   created () {
     this.searchForm.groupId = this.value
     this.getYear()
-    
+
   },
   methods: {
     getYear () {
@@ -128,11 +125,11 @@ export default {
       this.searchForm.certId = ''
       this.searchForm.appPersonName = ''
       this.searchForm.appUnitName = ''
-      
+
       if (this.$refs.knowledgeSelectRef) {
         this.$refs.knowledgeSelectRef.reset()
       }
-      
+
       this.pagination.pageIndex = 1
       this.getListByPage()
     },

src/views/peAssign/projKeyAssign.vue

@@ -86,7 +86,7 @@
     <a-modal v-model="assignDetailVisible" title="分配明细" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
       <assign-detail :groupList="groupList" />
     </a-modal>
-    <a-modal v-model="projectIntoGroupVisible" :title="projectIntoGroupTitle" width="70%" :dialog-style="{ top: '15%' }" :maskClosable="false" destroyOnClose>
+    <a-modal v-model="projectIntoGroupVisible" :title="projectIntoGroupTitle" width="70%" :dialog-style="{ top: '8%' }" :maskClosable="false" destroyOnClose>
       <template slot="footer">
         <div style="text-align:center; width:100%">
           <a-button type="primary" @click="() => this.$refs.childEdit.submit()">提交</a-button>
@@ -278,7 +278,7 @@ export default {
           break
       }
     },
-    
+
     onAddProjectGroup () {
       this.groupId = null
       this.groupEditVisible = true
@@ -408,14 +408,14 @@ export default {
     exportEvaluationExcel () {
       this.loading = true
 
-      const rowMarks = [ 'A', 'B', 'C', 'D', 'K' ]
+      const rowMarks = ['A', 'B', 'C', 'D', 'K']
       this.$api.statistical.getEvaluationExportExcel({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
           this.eTableData = data.evaluationList
           this.eMergeList = data.mergeList
 
           import('@/views/utils/Export2Excel').then(excel => {
-            const multiHeader = [[ this.reportYear + '项目评审结果列表', '','']] // 标题
+            const multiHeader = [[this.reportYear + '项目评审结果列表', '', '']] // 标题
             const header = ['项目编号', '项目名称', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '评分', '评审内容', '平均分'] // 表头
             const filterVal = ['projNo', 'projName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'totalScore', 'remark', 'averageScore'] // 数据属性
             const list = this.eTableData //请求来的数据
@@ -440,16 +440,16 @@ export default {
     exportProjGroupScoreExcel () {
       this.loading = true
 
-      const rowMarks = [ 'A' ]
+      const rowMarks = ['A']
       this.$api.statistical.getProjectGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
           this.eTableData = data.groupScoreList
           //this.eMergeList = data.mergeList
 
           import('@/views/utils/Export2Excel').then(excel => {
-            const multiHeader = [[ this.reportYear + '项目分组排名列表', '','']] // 标题
+            const multiHeader = [[this.reportYear + '项目分组排名列表', '', '']] // 标题
             const header = ['组名', '组内排名', '项目编号', '项目名称', '一级学科', '二级学科', '申报单位', '申报人', '所属市(州）', '总分', '平均分'] // 表头
-            const filterVal = ['groupName', 'orderNo',  'projNo', 'projName', 'knowledgeParentName', 'knowledgeName', 'appUnitName', 'personName', 'unitName', 'totalScore', 'averageScore'] // 数据属性
+            const filterVal = ['groupName', 'orderNo', 'projNo', 'projName', 'knowledgeParentName', 'knowledgeName', 'appUnitName', 'personName', 'unitName', 'totalScore', 'averageScore'] // 数据属性
             const list = this.eTableData //请求来的数据
             const merges = ['A1:I1'].concat(this.eMergeList) //需要合并的单元格
             const data = list.map(item => filterVal.map(j => item[j])) // 转换二维数组