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
5b9364e2
Commit
5b9364e2
authored
4 months ago
by
wangxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3333
parent
adf3195a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
48 deletions
+75
-48
expertEdit.vue
src/views/expert/components/expertEdit.vue
+1
-0
fundEdit.vue
src/views/report/project/components/fundEdit.vue
+51
-25
config.js
src/views/report/project/config.js
+23
-23
taskEdit.vue
src/views/report/task/components/taskEdit.vue
+0
-0
No files found.
src/views/expert/components/expertEdit.vue
View file @
5b9364e2
...
@@ -222,6 +222,7 @@ export default {
...
@@ -222,6 +222,7 @@ export default {
}).
catch
(()
=>
{
this
.
loading
=
false
})
}).
catch
(()
=>
{
this
.
loading
=
false
})
},
},
submit
()
{
submit
()
{
console
.
log
(
this
.
formData
)
if
(
!!!
this
.
formData
.
specList
||
this
.
formData
.
specList
.
length
==
0
)
{
if
(
!!!
this
.
formData
.
specList
||
this
.
formData
.
specList
.
length
==
0
)
{
this
.
$message
.
error
(
'请选择评审专业!'
)
this
.
$message
.
error
(
'请选择评审专业!'
)
return
false
return
false
...
...
This diff is collapsed.
Click to expand it.
src/views/report/project/components/fundEdit.vue
View file @
5b9364e2
...
@@ -26,38 +26,58 @@
...
@@ -26,38 +26,58 @@
</a-row>
</a-row>
<div
v-for=
"(item, index) in budget"
:key=
"'budget' + index"
class=
"row_center"
>
<div
v-for=
"(item, index) in budget"
:key=
"'budget' + index"
class=
"row_center"
>
<a-row
v-if=
"item.type ==='count'"
>
<a-row
v-if=
"item.type ==='count'"
type=
"flex"
>
<a-col
:span=
"6"
:style=
"'text-align: left;padding-left:'+left(item.level)+'px'"
>
<a-col
:span=
"6"
:style=
"'text-align: left;padding-left:'+left(item.level)+'px'"
>
{{
item
.
budgetName
}}
<div
class=
"special-middle"
>
{{
item
.
budgetName
}}
</div>
</a-col>
</a-col>
<a-col
:span=
"3"
>
<a-col
:span=
"3"
>
{{
Count
(
item
.
source
,
'totalBudget'
,
index
)
}}
<div
class=
"special-middle"
>
{{
Count
(
item
.
source
,
'totalBudget'
,
index
)
}}
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
<span
v-if=
"!!!item.show||item.show === 'applyFunds'"
>
{{
Count
(
item
.
source
,
'applyFunds'
,
index
)
}}
</span>
<div
class=
"special-middle"
>
<span
v-if=
"!!!item.code||item.code === 'applyFunds'"
>
{{
Count
(
item
.
source
,
'applyFunds'
,
index
)
}}
</span>
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
{{
Count
(
item
.
source
,
'selfFunds'
,
index
)
}}
<div
class=
"special-middle"
>
{{
Count
(
item
.
source
,
'selfFunds'
,
index
)
}}
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
<a-input
v-model=
"item.calculationBasis"
:maxLength=
"100"
style=
"width: 80%;"
/>
<div
class=
"special-middle"
>
<a-input
v-model=
"item.calculationBasis"
:maxLength=
"100"
style=
"width: 80%;"
/>
</div>
</a-col>
</a-col>
</a-row>
</a-row>
<a-row
v-else
>
<a-row
v-else
type=
"flex"
>
<a-col
:span=
"6"
:style=
"'text-align: left;padding-left:'+left(item.level)+'px'"
>
<a-col
:span=
"6"
:style=
"'text-align: left;padding-left:'+left(item.level)+'px'"
>
{{
item
.
budgetName
}}
<div
class=
"special-middle"
>
{{
item
.
budgetName
}}
</div>
</a-col>
</a-col>
<a-col
:span=
"3"
>
<a-col
:span=
"3"
>
{{
Count1
(
index
,
item
.
applyFunds
,
item
.
selfFunds
)
}}
<div
class=
"special-middle"
>
{{
Count1
(
index
,
item
.
applyFunds
,
item
.
selfFunds
)
}}
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
<a-input-number
v-model=
"item.applyFunds"
:min=
"0"
:step=
"0.01"
style=
"width: 80%"
v-if=
"!!!item.show||item.show === 'applyFunds'"
/>
<div
class=
"special-middle"
>
<a-input-number
v-model=
"item.applyFunds"
:min=
"0"
:step=
"0.01"
style=
"width: 80%"
v-if=
"!!!item.code||item.code === 'applyFunds'"
/>
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
<a-input-number
v-model=
"item.selfFunds"
:min=
"0"
:step=
"0.01"
style=
"width: 80%"
v-if=
"!!!item.show||item.show === 'selfFunds'"
/>
<div
class=
"special-middle"
>
<a-input-number
v-model=
"item.selfFunds"
:min=
"0"
:step=
"0.01"
style=
"width: 80%"
v-if=
"!!!item.code||item.code === 'selfFunds'"
/>
</div>
</a-col>
</a-col>
<a-col
:span=
"5"
>
<a-col
:span=
"5"
>
<a-input
v-model=
"item.calculationBasis"
:maxLength=
"100"
style=
"width: 80%;"
/>
<div
class=
"special-middle"
>
<a-input
v-model=
"item.calculationBasis"
:maxLength=
"100"
style=
"width: 80%;"
/>
</div>
</a-col>
</a-col>
</a-row>
</a-row>
</div>
</div>
...
@@ -70,16 +90,16 @@ export default {
...
@@ -70,16 +90,16 @@ export default {
name
:
"fundEdit"
,
name
:
"fundEdit"
,
data
()
{
data
()
{
return
{
return
{
budget
:
budgetList
()
};
};
},
},
props
:
{
props
:
{
//
budget: {
budget
:
{
//
type: Array,
type
:
Array
,
//
default: () => {
default
:
()
=>
{
//
return []
return
[]
//
}
}
//
},
},
},
},
created
()
{
created
()
{
},
},
...
@@ -106,18 +126,24 @@ export default {
...
@@ -106,18 +126,24 @@ export default {
}
}
},
},
Count1
(
index
,
applyFunds
,
selfFunds
)
{
Count1
(
index
,
applyFunds
,
selfFunds
)
{
this
.
budget
[
index
].
totalBudget
=
(
applyFunds
+
selfFunds
).
toFixed
(
2
)
let
apply
=
0.00
return
(
applyFunds
+
selfFunds
).
toFixed
(
2
)
let
self
=
0.00
if
(
!!
applyFunds
)
apply
=
applyFunds
if
(
!!
selfFunds
)
self
=
selfFunds
this
.
budget
[
index
].
totalBudget
=
(
apply
+
self
).
toFixed
(
2
)
return
(
apply
+
self
).
toFixed
(
2
)
},
},
left
(
l
)
{
left
(
l
)
{
switch
(
l
)
{
switch
(
l
)
{
case
1
:
case
'1'
:
return
4
;
return
4
;
case
2
:
case
'2'
:
return
12
;
return
12
;
case
3
:
case
'3'
:
return
20
;
return
20
;
case
4
:
case
'4'
:
return
30
;
return
30
;
}
}
return
0
;
return
0
;
...
...
This diff is collapsed.
Click to expand it.
src/views/report/project/config.js
View file @
5b9364e2
...
@@ -11,7 +11,7 @@ const budgetList = () => {
...
@@ -11,7 +11,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"一、资金来源合计"
,
budgetName
:
"一、资金来源合计"
,
source
:
[
1
,
2
],
source
:
[
1
,
2
],
show
:
null
,
code
:
null
,
type
:
'count'
type
:
'count'
},
},
{
{
...
@@ -25,7 +25,7 @@ const budgetList = () => {
...
@@ -25,7 +25,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(一)财政资金"
,
budgetName
:
"(一)财政资金"
,
source
:
null
,
source
:
null
,
show
:
'applyFunds'
,
code
:
'applyFunds'
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -39,7 +39,7 @@ const budgetList = () => {
...
@@ -39,7 +39,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(二)自筹资金"
,
budgetName
:
"(二)自筹资金"
,
source
:
[
3
,
4
,
5
,
6
],
source
:
[
3
,
4
,
5
,
6
],
show
:
'selfFunds'
,
code
:
'selfFunds'
,
type
:
'count'
type
:
'count'
},
},
{
{
...
@@ -53,7 +53,7 @@ const budgetList = () => {
...
@@ -53,7 +53,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"1.承担单位自有货币资金"
,
budgetName
:
"1.承担单位自有货币资金"
,
source
:
null
,
source
:
null
,
show
:
'selfFunds'
,
code
:
'selfFunds'
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -67,7 +67,7 @@ const budgetList = () => {
...
@@ -67,7 +67,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"2.从银行获得的贷款"
,
budgetName
:
"2.从银行获得的贷款"
,
source
:
null
,
source
:
null
,
show
:
'selfFunds'
,
code
:
'selfFunds'
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -81,7 +81,7 @@ const budgetList = () => {
...
@@ -81,7 +81,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"3.其他财政拨款"
,
budgetName
:
"3.其他财政拨款"
,
source
:
null
,
source
:
null
,
show
:
'selfFunds'
,
code
:
'selfFunds'
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -95,7 +95,7 @@ const budgetList = () => {
...
@@ -95,7 +95,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"4.其他资金"
,
budgetName
:
"4.其他资金"
,
source
:
null
,
source
:
null
,
show
:
'selfFunds'
,
code
:
'selfFunds'
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -109,7 +109,7 @@ const budgetList = () => {
...
@@ -109,7 +109,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"二、支出预算合计"
,
budgetName
:
"二、支出预算合计"
,
source
:
[
8
,
22
],
source
:
[
8
,
22
],
show
:
null
,
code
:
null
,
type
:
'count'
type
:
'count'
},
},
{
{
...
@@ -123,7 +123,7 @@ const budgetList = () => {
...
@@ -123,7 +123,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(一)直接费用"
,
budgetName
:
"(一)直接费用"
,
source
:
[
9
,
14
,
15
,
16
,
17
,
18
,
19
,
20
,
21
],
source
:
[
9
,
14
,
15
,
16
,
17
,
18
,
19
,
20
,
21
],
show
:
null
,
code
:
null
,
type
:
'count'
type
:
'count'
},
},
{
{
...
@@ -137,7 +137,7 @@ const budgetList = () => {
...
@@ -137,7 +137,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"1.设备费"
,
budgetName
:
"1.设备费"
,
source
:
[
10
,
11
,
12
,
13
],
source
:
[
10
,
11
,
12
,
13
],
show
:
null
,
code
:
null
,
type
:
'count'
type
:
'count'
},
},
{
{
...
@@ -151,7 +151,7 @@ const budgetList = () => {
...
@@ -151,7 +151,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(1)设备购置费"
,
budgetName
:
"(1)设备购置费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -165,7 +165,7 @@ const budgetList = () => {
...
@@ -165,7 +165,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(2)试制设备费"
,
budgetName
:
"(2)试制设备费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -179,7 +179,7 @@ const budgetList = () => {
...
@@ -179,7 +179,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(3)设备改造费"
,
budgetName
:
"(3)设备改造费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -193,7 +193,7 @@ const budgetList = () => {
...
@@ -193,7 +193,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(4)设备租赁费"
,
budgetName
:
"(4)设备租赁费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -207,7 +207,7 @@ const budgetList = () => {
...
@@ -207,7 +207,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"2.材料费"
,
budgetName
:
"2.材料费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -221,7 +221,7 @@ const budgetList = () => {
...
@@ -221,7 +221,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"3.燃料动力费"
,
budgetName
:
"3.燃料动力费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -235,7 +235,7 @@ const budgetList = () => {
...
@@ -235,7 +235,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"4.测试化验加工费"
,
budgetName
:
"4.测试化验加工费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -249,7 +249,7 @@ const budgetList = () => {
...
@@ -249,7 +249,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"5.差旅费/会议费/国际合作交流费"
,
budgetName
:
"5.差旅费/会议费/国际合作交流费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -263,7 +263,7 @@ const budgetList = () => {
...
@@ -263,7 +263,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"6.劳务费"
,
budgetName
:
"6.劳务费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -277,7 +277,7 @@ const budgetList = () => {
...
@@ -277,7 +277,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"7.专家咨询费"
,
budgetName
:
"7.专家咨询费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -291,7 +291,7 @@ const budgetList = () => {
...
@@ -291,7 +291,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"8.出版/文献/信息传播/知识产权
\n
事务费"
,
budgetName
:
"8.出版/文献/信息传播/知识产权
\n
事务费"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -305,7 +305,7 @@ const budgetList = () => {
...
@@ -305,7 +305,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"9.其他支出"
,
budgetName
:
"9.其他支出"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
},
},
{
{
...
@@ -319,7 +319,7 @@ const budgetList = () => {
...
@@ -319,7 +319,7 @@ const budgetList = () => {
calculationBasis
:
""
,
calculationBasis
:
""
,
budgetName
:
"(二)间接费用
\
r
\n
"
,
budgetName
:
"(二)间接费用
\
r
\n
"
,
source
:
null
,
source
:
null
,
show
:
null
,
code
:
null
,
type
:
'ins'
type
:
'ins'
}
}
]
]
...
...
This diff is collapsed.
Click to expand it.
src/views/report/task/components/taskEdit.vue
View file @
5b9364e2
This diff is collapsed.
Click to expand it.
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