33333

src/views/manager/project/index.vue

@@ -65,7 +65,7 @@
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import projectView from '@/views/report/project/components/projectView'
-import projectCreate from '@/views/report/project/components/edit/projectCreate'
+import projectCreate from '@/views/report/project/components/projectCreate'
 import paraSelect from '@/views/components/common/paraSelect'
 import baseSelect from '@/views/components/common/baseSelect'
 import projectImport from '@/views/manager/project/components/projectImport';

src/views/query/task/Index.vue

@@ -22,14 +22,9 @@
     <div class="submit-btn">
       <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
     </div>
-    <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
+    <a-table :dataSource="tableData" :columns="columns" rowKey="projId" :pagination="false" :loading="loading">
       <template slot="taskStateName" slot-scope="record">
-        <span v-if="record">
-          {{record}}
-        </span>
-        <span v-else>
-          未填写
-        </span>
+        <span>{{record.taskStateName}}</span>
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button>
@@ -64,15 +59,14 @@ export default {
       searchForm: { projName: null, projNo: null, projClass: null, reportYear: null, taskState: null, projType: getType() },
       tableData: [],
       columns: [
-        { title: '项目名称', dataIndex: 'projName' },
-        { title: '项目编号', dataIndex: 'projNo' },
-        { title: '版本号', dataIndex: 'versionNo' },
-        { title: '项目类别', dataIndex: 'projClassName' },
-        { title: '开始时间', dataIndex: 'startDate' },
-        { title: '结束时间', dataIndex: 'endDate' },
-        { title: '申报年度', dataIndex: 'reportYear' },
-        { title: '状态', dataIndex: 'taskStateName', scopedSlots: { customRender: 'taskStateName' }, width: '100px', },
-        { title: '操作', fixed: 'right', scopedSlots: { customRender: 'option' } }
+        { title: '项目名称', dataIndex: 'projName', align: 'center' },
+        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
+        { title: '项目类别', dataIndex: 'projClassName', align: 'center' },
+        { title: '开始时间', dataIndex: 'startDate', align: 'center' },
+        { title: '结束时间', dataIndex: 'endDate', align: 'center' },
+        { title: '申报年度', dataIndex: 'reportYear', align: 'center' },
+        { title: '状态',scopedSlots: { customRender: 'taskStateName' }, align: 'center' },
+        { title: '操作', fixed: 'right', scopedSlots: { customRender: 'option' }, align: 'center' }
       ],
       pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
       loading: false,

src/views/report/project/Index.vue

@@ -62,7 +62,7 @@
 import { getType, getComplete, setComplete } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common"
-import projectCreate from '@/views/report/project/components/edit/projectCreate'
+import projectCreate from '@/views/report/project/components/projectCreate'
 import projectView from '@/views/report/project/components/projectView'
 import previewFile from '@/views/components/common/previewFile'
 import knowledgeSelect from '@/views/components/common/knowledgeSelect'

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

@@ -22,7 +22,7 @@
 
 <script>
 import { getType } from '@/views/utils/auth'
-import projectEdit from "@/views/report/project/components/edit/projectEdit"
+import projectEdit from "@/views/report/project/components/projectEdit"
 import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
 export default {
   name: "projectCreate",

src/views/report/task/Index.vue

@@ -75,7 +75,7 @@ export default {
         { title: '开始时间', dataIndex: 'startDate', align: 'center' },
         { title: '结束时间', dataIndex: 'endDate', align: 'center' },
         { title: '申报年度', dataIndex: 'reportYear', align: 'center' },
-        { title: '状态', dataIndex: 'taskStateName', scopedSlots: { customRender: 'taskStateName' }, align: 'center' },
+        { title: '状态',scopedSlots: { customRender: 'taskStateName' }, align: 'center' },
         { title: '操作', fixed: 'right', width: '200px', scopedSlots: { customRender: 'option' }, align: 'center' }
       ],
       pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },