Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-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
周远喜
mes-ui
Commits
c6b14247
Commit
c6b14247
authored
Apr 30, 2020
by
康振飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员管理&编码管理detail
parent
7c33d92c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
106 additions
and
36 deletions
+106
-36
base.less
assets/css/base.less
+6
-0
detail.vue
pages/basicData/code/detail.vue
+32
-2
index.vue
pages/basicData/code/index.vue
+1
-1
detail.vue
pages/basicData/user/detail.vue
+66
-32
index.vue
pages/basicData/user/index.vue
+1
-1
No files found.
assets/css/base.less
View file @
c6b14247
...
@@ -1190,4 +1190,10 @@ html [type=button] {
...
@@ -1190,4 +1190,10 @@ html [type=button] {
.content {
.content {
padding-left: 5px;
padding-left: 5px;
}
}
// 详情弹框css
.row_border_bottom{
border-bottom: 1px solid #E0E0E0;
padding: 15px 20px;
}
\ No newline at end of file
pages/basicData/code/detail.vue
View file @
c6b14247
<
template
>
<
template
>
<div
class=
"detail"
>
<div
>
<
Row>
<
!--
<Row>
class="detail"
<Filed
:span=
"12"
:name=
"l('businessName')"
>
{{
entity
.
businessName
}}
</Filed>
<Filed
:span=
"12"
:name=
"l('businessName')"
>
{{
entity
.
businessName
}}
</Filed>
<Filed
:span=
"12"
:name=
"l('businessCode')"
>
{{
entity
.
businessCode
}}
</Filed>
<Filed
:span=
"12"
:name=
"l('businessCode')"
>
{{
entity
.
businessCode
}}
</Filed>
<Filed
:span=
"12"
:name=
"l('prefix')"
>
{{
entity
.
prefix
}}
</Filed>
<Filed
:span=
"12"
:name=
"l('prefix')"
>
{{
entity
.
prefix
}}
</Filed>
...
@@ -10,6 +10,36 @@
...
@@ -10,6 +10,36 @@
</Filed>
</Filed>
<Filed
:span=
"12"
></Filed>
<Filed
:span=
"12"
></Filed>
<Filed
:span=
"24"
:name=
"l('remark')"
>
{{
entity
.
remark
}}
</Filed>
<Filed
:span=
"24"
:name=
"l('remark')"
>
{{
entity
.
remark
}}
</Filed>
</Row>
-->
<Row
class=
"row_border_bottom"
>
<Col
:span=
"8"
>
<b>
{{
l
(
'businessName'
)
}}
</b>
<p>
{{
entity
.
businessName
}}
</p>
</Col>
<Col
:span=
"8"
>
<b>
{{
l
(
'businessCode'
)
}}
</b>
<p>
{{
entity
.
businessCode
}}
</p>
</Col>
<Col
:span=
"8"
>
<b>
{{
l
(
'prefix'
)
}}
</b>
<p>
{{
entity
.
prefix
}}
</p>
</Col>
</Row>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"8"
>
<b>
{{
l
(
'maxSerial'
)
}}
</b>
<p>
{{
entity
.
maxSerial
}}
</p>
</Col>
<Col
:span=
"8"
>
<b>
{{
l
(
'day'
)
}}
</b>
<p><state
code=
"mes_xingchi_system.business_code_config.day"
:value=
"entity.day"
/></p>
</Col>
</Row>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"24"
>
<b>
{{
l
(
'remark'
)
}}
</b>
<p>
{{
entity
.
remark
}}
</p>
</Col>
</Row>
</Row>
</div>
</div>
</
template
>
</
template
>
...
...
pages/basicData/code/index.vue
View file @
c6b14247
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<Modal
v-model=
"setModal"
title=
"设置"
width=
"600"
footer-hide
>
<Modal
v-model=
"setModal"
title=
"设置"
width=
"600"
footer-hide
>
<Set
:eid=
"curId"
@
on-close=
"cancel"
@
on-ok=
"addOk"
/>
<Set
:eid=
"curId"
@
on-close=
"cancel"
@
on-ok=
"addOk"
/>
</Modal>
</Modal>
<Modal
v-model=
"detailModal"
title=
"详情"
width=
"
8
00"
>
<Modal
v-model=
"detailModal"
title=
"详情"
width=
"
9
00"
>
<Detail
:eid=
"curId"
/>
<Detail
:eid=
"curId"
/>
</Modal>
</Modal>
</div>
</div>
...
...
pages/basicData/user/detail.vue
View file @
c6b14247
<
template
>
<
template
>
<div
class=
"addUser"
>
<div
class=
"addUser"
>
<Form
ref=
"form"
:model=
"entity"
:label-width=
"90"
>
<Form
ref=
"form"
:model=
"entity"
:label-width=
"90"
>
<Row>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"12"
>
<Col
:span=
"8"
>
<FormItem
:label=
"l('userName')"
prop=
"userName"
>
{{
entity
.
userName
}}
</FormItem>
<!--
<FormItem
:label=
"l('userName')"
prop=
"userName"
>
{{
entity
.
userName
}}
</FormItem>
-->
<b>
{{
l
(
'userName'
)
}}
</b>
<p>
{{
entity
.
userName
}}
</p>
</Col>
</Col>
<Col
:span=
"12"
>
<Col
:span=
"8"
>
<FormItem
:label=
"l('cardNo')"
prop=
"cardNo"
>
{{
entity
.
cardNo
}}
</FormItem>
<!--
<FormItem
:label=
"l('cardNo')"
prop=
"cardNo"
>
{{
entity
.
cardNo
}}
</FormItem>
-->
<b>
{{
l
(
'cardNo'
)
}}
</b>
<p>
{{
entity
.
cardNo
}}
</p>
</Col>
</Col>
<Col
:span=
"
12
"
>
<Col
:span=
"
8
"
>
<FormItem
:label=
"l('gender')"
prop=
"gender"
>
<
!--
<
FormItem
:label=
"l('gender')"
prop=
"gender"
>
<state
code=
"User.base.gender"
:value=
"entity.gender"
type=
"text"
></state>
<state
code=
"User.base.gender"
:value=
"entity.gender"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'gender'
)
}}
</b>
<p><state
code=
"User.base.gender"
:value=
"entity.gender"
type=
"text"
></state></p>
</Col>
</Col>
<Col
:span=
"12"
>
</Row>
<FormItem
:label=
"l('birthday')"
prop=
"birthday"
>
{{
entity
.
birthday
}}
</FormItem>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"8"
>
<!--
<FormItem
:label=
"l('birthday')"
prop=
"birthday"
>
{{
entity
.
birthday
}}
</FormItem>
-->
<b>
{{
l
(
'birthday'
)
}}
</b>
<p>
{{
entity
.
birthday
}}
</p>
</Col>
</Col>
<Col
:span=
"
12
"
>
<Col
:span=
"
8
"
>
<FormItem
:label=
"l('degreeId')"
prop=
"degreeId"
>
<
!--
<
FormItem
:label=
"l('degreeId')"
prop=
"degreeId"
>
<state
code=
"User.base.degree"
:value=
"entity.degreeId"
type=
"text"
></state>
<state
code=
"User.base.degree"
:value=
"entity.degreeId"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'degreeId'
)
}}
</b>
<p><state
code=
"User.base.degree"
:value=
"entity.degreeId"
type=
"text"
></state></p>
</Col>
</Col>
<Col
:span=
"12"
>
<Col
:span=
"8"
>
<FormItem
:label=
"l('departmentTitle')"
prop=
"departmentTitle"
>
{{
entity
.
departmentTitle
}}
</FormItem>
<!--
<FormItem
:label=
"l('departmentTitle')"
prop=
"departmentTitle"
>
{{
entity
.
departmentTitle
}}
</FormItem>
-->
<b>
{{
l
(
'departmentTitle'
)
}}
</b>
<p>
{{
entity
.
departmentTitle
}}
</p>
</Col>
</Col>
<Col
:span=
"12"
>
</Row>
<FormItem
:label=
"l('status')"
prop=
"status"
>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"8"
>
<!--
<FormItem
:label=
"l('status')"
prop=
"status"
>
<state
code=
"User.base.status"
:value=
"entity.status"
type=
"text"
></state>
<state
code=
"User.base.status"
:value=
"entity.status"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'status'
)
}}
</b>
<p><state
code=
"User.base.status"
:value=
"entity.status"
type=
"text"
></state></p>
</Col>
</Col>
<Col
:span=
"12"
>
<Col
:span=
"8"
>
<FormItem
:label=
"l('phone')"
prop=
"phone"
>
{{
entity
.
phone
}}
</FormItem>
<!--
<FormItem
:label=
"l('phone')"
prop=
"phone"
>
{{
entity
.
phone
}}
</FormItem>
-->
<b>
{{
l
(
'phone'
)
}}
</b>
<p>
{{
entity
.
phone
}}
</p>
</Col>
</Col>
<Col
:span=
"12"
>
<Col
:span=
"8"
>
<FormItem
:label=
"l('email')"
prop=
"email"
>
{{
entity
.
email
}}
</FormItem>
<!--
<FormItem
:label=
"l('email')"
prop=
"email"
>
{{
entity
.
email
}}
</FormItem>
-->
<b>
{{
l
(
'email'
)
}}
</b>
<p>
{{
entity
.
email
}}
</p>
</Col>
</Col>
<!--
<Col
:span=
"12"
>
<!--
<Col
:span=
"12"
>
<FormItem
:label=
"l('enableEquip')"
prop=
"enableEquip"
>
{{
entity
.
enableEquip
}}
</FormItem>
<FormItem
:label=
"l('enableEquip')"
prop=
"enableEquip"
>
{{
entity
.
enableEquip
}}
</FormItem>
</Col>
-->
</Col>
-->
<Col
:span=
"12"
>
</Row>
<FormItem
:label=
"l('positionId')"
prop=
"positionId"
>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"8"
>
<!--
<FormItem
:label=
"l('positionId')"
prop=
"positionId"
>
<state
code=
"User.base.position"
:value=
"entity.positionId"
type=
"text"
></state>
<state
code=
"User.base.position"
:value=
"entity.positionId"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'positionId'
)
}}
</b>
<p><state
code=
"User.base.position"
:value=
"entity.positionId"
type=
"text"
></state></p>
</Col>
</Col>
<Col
:span=
"
12
"
>
<Col
:span=
"
8
"
>
<FormItem
:label=
"l('titleId')"
prop=
"titleId"
>
<
!--
<
FormItem
:label=
"l('titleId')"
prop=
"titleId"
>
<state
code=
"User.base.jobtitle"
:value=
"entity.titleId"
type=
"text"
></state>
<state
code=
"User.base.jobtitle"
:value=
"entity.titleId"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'titleId'
)
}}
</b>
<p><state
code=
"User.base.titleId"
:value=
"entity.titleId"
type=
"text"
></state></p>
</Col>
</Col>
<Col
:span=
"
12
"
>
<Col
:span=
"
8
"
>
<FormItem
:label=
"l('licensedToWork')"
prop=
"licensedToWork"
>
<
!--
<
FormItem
:label=
"l('licensedToWork')"
prop=
"licensedToWork"
>
<state
code=
"User.base.workLicense"
:value=
"entity.licensedToWork"
type=
"text"
></state>
<state
code=
"User.base.workLicense"
:value=
"entity.licensedToWork"
type=
"text"
></state>
</FormItem>
</FormItem>
-->
<b>
{{
l
(
'workLicense'
)
}}
</b>
<p><state
code=
"User.base.workLicense"
:value=
"entity.workLicense"
type=
"text"
></state></p>
</Col>
</Col>
</Row>
<Row
class=
"row_border_bottom"
>
<Col
:span=
"24"
>
<Col
:span=
"24"
>
<FormItem
:label=
"l('remark')"
prop=
"remark"
>
{{
entity
.
remark
}}
</FormItem>
<!--
<FormItem
:label=
"l('remark')"
prop=
"remark"
>
{{
entity
.
remark
}}
</FormItem>
-->
<b>
{{
l
(
'remark'
)
}}
</b>
<p>
{{
entity
.
remark
}}
</p>
</Col>
</Col>
</Row>
</Row>
</Form>
</Form>
...
...
pages/basicData/user/index.vue
View file @
c6b14247
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<Modal
v-model=
"editModal"
title=
"编辑"
footer-hide
width=
"800"
>
<Modal
v-model=
"editModal"
title=
"编辑"
footer-hide
width=
"800"
>
<Edit
:eid=
"curId"
@
on-close=
"cancel"
@
on-ok=
"addOk"
/>
<Edit
:eid=
"curId"
@
on-close=
"cancel"
@
on-ok=
"addOk"
/>
</Modal>
</Modal>
<Modal
v-model=
"detailModal"
title=
"详情"
width=
"
8
00"
>
<Modal
v-model=
"detailModal"
title=
"详情"
width=
"
9
00"
>
<Detail
:eid=
"curId"
/>
<Detail
:eid=
"curId"
/>
</Modal>
</Modal>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
...
...
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