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

src/views/components/common/cascaderSelect.vue

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

src/views/report/project/components/cooperativeUnitsEdit.vue

@@ -36,7 +36,7 @@
         <div class="special-middle">
           <div>
             <a-form-model-item :prop="'cooperativeUnits.' + index + '.unitName'">
-              <a-input v-model="item.unitName" :maxLength="20" placeholder="单位名称" style="width: 80%" />
+              <a-input v-model="item.unitName" :maxLength="50" placeholder="单位名称" style="width: 80%" />
             </a-form-model-item>
           </div>
         </div>

src/views/report/project/components/memberImport.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
       <div style="width:100%; height: 36px;">
         <a :href="url" download="memberInfo.xlsx">
-          <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">模板下载</span>
+          <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">项目组成员模板下载</span>
         </a>
         <up-load @beforeUpload="beforeUpload" :format="['xls', 'xlsx']"/>
       </div>

src/views/report/project/components/projectMemberEdit.vue

@@ -4,6 +4,9 @@
       <a-col :span="24">
         <div class="tb-title">
           <span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人)</strong>
+            <a :href="'/downloadFile/memberInfo.xlsx'" download="memberInfo.xlsx" style="margin-left: 12px;">
+              <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">项目组成员模板下载</span>
+            </a>
             <a :href="'/downloadFile/vitaeTemplate.docx'" download="个人简历.docx" style="margin-left: 12px;">
               <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;font-size: 14px;margin-left: 2px;">个人简历模板下载</span>
             </a>