Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
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
罗超
confucius
Commits
e3e196cb
Commit
e3e196cb
authored
Jan 17, 2022
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
1dc7c329
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
3 deletions
+117
-3
contribution.js
src/api/teacher/contribution.js
+9
-0
process-form.vue
src/components/flow/process-form.vue
+10
-0
tougao-form.vue
src/components/flow/tougao-form.vue
+2
-1
tougao-form.vue
src/components/sale/tougao-form.vue
+29
-1
contributeManage.vue
src/pages/teacher/contribution/contributeManage.vue
+67
-1
No files found.
src/api/teacher/contribution.js
View file @
e3e196cb
...
@@ -131,4 +131,13 @@ export function getGZHUserTagList(data) {
...
@@ -131,4 +131,13 @@ export function getGZHUserTagList(data) {
data
data
})
})
}
}
// 稿酬状态
export
function
setRemunerationState
(
data
)
{
return
request
({
url
:
'/QYContribute/SetRemunerationState'
,
method
:
'post'
,
data
})
}
src/components/flow/process-form.vue
View file @
e3e196cb
...
@@ -194,6 +194,7 @@
...
@@ -194,6 +194,7 @@
</
template
>
</
template
>
</q-select>
</q-select>
</div>
</div>
<!-- 设定收损 -->
<q-toggle
<q-toggle
v-if=
"AuthorityObj.isShowShouSun==1 &&saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex==0"
v-if=
"AuthorityObj.isShowShouSun==1 &&saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex==0"
v-model=
"saveObj.FlowNodeList[NodeIndex].FlowAduitList[0].IsSpecNode"
label=
"设定收损"
left-label
v-model=
"saveObj.FlowNodeList[NodeIndex].FlowAduitList[0].IsSpecNode"
label=
"设定收损"
left-label
...
@@ -204,6 +205,12 @@
...
@@ -204,6 +205,12 @@
<i
class=
"iconfont icon-jinggao"
></i>
<i
class=
"iconfont icon-jinggao"
></i>
只能由一个人开启,一旦开启其他关闭
只能由一个人开启,一旦开启其他关闭
</div>
</div>
<!-- 稿酬 -->
<q-toggle
v-if=
"AuthorityObj.isroyalties==1 &&saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex==0"
v-model=
"saveObj.FlowNodeList[NodeIndex].FlowAduitList[0].IsSpecNode"
label=
"稿酬状态"
left-label
:true-value=
"1"
:false-value=
"0"
@
input=
"changeSpecNode(saveObj.FlowNodeList[NodeIndex].FlowAduitList[0])"
/>
</div>
</div>
<i
class=
"iconfont icon-shanchu ProcessShanchu"
<i
class=
"iconfont icon-shanchu ProcessShanchu"
v-if=
"saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex>0"
v-if=
"saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex>0"
...
@@ -316,6 +323,9 @@
...
@@ -316,6 +323,9 @@
if
(
this
.
authObj
.
isShowShouSun
!=
null
&&
this
.
authObj
.
isShowShouSun
==
1
)
{
if
(
this
.
authObj
.
isShowShouSun
!=
null
&&
this
.
authObj
.
isShowShouSun
==
1
)
{
this
.
AuthorityObj
.
isShowShouSun
=
this
.
authObj
.
isShowShouSun
;
this
.
AuthorityObj
.
isShowShouSun
=
this
.
authObj
.
isShowShouSun
;
}
}
if
(
this
.
authObj
.
isroyalties
!=
null
&&
this
.
authObj
.
isroyalties
==
1
)
{
this
.
AuthorityObj
.
isroyalties
=
this
.
authObj
.
isroyalties
;
}
}
}
},
},
queryPostList
()
{
queryPostList
()
{
...
...
src/components/flow/tougao-form.vue
View file @
e3e196cb
...
@@ -170,7 +170,7 @@
...
@@ -170,7 +170,7 @@
item.FlowAduitList[0].IsSpecNode == 1
item.FlowAduitList[0].IsSpecNode == 1
"
"
>
>
<span
class=
"SetShouSun"
>
设定
收损
</span>
<span
class=
"SetShouSun"
>
设定
稿酬
</span>
</
template
>
</
template
>
<div
class=
"operationDiv"
>
<div
class=
"operationDiv"
>
<i
<i
...
@@ -304,6 +304,7 @@ export default {
...
@@ -304,6 +304,7 @@ export default {
//显示对象
//显示对象
showObj
:
{
showObj
:
{
isShowShouSun
:
0
,
//不显示收损
isShowShouSun
:
0
,
//不显示收损
isroyalties
:
1
,
//稿酬
},
},
ChooseNodeIndex
:
0
,
ChooseNodeIndex
:
0
,
};
};
...
...
src/components/sale/tougao-form.vue
View file @
e3e196cb
...
@@ -368,12 +368,38 @@
...
@@ -368,12 +368,38 @@
</div>
</div>
</div>
</div>
<div
v-if=
"showType == 2"
>
<div
v-if=
"showType == 2"
>
<div
v-if=
"changeBillMsg.SpecialNode==1"
style=
"
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
"
>
<div>
稿酬状态
</div>
<div>
<q-radio
v-model=
"changeBillMsg.RemunerationState"
@
input=
"$forceUpdate()"
:val=
"1"
label=
"发放"
/>
<q-radio
v-model=
"changeBillMsg.RemunerationState"
:val=
"0"
label=
"不发放"
@
input=
"$forceUpdate()"
/>
</div>
</div>
<div
<div
style=
"
style=
"
display: flex;
display: flex;
justify-content: space-between;
justify-content: space-between;
align-items: center;
align-items: center;
margin-top: 20px;
"
"
>
>
<div>
审批意见
</div>
<div>
审批意见
</div>
...
@@ -631,6 +657,8 @@ export default {
...
@@ -631,6 +657,8 @@ export default {
mounted
()
{
mounted
()
{
this
.
changeBillMsg
.
Id
=
this
.
setingObj
.
Id
;
this
.
changeBillMsg
.
Id
=
this
.
setingObj
.
Id
;
this
.
changeBillMsg
.
SpecialNode
=
this
.
setingObj
.
SpecialNode
;
this
.
changeBillMsg
.
SpecialNode
=
this
.
setingObj
.
SpecialNode
;
this
.
changeBillMsg
.
RemunerationState
=
this
.
setingObj
.
DataObj
.
RemunerationState
;
console
.
log
(
this
.
setingObj
)
},
},
methods
:
{
methods
:
{
closeBackInfo
()
{
closeBackInfo
()
{
...
...
src/pages/teacher/contribution/contributeManage.vue
View file @
e3e196cb
...
@@ -48,6 +48,12 @@
...
@@ -48,6 +48,12 @@
-webkit-line-clamp: 3;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical; white-space:pre-wrap"
>
{{
props
.
row
.
Description
}}
</div>
-webkit-box-orient: vertical; white-space:pre-wrap"
>
{{
props
.
row
.
Description
}}
</div>
</q-td>
</q-td>
</
template
>
<
template
v-slot:body-cell-RemunerationState=
"props"
>
<q-td
:props=
"props"
>
<span
v-if=
"props.row.RemunerationState==1"
>
发放
</span>
<span
v-if=
"props.row.RemunerationState==2"
>
不发放
</span>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-optioned=
"props"
>
<
template
v-slot:body-cell-optioned=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
...
@@ -56,8 +62,11 @@
...
@@ -56,8 +62,11 @@
class=
"q-mr-xs"
label=
"详情"
@
click=
"viewDetails(props.row)"
/>
-->
class=
"q-mr-xs"
label=
"详情"
@
click=
"viewDetails(props.row)"
/>
-->
<q-btn
flat
size=
"xs"
icon=
"edit"
style=
"font-weight:400;color: #3FC4FF"
class=
"q-mr-xs"
label=
"修改"
<q-btn
flat
size=
"xs"
icon=
"edit"
style=
"font-weight:400;color: #3FC4FF"
class=
"q-mr-xs"
label=
"修改"
@
click=
"goedit(props.row)"
/>
@
click=
"goedit(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"edit"
style=
"font-weight:400;color: #3FC4FF"
class=
"q-mr-xs"
label=
"稿酬"
@
click=
"gaochou(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-fabu"
style=
"font-weight:400;color: purple"
class=
"q-mr-xs"
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-fabu"
style=
"font-weight:400;color: purple"
class=
"q-mr-xs"
label=
"发布"
@
click=
"release(props.row)"
/>
label=
"发布"
@
click=
"release(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-lianluojilu"
style=
"font-weight:400;color: purple"
class=
"q-mr-xs"
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-lianluojilu"
style=
"font-weight:400;color: purple"
class=
"q-mr-xs"
label=
"发布记录"
@
click=
"releaserecord(props.row)"
>
label=
"发布记录"
@
click=
"releaserecord(props.row)"
>
<q-popup-proxy
transition-show=
"flip-up"
transition-hide=
"flip-down"
>
<q-popup-proxy
transition-show=
"flip-up"
transition-hide=
"flip-down"
>
...
@@ -121,6 +130,29 @@
...
@@ -121,6 +130,29 @@
</q-card-actions>
</q-card-actions>
</q-card>
</q-card>
</q-dialog>
</q-dialog>
<q-dialog
v-model=
"isgaochouMsg"
persistent
transition-show=
"scale"
transition-hide=
"scale"
>
<q-card
style=
"width: 600px;max-width:900px;"
>
<q-card-section>
<div
class=
"text-h6"
>
稿酬状态设置
</div>
</q-card-section>
<q-card-section
class=
"q-pt-none scroll"
style=
"max-height: 70vh"
>
<div
style=
"display: flex;align-items: center;margin: 10px 0 ;"
v-if=
"gaochouMsg"
>
稿酬状态:
<q-radio
v-model=
"gaochouMsg.RemunerationState"
val=
"1"
label=
"发放"
/>
<q-radio
v-model=
"gaochouMsg.RemunerationState"
val=
"2"
label=
"不发放"
/>
</div>
</q-card-section>
<q-separator
/>
<q-card-actions
align=
"right"
class=
"bg-white"
>
<q-btn
label=
"取消"
flat
color=
"grey-10"
style=
"font-weight:400 !important"
@
click=
"isgaochouMsg=false"
/>
<q-btn
label=
"立即提交"
color=
"accent q-px-md"
style=
"font-weight:400 !important"
@
click=
"saveCourse2"
/>
</q-card-actions>
</q-card>
</q-dialog>
</div>
</div>
</template>
</template>
...
@@ -132,7 +164,8 @@
...
@@ -132,7 +164,8 @@
setContributeInfoState
,
setContributeInfoState
,
setContributeInfoPublish
,
setContributeInfoPublish
,
getContributeInfoPublishLogList
,
getContributeInfoPublishLogList
,
getGZHUserTagList
getGZHUserTagList
,
setRemunerationState
}
from
'../../../api/teacher/contribution'
;
}
from
'../../../api/teacher/contribution'
;
import
{
import
{
GetContributePlatfrom
,
//获取平台
GetContributePlatfrom
,
//获取平台
...
@@ -189,6 +222,12 @@
...
@@ -189,6 +222,12 @@
label
:
'审核状态'
,
label
:
'审核状态'
,
align
:
'left'
align
:
'left'
},
},
{
name
:
'RemunerationState'
,
field
:
'RemunerationState'
,
label
:
'稿酬状态'
,
align
:
'left'
},
{
{
name
:
'UpdateByName'
,
name
:
'UpdateByName'
,
field
:
'UpdateByName'
,
field
:
'UpdateByName'
,
...
@@ -217,6 +256,8 @@
...
@@ -217,6 +256,8 @@
},
},
recordDate
:
[],
recordDate
:
[],
tagList
:
[],
tagList
:
[],
gaochouMsg
:
null
,
isgaochouMsg
:
false
}
}
},
},
...
@@ -298,6 +339,14 @@
...
@@ -298,6 +339,14 @@
this
.
releasedialog
=
true
this
.
releasedialog
=
true
},
},
gaochou
(
row
){
//稿酬状态设置
this
.
gaochouMsg
=
{
ContributeId
:
row
.
Id
,
RemunerationState
:
row
.
RemunerationState
?
row
.
RemunerationState
.
toString
():
2
,
}
this
.
isgaochouMsg
=
true
},
releaserecord
(
row
)
{
releaserecord
(
row
)
{
getContributeInfoPublishLogList
({
getContributeInfoPublishLogList
({
ContributeId
:
row
.
Id
ContributeId
:
row
.
Id
...
@@ -347,6 +396,23 @@
...
@@ -347,6 +396,23 @@
})
})
},
},
saveCourse2
(){
console
.
log
(
this
.
gaochouMsg
)
setRemunerationState
(
this
.
gaochouMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
res
.
Message
,
position
:
'top'
})
this
.
getList
()
this
.
isgaochouMsg
=
false
}
}).
catch
(()
=>
{
})
},
goedit
(
row
)
{
//编辑
goedit
(
row
)
{
//编辑
this
.
OpenNewUrl
(
"/teacher/contribution/addimageText"
,
{
this
.
OpenNewUrl
(
"/teacher/contribution/addimageText"
,
{
...
...
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