Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
32f68bd0
Commit
32f68bd0
authored
Apr 25, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增会员等级后台配置页面,修改财务一键审批一键转交
parent
53c27702
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
254 additions
and
10 deletions
+254
-10
FinancialDocuments.vue
src/components/FinancialModule/FinancialDocuments.vue
+9
-7
MemberLevel.vue
src/components/activity/MemberLevel.vue
+237
-0
config.js
src/router/config.js
+8
-3
No files found.
src/components/FinancialModule/FinancialDocuments.vue
View file @
32f68bd0
...
...
@@ -383,9 +383,9 @@
<button
class=
"normalBtn"
v-if=
"checkboxShow"
@
click=
"Financial_post_SetBatch"
>
{{$t('fnc.piltijiao')}}
</button>
<button
class=
"normalBtn"
@
click=
"method5()"
>
{{$t('visa.v_daochu')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"goUrl('WorkEntrustmentMy')"
>
{{$t('fnc.gzweituo')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn = !BOSSBtn, checkList = [], getPageList(1)"
v-if=
"msg.Conditon === 3 && userMenuCode"
>
{{BOSSBtn ? '关闭一键审批' : '一键审批'}}
</button>
<button
class=
"hollowFixedBtn"
v-if=
"msg.Conditon === 3 && BOSSBtn"
@
click=
"BOSSBtnClick"
>
{{$t('ios.shenpi')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1)
"
v-if=
"msg.Conditon === 3 && userMenuCode
"
>
{{BOSSBtn2 ? '关闭一键转交' : '一键转交'}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn = !BOSSBtn, checkList = [], getPageList(1)
, BOSSBtn2 = false
"
v-if=
"msg.Conditon === 3 && userMenuCode"
>
{{BOSSBtn ? '关闭一键审批' : '一键审批'}}
</button>
<button
class=
"hollowFixedBtn"
v-if=
"msg.Conditon === 3 && BOSSBtn"
@
click=
"BOSSBtnClick
(1)
"
>
{{$t('ios.shenpi')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1)
, BOSSBtn = false"
v-if=
"msg.Conditon === 3
"
>
{{BOSSBtn2 ? '关闭一键转交' : '一键转交'}}
</button>
<button
class=
"hollowFixedBtn"
v-if=
"msg.Conditon === 3 && BOSSBtn2"
@
click=
"BOSSBtnClick(2)"
>
转交
</button>
</li>
</ul>
...
...
@@ -560,7 +560,7 @@
<div
class=
"noData"
v-show=
"noData"
>
{{$t('system.content_noData')}}
</div>
<div
v-if=
"!BOSSBtn
||
!BOSSBtn2"
>
<div
v-if=
"!BOSSBtn
&&
!BOSSBtn2"
>
<el-pagination
background
@
current-change=
"handleCurrentChange"
...
...
@@ -821,6 +821,7 @@ export default {
let
userInfo
=
this
.
getLocalStorage
();
let
userMenuCode
=
','
+
userInfo
.
ActionMenuCode
+
','
;
this
.
userMenuCode
=
userMenuCode
.
indexOf
(
',C_Batch_AuditFinance,'
)
!=
-
1
?
true
:
false
;
this
.
userMenuCode
=
true
;
this
.
getCompanyMsg
.
RB_Group_Id
=
this
.
employeeMsg
.
GroupId
=
this
.
getDepartmentMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
this
.
DepartIDs
=
userInfo
.
RB_Department_Id
;
...
...
@@ -868,12 +869,13 @@ export default {
if
(
this
.
checkList
.
length
<
1
)
{
this
.
$message
.
error
(
this
.
$t
(
'rule.qxzygxytjddanju'
));
}
else
{
if
(
t
)
{
if
(
t
===
2
)
{
this
.
zhuanBox
=
true
}
else
{
this
.
BOSSDialog
=
true
;
}
}
},
goTicketPage
(
data
)
{
// 跳转机票
this
.
$router
.
push
({
name
:
'TicketManager'
,
query
:{
id
:
data
.
SourceID
,
blank
:
'y'
,
tab
:
'票务管理'
}
})
...
...
@@ -883,9 +885,9 @@ export default {
if
(
!
this
.
zhuanMsg
.
Description
)
return
this
.
$message
.
error
(
this
.
$t
(
'rule.qtxzjbeizhu'
));
let
msg
=
[];
msg
.
push
(
this
.
zhuanMsg
);
this
.
BOSSDialogText
=
true
;
this
.
zhuanMsg
.
WorkFlowId
=
this
.
checkList
[
this
.
bossLen
-
1
]
this
.
BOSSDialogText
=
true
;
if
(
this
.
BOSSBtn2
)
{
this
.
zhuanMsg
.
WorkFlowId
=
this
.
checkList
[
this
.
bossLen
-
1
]
this
.
loading
=
true
;
if
(
this
.
bossLen
&&
this
.
bossLen
<=
this
.
checkList
.
length
)
{
this
.
apipost
(
'Financial_post_Transfer'
,
msg
,
res
=>
{
...
...
src/components/activity/MemberLevel.vue
0 → 100644
View file @
32f68bd0
<
template
>
<div
class=
"flexOne"
>
<div
class=
"query-box"
>
<ul
class=
"user_time_picker"
>
<li>
<input
type=
"button"
@
click=
" "
class=
"hollowFixedBtn"
value=
"查询"
>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
>
</li>
</ul>
</div>
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
会员等级
</th>
<th>
等级名称
</th>
<th>
积分
</th>
<th>
特权
</th>
<th>
升降级标准
</th>
<th>
星级有效期延长的条件
</th>
<th>
操作
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
rank
}}
</td>
<td>
{{
item
.
awardName
}}
</td>
<td>
{{
item
.
awardCount
}}
</td>
<td>
{{
item
.
awardWinningCount
}}
</td>
<td>
223
</td>
<td>
22
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_editInfo')"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-dialog
custom-class=
"w800"
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
:before-close=
"closeChangeMachie"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
<table
class=
"layerTable layerNoIcon"
>
<tr>
<td>
<el-form-item
label=
"会员等级"
prop=
"memberLevel"
>
<el-input
v-model=
"addMsg.memberLevel"
class=
"w217"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"等级名称"
prop=
"memberName"
>
<el-input
v-model=
"addMsg.memberName"
class=
"w217"
/>
</el-form-item>
</td>
</tr>
<td>
<el-form-item
label=
"积分"
prop=
"integral"
>
<el-input
v-model=
"addMsg.integral"
class=
"w217"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"特权"
prop=
"privilege"
>
<el-select
filterable
v-model=
"addMsg.privilege"
class=
"w217"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
<el-option
v-for=
"item in awardRelationList"
:label=
"item.couponsName"
:value=
"item.couponId"
:key=
"item.couponId"
></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td
colspan=
"2"
>
<el-form-item
label=
"升降级标准"
prop=
"standard"
>
<el-input
v-model=
"addMsg.standard"
type=
"textarea"
/>
</el-form-item>
</td>
</tr>
<tr>
<td
colspan=
"2"
>
<el-form-item
label=
"星级有效期延长的条件"
prop=
"condition"
>
<el-input
v-model=
"addMsg.condition"
type=
"textarea"
/>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
</div>
</el-dialog>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
//请求
msg
:
{
lotteryId
:
''
,
},
addMsg
:{
id
:
0
,
memberLevel
:
''
,
memberName
:
''
,
integral
:
''
,
privilege
:
''
,
standard
:
''
,
condition
:
''
},
rules
:{
memberLevel
:
[{
required
:
true
,
message
:
'请输入会员等级'
,
trigger
:
"blur"
}],
memberName
:
[{
required
:
true
,
message
:
'请输入等级名称'
,
trigger
:
"blur"
}],
integral
:
[{
required
:
true
,
message
:
'请输入积分'
,
trigger
:
"blur"
}],
privilege
:
[{
required
:
true
,
message
:
'请选择特选'
,
trigger
:
"change"
}],
standard
:
[{
required
:
true
,
message
:
'请输入升降级标准'
,
trigger
:
"blur"
}],
condition
:
[{
required
:
true
,
message
:
'请输入星级有效期延长的条件'
,
trigger
:
"blur"
}],
},
loading
:
false
,
outerVisible
:
false
,
dialogTitle
:
''
,
dataList
:[],
awardRelationList
:[],
};
},
mounted
()
{
this
.
msg
.
lotteryId
=
this
.
$route
.
query
.
lotteryId
;
// this.getList();
},
filters
:
{
},
methods
:
{
//获取数据
getList
()
{
this
.
loading
=
true
;
this
.
apiJavaPost
(
"/api/sell/lottery/getLotteryAwardList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dataList
=
res
.
data
.
data
;
console
.
log
(
this
.
dataList
,
'datalist'
);
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
},
//提交
submitForm
(
addMsg
)
{
//提交创建、修改表单
this
.
$refs
[
addMsg
].
validate
(
valid
=>
{
if
(
valid
)
{
this
.
addAward
();
}
else
{
return
false
;
}
});
},
//提交添加
addAward
(){
this
.
addMsg
.
lotteryId
=
this
.
$route
.
query
.
lotteryId
;
if
(
this
.
addMsg
.
awardType
==
1
||
this
.
addMsg
.
awardType
==
2
){
this
.
addMsg
.
awardRelationId
=
0
;
}
this
.
apiJavaPost
(
"/api/sell/lottery/setLotteryAward"
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
outerVisible
=
false
;
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
},
//修改信息
updateData
(
item
){
this
.
addMsg
.
id
=
item
.
id
;
this
.
addMsg
.
lotteryId
=
item
.
lotteryId
;
this
.
addMsg
.
awardName
=
item
.
awardName
;
this
.
addMsg
.
awardType
=
item
.
awardType
;
this
.
addMsg
.
awardRelationId
=
item
.
awardRelationId
;
this
.
addMsg
.
awardCount
=
item
.
awardCount
;
this
.
addMsg
.
awardStatus
=
item
.
awardStatus
;
this
.
addMsg
.
rank
=
item
.
rank
;
this
.
getAwardRelationId
(
3
);
},
//根据奖项类型请求关联Id
getAwardRelationId
(
id
){
let
branchId
=
this
.
$route
.
query
.
branchId
;
if
(
id
==
3
){
let
msg
=
{
couponId
:
this
.
addMsg
.
awardRelationId
,
branchId
:
branchId
}
this
.
apiJavaPost
(
"/api/sell/lottery/getCouponsList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
awardRelationList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
}
},
//重置信息
resetInfo
(){
var
newMsg
=
{
id
:
0
,
lotteryId
:
0
,
awardName
:
''
,
awardType
:
1
,
awardRelationId
:
0
,
awardCount
:
''
,
awardStatus
:
1
,
rank
:
''
,
}
this
.
addMsg
=
newMsg
;
},
closeChangeMachie
(
done
)
{
//弹出框关闭初始化弹框内表单
done
();
this
.
resetForm
(
"addMsg"
);
},
resetForm
(
formName
)
{
this
.
$refs
[
formName
].
resetFields
();
}
}
};
</
script
>
\ No newline at end of file
src/router/config.js
View file @
32f68bd0
...
...
@@ -3049,9 +3049,14 @@ export default {
title
:
'团期标签'
}
},
{
path
:
'/MemberLevel'
,
name
:
'MemberLevel'
,
component
:
resolve
=>
require
([
'@/components/activity/MemberLevel'
],
resolve
),
meta
:
{
title
:
'会员等级'
}
},
]
},
{
...
...
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