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

src/views/components/common/fileLoad.vue

@@ -23,7 +23,7 @@ export default {
   },
   data () {
     return {
-      isRequired: true
+      isRequired: false
     };
   },
   props: {

src/views/manager/project/index.vue

@@ -46,16 +46,9 @@
       </template>
     </a-table>
     <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />
-    <s-modal title="项目修改" v-model="visibleEdit" v-if="visibleEdit">
-      <div slot="content">
-        <project-edit v-model="id" @close="closeWindow" ref="projCreate" :isModifyNo="true"></project-edit>
-      </div>
-      <template slot="footer">
-        <a-button @click="() => this.$refs.projCreate.save()">
-          保存
-        </a-button>
-      </template>
-    </s-modal>
+    <a-modal v-model="visibleEdit" v-if="visibleEdit" title="项目修改" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
+      <project-create v-model="id" @close="closeWindow"></project-create>
+    </a-modal>
     <a-modal v-model="visibleView" v-if="visibleView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <project-view v-model="id" @close="() => this.visibleView = false" />
     </a-modal>
@@ -72,7 +65,7 @@
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import projectView from '@/views/report/project/components/projectView'
-import projectEdit from '@/views/report/project/components/projectEdit'
+import projectCreate from '@/views/report/project/components/edit/projectCreate'
 import paraSelect from '@/views/components/common/paraSelect'
 import baseSelect from '@/views/components/common/baseSelect'
 import projectImport from '@/views/manager/project/components/projectImport';
@@ -80,8 +73,7 @@ import auditRecord from '@/views/manager/project/components/auditRecord';
 export default {
   name: 'managerProject',
   components: {
-    projectView,
-    projectEdit, paraSelect, baseSelect, projectImport, auditRecord
+    projectView, projectCreate, paraSelect, baseSelect, projectImport, auditRecord
   },
   data () {
     return {

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

@@ -387,14 +387,14 @@
               <a :href="'/downloadFile/textTemplate.docx'" download="申请书正文.docx">
                 <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;font-size: 16px;">正文模板下载</span>
               </a>
-              <span style="color: red;margin-left: 42px;">注：正文部分需要下载模版，填写完成后上传到系统中,格式 .doc,.docx。</span>
+              <span style="color: red;margin-left: 42px;">注：正文部分需要下载模版，填写完成后上传到系统中,格式 .doc,.docx,.pdf。</span>
             </div>
           </a-col>
         </a-row>
         <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']" message="请上传申请书正文" />
+              <up-load :isUpload="true" :file.sync="formData" :format="['doc', 'docx','pdf']" message="请上传申请书正文" />
             </div>
           </a-col>
         </a-row>

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

@@ -69,7 +69,7 @@ export default {
           let msg = ''
           let certId = e.证件号码
           let gender = e.性别
-          let birthday = moment(e.出生日期).format('YYYY-MM-DD HH:mm:ss')
+          let birthday = moment(e.出生日期.replace(/\s/g, "").replace(/\//g, '-')).format('YYYY-MM-DD HH:mm:ss')
           let title = null
           let degree = null
           if (!!!e.姓名) {
@@ -114,7 +114,7 @@ export default {
             this.errorState = true
           }
           let member = {
-            name: e.姓名, birthday: birthday, sex: gender, title: title, titleName: e.职称, degree: degree, degreeName: e.学位, workUnit: e.工作单位, mobile: e.手机号, email: e.电子邮箱, certId: certId, projWork: e.项目分工, forMonths: e.每年工作, msg: msg, fileId: null, downloadId: null, fileName: null, downloadUrl: null, isRequired: true
+            name: e.姓名, birthday: birthday, sex: gender, title: title, titleName: e.职称, degree: degree, degreeName: e.学位, workUnit: e.工作单位, mobile: e.手机号, email: e.电子邮箱, certId: certId, projWork: e.项目分工, forMonths: e.每年工作, msg: msg, fileId: null, downloadId: null, fileName: null, downloadUrl: null
           }
           memberList.push(member)
         })

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

@@ -844,8 +844,7 @@ export default {
             return false
           } else {
             this.$emit('load', true)
-            let state = this.formData.projState
-            if (state != 30)
+            if (this.formData.projState < 10)
               this.formData.projState = 10
             let pars = isEmptyParams(this.formData)
             let par = { ...pars }
@@ -898,7 +897,7 @@ export default {
       if (!!e && e.length == 3) {
         this.formData.totalFunding = e[0]
         this.formData.govFunding = e[1]
-        
+
         this.formData.projectKPI.totalBudget = this.formData.totalFunding
         this.formData.projectKPI.applyFunds = this.formData.govFunding
         this.formData.projectKPI.selfFunds = e[2]

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

@@ -3,7 +3,7 @@
     <a-row>
       <a-col :span="24">
         <div class="tb-title">
-          <span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人)</strong>
+          <span>项目组主要成员 <strong style="color: red;">(注：不包含项目申请人,附件格式.doc, .docx, .pdf)</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>
@@ -174,7 +174,7 @@
         </a-col>
         <a-col :span="4">
           <div class="special-middle">
-            <file-load :file.sync="dataList[index]" :index="index" :name="'members'" />
+            <file-load :file.sync="dataList[index]" :index="index" :name="'members'" :format="['doc', 'docx', 'pdf']" />
           </div>
         </a-col>
         <a-col :span="3">
@@ -315,7 +315,6 @@ import moment from 'moment'
 
 const Member = {
   name: null, birthday: null, sex: null, title: null, titleName: null, degree: null, degreeName: null, workUnit: null, mobile: null, email: null, certId: null, projWork: null, forMonths: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null
-  , isRequired: true
 }
 
 export default {