3333

src/views/components/common/documentView.vue

@@ -83,6 +83,7 @@ export default {
   .ant-tag {
     display: inline !important;
     border:0 !important;
+    font-size: 14px;
   }
 }
 </style>

src/views/components/common/fileLoad.vue

@@ -4,7 +4,7 @@
       <div>
         <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
       </div>
-      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 4px;" />
+      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 2px;" />
     </div>
     <div v-else>
       <a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: true, message: '请上传附件',trigger: 'blur',}">

src/views/components/common/upLoad.vue

@@ -4,13 +4,15 @@
       <div>
         <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
       </div>
-      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 1px;" />
+      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 2px;" />
     </div>
     <div v-else>
-      <input type="file" ref="fileElem" class="visually-hidden" @change="handleFiles">
-      <a-button @click="fileSelect">
-        <a-icon type="upload" />选择文件
-      </a-button>
+      <a-form-model-item :prop="name+'downloadUrl'" :rules="{required: isRequired, message: message,trigger: 'blur',}">
+        <input type="file" ref="fileElem" class="visually-hidden" @change="handleFiles">
+        <a-button @click="fileSelect">
+          <a-icon type="upload" />选择文件
+        </a-button>
+      </a-form-model-item>
     </div>
   </div>
 </template>
@@ -40,12 +42,30 @@ export default {
         return false
       }
     },
+    isRequired: {
+      type: Boolean,
+      default () {
+        return true
+      }
+    },
     format: {
       type: Array,
       default () {
         return []
       }
     },
+    name: {
+      type: String,
+      default () {
+        return 'fileobj'
+      }
+    },
+    message: {
+      type: String,
+      default () {
+        return '请上传附件'
+      }
+    },
   },
   created () {
 

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

@@ -15,7 +15,7 @@
       </a-col>
       <a-col :span="20" class="bg-gray">
         <div class="special-middle">
-          <div class="required">单位名称</div>
+          <div>单位名称</div>
         </div>
       </a-col>
       <a-col :span="2" class="bg-gray">

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

@@ -5,7 +5,7 @@
         <a :href="url" download="memberInfo.xlsx">
           <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">模板下载</span>
         </a>
-        <up-load @beforeUpload="beforeUpload" />
+        <up-load @beforeUpload="beforeUpload" :format="['xls', 'xlsx']"/>
       </div>
       <div style="width:100%;height: calc(100% - 72px);overflow: auto;">
         <a-table :dataSource="tableData" :columns="columns" :pagination="false" :loading="loading" bordered size="small">

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

@@ -460,7 +460,7 @@
       <a-row type="flex">
         <a-col :span="24">
           <div style="min-height:34px;line-height: 40px;text-align: center;">
-            <up-load :isUpload="true" :file.sync="formData" :format="['doc', 'docx']" />
+            <up-load :isUpload="true" :file.sync="formData" :format="['doc', 'docx']" message="请上传申请书正文"/>
           </div>
         </a-col>
       </a-row>
@@ -595,7 +595,7 @@ export default {
         managerDept: "",
       },
       rules: {
-        jobTime :null,
+        jobTime: [{ required: true, message: '请填写每年工作时间(月)', trigger: 'blur' },],
         mainResearchAreas: [{ required: true, message: '请填写主要研究领域', trigger: 'blur' },],
         unitLinkName: [{ required: true, message: '请填写单位联系人', trigger: 'blur' },],
         unitLinkMobile: [{ required: true, message: '请填写联系人电话', trigger: 'blur' },],
@@ -612,6 +612,7 @@ export default {
         govFunding: [{ required: true, message: '请填写申请科技经费', trigger: 'blur' },],
         projAbstract: [{ required: true, message: '请填写项目摘要', trigger: 'blur' },],
         projKeywords: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
+        downloadUrl: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
       },
     }
   },

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

@@ -3,7 +3,11 @@
     <a-row>
       <a-col :span="24">
         <div class="tb-title">
-          <span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人)</strong></span>
+          <span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人)</strong>
+            <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>
+          </span>
         </div>
       </a-col>
     </a-row>