eee

src/views/report/project/Index.vue

@@ -115,10 +115,10 @@
       <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} 条`" />
     </div>
     <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" @closeWindow="closeWindow"></project-create>
+      <project-create v-model="id" @close="closeWindow"></project-create>
     </a-modal>
     <a-modal v-model="visibleView" v-if="visibleView" title="项目详情" width="80%" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose>
-      <project-view v-model="id" @close="() => this.visibleView = false"></project-view>
+      <project-view v-model="id" @close="closeWindow"></project-view>
     </a-modal>
     <a-modal v-model="visibleFileView" title="查看" width="1000px" :dialog-style="{ top: '10%' }" :footer="null" destroyOnClose>
       <preview-file v-model="realurl.downloadUrl" :fileName="realurl.fileName"></preview-file>
@@ -321,6 +321,7 @@ export default {
       });
     },
     createProject () {
+      this.visibleEdit = true
       this.visibleEdit = true
       //this.$store.commit('app/addCard', { title: '项目创建', key: '1299', code: 'projectCreate', keepAlive: 1, router: '/project/create', closable: true })
     },
@@ -332,7 +333,9 @@ export default {
         this.getListByPage()
       }
       else if (value === 'error') {
+        this.id = null
         this.visibleEdit = false
+        this.visibleView = false
       }
     },
     onLoad (value) {
@@ -418,7 +421,7 @@ export default {
           this.visibleFileView = true
       }
     },
-    projectKPI() {
+    projectKPI () {
       this.projectKPIView = true
     }
   }

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

@@ -3,8 +3,8 @@
   <div class="app-content" style="height: 76vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
       <div class="page-content">
-        <project-edit v-model="value" @onSave="onSave" @load="onLoad" ref="projCreate" v-if="projType"></project-edit>
-        <project-edit-key v-model="value" @onSave="onSave" @load="onLoad" ref="projCreate" v-else></project-edit-key>
+        <project-edit v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-if="projType"></project-edit>
+        <project-edit-key v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-else></project-edit-key>
       </div>
       <div class="page-footer">
         <a-button @click="save">保存</a-button>
@@ -46,8 +46,8 @@ export default {
     submit () {
       this.$refs.projCreate.submit()
     },
-    onSave (value) {
-      this.$emit('closeWindow', value)
+    closeWindow (value) {
+      this.$emit('close', value)
     },
     onLoad (value) {
       this.loading = value
@@ -56,6 +56,10 @@ export default {
 }
 </script>
 <style scoped lang="less">
+::v-deep .ant-spin-container {
+  width: 100%;
+  height: 100%;
+}
 .page-content {
   width: 100%;
   height: calc(100% - 40px);

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

@@ -291,6 +291,7 @@
           </div>
         </a-col>
       </a-row>
+      
       <a-row>
         <a-col :span="24" style="border-top: 0px">
           <div class="tb-title">
@@ -800,7 +801,7 @@ export default {
           if (data) {
             this.formData.id = data
             this.$message.success('保存成功！')
-            this.$emit('onSave', 'save')
+            this.$emit('close', 'save')
           }
           this.$emit('load', false)
         }).catch(() => {
@@ -825,7 +826,7 @@ export default {
             if (data) {
               this.formData.id = data
               this.$message.success('成功！')
-              this.$emit('onSave', 'submit')
+              this.$emit('close', 'submit')
             }
             this.$emit('load', false)
           }).catch(() => {
@@ -851,6 +852,5 @@ export default {
 }
 </script>
 <style scoped lang="less">
-
 </style>
 

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

@@ -22,36 +22,53 @@ export default {
   data () {
     return {
       projectInfo: {
-        projName: '',
-        startDate: '',
-        endDate: '',
-        applyMoney: '',
-        projClassName: '',
-        appPersonName: '',
-        sex: '',
-        titleName: '',
-        degreeName: '',
-        specName: '',
-        jobUnit: '',
-        mobile: '',
-        address: '',
-        appUnitName: '',
-        linkName: '',
-        linkEmail: '',
-        linkTel: '',
-        knowledgeName: '',
-        projContent: '',
-        projTarget: '',
-        projKeywords: '',
-        // 合作单位
-        together: [{ unitName: '', unitAddress: '', projectWork: '' }, { unitName: '', unitAddress: '', projectWork: '' }],
-        // 项目组成员
+        id: null,
+        organizationCode: 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,
+        projName: null,
+        leadUnit: null,
+        recommendUnit: 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,
+        cooperativeUnits: [],
         members: [],
-        // 经费
-        budget: budgetList(),
-        projDoc: null,
-        fileList: [{ fileName: '', url: '', remarks: '', id: '' }],
-        auditList: [{ result: '', unit: '', time: '' }],
+        budget: [],
+        equipments: [],
+        projectSubList: [],
+        managementRuleList: [],
+        fileList: [],
+        projType: getType()
       },
       loading: false,
       projType: getType() == "1"
@@ -77,8 +94,8 @@ export default {
             this.projectInfo = data
             this.loading = false
           } else
-            this.$emit('close', 'close')
-        }).catch(() => { this.$emit('close', 'close') })
+            this.$emit('close', 'error')
+        }).catch(() => { this.$emit('close', 'error') })
       }
     },
     onExport () {