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
24713947
Commit
24713947
authored
Mar 26, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
1968df08
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
42 deletions
+77
-42
zh.js
src/assets/common/lang/zh.js
+34
-1
VisaFinancialDocuments.vue
src/components/SalesModule/VisaFinancialDocuments.vue
+2
-2
groupInquiry.vue
src/components/SalesModule/groupInquiry.vue
+28
-26
departmentManagement.vue
src/components/administrative/departmentManagement.vue
+13
-13
No files found.
src/assets/common/lang/zh.js
View file @
24713947
...
...
@@ -251,7 +251,22 @@ export const admin={ //行政
admin_LoginPwd
:
'登录密码'
,
admin_lnLoginPwd
:
'请输入登录密码'
,
admin_Department
:
'部门'
,
admin_Post
:
'岗位'
,
admin_Post
:
'岗位'
,
admin_xueli
:
'学历'
,
admin_Entrytime
:
'入职时间'
,
admin_Departuretime
:
'离职时间'
,
admin_Birthday
:
'生日'
,
admin_password
:
'密码'
,
admin_departsort
:
'部门排序'
,
admin_isleader
:
'是否领队'
,
admin_Bindingposition
:
'绑定岗位'
,
admin_sort
:
'排序'
,
admin_level
:
'级'
,
}
//zk
export
const
hotel
=
{
...
...
@@ -637,6 +652,12 @@ export const visa = {
v_yxiajia
:
'已下架'
,
v_hangban
:
'航班'
,
v_zanding
:
'暂定'
,
v_teaminfo
:
'团队信息'
,
v_tuanweiinfo
:
'团位信息'
,
v_currentseat
:
'当前余位'
,
v_yibaoru
:
'已报入'
,
v_houbu
:
'候补'
,
v_yxhoubu
:
'允许候补'
,
...
...
@@ -1148,4 +1169,16 @@ export const visaT = {
xzsycl
:
'下载身元材料'
,
xzggbg
:
'下载归国报告'
,
dccg
:
'导出成功!'
}
export
const
adm
=
{
adm_xzbumen
:
"新增部门"
,
adm_sxjg
:
"树形结构"
,
adm_fhlb
:
"返回列表"
,
adm_jggl
:
"结构管理"
,
adm_addbumen
:
"添加部门"
,
adm_addzibumen
:
"添加子部门"
,
adm_addyuangong
:
"添加部门"
,
adm_edityuangong
:
"添加员工"
,
adm_rzshijian
:
"入职时间"
,
}
\ No newline at end of file
src/components/SalesModule/VisaFinancialDocuments.vue
View file @
24713947
...
...
@@ -89,7 +89,7 @@
<div
v-loading=
"loading"
>
<div
class=
"sfd_header"
>
<ul
class=
"clearfix"
>
<li><span>
团队编号:
</span>
{{
TCNUM
}}
</li>
<li><span>
{{
$t
(
'scen.sc_temID'
)
}}
:
</span>
{{
TCNUM
}}
</li>
<!--
<li><span>
订单号:
</span>
{{
orderId
}}
</li>
-->
<li>
</li>
<li><span>
已收总金额:
</span>
{{
moneyFormat
(
allMoney
)
}}
</li>
...
...
@@ -106,7 +106,7 @@
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"teamRevenueExpenditureTable"
>
<tr>
<th
width=
"100"
>
单号
</th>
<th
width=
"200"
>
费用类型
</th>
<th
width=
"200"
>
{{
$t
(
'fnc.fyleixing'
)
}}
</th>
<th
width=
"350"
>
交易方式
</th>
<th
width=
"100"
>
同行转款
</th>
<th
width=
"100"
>
应收
</th>
...
...
src/components/SalesModule/groupInquiry.vue
View file @
24713947
This diff is collapsed.
Click to expand it.
src/components/administrative/departmentManagement.vue
View file @
24713947
...
...
@@ -226,20 +226,20 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('adm
.adm
_xueli')"
prop=
"EmEducation"
>
<el-form-item
:label=
"$t('adm
in.admin
_xueli')"
prop=
"EmEducation"
>
<el-input
maxlength=
'20'
type=
"text"
v-model=
"addMsg1.EmEducation"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"入职时间
"
prop=
"EmEntry"
>
<el-form-item
:label=
"$t('admin.admin_Entrytime')
"
prop=
"EmEntry"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
'addMsg1.EmEntry'
type=
"date"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"10"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"离职时间
"
prop=
"EmLeave"
>
<el-form-item
:label=
"$t('admin.admin_Departuretime')
"
prop=
"EmLeave"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
'addMsg1.EmLeave'
type=
"date"
disabled
></el-date-picker>
</el-form-item>
...
...
@@ -269,7 +269,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"生日
"
prop=
"EmBirthday"
>
<el-form-item
:label=
"$t('admin.admin_Birthday')
"
prop=
"EmBirthday"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
'addMsg1.EmBirthday'
type=
"date"
></el-date-picker>
</el-form-item>
</el-col>
...
...
@@ -279,7 +279,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"密码
"
prop=
"EmPassword"
>
<el-form-item
:label=
"$t('admin.admin_password')
"
prop=
"EmPassword"
>
<el-input
type=
"password"
v-model=
"addMsg1.EmPassword"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</el-form-item>
</el-col>
...
...
@@ -287,8 +287,8 @@
<el-row
:gutter=
"10"
>
<el-col
:span=
"24"
>
<input
type=
"button"
:value=
"$t('pub.cancelBtn')"
class=
"hollowFixedBtn"
@
click=
"resetForm('addMsg1'),treeLayerShowUser=false"
></input
>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.saveBtn')"
@
click=
"submitForm1('addMsg1')"
></input
>
@
click=
"resetForm('addMsg1'),treeLayerShowUser=false"
/
>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.saveBtn')"
@
click=
"submitForm1('addMsg1')"
/
>
<button
v-if=
'isleaveBtn'
class=
"normalBtn"
@
click=
"setIsLeave(leaveId)"
>
{{
leaveBtn
}}
</button>
</el-col>
</el-row>
...
...
@@ -346,19 +346,19 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"部门排序
"
prop=
"Sort"
>
<el-form-item
:label=
"$t('admin.admin_departsort')
"
prop=
"Sort"
>
<el-input
type=
"text"
v-model=
"addMsg.Sort"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
'是否领队'
prop=
"IsLeader"
>
<el-form-item
:label=
"$t('admin.admin_isleader')"
prop=
"IsLeader"
>
<el-switch
v-model=
"addMsg.IsLeader"
active-value=
"1"
inactive-value=
"0"
></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"10"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"绑定岗位
"
prop=
"PostIdArr"
>
<el-form-item
:label=
"$t('admin.admin_Bindingposition')
"
prop=
"PostIdArr"
>
<el-select
filterable
class=
'w400 multiple_input'
multiple
v-model=
'addMsg.PostIdArr'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in postList'
:label=
'item.PostName'
:value=
'item.PostId'
:key=
"item.PostId"
>
...
...
@@ -388,14 +388,14 @@
<th>
{{
$t
(
'admin.admin_departmentLevel'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_leader'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_dphone'
)
}}
</th>
<th
width=
"300"
>
绑定岗位
</th>
<th>
排序
</th>
<th
width=
"300"
>
{{
$t
(
'admin.admin_Bindingposition'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_sort'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_operate'
)
}}
</th>
</tr>
<tr
v-for=
"(item,index) in DataList"
>
<td>
{{
item
.
RB_Branch_Name
}}
</td>
<td>
{{
item
.
DepartmentName
}}
</td>
<td>
{{
item
.
Tier
}}
级
</td>
<td>
{{
item
.
Tier
}}
{{
$t
(
'admin.admin_level'
)
}}
</td>
<td>
{{
item
.
DepartmentManagerName
}}
</td>
<td>
{{
item
.
DepartmentTel
}}
</td>
<td>
{{
item
.
PostName
}}
</td>
...
...
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