Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
yn-science-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐俊
yn-science-front
Commits
0c217281
Commit
0c217281
authored
Dec 12, 2024
by
wangxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
33333
parent
90ffeef4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
final.vue
src/views/audit/project/final.vue
+2
-2
evaluation.vue
src/views/evaluation/evaluation.vue
+1
-1
Index.vue
src/views/timeSet/batch/Index.vue
+6
-6
batchEdit.vue
src/views/timeSet/batch/components/batchEdit.vue
+8
-8
No files found.
src/views/audit/project/final.vue
View file @
0c217281
...
...
@@ -47,9 +47,9 @@
</span>
</
template
>
<
template
slot=
"option"
slot-scope=
"record"
>
<
a-button
type=
"link"
size=
"small"
v-if=
"record.projState >= 50"
@
click=
"recordClick(record, 'viewProjectTask')"
>
查看任务书
</a-button
>
<
!--
<a-button
type=
"link"
size=
"small"
v-if=
"record.projState >= 50"
@
click=
"recordClick(record, 'viewProjectTask')"
>
查看任务书
</a-button>
--
>
<a-button
type=
"link"
size=
"small"
@
click=
"recordClick(record, 'evaluation')"
>
专家评审明细
</a-button>
<a-button
type=
"link"
size=
"small"
v-if=
"
(record.auditResult == 1 && isButten)
"
@
click=
"recordClick(record, 'audit')"
>
审核
</a-button>
<a-button
type=
"link"
size=
"small"
v-if=
"
record.auditResult == 1
"
@
click=
"recordClick(record, 'audit')"
>
审核
</a-button>
</
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} 条`"
/>
...
...
src/views/evaluation/evaluation.vue
View file @
0c217281
...
...
@@ -96,7 +96,7 @@ export default {
methods
:
{
moment
,
getYear
()
{
this
.
$api
.
batch
.
getCurrentYearBatch
({
type
:
3
,
projType
:
getType
()
}).
then
(({
data
=
{}
})
=>
{
this
.
$api
.
batch
.
getCurrentYearBatch
({
type
:
5
,
projType
:
getType
()
}).
then
(({
data
=
{}
})
=>
{
if
(
data
)
{
this
.
isButten
=
data
.
disabled
this
.
description
=
data
.
description
...
...
src/views/timeSet/batch/Index.vue
View file @
0c217281
...
...
@@ -32,12 +32,12 @@ export default {
{
key
:
'2'
,
title
:
'批次'
,
dataIndex
:
'batch'
,
align
:
'center'
},
{
key
:
'3'
,
title
:
'项目申报时间'
,
dataIndex
:
'reportStart'
,
colSpan
:
2
,
ellipsis
:
true
},
{
key
:
'4'
,
title
:
'项目申报时间'
,
dataIndex
:
'reportEnd'
,
colSpan
:
0
,
ellipsis
:
true
},
{
key
:
'5'
,
title
:
'州市级及以下单位上报时间'
,
dataIndex
:
'unitStart'
,
colSpan
:
2
,
ellipsis
:
true
},
{
key
:
'6'
,
title
:
'州市级及以下单位上报时间'
,
dataIndex
:
'unitEnd'
,
colSpan
:
0
,
ellipsis
:
true
},
{
key
:
'7'
,
title
:
'州市级行政单位审核时间'
,
dataIndex
:
'prefectureStart'
,
colSpan
:
2
,
ellipsis
:
true
},
{
key
:
'8'
,
title
:
'州市级行政单位审核时间'
,
dataIndex
:
'prefectureEnd'
,
colSpan
:
0
,
ellipsis
:
true
},
{
key
:
'9'
,
title
:
'省直单位上报时间'
,
dataIndex
:
'provinceStart'
,
colSpan
:
2
,
ellipsis
:
true
},
{
key
:
'10'
,
title
:
'省直单位上报时间'
,
dataIndex
:
'provinceEnd'
,
colSpan
:
0
,
ellipsis
:
true
},
//
{ key: '5', title: '州市级及以下单位上报时间', dataIndex: 'unitStart', colSpan: 2, ellipsis: true },
//
{ key: '6', title: '州市级及以下单位上报时间', dataIndex: 'unitEnd', colSpan: 0, ellipsis: true },
//
{ key: '7', title: '州市级行政单位审核时间', dataIndex: 'prefectureStart', colSpan: 2, ellipsis: true },
//
{ key: '8', title: '州市级行政单位审核时间', dataIndex: 'prefectureEnd', colSpan: 0, ellipsis: true },
//
{ key: '9', title: '省直单位上报时间', dataIndex: 'provinceStart', colSpan: 2, ellipsis: true },
//
{ key: '10', title: '省直单位上报时间', dataIndex: 'provinceEnd', colSpan: 0, ellipsis: true },
{
key
:
'11'
,
title
:
'专家评审时间'
,
dataIndex
:
'expertStart'
,
colSpan
:
2
,
ellipsis
:
true
},
{
key
:
'12'
,
title
:
'专家评审时间'
,
dataIndex
:
'expertEnd'
,
colSpan
:
0
,
ellipsis
:
true
},
{
key
:
'13'
,
title
:
'备注'
,
dataIndex
:
'remark'
,
align
:
'center'
,
ellipsis
:
true
},
...
...
src/views/timeSet/batch/components/batchEdit.vue
View file @
0c217281
...
...
@@ -30,7 +30,7 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<
!--
<
a-row>
<a-col
:span=
"6"
class=
"bg-gray"
>
<div
class=
"required"
>
州市级及以下单位上报时间
</div>
</a-col>
...
...
@@ -59,7 +59,7 @@
<a-range-picker
v-model=
"formData.provinceRange"
show-time
format=
"YYYY-MM-DD HH:mm:ss"
valueFormat=
"YYYY-MM-DD HH:mm:ss"
@
change=
"provinceDateChange"
:placeholder=
"['开始时间', '结束时间']"
/>
</a-form-model-item>
</a-col>
</a-row>
</a-row>
-->
<a-row>
<a-col
:span=
"6"
class=
"bg-gray"
>
<div
class=
"required"
>
专家审核时间
</div>
...
...
@@ -126,9 +126,9 @@ export default {
year
:
{
required
:
true
,
message
:
'请输入申报年度'
},
batch
:
{
required
:
true
,
message
:
'请输入申报批次'
},
reportRange
:
[{
required
:
true
,
validator
:
checkDateRange
,
trigger
:
'blur'
}],
unitRange
:
[{
required
:
true
,
validator
:
checkDateRange
,
trigger
:
'blur'
}],
prefectureRange
:
[{
required
:
true
,
validator
:
checkDateRange
,
trigger
:
'blur'
}],
provinceRange
:
[{
required
:
true
,
validator
:
checkDateRange
,
trigger
:
'blur'
}],
//
unitRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
//
prefectureRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
//
provinceRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
expertRange
:
[{
required
:
true
,
validator
:
checkDateRange
,
trigger
:
'blur'
}],
remark
:
[{
required
:
false
}]
},
...
...
@@ -165,9 +165,9 @@ export default {
this
.
formData
.
expertEnd
=
data
.
expertEnd
this
.
formData
.
remark
=
data
.
remark
this
.
formData
.
reportRange
=
[
data
.
reportStart
,
data
.
reportEnd
]
this
.
formData
.
unitRange
=
[
data
.
unitStart
,
data
.
unitEnd
]
this
.
formData
.
prefectureRange
=
[
data
.
prefectureStart
,
data
.
prefectureEnd
]
this
.
formData
.
provinceRange
=
[
data
.
provinceStart
,
data
.
provinceEnd
]
//
this.formData.unitRange = [data.unitStart, data.unitEnd]
//
this.formData.prefectureRange = [data.prefectureStart, data.prefectureEnd]
//
this.formData.provinceRange = [data.provinceStart, data.provinceEnd]
this
.
formData
.
expertRange
=
[
data
.
expertStart
,
data
.
expertEnd
]
}
this
.
loading
=
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment