4444

src/views/report/task/Index.vue

@@ -25,12 +25,8 @@
     <span class="form-description"> ※填报时间：{{ description }}</span>
     <a-table :dataSource="tableData" :columns="columns" rowKey="projId" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio' }">
       <template slot="testStateName" slot-scope="record">
-        <span v-if="record">
-          {{record}}
-        </span>
-        <span v-else>
-          未填写
-        </span>
+        <span v-if="record">{{record}}</span>
+        <span v-else>未填写</span>
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" v-if="record.testState" @click="recordClick(record,'view')">查看</a-button>
@@ -40,36 +36,24 @@
     </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 class="sc_modal" :centered="true">
-      <test-edit v-model="selectProjId" @close="closeWindow" />
+      <task-edit v-model="projId" @close="closeWindow" />
     </a-modal>
     <a-modal v-model="visibleView" title="查看合同书" :width="'80%'" :dialog-style="{ top: '5%' }" :maskClosable="false" :footer="null" destroyOnClose class="sc_modal">
-      <test-view v-model="selectProjId" @close="closeWindow" />
+      <task-view v-model="projId" @close="closeWindow" />
     </a-modal>
   </div>
 </template>
 
 <script>
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
-import TestEdit from "@/views/report/task/components/taskEdit.vue"
-import TestView from "@/views/report/task/components/taskView.vue"
-
-
-const columns = [
-  { title: '项目名称', dataIndex: 'projName' },
-  { title: '项目编号', dataIndex: 'projNo' },
-  { title: '版本号', dataIndex: 'versionNo' },
-  { title: '项目类别', dataIndex: 'projClassName' },
-  { title: '项目开始时间', dataIndex: 'projStart', tabKey: '2' },
-  { title: '项目结束时间', dataIndex: 'projEnd', tabKey: '2' },
-  { title: '任务书开始时间', dataIndex: 'startDate', tabKey: '1' },
-  { title: '任务书结束时间', dataIndex: 'endDate', tabKey: '1' },
-  { title: '申报年度', dataIndex: 'reportYear' },
-  { title: '状态', dataIndex: 'testStateName', scopedSlots: { customRender: 'testStateName' } },
-  { title: '操作', fixed: 'right', width: '200px', scopedSlots: { customRender: 'option' } }
-]
+import taskEdit from "@/views/report/task/components/taskEdit.vue"
+import taskView from "@/views/report/task/components/taskView.vue"
 
 export default {
   name: 'reportTask',
+  components: {
+    taskEdit, taskView
+  },
   data () {
     return {
       // 选项卡
@@ -84,25 +68,27 @@ export default {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       searchForm: { projName: '', projNo: '', testState: '1', reportYear: null },
       tableData: [],
-      columns: [],
+      columns: [
+        { title: '项目名称', dataIndex: 'projName' },
+        { title: '项目编号', dataIndex: 'projNo' },
+        { title: '开始时间', dataIndex: 'startDate', tabKey: '1' },
+        { title: '结束时间', dataIndex: 'endDate', tabKey: '1' },
+        { title: '申报年度', dataIndex: 'reportYear' },
+        { title: '状态', dataIndex: 'testStateName', scopedSlots: { customRender: 'testStateName' } },
+        { title: '操作', fixed: 'right', width: '200px', scopedSlots: { customRender: 'option' } }
+      ],
       pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
       loading: false,
       // 弹窗
       visibleEdit: false,
       visibleView: false,
-      selectProjId: null,
-      selectTaskId: null,
-      selectedRowKeys: [],
-      selectTestState: null,
       id: null,
+      projId: null,
+      selectedRowKeys: [],
       isButten: false,
       description: '',
     }
   },
-  components: {
-    TestEdit,
-    TestView
-  },
   created () {
     this.getYear()
   },
@@ -140,7 +126,7 @@ export default {
       let pars = isEmptyParams({ reportYear: this.searchForm.reportYear });
       this.$api.taskReport.getCount(pars).then(({ data = {} }) => {
         if (data) {
-          this.panes = data
+          this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
         }
       }).catch(() => { })
     },
@@ -164,29 +150,13 @@ export default {
     },
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
-      this.selectProjId = selectedRows[0].projId
-      this.selectTaskId = selectedRows[0].id
-      this.selectTestState = selectedRows[0].testState
-    },
-    createTaskBook () {
-      if (this.selectProjId == null) {
-        this.$message.error('请选择项目')
-        return
-      }
-      if (this.selectTestState != null) {
-        this.$message.error('任务书已创建')
-        return
-      }
-      this.selectTaskId = ''
-      this.visibleEdit = true
     },
     recordClick (record, type) {
       if (type === 'view') {
-        this.selectProjId = record.projId
-        this.selectTaskId = record.id
+        this.projId = record.projId
         this.visibleView = true
       } else if (type === 'edit') {
-        this.selectProjId = record.projId
+        this.projId = record.projId
         this.visibleEdit = true
       } else {
         let par = { auditObjectId: record.id, auditType: 2 }

src/views/report/task/components/taskCreate.vue

@@ -8,7 +8,7 @@
         </a-steps>
       </div>
       <div class="page-content">
-        <project-edit v-model="value" @close="closeWindow" @load="onLoad" @onStepChange="onStepChange" :completeStatus.sync=completeStatus :stepsArray.sync="stepsArray" ref="projCreate"></project-edit>
+        <task-edit v-model="value" @close="closeWindow" @load="onLoad" @onStepChange="onStepChange" :completeStatus.sync=completeStatus :stepsArray.sync="stepsArray" ref="projCreate" />
       </div>
       <div class="page-footer">
         <a-button v-if="currSteps > 0" style="margin-left: 40px" type="primary" @click="prev">上一步</a-button>
@@ -22,12 +22,11 @@
 
 <script>
 import { getType } from '@/views/utils/auth'
-import projectEdit from "@/views/report/project/components/edit/projectEdit"
-import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
+import taskEdit from "@/views/report/task/components/taskEdit"
 export default {
   name: "projectCreate",
   components: {
-    projectEdit, projectEditKey,
+    taskEdit,
   },
   data () {
     return {

src/views/report/task/components/taskView.vue

@@ -11,8 +11,7 @@
       <div class="page-footer">
         <!-- 申报项目详情 -->
         <!-- <a-button type="primary" @click="onExport">导出</a-button> -->
-        <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projType=='1'" />
-        <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projType=='2'" />
+        <task-info v-model="formData" :tabsData.sync="tabsData" />
       </div>
     </a-spin>
   </div>
@@ -56,12 +55,11 @@ const projectKPI = {
 
 import { budgetList } from '@/views/report/project/config'
 import { getType } from '@/views/utils/auth'
-import projectInfo from '@/views/report/project/components/projectInfo'
-import projectInfoKey from "@/views/report/project/components/keyProject/projectInfo"
+import taskInfo from "@/views/report/task/components/taskInfo"
 export default {
   name: "projectView",
   components: {
-    projectInfo, projectInfoKey
+    taskInfo
   },
   data () {
     return {