Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
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
youjj
cloud-platform-ui
Commits
e6b0e964
Commit
e6b0e964
authored
Dec 25, 2019
by
guoyou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
股东信息修改
parent
c7c6af98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
127 additions
and
45 deletions
+127
-45
index.js
src/api/admin/userManagement/index.js
+19
-1
branchCompany.vue
src/views/financial/branchCompany.vue
+9
-1
employeesInput.vue
src/views/interior/employeesInput.vue
+1
-1
shareholder.vue
src/views/interior/shareholder.vue
+98
-42
No files found.
src/api/admin/userManagement/index.js
View file @
e6b0e964
...
...
@@ -215,11 +215,29 @@ export function addUserPostion(query) {
});
}
// 批量导入
// 批量导入
股东
export
function
exports
(
query
)
{
return
fetch
({
url
:
'api/admin/appShareholder/export'
,
method
:
'post'
,
data
:
query
});
}
// 编辑股东信息
export
function
updUserPostionEditor
(
query
)
{
return
fetch
({
url
:
'api/admin/appShareholder/updUserPostion'
,
method
:
'post'
,
data
:
query
});
}
// 股东信息变更记录
export
function
findShareholderChangeRecord
(
query
)
{
return
fetch
({
url
:
'api/admin/appShareholder/findShareholderChangeRecord'
,
method
:
'get'
,
data
:
query
});
}
\ No newline at end of file
src/views/financial/branchCompany.vue
View file @
e6b0e964
...
...
@@ -53,13 +53,21 @@
<el-table-column
prop=
"companyName"
label=
"公司"
align=
"center"
></el-table-column>
<el-table-column
prop=
"memberAmount"
label=
"会员费"
align=
"center"
></el-table-column>
<el-table-column
prop=
"rentVehilceAmount"
label=
"租车费"
align=
"center"
></el-table-column>
<el-table-column
prop=
"depositAmount"
label=
"押金"
align=
"center"
></el-table-column>
<el-table-column
prop=
"noDeductibleAmount"
label=
"不计免赔费"
align=
"center"
></el-table-column>
<el-table-column
prop=
"travelAmount"
label=
"旅游费"
align=
"center"
></el-table-column>
<el-table-column
prop=
"rentDays"
label=
"租借天数"
align=
"center"
></el-table-column>
<!--
<el-table-column
prop=
"extralAmount"
label=
"其他费用"
align=
"center"
></el-table-column>
-->
<el-table-column
prop=
"departureNum"
label=
"出车服务次数"
align=
"center"
></el-table-column>
<el-table-column
prop=
"arrivalNum"
label=
"收车服务次数"
align=
"center"
></el-table-column>
<el-table-column
prop=
"lossSpecifiedAmount"
label=
"定损金额"
align=
"center"
></el-table-column>
<el-table-column
prop=
"lateFeeAmount"
label=
"违约金额"
align=
"center"
></el-table-column>
<el-table-column
label=
"押金"
align=
"center"
>
<template
scope=
"scope"
>
<span>
{{
Math
.
round
((
scope
.
row
.
depositAmount
+
scope
.
row
.
depositRefundAmount
)
*
100
)
/
100
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"depositRefundAmount"
label=
"已退押金"
align=
"center"
></el-table-column>
</el-table>
<el-pagination
...
...
src/views/interior/employeesInput.vue
View file @
e6b0e964
...
...
@@ -862,7 +862,7 @@ export default {
infoStaff
(
row
)
{
this
.
infoPop
=
true
this
.
staffInfo
.
info
=
row
findPositionChangeRecord
({
phone
:
row
.
phone
}).
then
(
data
=>
{
findPositionChangeRecord
({
id
:
row
.
id
}).
then
(
data
=>
{
if
(
data
.
status
==
200
){
this
.
staffInfo
.
record
=
data
.
data
}
...
...
src/views/interior/shareholder.vue
View file @
e6b0e964
...
...
@@ -15,7 +15,7 @@
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"分公司"
>
<el-select
v-model=
"listQuery.companyId"
clearable
filterable
placeholder=
"请选择"
>
<el-select
v-model=
"listQuery.companyId"
clearable
filterable
placeholder=
"请选择"
>
<el-option
v-for=
"item in companyList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -45,7 +45,7 @@
<el-form
:model=
"fileForm"
>
<el-form-item
label=
"上传文件"
label-width=
"80px"
>
<el-button
type=
"primary"
icon=
"el-icon-download"
@
click=
"download"
>
下载模板
下载模板
<!--
<a
class=
"el-icon-download"
href=
"https://mgmt.dfangche.com/axshare/gudongdaoru.xlsx"
>
下载模板
</a>
-->
</el-button>
...
...
@@ -105,9 +105,9 @@
<el-input
v-model=
"ruleForm.name"
placeholder=
"请输入股东姓名"
></el-input>
</el-form-item>
<el-form-item
label=
"手机号"
>
<el-input
v-model=
"ruleForm.phone"
placeholder=
"请输入股东
姓名
"
></el-input>
<el-input
v-model=
"ruleForm.phone"
placeholder=
"请输入股东
手机号
"
></el-input>
</el-form-item>
<el-form-item
label=
"入股日期"
>
<el-form-item
label=
"入股日期"
v-show=
"addPopTitle == '新增'"
>
<el-date-picker
v-model=
"time"
type=
"date"
placeholder=
"选择日期"
style=
"width:100%"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"入股公司"
>
...
...
@@ -115,21 +115,22 @@
<el-option
v-for=
"item in companyList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
<
!--
<
el-form-item
label=
"状态"
v-show=
"addPopTitle == '编辑'"
>
<el-input
v-model=
"ruleForm.name"
placeholder=
"持股中
"
style=
"width:90%"
disabled
></el-input>
<el-form-item
label=
"状态"
v-show=
"addPopTitle == '编辑'"
>
<el-input
:placeholder=
"ruleForm.isQuit == 0 ? '持股中' : '已退股'
"
style=
"width:90%"
disabled
></el-input>
<el-button
type=
"text"
@
click=
"amend"
>
修改
</el-button>
</el-form-item>
-->
</el-form-item>
<el-row
style=
"text-align:center"
>
<el-button
type=
"primary"
@
click=
"submitBtn"
>
确定
</el-button>
<el-button
type=
"primary"
@
click=
"addPop = false"
>
取消
</el-button>
</el-row>
</el-form>
</el-dialog>
<el-dialog
:title=
"shareTitle == 1 ? '入股时间' : '退股时间'"
:visible
.
sync=
"sharePop"
class=
"member"
>
<el-dialog
:title=
"ruleForm.isQuit == 1 ? '入股时间' : '退股时间'"
:visible
.
sync=
"sharePop"
class=
"member"
@
close=
"closeShare"
>
<el-date-picker
v-model=
"
listQuery.name
"
v-model=
"
times
"
type=
"date"
:placeholder=
"
+shareTitle
== 1 ? '请选择入股时间' : '请选择退股时间'"
:placeholder=
"
ruleForm.isQuit
== 1 ? '请选择入股时间' : '请选择退股时间'"
style=
"width:100%"
></el-date-picker>
<el-row
style=
"text-align:center;margin-top:20px"
>
...
...
@@ -202,19 +203,13 @@
{{staffInfo.info.companyName}}
</span>
</p>
<
!-- <p class="title" style="margin-top:20px">股权变动</p> --
>
<
p
class=
"title"
style=
"margin-top:20px"
>
股权变动
</p
>
<!-- <p v-for="(item,index) in staffInfo.record" :key="index">
<b v-show="!!item.jobRemark">{{item.relTime}}</b>
<span v-if="item.jobRemark == 1" v-show="!!item.relTime">入职</span>
<span v-else-if="item.jobRemark == 4">(人事调动) {{item.oldCompanyName}} => {{item.newCompanyName}}</span>
<span v-else-if="item.jobRemark == 2">(职位变更) {{item.oldJobName}} => {{item.newJobName}}</span>
<span
v-else-if="item.jobRemark == 3"
>(身份变更) {{item.oldPositionName}} => {{item.newPositionName}}</span>
<span v-else-if="item.jobRemark == 5">离职</span>
<span v-else-if="item.jobRemark == 6">复职</span>
</p>-->
<p
v-for=
"(item,index) in staffInfo.record"
:key=
"index"
>
<b>
{{item.relTime}}
</b>
<span
style=
"margin-left:10px"
>
{{item.isQuit == 0 ? '(入股)' : "(退股)"}}
</span>
<span>
{{item.companyName}}
</span>
</p>
</el-dialog>
<!-- 股东详情 E -->
</div>
...
...
@@ -227,7 +222,9 @@ import { getToken } from 'src/utils/auth'
import
{
stockholderList
,
addUserPostion
,
exports
exports
,
updUserPostionEditor
,
findShareholderChangeRecord
}
from
'src/api/admin/userManagement/index'
import
{
formatDate
}
from
'utils/dateFormattor'
export
default
{
...
...
@@ -243,6 +240,7 @@ export default {
},
data
()
{
return
{
times
:
null
,
infoPop
:
false
,
time
:
null
,
sharePop
:
false
,
...
...
@@ -255,7 +253,8 @@ export default {
name
:
null
,
phone
:
null
,
companyList
:
[],
relTime
:
null
relTime
:
null
,
isQuit
:
0
},
rules
:
{},
addPopTitle
:
'新增'
,
...
...
@@ -290,13 +289,17 @@ export default {
}
},
methods
:
{
//下载模板
download
(){
window
.
location
.
href
=
"https://mgmt.dfangche.com/axshare/gudongdaoru.xlsx"
closeShare
(){
this
.
times
=
null
},
//下载模板
download
()
{
window
.
location
.
href
=
'https://mgmt.dfangche.com/axshare/gudongdaoru.xlsx'
},
closeAdd
()
{
this
.
time
=
null
this
.
ruleForm
=
{
this
.
time
=
null
this
.
ruleForm
=
{
name
:
null
,
phone
:
null
,
companyList
:
[],
...
...
@@ -304,25 +307,56 @@ export default {
}
},
//入股 退股时间
shareBtn
()
{},
shareBtn
()
{
this
.
ruleForm
.
changeState
=
2
this
.
ruleForm
.
relTime
=
formatDate
(
this
.
times
,
'yyyy-MM-dd'
)
+
' 00:00:00'
updUserPostionEditor
(
this
.
ruleForm
).
then
(
data
=>
{
if
(
data
.
status
==
200
)
{
this
.
$message
.
success
(
'编辑成功'
)
this
.
addPop
=
false
this
.
sharePop
=
false
this
.
getList
()
}
else
{
this
.
$message
(
data
.
message
)
}
})
},
//详情
infoStaff
(
row
)
{
this
.
infoPop
=
true
this
.
staffInfo
.
info
=
row
this
.
staffInfo
.
info
=
row
findShareholderChangeRecord
({
id
:
row
.
id
,
phone
:
row
.
phone
}).
then
(
data
=>
{
if
(
data
.
status
==
200
)
{
this
.
staffInfo
.
record
=
data
.
data
}
})
},
//编辑
editorStaff
()
{},
editorStaff
(
row
)
{
this
.
addPopTitle
=
'编辑'
this
.
$nextTick
(()
=>
{
this
.
ruleForm
=
{
name
:
row
.
name
,
phone
:
row
.
phone
,
isQuit
:
row
.
isQuit
,
companyList
:
row
.
companyIdArray
.
split
(
','
).
map
(
Number
),
// companyList:['1,1'],
id
:
row
.
id
}
this
.
addPop
=
true
})
},
//新增,编辑
submitBtn
()
{
if
(
!
this
.
ruleForm
.
name
||
!
this
.
ruleForm
.
phon
e
||
!
this
.
ruleForm
.
companyList
||
!
this
.
time
)
{
this
.
$message
(
'必填项不能为空'
)
}
else
{
if
(
this
.
addPopTitle
==
'新增'
)
{
if
(
this
.
addPopTitle
==
'新增'
)
{
if
(
!
this
.
ruleForm
.
nam
e
||
!
this
.
ruleForm
.
phone
||
!
this
.
ruleForm
.
companyList
||
!
this
.
time
)
{
this
.
$message
(
'必填项不能为空'
)
}
else
{
this
.
ruleForm
.
relTime
=
formatDate
(
this
.
time
,
'yyyy-MM-dd'
)
+
' 00:00:00'
addUserPostion
(
this
.
ruleForm
).
then
(
data
=>
{
...
...
@@ -335,6 +369,26 @@ export default {
}
})
}
}
else
{
if
(
!
this
.
ruleForm
.
name
||
!
this
.
ruleForm
.
phone
||
!
this
.
ruleForm
.
companyList
)
{
this
.
$message
(
'必填项不能为空'
)
}
else
{
this
.
ruleForm
.
changeState
=
1
updUserPostionEditor
(
this
.
ruleForm
).
then
(
data
=>
{
if
(
data
.
status
==
200
)
{
this
.
$message
.
success
(
'编辑成功'
)
this
.
addPop
=
false
this
.
getList
()
}
else
{
this
.
$message
(
data
.
message
)
}
})
}
}
},
handleSizeChange
(
val
)
{
...
...
@@ -346,7 +400,9 @@ export default {
this
.
getList
()
},
//修改分公司
amend
()
{},
amend
()
{
this
.
sharePop
=
true
},
//新增股东
addData
()
{
this
.
addPopTitle
=
'新增'
...
...
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