44

src/views/report/project/Index.vue

@@ -113,21 +113,12 @@
       </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} 条`" />
     </div>
-    <s-modal title="项目修改" v-model="visibleEdit" v-if="visibleEdit" :loading="loading">
-      <div slot="content">
-        <project-edit v-model="id" @onSave="closeWindow" @load="onLoad" ref="projCreate" v-if="projType"></project-edit>
-        <project-edit-key v-model="id" @onSave="closeWindow" @load="onLoad" ref="projCreate" v-else></project-edit-key>
-      </div>
-      <template slot="footer">
-        <a-button @click="() => this.$refs.projCreate.save()">保存</a-button>
-        <a-button type="primary" @click="() => this.$refs.projCreate.submit()" style="margin-left:16px;">完成填写</a-button>
-      </template>
-    </s-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
+    <a-modal v-model="visibleEdit" v-if="visibleEdit" title="项目创建/修改" width="80%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose>
+      <project-create v-model="id" @closeWindow="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>
-      </div>
-    </s-modal>
+    </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>
     </a-modal>
@@ -140,6 +131,7 @@ import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common"
 import paraMultiSelect from '@/views/components/common/paraMultiSelect'
 import paraSelect from '@/views/components/common/paraSelect'
+import projectCreate from '@/views/report/project/components/projectCreate'
 import projectEdit from '@/views/report/project/components/projectEdit'
 import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
 import projectView from '@/views/report/project/components/projectView'
@@ -149,7 +141,7 @@ import axios from 'axios'
 export default {
   name: 'reportProject',
   components: {
-    projectView, projectEdit, paraMultiSelect, paraSelect, previewFile, projectEditKey
+    projectView, projectCreate, projectEdit, paraMultiSelect, paraSelect, previewFile, projectEditKey
   },
   data () {
     return {
@@ -323,7 +315,8 @@ export default {
       });
     },
     createProject () {
-      this.$store.commit('app/addCard', { title: '项目创建', key: '1299', code: 'projectCreate', keepAlive: 1, router: '/project/create', closable: true })
+      this.visibleEdit = true
+      //this.$store.commit('app/addCard', { title: '项目创建', key: '1299', code: 'projectCreate', keepAlive: 1, router: '/project/create', closable: true })
     },
     closeWindow (value) {
       if (value === 'submit') {

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

 
 <template>
-  <div class="app-content">
+  <div class="app-content" style="height: 70vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
       <div class="page-content">
-        <project-edit @onSave="closeWindow" @load="onLoad" v-if="projType"></project-edit>
-        <project-edit-key @onSave="closeWindow" @load="onLoad" ref="projCreate" v-else></project-edit-key>
+        <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>
       </div>
       <div class="page-footer">
         <a-button @click="save">保存</a-button>
@@ -13,17 +13,8 @@
     </a-spin>
   </div>
 </template>
+
 <script>
-const filterTabsByPath = (list, path) => {
-  let res = { obj: null, index: null }
-  for (var i = 0; i < list.length; i++) {
-    if (list[i].router == path) {
-      res = { obj: list[i], index: i }
-      break
-    }
-  }
-  return res
-}
 import { getType } from '@/views/utils/auth'
 import projectEdit from "@/views/report/project/components/projectEdit"
 import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
@@ -39,9 +30,14 @@ export default {
     }
   },
   props: {
+    value: {
+      type: String,
+      default: () => {
+        return null
+      }
+    }
   },
   created () {
-
   },
   methods: {
     save () {
@@ -50,15 +46,8 @@ export default {
     submit () {
       this.$refs.projCreate.submit()
     },
-    closeWindow (value) {
-      if (value === 'submit' || value === 'error') {
-        let { obj, index } = filterTabsByPath(this.$store.state.app.tabsArray, '/project/create')
-        if (obj) {
-          this.$store.commit('app/closeTabs', index)
-          this.$store.commit('app/delCachedViews', obj)
-        }
-        this.$router.push('/report/project')
-      }
+    onSave (value) {
+      this.$emit('closeWindow', value)
     },
     onLoad (value) {
       this.loading = value

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

@@ -444,8 +444,8 @@
           </div>
         </a-col>
       </a-row>
-      <template v-for="(item, index) in formData.budget">
-        <a-row :key="'budget' + index" type="flex" class="item_inner">
+      <div v-for="(item, index) in formData.budget" :key="'budget' + index">
+        <a-row  type="flex" class="item_inner">
           <a-col :span="4">
             <div class="special-middle">
               <div>{{ item.budgetName }}</div>
@@ -468,7 +468,7 @@
             </div>
           </a-col>
         </a-row>
-      </template>
+      </div>
       <a-row type="flex" class="item_inner">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">