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

src/views/audit/project/audit.vue

@@ -64,52 +64,45 @@ export default {
       ],
       formData: {
         id: null,
-        organizationCode: null,
+        appPersonName: null,
+        sex: null,
+        birthday: null,
+        nationName: null,
+        degreeName: null,
+        titleName: null,
+        mobile: null,
+        email: null,
+        jobTime: null,
         address: null,
-        registeredAddress: null,
-        postCode: null,
-        legalPerson: null,
-        workforce: null,
-        specializedPersonnel: null,
-        researchPersonnel: null,
-        depositBank: null,
-        bankAccount: null,
-        depositBankAddress: null,
-        interbankNumber: null,
-        researchTotal: null,
-        isResearchActive: null,
-        researchCount: null,
-        researchPersonCount: null,
+        appUnitName: null,
+        mainResearchAreas: null,
+        unitLinkName: null,
+        unitLinkMobile: null,
+        unitLinkEmail: null,
+        unitLinkFax: null,
         projName: null,
-        leadUnit: null,
-        recommendUnit: null,
+        knowledgeId: null,
+        subjectScope: null,
+        projClass: null,
+        remark: null,
         startDate: null,
         endDate: null,
-        technologyInnovationBase: null,
-        knowledgeId: null,
         totalFunding: null,
         govFunding: null,
-        linkName: null,
-        linkMobile: null,
-        linkEmail: null,
         projAbstract: null,
         projKeywords: null,
-        researchContent: null,
-        memResume: null,
-        researchProgress: null,
-        researchContent: null,
-        technologyTarget: null,
-        economyTarget: null,
-        achievementTarget: null,
-        otherTarget: null,
+        yearTarget: null,
+        year1Goal: null,
+        year2Goal: null,
+        year3Goal: null,
+        projectKPI: projectKPI,
         cooperativeUnits: [],
         members: [],
         budget: [],
-        equipments: [],
-        projectSubList: [],
-        managementRuleList: [],
+        fundPlan: [],
         fileList: [],
         auditList: [],
+        managerDept: "",
       },
       auditObj: { id: this.value, auditObjectId: this.objId, auditResult: null, auditType: 1, auditContent: '' },
       rules: {

src/views/audit/project/finalJudgment.vue

@@ -453,7 +453,6 @@ export default {
       const rowMarks = [ 'A' ]
       this.$api.statistical.getProjectGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
-          console.log(data)
           this.eTableData = data.groupScoreList
           this.eMergeList = data.mergeList
 

src/views/components/common/documentView.vue

 <template>
-  <div class="file_view">
-    <a-tag :color="enums.fileColor[getFileExtension(fileName).toLowerCase()]" class="file_name" :title=" fileName">{{ fileName }}</a-tag>
-    <a-button v-show="isOpen" shape="circle" size="small" icon="search" @click="FileView()" class="btn" />
+  <div class="file_doc_v">
+    <div>
+      <a class="ant-dropdown-link dlw" style="width: calc(100% - 4px);margin-left:6px;display: block;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :href="fileUrl" :download="fileName">
+        <a-tag :color="enums.fileColor[getFileExtension(fileName).toLowerCase()]" class="file_name" :title=" fileName" style="cursor: pointer;">{{ fileName }}</a-tag>
+      </a>
+    </div>
+    <a-button v-show="isOpen" shape="circle" size="small" icon="search" @click="FileView()" class="btn" style="margin: 0 2px;" />
     <a-modal v-model="visibleFileView" :title="'[' + fileName + '] 文件查看'" width="1000px" :dialog-style="{ top: '10%' }" :footer="null" destroyOnClose>
       <preview-file v-model="fileUrl" :fileName="fileName"></preview-file>
     </a-modal>
-    <a class="ant-dropdown-link dlw" style="margin-left:6px" :href="fileUrl" :download="fileName">
-      <a-icon type="download" />
-    </a>
   </div>
 </template>
 
@@ -65,23 +66,23 @@ export default {
 };
 </script>
 <style scoped lang="less">
-.file_view {
-  position: relative;
-  .file_name {
-    max-width: calc(100% - 55px);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    display: inline-block;
-    vertical-align: bottom;
+.file_doc_v {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  > div:nth-child(1) {
+    max-width: calc(100% - 20px);
+    // overflow: hidden;
+    // white-space: nowrap;
+    // text-overflow: ellipsis;
   }
-  .btn {
-    position: absolute;
-    right: 26px;
+  .ant-tag-blue {
+    background: none !important;
   }
-  .dlw {
-    position: absolute;
-    right: 10px;
+  .ant-tag {
+    display: inline !important;
+    border:0 !important;
   }
 }
 </style>

src/views/components/common/fileLoad.vue

 <template>
-  <div v-if="file.downloadUrl" class="file-box">
-    <div>
-      <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
+  <div class="upload-layout">
+    <div v-if="file.downloadUrl" class="file-lay">
+      <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;" />
+    </div>
+    <div v-else>
+      <a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: true, message: '请上传附件',trigger: 'blur',}">
+        <input type="file" :ref="name +'fileElem' + index" class="visually-hidden" @change="handleFiles(file, index)" />
+        <a-button @click="fileSelect(index)"><a-icon type="upload" />选择文件</a-button>
+      </a-form-model-item>
     </div>
-    <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" />
-  </div>
-  <div v-else>
-    <a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: true, message: '请上传附件',trigger: 'blur',}">
-      <input type="file" :ref="name +'fileElem' + index" class="visually-hidden" @change="handleFiles(file, index)" />
-      <a-button @click="fileSelect(index)"><a-icon type="upload" />选择文件</a-button>
-    </a-form-model-item>
   </div>
 </template>
 <script>
@@ -124,13 +126,15 @@ export default {
 </script>
 <style scoped lang="less">
 .upload-layout {
-  display: inline-block;
-  margin: 0 10px;
-  height: 30px;
-  line-height: 30px;
-
-  .file-box {
+  width: 100%;
+  .file-lay {
+    display: flex;
+    justify-content: center;
+    align-items: center;
     margin: 0 8px;
+    > div:nth-child(1) {
+      max-width: calc(100% - 0px);
+    }
   }
   .visually-hidden {
     display: none !important;

src/views/components/common/upLoad.vue

 <template>
   <div class="upload-layout">
-    <div v-if="file.downloadUrl" class="file-box">
+    <div v-if="file.downloadUrl" class="file-lay">
       <div>
-        <a-icon type="file" style="margin-right: 6px" />
-        <span class="hover-pointer" style="color:blue;text-decoration:underline;font-size: 16px;" @click="downloadfile">{{file.fileName}}</span>
+        <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
       </div>
-      <a-icon type="delete" class="hover-pointer" @click="deletefile" style="margin-left: 8px" />
+      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 1px;" />
     </div>
     <div v-else>
       <input type="file" ref="fileElem" class="visually-hidden" @change="handleFiles">
@@ -17,8 +16,12 @@
 </template>
 <script>
 const File = { fileName: null, downloadUrl: null, fileExplain: null, downloadId: null }
+import documentView from '@/views/components/common/documentView'
 export default {
   name: "FileUpload",
+  components: {
+    documentView
+  },
   data () {
     return {
 
@@ -45,7 +48,7 @@ export default {
     },
   },
   created () {
-    console.log(this.format)
+
   },
   methods: {
     fileSelect () {
@@ -137,22 +140,14 @@ export default {
 </script>
 <style scoped lang="less">
 .upload-layout {
-  display: inline-block;
-  margin: 0 10px;
-  height: 30px;
-  line-height: 30px;
-
-  .file-box {
+  width: 100%;
+  .file-lay {
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
     margin: 0 8px;
-
     > div:nth-child(1) {
-      max-width: 90%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+      max-width: calc(100% - 0px);
     }
   }
   .visually-hidden {

src/views/conclusion/index.vue

@@ -143,7 +143,6 @@ export default {
         if (data) {
           const { dataList = [], total = 0 } = data
           this.tableData = dataList
-          console.log(dataList)
           this.pagination.total = total
           this.tableData.forEach(e => {
             if (e.startDate) {

src/views/evaluation/components/projectView.vue

@@ -77,7 +77,6 @@ export default {
         this.$api.project.getProjectInfoById({ id: this.value }).then(({ data = {} }) => {
           if (data) {
             this.projectInfo = data
-            console.log(this.projType)
             for (let i = 0; i < this.projectInfo.fileList.length; i++) {
               if (this.projectInfo.fileList[i].fileExplain.indexOf("项目申报简要信息首页") == -1 && this.projectInfo.fileList[i].fileExplain.indexOf("项目组成员签字") == -1)
                 fileArr.push(this.projectInfo.fileList[i])

src/views/evaluation/components/scoreEdit.vue

@@ -299,8 +299,6 @@ export default {
         })
       })
       this.a = list
-      console.log(list)
-      // console.log(this.totalRow, this.row3, this.row2, this.row1)
     }
   },
 };

src/views/expertGroup/expertGroupMembers.vue

@@ -96,7 +96,6 @@ export default {
       this.defaultExpandedKeys = value
     },
     filterOption (inputValue, option) {
-      //   console.log('filterOption', inputValue, option)
       return option.description.indexOf(inputValue) > -1;
     },
     handleChange (targetKeys, direction, moveKeys) {

src/views/manager/project/index.vue

@@ -189,7 +189,6 @@ export default {
       this.id = selectedRows[0].id
     },
     conclusionSubmit () {
-      console.log(this.id)
       this.loading = true
       let par = { id: this.id }
       this.$api.conclusion.createConclusionRecord(par).then(({ code, data }) => {

src/views/notice/components/noticeEdit.vue

@@ -100,13 +100,10 @@ export default {
       }
     },
     submit () {
-      // console.log(tinymce.activeEditor.getContent())
-      // console.log(this.textContent)
       this.formData.content = tinymce.activeEditor.getContent()
       this.$refs.from.validate(valid => {
         if (valid) {
           this.loading = true
-          console.log(this.formData)
           this.$api.notice.save(this.formData).then(({ data = {} }) => {
             if (data) {
               this.formData.id = data

src/views/peAssign/projKeyAssign.vue

@@ -428,7 +428,6 @@ export default {
       const rowMarks = [ 'A' ]
       this.$api.statistical.getProjectGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
-          console.log(data)
           this.eTableData = data.groupScoreList
           //this.eMergeList = data.mergeList
 

src/views/peAssign/projKnowledgeAssign.vue

@@ -480,7 +480,6 @@ export default {
       const rowMarks = [ 'A' ]
       this.$api.statistical.getProjectGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
-          console.log(data)
           this.eTableData = data.groupScoreList
           //this.eMergeList = data.mergeList
 

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

@@ -1198,7 +1198,6 @@ export default {
     },
     endDateChange (value, dateString) {
       this.formData.projectKPI.endDate = this.formData.endDate
-      console.log(this.formData.projectKPI)
     }
   },
   watch: {

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

@@ -450,22 +450,24 @@
       <a-row type="flex">
         <a-col :span="24" class="bg-gray">
           <div class="special-middle" style="font-weight: bold;text-align: center;">
+            <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>
           </div>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="24">
-          <div style="height:42px;line-height: 42px;text-align: center;">
-            <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>
-            <up-load :isUpload="true" :file.sync="formData" :format="['doc', 'docx']"/>
+          <div style="min-height:34px;line-height: 40px;text-align: center;">
+            <up-load :isUpload="true" :file.sync="formData" :format="['doc', 'docx']" />
           </div>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="24">
+          <!-- <document-view :fileUrl="formData.downloadUrl" :fileName="formData.fileName" :imageArray="[formData.downloadUrl]"></document-view>
+          <preview-file v-model="formData.downloadUrl" :fileName="formData.fileName"></preview-file> -->
         </a-col>
       </a-row>
 
@@ -476,6 +478,8 @@
 </template>
 
 <script>
+import documentView from '@/views/components/common/documentView'
+import previewFile from '@/views/components/common/previewFile'
 import { getType } from '@/views/utils/auth'
 import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
 import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
@@ -491,8 +495,6 @@ const ProjResearch = { projNo: null, projName: null, approveUnit: null, leader:
 const ManagementRule = { policyName: null, releaseDate: null, documentNumber: null, validityPeriod: null, mainContent: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
 const ProjectSub = { projName: null, undertakingUnit: null, address: null, director: null, totalBudget: null, govBudget: null, selfBudget: null, cooperativeUnits: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
 const Cooperative = { id: null, unitName: null }
-const ParticipateUnit = { id: null, unitName: null, unitCountry: null, unitAddress: null, organizationCode: null, projectWork: null }
-
 const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
 
 const projectKPI = {
@@ -534,7 +536,7 @@ const projectKPI = {
 export default {
   name: 'projectEdit',
   components: {
-    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit
+    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView
   },
   props: {
     value: {
@@ -552,103 +554,64 @@ export default {
       overseasShow: false,
       formData: {
         id: null,
-        organizationCode: null,
-        address: null,
+        appPersonName: null,
+        sex: null,
+        birthday: null,
+        nationName: null,
+        degreeName: null,
+        titleName: null,
+        mobile: null,
+        email: null,
         jobTime: null,
+        address: null,
+        appUnitName: null,
         mainResearchAreas: null,
-        registeredAddress: null,
-        postCode: null,
-        legalPerson: null,
-        workforce: null,
-        specializedPersonnel: null,
-        researchPersonnel: null,
-        depositBank: null,
-        bankAccount: null,
-        depositBankAddress: null,
-        interbankNumber: null,
-        researchTotal: null,
-        isResearchActive: null,
-        researchCount: null,
-        researchPersonCount: null,
+        unitLinkName: null,
+        unitLinkMobile: null,
+        unitLinkEmail: null,
+        unitLinkFax: null,
         projName: null,
-        leadUnit: null,
-        recommendUnit: null,
+        knowledgeId: null,
+        subjectScope: null,
+        projClass: null,
+        remark: null,
         startDate: null,
         endDate: null,
-        technologyInnovationBase: null,
-        knowledgeId: null,
         totalFunding: null,
         govFunding: null,
-        linkName: null,
-        linkMobile: null,
-        linkEmail: null,
         projAbstract: null,
         projKeywords: null,
-        projContent: null,
-        memResume: null,
-        researchProgress: null,
-        researchContent: null,
-        technologyTarget: null,
-        economyTarget: null,
-        achievementTarget: null,
-        otherTarget: null,
         yearTarget: null,
         year1Goal: null,
         year2Goal: null,
         year3Goal: null,
         projectKPI: projectKPI,
-        unitPayment: [],
         cooperativeUnits: [],
         members: [],
         budget: [],
         fundPlan: [],
-        equipments: [],
-        projectResearchList: [],
-        projectSubList: [],
-        managementRuleList: [],
         fileList: [],
+        auditList: [],
         managerDept: "",
       },
       rules: {
+        jobTime :null,
         mainResearchAreas: [{ required: true, message: '请填写主要研究领域', trigger: 'blur' },],
-        jobTime: [{ required: true, message: '请填写每年工作时间(月)', trigger: 'blur' },],
-        organizationCode: [{ required: true, message: '请填写组织机构代码/统一社会信用代码', trigger: 'blur' },],
-        registeredAddress: [{ required: true, message: '请填写注册所在地', trigger: 'blur' },],
-        postCode: [{ required: true, message: '请填写邮编', trigger: 'blur' },],
-        legalPerson: [{ required: true, message: '请填写法定代表人', trigger: 'blur' },],
-        workforce: [{ required: true, message: '请填写职工总数', trigger: 'blur' },],
-        specializedPersonnel: [{ required: true, message: '请填写其中专科以上人员', trigger: 'blur' },],
-        researchPersonnel: [{ required: true, message: '请填写研究开发人员', trigger: 'blur' },],
-        depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
-        bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
-        depositBankAddress: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
-        interbankNumber: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
-        // researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
-        // isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
-        // researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],
-        // researchPersonCount: [{ required: true, message: '请填写上一年度填报的研发人员数', trigger: 'blur' },],
+        unitLinkName: [{ required: true, message: '请填写单位联系人', trigger: 'blur' },],
+        unitLinkMobile: [{ required: true, message: '请填写联系人电话', trigger: 'blur' },],
+        unitLinkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
+        unitLinkFax: [{ required: true, message: '请填写传真', trigger: 'blur' },],
         projName: [{ required: true, message: '请填写项目名称', trigger: 'blur' },],
-        // leadUnit: [{ required: true, message: '请填写项目所属二级学院/部门名称(牵头单位)', trigger: 'blur' },],
-        // recommendUnit: [{ required: false, message: '请填写推荐部门', trigger: 'blur' },],
+        knowledgeId: { required: true, message: '请选择>项目所属学科类别', trigger: 'change' },
+        subjectScope: [{ required: true, message: '请填写选题范围', trigger: 'blur' },],
+        projClass: [{ required: true, message: '请填写项目类别', trigger: 'blur' },],
+        remark: [{ required: true, message: '请填写附注说明', trigger: 'blur' },],
         startDate: { required: true, message: '请选择项日开始时间', trigger: 'change' },
         endDate: { required: true, message: '请选择项目结束时间', trigger: 'change' },
-        technologyInnovationBase: [{ required: true, message: '请填写项目依托的科技创新基地', trigger: 'blur' },],
-        knowledgeId: { required: true, message: '请选择>项目所属学科类别', trigger: 'change' },
         totalFunding: [{ required: true, message: '请填写项目总经费', trigger: 'blur' },],
         govFunding: [{ required: true, message: '请填写申请科技经费', trigger: 'blur' },],
-        linkName: [{ required: true, message: '请填写项目联系人姓名', trigger: 'blur' },],
-        linkMobile: [{ required: true, message: '请填写联系人手机', trigger: 'blur' },],
-        linkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
         projAbstract: [{ required: true, message: '请填写项目摘要', trigger: 'blur' },],
         projKeywords: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
-        projContent: { required: true, message: '请填写项目的意义、必要性', trigger: 'blur' },
-        memResume: { required: true, message: '请填写项目现有工作基础和支撑条件', trigger: 'blur' },
-        researchProgress: { required: true, message: '请填写与项目相关的国内外技术发展现状', trigger: 'blur' },
-        researchContent: { required: true, message: '请填写项目实施目标', trigger: 'blur' },
-        technologyTarget: { required: true, message: '请填写主要技术指标', trigger: 'blur' },
-        economyTarget: { required: true, message: '请填写主要经济指标', trigger: 'blur' },
-        achievementTarget: [{ required: false, message: '请填写项目实施中形成的示范基地、中试线、生产线及其规模等', trigger: 'blur' },],
-        otherTarget: { required: false, message: '请填写其他应考核的指标', trigger: 'blur' },
       },
     }
   },
@@ -727,28 +690,29 @@ export default {
     },
     submit () {
       this.processProjectYearTarget()
-      if (this.formData.members.length == 0) {
-        this.$message.error('至少添加一位项目组成员！')
-        return
-      }
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.$emit('load', true)
-          let state = this.formData.projState
-          if (state != 30)
-            this.formData.projState = 10
-          let pars = isEmptyParams(this.formData)
-          let par = { ...pars }
-          this.$api.project.save(par).then(({ data = {} }) => {
-            if (data) {
-              this.formData.id = data
-              this.$message.success('成功！')
-              this.$emit('close', 'submit')
-            }
-            this.$emit('load', false)
-          }).catch(() => {
-            this.$emit('load', false)
-          })
+          if (this.formData.members.length == 0) {
+            this.$message.error('至少添加一位项目组成员！')
+            return false
+          } else {
+            this.$emit('load', true)
+            let state = this.formData.projState
+            if (state != 30)
+              this.formData.projState = 10
+            let pars = isEmptyParams(this.formData)
+            let par = { ...pars }
+            this.$api.project.save(par).then(({ data = {} }) => {
+              if (data) {
+                this.formData.id = data
+                this.$message.success('成功！')
+                this.$emit('close', 'submit')
+              }
+              this.$emit('load', false)
+            }).catch(() => {
+              this.$emit('load', false)
+            })
+          }
         } else {
           this.$message.warn('项目信息未填写完全！')
           return false

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

@@ -502,14 +502,16 @@
     <div v-if="tabsData[5].isShow">
       <a-row>
         <a-col :span="24" style="border-top: 0px">
-          <div class="tb-title">
+          <div class="main-title">
             <span>申请书正文</span>
           </div>
         </a-col>
       </a-row>
       <a-row type="flex">
-        <a-col :span="24">
-          <div v-html="toTextarea(value.projContent)"></div>
+        <a-col :span="24" class="bg-gray">
+          <div class="special-middle" style="font-weight: bold;text-align: center;">
+            <document-view :fileUrl="value.downloadUrl" :fileName="value.fileName" :imageArray="[value.downloadUrl]" v-if="!!value.downloadUrl"></document-view>
+          </div>
         </a-col>
       </a-row>
     </div>
@@ -569,7 +571,6 @@ export default {
         { title: '附件信息', key: '6', isShow: true },
         { title: '项目审核记录', key: '7', isShow: true },
       ]
-    console.log(this.value)
   },
   mounted () {
   },

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

@@ -77,58 +77,44 @@ export default {
       ],
       formData: {
         id: null,
-        organizationCode: null,
+        appPersonName: null,
+        sex: null,
+        birthday: null,
+        nationName: null,
+        degreeName: null,
+        titleName: null,
+        mobile: null,
+        email: null,
+        jobTime: null,
         address: null,
-        registeredAddress: null,
-        postCode: null,
-        legalPerson: null,
-        workforce: null,
-        specializedPersonnel: null,
-        researchPersonnel: null,
-        depositBank: null,
-        bankAccount: null,
-        depositBankAddress: null,
-        interbankNumber: null,
-        researchTotal: null,
-        isResearchActive: null,
-        researchCount: null,
-        researchPersonCount: null,
+        appUnitName: null,
+        mainResearchAreas: null,
+        unitLinkName: null,
+        unitLinkMobile: null,
+        unitLinkEmail: null,
+        unitLinkFax: null,
         projName: null,
-        leadUnit: null,
-        recommendUnit: null,
+        knowledgeId: null,
+        subjectScope: null,
+        projClass: null,
+        remark: null,
         startDate: null,
         endDate: null,
-        technologyInnovationBase: null,
-        knowledgeId: null,
         totalFunding: null,
         govFunding: null,
-        linkName: null,
-        linkMobile: null,
-        linkEmail: null,
         projAbstract: null,
         projKeywords: null,
-        researchContent: null,
-        memResume: null,
-        researchProgress: null,
-        researchContent: null,
-        technologyTarget: null,
-        economyTarget: null,
-        achievementTarget: null,
-        otherTarget: null,
         yearTarget: null,
         year1Goal: null,
         year2Goal: null,
         year3Goal: null,
         projectKPI: projectKPI,
         cooperativeUnits: [],
-        participateUnits: [],
         members: [],
         budget: [],
-        equipments: [],
-        projectResearchList: [],
-        projectSubList: [],
-        managementRuleList: [],
+        fundPlan: [],
         fileList: [],
+        auditList: [],
         managerDept: "",
       },
       loading: false,

src/views/report/task/components/taskFileEdit.vue

@@ -214,8 +214,6 @@ export default {
           item.downloadUrl = data.downloadUrl
           item.downloadId = data.id
           item.fileExplain = data.fileExplain
-          console.log(data)
-          console.log(this.projectInfo.fileList)
         } else
           this.$message.error('上传失败')
       }).catch(() => {

src/views/reset/index.vue

@@ -255,7 +255,6 @@ export default {
       })
     },
     submit () {
-      console.log(this.formPwd)
       this.$refs.formPwd.validate(valid => {
         if (valid) {
           let pars = isEmptyParams(this.formPwd)