333

src/router/index.js

@@ -116,7 +116,6 @@ export const routes = [
       { path: '/report/task', name: '合同书上报', component: () => import('@/views/report/task/Index.vue'), meta: { title: '合同书上报', icon: '', noCache: true } },
       { path: '/report/check', name: '中期考核上报', component: () => import('@/views/report/check/Index.vue'), meta: { title: '中期考核上报', icon: '', noCache: true } },
       { path: '/report/conclusion', name: '项目结题', component: () => import('@/views/conclusion/index.vue'), meta: { title: '项目结题', icon: '', noCache: true } },
-      { path: '/project/create', name: '项目创建', component: () => import('@/views/report/project/components/projectCreate'), meta: { title: '项目创建', icon: '', noCache: true } },
       { path: '/query/project', name: '项目申报查询1', component: () => import('@/views/query/project/Index.vue'), meta: { title: '项目申报查询', icon: '', noCache: true } },
       { path: '/query/task', name: '合同书查询1', component: () => import('@/views/query/task/Index.vue'), meta: { title: '合同书查询', icon: '', noCache: true } },
       { path: '/query/check', name: '中期考核上报查询1', component: () => import('@/views/query/check/Index.vue'), meta: { title: '中期考核上报查询', icon: '', noCache: true } },

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

-
-<template>
-  <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" @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>
-        <a-button style="margin-left: 10px" type="primary" @click="submit">完成填写</a-button>
-      </div>
-    </a-spin>
-  </div>
-</template>
-
-<script>
-import { getType } from '@/views/utils/auth'
-import projectEdit from "@/views/report/project/components/projectEdit"
-import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
-export default {
-  name: "projectCreate",
-  components: {
-    projectEdit, projectEditKey,
-  },
-  data () {
-    return {
-      loading: false,
-      projType: getType() == "1"
-    }
-  },
-  props: {
-    value: {
-      type: String,
-      default: () => {
-        return null
-      }
-    }
-  },
-  created () {
-  },
-  methods: {
-    save () {
-      this.$refs.projCreate.save()
-    },
-    submit () {
-      this.$refs.projCreate.submit()
-    },
-    closeWindow (value) {
-      this.$emit('close', value)
-    },
-    onLoad (value) {
-      this.loading = value
-    },
-  },
-}
-</script>
-<style scoped lang="less">
-::-webkit-scrollbar {
-  width: 8px;
-  height: 6px;
-}
-::v-deep .ant-spin-container {
-  width: 100%;
-  height: 100%;
-}
-.page-content {
-  width: 100%;
-  height: calc(100% - 40px);
-  overflow: auto;
-}
-.page-footer {
-  width: 100%;
-  height: 40px;
-  line-height: 40px;
-  background: rgb(248, 248, 248);
-  text-align: center;
-}
-</style>
-
-

src/views/report/task/Index.vue

@@ -36,10 +36,10 @@
       </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} 条`" />
-    <a-modal v-model="visibleEdit" :title="'创建/修改'" :width="'80%'" :dialog-style="{ top: '5%' }" :maskClosable="false" :footer="null" destroyOnClose :centered="true">
-      <task-edit v-model="projId" @close="closeWindow" />
+    <a-modal v-model="visibleEdit" :title="'创建/修改'" :width="'94%'" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose :maskClosable="false">
+      <task-create v-model="projId" @close="closeWindow" />
     </a-modal>
-    <a-modal v-model="visibleView" title="查看合同书" :width="'80%'" :dialog-style="{ top: '5%' }" :maskClosable="false" :footer="null" destroyOnClose>
+    <a-modal v-model="visibleView" title="查看合同书" :width="'94%'" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose :maskClosable="false">
       <task-view v-model="projId" @close="closeWindow" />
     </a-modal>
   </div>
@@ -48,13 +48,13 @@
 <script>
 import { getType } from '@/views/utils/auth'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
-import taskEdit from "@/views/report/task/components/taskEdit.vue"
+import taskCreate from "@/views/report/task/components/taskCreate.vue"
 import taskView from "@/views/report/task/components/taskView.vue"
 
 export default {
   name: 'reportTask',
   components: {
-    taskEdit, taskView
+    taskCreate, taskView
   },
   data () {
     return {

src/views/statistic/project/Index.vue

@@ -62,13 +62,13 @@ import { getType } from '@/views/utils/auth'
 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 unitEdit from '@/views/statistic/project/components/unitEdit'
 import unitTreeSelect from '@/views/components/common/unitTreeSelect'
 export default {
   name: 'serchProject',
   components: {
-    projectEdit, projectView, unitTreeSelect, unitEdit
+    projectView, unitTreeSelect, unitEdit
   },
   data () {
     return {