rrr

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/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]