Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
office-web
Overview
Overview
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
office
office-web
Commits
521a65eb
Commit
521a65eb
authored
Jan 10, 2019
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build for test
parent
baab5497
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
42 additions
and
12 deletions
+42
-12
vueSelectEmployee.vue
src/components/common/vueSelectEmployee.vue
+1
-1
clerkView.vue
src/components/contacts/share/clerkView.vue
+7
-0
employeeList.vue
src/components/contacts/share/employeeList.vue
+17
-5
permissionSet.vue
src/components/contacts/share/permissionSet.vue
+9
-0
editableCell.vue
src/components/employeeRecord/editableCell.vue
+1
-1
handleDialog.vue
src/components/employeeRecord/handleDialog.vue
+2
-2
listItem.vue
src/components/employeeRecord/listItem.vue
+1
-1
index.js
src/router/index.js
+1
-1
administrativeFrame.vue
src/views/contacts/administrativeFrame.vue
+1
-1
recordInfo.vue
src/views/contacts/recordInfo.vue
+2
-0
shareContact.vue
src/views/contacts/shareContact.vue
+0
-0
No files found.
src/components/common/vueSelectEmployee.vue
View file @
521a65eb
...
@@ -192,7 +192,7 @@
...
@@ -192,7 +192,7 @@
}
}
}
else
{
}
else
{
if
(
group
.
level
==
0
)
{
if
(
group
.
level
==
0
)
{
group
.
disabled
=
true
;
group
.
disabled
=
!
(
group
.
childrens
==
null
||
group
.
childrens
.
length
==
0
)
;
group
.
hasLoad
=
true
;
group
.
hasLoad
=
true
;
_this
.
menuData
=
[
group
];
_this
.
menuData
=
[
group
];
_this
.
defaultOpen
.
push
(
group
.
id
);
_this
.
defaultOpen
.
push
(
group
.
id
);
...
...
src/components/contacts/share/clerkView.vue
View file @
521a65eb
<
template
>
<
template
>
<div>
<div>
<el-table
<el-table
@
selection-change=
"selectMember"
ref=
"clerkViewTable"
ref=
"clerkViewTable"
class=
"diy-table"
class=
"diy-table"
height=
"445"
height=
"445"
...
@@ -67,6 +68,12 @@ export default {
...
@@ -67,6 +68,12 @@ export default {
};
};
},
},
methods
:
{
methods
:
{
/**
* table选择门店
*/
selectMember
(
selection
)
{
this
.
$emit
(
"selectMember"
,
selection
);
},
},
},
mounted
()
{
mounted
()
{
let
list
=
this
.
tableData
;
let
list
=
this
.
tableData
;
...
...
src/components/contacts/share/employeeList.vue
View file @
521a65eb
...
@@ -71,11 +71,23 @@ export default {
...
@@ -71,11 +71,23 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
let
arr
=
[];
// let arr = [];
this
.
employeeList
.
forEach
(
clerk
=>
{
// console.log( this.employeeList, " this.employeeList");
arr
.
push
(
clerk
.
ext
.
employeeClerk
);
// this.employeeList.forEach(clerk => {
});
// arr.push(clerk.ext.employeeClerk);
this
.
tableData
=
arr
;
// });
// this.tableData = arr;
},
watch
:
{
employeeList
(
list
)
{
let
arr
=
[];
console
.
log
(
list
,
" this.list"
);
list
.
forEach
(
clerk
=>
{
clerk
.
ext
.
employeeClerk
.
sharedContactEmployeeStoreId
=
clerk
.
sharedContactEmployeeStoreId
;
arr
.
push
(
clerk
.
ext
.
employeeClerk
);
});
this
.
tableData
=
arr
;
}
}
}
};
};
</
script
>
</
script
>
...
...
src/components/contacts/share/permissionSet.vue
0 → 100644
View file @
521a65eb
<
template
>
<div
class=
"per-set-div"
></div>
</
template
>
<
script
>
export
default
{
name
:
"permission-set"
}
</
script
>
src/components/employeeRecord/editableCell.vue
View file @
521a65eb
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
<
template
v-else
>
<
template
v-else
>
<div
v-if=
"item.fieldType == 0 || item.fieldType == 1 || item.fieldType == 6"
>
{{
info
[
item
.
fieldCode
]
}}
</div>
<div
v-if=
"item.fieldType == 0 || item.fieldType == 1 || item.fieldType == 6"
>
{{
info
[
item
.
fieldCode
]
}}
</div>
<template
v-else-if=
"item.fieldType == 2"
>
<template
v-else-if=
"item.fieldType == 2"
>
<div
v-if=
"item.systemFlag == 1"
>
{{
item
.
fieldOperations
.
fieldContent
[(
info
[
item
.
fieldCode
]
||
1
)
*
1
-
1
].
name
}}
</div>
<div
v-if=
"item.systemFlag == 1"
>
{{
!!
item
.
fieldOperations
.
fieldContent
[
info
[
item
.
fieldCode
]
*
1
-
1
]
?
item
.
fieldOperations
.
fieldContent
[
info
[
item
.
fieldCode
]
*
1
-
1
].
name
:
""
}}
</div>
<div
v-else
>
{{
info
[
item
.
fieldCode
]
}}
</div>
<div
v-else
>
{{
info
[
item
.
fieldCode
]
}}
</div>
</
template
>
</
template
>
<div
v-else-if=
"item.fieldType == 3"
></div>
<div
v-else-if=
"item.fieldType == 3"
></div>
...
...
src/components/employeeRecord/handleDialog.vue
View file @
521a65eb
...
@@ -142,7 +142,7 @@ export default {
...
@@ -142,7 +142,7 @@ export default {
},
},
resignation
:
{
resignation
:
{
params
:
{
params
:
{
fireReason
:
ths
.
ruleForm
.
reason
,
fireReason
:
ths
.
ruleForm
.
reason
*
1
+
1
,
remark
:
ths
.
ruleForm
.
remarks
,
remark
:
ths
.
ruleForm
.
remarks
,
recordId
:
ths
.
employee
.
recordId
,
recordId
:
ths
.
employee
.
recordId
,
fireDate
:
ths
.
ruleForm
.
date
fireDate
:
ths
.
ruleForm
.
date
...
@@ -151,7 +151,7 @@ export default {
...
@@ -151,7 +151,7 @@ export default {
},
},
changeFireInfo
:
{
changeFireInfo
:
{
params
:
{
params
:
{
fireReason
:
ths
.
ruleForm
.
reason
,
fireReason
:
ths
.
ruleForm
.
reason
*
1
+
1
,
remark
:
ths
.
ruleForm
.
remarks
,
remark
:
ths
.
ruleForm
.
remarks
,
recordId
:
ths
.
employee
.
recordId
,
recordId
:
ths
.
employee
.
recordId
,
fireDate
:
ths
.
ruleForm
.
date
,
fireDate
:
ths
.
ruleForm
.
date
,
...
...
src/components/employeeRecord/listItem.vue
View file @
521a65eb
...
@@ -75,7 +75,7 @@ export default {
...
@@ -75,7 +75,7 @@ export default {
data
()
{
data
()
{
return
{
return
{
typeLsit
:
[
"全部"
,
"全职"
,
"兼职"
,
"外包"
,
"实习"
,
"无类型"
],
typeLsit
:
[
"全部"
,
"全职"
,
"兼职"
,
"外包"
,
"实习"
,
"无类型"
],
reasons
:
[
"家庭原因"
,
"个人原因"
,
"发展原因"
,
"合同到期不续签"
,
"协议解除"
,
"无法胜任工作"
,
"经济性裁员"
,
"严重违法违纪"
,
"其他"
],
reasons
:
[
"
"
,
"
家庭原因"
,
"个人原因"
,
"发展原因"
,
"合同到期不续签"
,
"协议解除"
,
"无法胜任工作"
,
"经济性裁员"
,
"严重违法违纪"
,
"其他"
],
propList
:
{
propList
:
{
headPic
:
{
headPic
:
{
label
:
""
,
label
:
""
,
...
...
src/router/index.js
View file @
521a65eb
...
@@ -122,7 +122,7 @@ export const constantRouterMap = [
...
@@ -122,7 +122,7 @@ export const constantRouterMap = [
},
},
{
{
path
:
"/employeeRecord"
,
path
:
"/employeeRecord"
,
name
:
'
共享通讯录二维码
'
,
name
:
'
在职员工
'
,
component
:
_import
(
'contacts'
,
'employeeRecord'
)
component
:
_import
(
'contacts'
,
'employeeRecord'
)
}
}
]
]
...
...
src/views/contacts/administrativeFrame.vue
View file @
521a65eb
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
arr
.
push
(
li
.
employeeClerkId
);
arr
.
push
(
li
.
employeeClerkId
);
});
});
let
params
=
{
let
params
=
{
ids
:
arr
.
push
(
","
)
ids
:
arr
.
join
(
","
)
}
}
getRequest
(
"/haoban-manage-web/emp/del"
,
params
)
getRequest
(
"/haoban-manage-web/emp/del"
,
params
)
.
then
(
res
=>
{
.
then
(
res
=>
{
...
...
src/views/contacts/recordInfo.vue
View file @
521a65eb
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
</div>
</div>
<p
class=
"position"
>
{{his.positionName}}
</p>
<p
class=
"position"
>
{{his.positionName}}
</p>
<p>
{{historyStatus[his.historyStatus * 1 - 1]}}
<a
class=
"a-href m-l-10 fs-12"
@
click=
"editHis(his)"
v-if=
"his.historyStatus == 3"
>
编辑
</a></p>
<p>
{{historyStatus[his.historyStatus * 1 - 1]}}
<a
class=
"a-href m-l-10 fs-12"
@
click=
"editHis(his)"
v-if=
"his.historyStatus == 3"
>
编辑
</a></p>
<p
v-if=
"his.historyStatus == 3"
>
离职理由:{{reasons[his.fireReason]}}
</p>
<p>
{{!!his.storeName ? his.storeName : his.groupName}}
</p>
<p>
{{!!his.storeName ? his.storeName : his.groupName}}
</p>
</div>
</div>
</li>
</li>
...
@@ -89,6 +90,7 @@ export default {
...
@@ -89,6 +90,7 @@ export default {
info
:
{},
info
:
{},
staticInfo
:
{},
staticInfo
:
{},
statusList
:
[
"正式"
,
"试用"
,
"离职"
],
statusList
:
[
"正式"
,
"试用"
,
"离职"
],
reasons
:
[
""
,
"家庭原因"
,
"个人原因"
,
"发展原因"
,
"合同到期不续签"
,
"协议解除"
,
"无法胜任工作"
,
"经济性裁员"
,
"严重违法违纪"
,
"其他"
],
items
:
[],
items
:
[],
fieldList
:
[],
fieldList
:
[],
mileStone
:
[],
// 里程碑数据
mileStone
:
[],
// 里程碑数据
...
...
src/views/contacts/shareContact.vue
View file @
521a65eb
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