Skip to content

Y
yn-science-front
Commit f806c121 authored by wangxl's avatar wangxl
Browse files
Options

3333

parent b4734208
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
src/router/index.js
View file @ f806c121
...@@ -258,7 +258,7 @@ export const routes = [ ...@@ -258,7 +258,7 @@ export const routes = [
meta: { title: '系统设置', icon: 'el-icon-s-tools' }, meta: { title: '系统设置', icon: 'el-icon-s-tools' },
hidden: false, hidden: false,
children: [ children: [
{ path: '/timeSet/task', name: '合同书时间设置', component: () => import('@/views/timeSet/taskTimeSet/Index.vue'), meta: { title: '合同书时间设置', icon: '', noCache: true } }, { path: '/batch/task', name: '任务书时间设置', component: () => import('@/views/timeSet/task/index.vue'), meta: { title: '任务书时间设置', icon: '', noCache: true } },
{ path: '/setting/batch', name: '项目申报批次设置', component: () => import('@/views/timeSet/batch/Index.vue'), meta: { title: '项目申报批次设置', icon: '', noCache: true } }, { path: '/setting/batch', name: '项目申报批次设置', component: () => import('@/views/timeSet/batch/Index.vue'), meta: { title: '项目申报批次设置', icon: '', noCache: true } },
{ path: '/system/evaluationStandard', name: '年度评审标准设置', component: () => import('@/views/system/evaluationStandard/index.vue'), meta: { title: '年度评审标准设置', icon: '', noCache: true } }, { path: '/system/evaluationStandard', name: '年度评审标准设置', component: () => import('@/views/system/evaluationStandard/index.vue'), meta: { title: '年度评审标准设置', icon: '', noCache: true } },
//后台 //后台
......
src/views/timeSet/batch/Index.vue
View file @ f806c121
...@@ -35,13 +35,13 @@ export default { ...@@ -35,13 +35,13 @@ export default {
columns: [ columns: [
{ key: '1', title: '申报年度', dataIndex: 'year', align: 'center' }, { key: '1', title: '申报年度', dataIndex: 'year', align: 'center' },
{ key: '2', title: '批次', dataIndex: 'batch', align: 'center' }, { key: '2', title: '批次', dataIndex: 'batch', align: 'center' },
{ key: '3', title: '项目申报时间', dataIndex: 'reportStart', colSpan: 2, ellipsis: true }, { key: '3', title: '项目申报时间', dataIndex: 'reportStart', colSpan: 2, ellipsis: true, align: 'center' },
{ key: '4', title: '项目申报时间', dataIndex: 'reportEnd', colSpan: 0, ellipsis: true }, { key: '4', title: '项目申报时间', dataIndex: 'reportEnd', colSpan: 0, ellipsis: true, align: 'center' },
{ key: '5', title: '审核时间', dataIndex: 'auditStart', colSpan: 2, ellipsis: true }, { key: '5', title: '审核时间', dataIndex: 'auditStart', colSpan: 2, ellipsis: true , align: 'center'},
{ key: '6', title: '审核时间', dataIndex: 'auditEnd', colSpan: 0, ellipsis: true }, { key: '6', title: '审核时间', dataIndex: 'auditEnd', colSpan: 0, ellipsis: true , align: 'center'},
{ key: '11', title: '专家评审时间', dataIndex: 'expertStart', colSpan: 2, ellipsis: true }, { key: '11', title: '专家评审时间', dataIndex: 'expertStart', colSpan: 2, ellipsis: true, align: 'center' },
{ key: '12', title: '专家评审时间', dataIndex: 'expertEnd', colSpan: 0, ellipsis: true }, { key: '12', title: '专家评审时间', dataIndex: 'expertEnd', colSpan: 0, ellipsis: true, align: 'center' },
{ key: '13', title: '备注', dataIndex: 'remark', align: 'center', ellipsis: true }, { key: '13', title: '备注', dataIndex: 'remark', align: 'center', ellipsis: true, align: 'center' },
{ key: '14', title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, }, { key: '14', title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
], ],
pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, }, pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
......
src/views/timeSet/taskTimeSet/components/timeEdit.vue → src/views/timeSet/task/components/timeEdit.vue
View file @ f806c121
...@@ -127,8 +127,8 @@ export default { ...@@ -127,8 +127,8 @@ export default {
this.formData.reportEnd = data.reportEnd this.formData.reportEnd = data.reportEnd
this.formData.auditStart = data.auditStart this.formData.auditStart = data.auditStart
this.formData.auditEnd = data.auditEnd this.formData.auditEnd = data.auditEnd
this.formData.expertStart = data.expertStart // this.formData.expertStart = data.expertStart
this.formData.expertEnd = data.expertEnd // this.formData.expertEnd = data.expertEnd
this.formData.remark = data.remark this.formData.remark = data.remark
this.formData.reportRange = [data.reportStart, data.reportEnd] this.formData.reportRange = [data.reportStart, data.reportEnd]
this.formData.auditRange = [data.auditStart, data.auditEnd] this.formData.auditRange = [data.auditStart, data.auditEnd]
......
src/views/timeSet/taskTimeSet/Index.vue → src/views/timeSet/task/index.vue
View file @ f806c121
...@@ -21,25 +21,25 @@ ...@@ -21,25 +21,25 @@
<script> <script>
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import timeEdit from '@/views/timeSet/taskTimeSet/components/timeEdit'
import moment from 'moment' import moment from 'moment'
import timeEdit from '@/views/timeSet/task/components/timeEdit'
import { isEmptyParams } from "@/views/utils/common" import { isEmptyParams } from "@/views/utils/common"
export default { export default {
name: 'taskTimeSet', name: 'taskTimeSet',
components: { timeEdit }, components: { timeEdit },
data () { data () {
return { return {
searchForm: { systemType: getType(), timeType: 2, }, searchForm: { systemType: getType(), timeType: 2 },
form: this.$form.createForm(this, { name: 'advanced_search' }), form: this.$form.createForm(this, { name: 'advanced_search' }),
tableData: [], tableData: [],
columns: [ columns: [
{ key: '1', title: '申报年度', dataIndex: 'year', align: 'center' }, { key: '1', title: '申报年度', dataIndex: 'year', align: 'center' },
{ key: '2', title: '批次', dataIndex: 'batch', align: 'center' }, { key: '2', title: '批次', dataIndex: 'batch', align: 'center' },
{ key: '3', title: '项目申报时间', dataIndex: 'reportStart', colSpan: 2, ellipsis: true }, { key: '3', title: '项目申报时间', dataIndex: 'reportStart', colSpan: 2, ellipsis: true, align: 'center' },
{ key: '4', title: '项目申报时间', dataIndex: 'reportEnd', colSpan: 0, ellipsis: true }, { key: '4', title: '项目申报时间', dataIndex: 'reportEnd', colSpan: 0, ellipsis: true, align: 'center' },
{ key: '5', title: '审核时间', dataIndex: 'auditStart', colSpan: 2, ellipsis: true }, { key: '5', title: '审核时间', dataIndex: 'auditStart', colSpan: 2, ellipsis: true, align: 'center' },
{ key: '6', title: '审核时间', dataIndex: 'auditEnd', colSpan: 0, ellipsis: true }, { key: '6', title: '审核时间', dataIndex: 'auditEnd', colSpan: 0, ellipsis: true, align: 'center' },
{ key: '13', title: '备注', dataIndex: 'remark', align: 'center', ellipsis: true }, { key: '13', title: '备注', dataIndex: 'remark', align: 'center', ellipsis: true, align: 'center' },
{ key: '14', title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, }, { key: '14', title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
], ],
pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, }, pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment