Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/evaluation/components/score.vue

@@ -209,7 +209,7 @@ export default {
         score19: { required: true, message: "*", trigger: "blur" },
         additionalScore: { required: true, message: "*", trigger: "blur" },
         recommendFunding: { required: true, message: "*", trigger: "blur" },
-        supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
+        // supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
         evaluationType: { required: true, message: "*", trigger: "change" },
       },
       projectInfo: {

src/views/evaluation/components/scoreEdit.vue

@@ -41,7 +41,7 @@
         <td class="bg-title" style="text-align: right;">总分：</td>
         <td colspan="2" style="text-align: left;padding-left: 12px;">{{Count()}}分</td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td class="bg-title" style="text-align: right;">是否推荐立项支持</td>
         <td colspan="2">
           <a-form-model-item prop="supportState">
@@ -51,7 +51,7 @@
             </a-radio-group>
           </a-form-model-item>
         </td>
-      </tr>
+      </tr> -->
       <tr>
         <td class="bg-title" style="text-align: right;">评审结果</td>
         <td colspan="2">

src/views/evaluation/components/scoreInfo.vue

@@ -23,13 +23,13 @@
           <span v-if="item.order==7">{{ value.score7 }}</span>
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td class="bg-title" style="text-align: right;">是否推荐立项支持</td>
         <td colspan="2">
           <a-tag :color="'#87d068'" v-if="value.supportState==1">是</a-tag>
           <a-tag :color="'#f50'" v-if="value.supportState==0">否</a-tag>
         </td>
-      </tr>
+      </tr> -->
       <tr>
         <td class="bg-title" style="text-align: right;">评审结果</td>
         <td colspan="2">

src/views/evaluation/index.vue

@@ -87,7 +87,7 @@ export default {
         { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
         { title: '评审结果', scopedSlots: { customRender: 'evaluationType' }, align: 'center' },
-        { title: '是否推荐立项支持', scopedSlots: { customRender: 'supportState' }, align: 'center' },
+        // { title: '是否推荐立项支持', scopedSlots: { customRender: 'supportState' }, align: 'center' },
         { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
       ],

src/views/peAssign/projKeyAssign.vue

@@ -414,8 +414,8 @@ export default {
           import('@/views/utils/Export2Excel').then(excel => {
             try {
               const multiHeader = [[this.reportYear + '项目评审结果列表', '', '']]
-              const header = ['项目编号', '项目名称', '一级学科', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '专家类型', '专家评分', '评审类别', '是否支持立项', '评审内容', '评审状态', '总分', '最终得分']
-              const filterVal = ['projNo', 'projName', 'parentName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'expertTypeName', 'evaluationScore', 'evaluationTypeName', 'supportStateName', 'remark', 'auditStateName', 'totalScore', 'calculateScore']
+              const header = ['项目编号', '项目名称', '一级学科', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '专家类型', '专家评分', '评审类别', '评审内容', '评审状态', '总分', '最终得分']
+              const filterVal = ['projNo', 'projName', 'parentName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'expertTypeName', 'evaluationScore', 'evaluationTypeName',  'remark', 'auditStateName', 'totalScore', 'calculateScore']
               const list = this.eTableData
               const merges = ['A1:Q1'].concat(this.eMergeList)
               const data = list.map(item => filterVal.map(j => item[j]))