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
bed9752d
Commit
bed9752d
authored
Sep 23, 2019
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
cfe9b2c9
256fd9ff
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
1722 additions
and
49 deletions
+1722
-49
login.css
src/assets/css/login.css
+6
-6
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+36
-24
Qzcommissions.vue
src/components/FinancialModule/Qzcommissions.vue
+8
-0
EasyReport.vue
src/components/FinancialModule/ReportForm/EasyReport.vue
+32
-2
Login2019.vue
src/components/Login2019.vue
+1
-1
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+1
-1
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+973
-0
DirectNewQuotation.vue
...s/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
+366
-0
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+171
-0
quoTation.vue
...ponents/TravelManager/TravelQuotationCenter/quoTation.vue
+10
-0
AttendanceRules.vue
src/components/administrative/AttendanceRules.vue
+95
-7
Survey.vue
src/components/administrative/Survey.vue
+11
-5
index.vue
src/components/index.vue
+2
-1
ScenTicketOrder.vue
src/components/scenicSpot/ScenTicketOrder.vue
+1
-1
config.js
src/router/config.js
+8
-0
No files found.
src/assets/css/login.css
View file @
bed9752d
input
:-webkit-autofill
{
-webkit-box-shadow
:
0
0
0px
1000px
white
inset
;}
.login-box
{
position
:
absolute
;
/* position:absolute; */
/*background-repeat: no-repeat;*/
width
:
100%
;
height
:
100%
;
font-family
:
MicrosoftYaHei
;
overflow
:
hidden
;
/*
width:100%;
height:100%;
*/
/*
font-family:MicrosoftYaHei;
overflow: hidden;
*/
/*background-size: cover;*/
/*background-position: center center;*/
background-color
:
white
;
/* background-color: white; */
}
.login-Div
{
width
:
380px
;
...
...
src/components/FinancialModule/BasicDocuments.vue
View file @
bed9752d
...
...
@@ -571,7 +571,7 @@
</div>
</div>
</div>
<div
class=
"_right_content"
v-for=
"(son,sindex) in item.AuditRecordList"
v-if=
"son.AuditStatus!=2"
>
<div
class=
"_right_content"
v-for=
"(son,sindex) in item.AuditRecordList"
v-if=
"son.AuditStatus!=2
&& MsgUrl
"
>
<span
class=
"_sm"
>
<p
class=
"_name"
>
<span
class=
"_n"
>
{{son.AuditName}}
</span>
...
...
@@ -584,7 +584,7 @@
<p><span>
由
</span>
{{
z
.
BeFrom
}}
<span><i
class=
"_color_green"
>
转交
</i>
给
</span>
{{
z
.
Target
}}
</p>
<p
class=
"_pp_info"
>
转交备注:
{{
z
.
Remarks
?
z
.
Remarks
:
'无'
}}
</p>
</div>
</
template
>
</
template
>
</span>
</div>
<textarea
v-if=
"item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'"
class=
"_textarea"
v-model=
"AuditOrRefundMsg.Description"
placeholder=
"请输入..."
></textarea>
...
...
@@ -880,7 +880,7 @@
</ul>
</div>
</div>
<div
class=
"_pb_son clearfix"
v-if=
"item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2"
>
<div
class=
"_pb_son clearfix"
v-if=
"item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2
&& MsgUrl
"
>
<div
class=
"_left_radius _left_radius_sus"
v-if=
"item.Status==1"
>
待审
</div>
<p
class=
"_name"
>
<span
class=
"_n"
>
{{item.AuditDescription}}
</span><span
class=
"_sm _huoqian"
v-if=
"item.AuditWay==3"
>
({{item.AuditWayName}})
</span></p>
<div
class=
"_right_content _padd_left_10"
>
...
...
@@ -1008,7 +1008,7 @@
</div>
<!-- 111 -->
<div
class=
"_pay_box"
v-if=
"AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2"
>
<!-- <div class="_pay_box"> -->
<!-- <div class="_pay_box"> -->
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;"
>
<tr>
...
...
@@ -1250,7 +1250,7 @@
</div>
</template>
</div>
<div
class=
"_submit"
v-if=
"GetDetail.Is_Self!=1"
>
<div
class=
"_submit"
v-if=
"GetDetail.Is_Self!=1
&& MsgUrl
"
>
<div
class=
"chosenNextBox"
v-if=
"(GetDetail.IsHave==0||resultCode==11019)&&AuditOrRefundMsg.Status=='5'"
>
<
template
>
<div>
...
...
@@ -1278,7 +1278,7 @@
</template>
</div>
</div>
<div
class=
"_submit"
v-if=
"GetDetail.Is_Self==1"
>
<div
class=
"_submit"
v-if=
"GetDetail.Is_Self==1"
&&
MsgUrl
>
<div>
<label>
转交人:
</label>
<el-select
size=
"mini"
style=
"width:300px"
v-model=
"zhuanMsg.AuditEmId"
filterable
remote
reserve-keyword
placeholder=
"请选择转交人"
:remote-method=
"remoteMethod"
:loading=
"loadingPeople"
>
...
...
@@ -1466,6 +1466,7 @@ export default {
isChongDi
:
false
,
danjuType
:
''
,
showModel
:
false
,
MsgUrl
:
true
,
}
},
components
:{
"my-FlowChartModule"
:
myFlowChartModule
,
...
...
@@ -1583,7 +1584,7 @@ export default {
this
.
ChongDiMsg
.
QEndDate
=
this
.
productionDate
[
1
];
}
},
payMsgListShow
:
function
(
type
,
index
)
{
payMsgListShow
:
function
(
type
,
index
)
{
if
(
this
.
choiceMsg
.
Status
==
1
){
this
.
payMsgList
.
forEach
(
x
=>
{
x
.
show
=
false
...
...
@@ -1602,8 +1603,8 @@ export default {
}
this
.
payMsgList
[
index
].
show
=
true
}
},
addList
:
function
(
type
,
index
)
{
},
addList
:
function
(
type
,
index
)
{
if
(
type
)
{
if
(
this
.
payMsgList
[
index
].
AccountId
===
''
)
return
if
(
this
.
payMsgList
[
index
].
Type
===
''
)
return
...
...
@@ -1647,21 +1648,21 @@ export default {
}
this
.
allMoney
=
Math
.
round
(
allMoney
*
100
)
/
100
;
},
Financial_post_GetFinancLogList
(){
// 获取单据日志
if
(
this
.
checkboxShow
)
return
this
.
LogLoading
=
true
;
this
.
apipost
(
'Financial_post_GetFinancLogList'
,{
ID
:
this
.
ID
,
Type
:
2
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
x
.
UpdateDate
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
UpdateDate
)
})
this
.
LogLoading
=
false
;
this
.
GetFinancLogList
=
data
;
}
},
err
=>
{})
},
},
Financial_post_GetFinancLogList
(){
// 获取单据日志
if
(
this
.
checkboxShow
)
return
this
.
LogLoading
=
true
;
this
.
apipost
(
'Financial_post_GetFinancLogList'
,{
ID
:
this
.
ID
,
Type
:
2
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
x
.
UpdateDate
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
UpdateDate
)
})
this
.
LogLoading
=
false
;
this
.
GetFinancLogList
=
data
;
}
},
err
=>
{})
},
zanCun
()
{
this
.
loading
=
true
;
let
imgArr
=
[];
...
...
@@ -2242,6 +2243,7 @@ export default {
}
},
Financial_post_GetDetail
(
id
,
t
){
//获取单据详情
let
userInfo
=
this
.
getLocalStorage
();
this
.
apipost
(
'Financial_post_GetDetail'
,{
ID
:
id
,
Type
:
2
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
...
...
@@ -2276,6 +2278,7 @@ export default {
}
let
AuditSteps
=
this
.
GetDetail
.
AuditSteps
;
let
ChuNaShenHe
=
false
let
MsgUrl
=
false
;
for
(
let
i
=
0
;
i
<
AuditSteps
.
length
;
i
++
)
{
if
(
AuditSteps
[
i
].
NextStep
==
1
&&
AuditSteps
[
i
].
SpecialNode
==
2
&&
AuditSteps
[
i
].
Status
==
1
){
ChuNaShenHe
=
true
...
...
@@ -2286,9 +2289,18 @@ export default {
return
}
})
}
if
(
AuditSteps
[
i
].
NextStep
==
1
){
AuditSteps
[
i
].
AuditRecordList
.
forEach
(
audit
=>
{
if
(
audit
.
AuditName
==
userInfo
.
emName
){
MsgUrl
=
true
return
}
})
}
}
this
.
MsgUrl
=
MsgUrl
// AuditSteps.forEach(item=>{
// if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
// ChuNaShenHe = true
...
...
src/components/FinancialModule/Qzcommissions.vue
View file @
bed9752d
...
...
@@ -18,6 +18,14 @@
<th>
占比
</th>
<th>
设置
</th>
</tr>
<tr>
<td>
地接账户基金
</td>
<td>
{{
allzb
}}
%
</td>
<td>
<!--
<el-button
@
click=
"SetRules(item)"
style=
"padding:4px"
type=
"primary"
icon=
"el-icon-edit"
circle
></el-button>
<el-button
@
click=
"Delete(item)"
style=
"padding:4px"
type=
"danger"
icon=
"el-icon-delete"
circle
></el-button>
-->
</td>
</tr>
<tbody
v-for=
"(item,i) in dataList"
:key=
"i"
>
<tr>
<td>
{{
item
.
EmployeeName
}}
</td>
...
...
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @
bed9752d
...
...
@@ -865,7 +865,6 @@ export default {
}
else
{
endDate
=
that
.
year
+
"-"
+
column
.
end
}
// console.log("rowData",rowData);
if
(
rowIndex
<
9
){
// 联运收入
if
(
rowData
.
ZhaiYao
==
"联运收入"
){
...
...
@@ -883,7 +882,38 @@ export default {
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
}
}
else
{
if
(
rowData
.
CostIds
){
console
.
log
(
"rowIndex"
,
rowIndex
)
console
.
log
(
"column"
,
column
)
console
.
log
(
"year"
,
this
.
year
)
console
.
log
(
"rowData"
,
rowData
);
if
(
rowData
.
ZhaiYao
==
"员工提成"
){
if
(
Number
(
this
.
year
)
==
2019
){
if
(
column
.
title
==
"七月"
||
column
.
title
==
"八月"
||
column
.
title
==
"九月"
||
column
.
title
==
"十月"
||
column
.
title
==
"十一月"
||
column
.
title
==
"十二月"
){
let
CostIds
=
""
;
CostIds
=
rowData
.
CostIds
.
replace
(
'112,'
,
''
);
console
.
log
(
"CostIds"
,
CostIds
)
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
CostIds
)
}
else
{
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
)
}
}
else
if
(
Number
(
this
.
year
)
>
2019
){
let
CostIds
=
""
;
CostIds
=
rowData
.
CostIds
.
replace
(
'112,'
,
''
);
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
CostIds
)
}
else
{
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
)
}
}
else
{
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
)
}
...
...
src/components/Login2019.vue
View file @
bed9752d
...
...
@@ -170,7 +170,7 @@ export default {
speed
:
3000
,
imgList
:
[
{
src
:
'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/2019092
0032221373
.jpg'
,
src
:
'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/2019092
3020945469
.jpg'
,
text
:
'京都独旅之秋'
,
text1
:
'旅宿权威柏井寿的私房赏枫秘境'
,
url
:
'http://www.oytour.com/#/JuanDetails?id=70'
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
bed9752d
...
...
@@ -2926,7 +2926,7 @@
// 华国豪5-5新增
if
(
moment
().
format
(
"YYYY-MM-DD"
)
>=
obj
.
startDate
)
{
// 该团目前已是结团状态,不能随意修改备注信息,若强行修改备注,将会计入个人考核,是否确定修改备注信息?
this
.
$confirm
(
"该团目前已是结团状态,无法修改备注
?
"
,
"提示"
,
{
this
.
$confirm
(
"该团目前已是结团状态,无法修改备注"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
showCancelButton
:
false
,
type
:
"warning"
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
bed9752d
...
...
@@ -3431,8 +3431,8 @@
if
(
res
.
resultCode
==
1
)
{
this
.
Success
(
res
.
message
);
this
.
outerVisible
=
false
;
this
.
isShow
=
false
;
this
.
fillShow
=
true
;
this
.
importNameFile
=
false
;
this
.
importData
=
res
.
data
;
this
.
getList
()
}
else
{
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
0 → 100644
View file @
bed9752d
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
0 → 100644
View file @
bed9752d
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
0 → 100644
View file @
bed9752d
<
template
>
<div
v-if=
"isShow"
class=
"DirectQuotation clearfix"
>
<DirectQuotation
ref=
"QuotationPrice"
:postConfig=
"postData"
:dayCostPrice=
"dayCostPriceList"
:otherPrice=
"otherPrice"
></DirectQuotation>
<div
class=
"btnFixedDiv"
>
<div
class=
"toTop"
@
click=
"backTop"
>
<i
class=
"iconfont icon-huidaodingbu"
></i>
</div>
<div
class=
"DTSaveBtn"
:class=
"
{'disClick':!isSubmit}" @click="SaveData(2)">提交
</div>
<div
class=
"DTSaveBtn"
@
click=
"copyQuotationData"
style=
"display:none;"
>
复制
</div>
<div
class=
"DTSaveBtn caogao"
:class=
"
{'disClick':!isSubmit}" @click="SaveData(1)">
<span>
保存
</span>
<span>
草稿
</span>
</div>
</div>
</div>
</
template
>
<
script
>
import
DirectQuotation
from
"../TravelNewQuotation/DirectNewQuotation"
;
export
default
{
data
()
{
return
{
//基本配置
postData
:
{
ID
:
0
,
StartCityId
:
0
,
LineId
:
0
,
LineteamId
:
0
,
Title
:
""
,
IsOrder
:
1
,
IsSubstitution
:
1
,
IsB2B
:
1
,
IsB2C
:
1
,
FSeat
:
""
,
CSeat
:
""
,
YSeat
:
""
,
//最低成团人数
LowNum
:
""
,
//OP备注
OpRemark
:
""
,
//产品经理备注
ProductRecommend
:
""
,
IsDirect
:
0
,
//是否直采(0-否-1-是)【全部默认非直采】
PriceIsDirect
:
1
,
//是否直采报价(1-否-2-是)【全部默认非直采】
PDFAlias
:
""
,
//pdf别名
ImgCover
:
""
,
//封面图
DayNum
:
""
,
//天数
NightNum
:
""
,
//晚数
StartCityId
:
0
,
ReturnArriveCityId
:
0
,
//返回抵达城市
},
dayCostPriceList
:
[],
//报价列表
otherPrice
:
{
CostId
:
0
,
//主键编号
ConfigID
:
0
,
//配置编号
OfferId
:
0
,
//报价单编号
InlandAirTicketCurrency
:
0
,
//内陆段机位币种
InlandAirTicketMoney
:
0
,
//内陆段机位金额(每人)
InlandShipTicketCurrency
:
0
,
//内陆段船票币种
InlandShipTicketMoney
:
0
,
//内陆段船票金额(每人)
InlandTrainTicketCurrency
:
0
,
//内陆段火车币种
InlandTrainTicketMoney
:
0
,
//内陆段火车金额(每人)
VisaMoney
:
0
,
//签证费用(每人)
SafeMoney
:
0
,
//保险费用(每人)
LeaderTripMoney
:
0
,
//领队小费
DriverGuideMoney
:
0
,
//司机导游小费
SalesCommissionMoney
:
0
,
//销售提成
OfficeCommissionMoney
:
0
,
//作业处提成
TripMoney
:
0
,
//小费
GuidePeopleMoney
:
0
,
//导游人头费
AirTicketMoeny
:
0
,
//机票成本费用
KBMoney
:
0
,
//KB人头费
AirTicketShareMoney
:
0
,
//机票分摊费用
TicketShareMoney
:
0
,
//门票分摊费用,
SingleRoomShareMoney
:
0
,
//单房差分摊费用
InlandTrafficShareMoney
:
0
,
//内陆段交通分摊费用
OtherShareMoney
:
0
,
//杂费分摊费用
},
//团报价信息
teamPrice
:{
QuotationId
:
0
,
//主键编号
TeamId
:
0
,
//团期编号
ConfigID
:
0
,
//团队配置编号
OfferId
:
0
,
//报价编号
B2BMemberPrice
:
0
,
//同业会员价
B2BPrice
:
0
,
//同业价格
B2CMemberPrice
:
0
,
//直客会员价,
B2CPrice
:
0
,
//直客价格
ChildNeedPrice
:
0
,
//小孩占床价格,
ChildNoNeedPrice
:
0
,
//小孩不占床价格
BabyPrice
:
0
,
//婴儿价格
BabyChargePrice
:
0
,
//婴儿附加费
OldManChargePrice
:
0
,
//老人附加费
VisaPrice
:
0
,
//签证
OtherPrice
:
0
,
//杂费
SingleRoomPrice
:
0
,
//单房差
SingleDMCPrice
:
0
,
//单地接
RebatePrice
:
0
,
//同行返佣
DiscountPrice
:
0
,
//早鸟优惠
IsSupportChildren
:
1
,
//是否支持儿童出游(1-支持,2-不支持)
SafeMoney
:
0
,
//保险费
PeopleNumber
:
0
,
//人数
AirticketMoney
:
0
,
//机票费用
BackVisaPrice
:
0
,
//退签证费
BackSafeMoney
:
0
,
//退保险费
ContractUrl
:
""
,
//合同地址
}
};
},
methods
:
{
//表单提交
submitForm
(
type
)
{
this
.
$refs
[
"QuotationPrice"
].
submitForm
(
type
);
},
//保存数据
SaveData
()
{
this
.
apipost
(
"travel_post_SetConfigOffer_V2"
,
{
config
:
postData
,
dayCostPriceList
:
dayCostPriceList
,
otherPrice
:
otherPrice
,
teamPrice
:
teamPrice
},
res
=>
{
console
.
log
(
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{}
},
err
=>
{}
);
},
getPostData
()
{
let
configId
=
this
.
$route
.
query
.
configId
;
if
(
configId
>
0
)
{
let
msg
=
{
ID
:
configId
};
this
.
apipost
(
"travel_get_GetMyTravelInfo_V2"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res.data.data"
,
res
.
data
);
this
.
postData
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
}
else
{
let
params
=
{
isNoOffer
:
false
};
this
.
$router
.
push
({
name
:
"quoTation"
,
params
:
params
});
}
}
},
created
()
{
this
.
getPostData
();
},
components
:
{
DirectQuotation
:
DirectQuotation
}
};
</
script
>
src/components/TravelManager/TravelQuotationCenter/quoTation.vue
View file @
bed9752d
...
...
@@ -48,6 +48,7 @@
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList(),resetPageIndex()"
>
查询
</button>
<button
class=
"hollowFixedBtn"
@
click=
"goMakeQuo('MakeQuotation')"
>
新增
</button>
</li>
</ul>
</div>
...
...
@@ -455,6 +456,15 @@
}
});
},
goMakeQuo
(
path
)
{
this
.
$router
.
push
({
path
:
path
,
query
:
{
blank
:
'y'
,
tab
:
'报价单'
}
});
},
goSubInfo
(
path
,
configId
)
{
this
.
$store
.
commit
(
"pageConditionUpdate"
,
this
.
queryData
);
...
...
src/components/administrative/AttendanceRules.vue
View file @
bed9752d
...
...
@@ -36,11 +36,15 @@
<table
v-if=
'this.signInDates.length>=1'
class=
"att_table"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
日期
</th>
<th>
部门
</th>
<th>
员工
</th>
<th>
考勤时间
</th>
<th
width=
"80"
>
操作
</th>
</tr>
<tr
v-for=
"(item,index) in signInDates"
>
<td>
{{
item
.
Date
}}
</td>
<td>
{{
item
.
DepartmentName
}}
</td>
<td>
{{
item
.
EmployeeName
}}
</td>
<td>
{{
item
.
BeOnDutyTime
}}
~
{{
item
.
OffDutyTime
}}
</td>
<td>
<el-row>
...
...
@@ -180,8 +184,31 @@
</el-time-select>
</td>
</tr>
<tr>
<td>
<span>
部门
</span>
<el-select
filterable
v-model=
'newSignIn.RB_Department_Id'
@
change=
'getEmployee(newSignIn.RB_Department_Id)'
>
<el-option
v-for=
'item in departmentList'
:label=
'item.DepartmentName'
:value=
'item.DepartmentID'
:key=
'item.DepartmentID'
>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td>
<span>
员工
</span>
<el-select
filterable
v-model=
'newSignIn.EmployeeId'
@
change=
"getEmployeeName(newSignIn.EmployeeId)"
>
<el-option
v-for=
'item in employeeList'
:label=
'item.name'
:value=
'item.empId'
:key=
'item.empId'
>
</el-option>
</el-select>
</td>
</tr>
</table>
<table
class=
"layerTable"
v-if=
'this.signDateType==2'
>
<tr>
<td>
...
...
@@ -384,9 +411,51 @@
awList
:
[],
//Name,Address,TargetAddress,Scope awList:[{'Name':'xxx',Address:'xxx',TargetAddress:'xxx',Scope:'xxx'},{}]
awWifiList
:
[]
//awWifiList:[{'Name':'xxxx',TargetAddress:'12.51.42.32'}]
},
departmentMsg
:
{
RB_Group_Id
:
'0'
,
RB_Branch_Id
:
'0'
,
Status
:
'0'
,
ParentId
:
'-1'
,
Tier
:
'0'
,
},
employeeMsg
:
{
RB_Group_id
:
'0'
,
RB_Branch_id
:
'-1'
,
departmentId
:
'0'
,
IsLeave
:
'-1'
,
},
departmentList
:
[],
employeeList
:
[],
}
},
methods
:
{
getEmployeeName
(
id
){
this
.
employeeList
.
map
(
x
=>
{
if
(
id
==
x
.
empId
)
{
this
.
newSignIn
.
EmployeeName
=
x
.
name
}
})
},
getEmployee
(
id
)
{
this
.
employeeMsg
.
departmentId
=
id
this
.
apipost
(
'app_get_company_employee'
,
this
.
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
employeeList
=
res
.
data
.
data
;
}
},
err
=>
{})
this
.
departmentList
.
map
(
x
=>
{
if
(
id
==
x
.
DepartmentID
)
{
this
.
newSignIn
.
DepartmentName
=
x
.
DepartmentName
}
})
},
getDepartment
()
{
this
.
apipost
(
'admin_get_DepartmentGetList'
,
this
.
departmentMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
departmentList
=
res
.
data
.
data
;
}
},
err
=>
{})
},
getDateArr
()
{
if
(
this
.
fwStartTime
!=
''
&&
this
.
fwEndTime
!=
''
)
{
this
.
apipost
(
'User_get_AttendanceGetTimeSpanValue'
,
{
...
...
@@ -462,7 +531,9 @@
this
.
newSignIn
=
{
'Date'
:
''
,
'BeOnDutyTime'
:
''
,
'OffDutyTime'
:
''
'OffDutyTime'
:
''
,
RB_Department_Id
:
''
,
EmployeeId
:
''
,
};
this
.
outerVisible
=
true
;
this
.
signDateType
=
1
;
...
...
@@ -499,10 +570,20 @@
},
saveSignIn
()
{
let
list
=
[...
this
.
signInDates
,
...
this
.
signOutDates
]
if
(
this
.
newSignIn
.
RB_Department_Id
==
''
)
{
this
.
newSignIn
.
RB_Department_Id
=
0
}
if
(
this
.
newSignIn
.
EmployeeId
==
''
)
{
this
.
newSignIn
.
EmployeeId
=
0
}
if
(
this
.
picked
==
'one'
)
{
// 单天设置
this
.
isRepetition
=
false
;
this
.
SpecialDates
.
forEach
(
item
=>
{
if
(
this
.
newSignIn
.
Date
==
item
)
{
list
.
forEach
(
item
=>
{
if
(
this
.
newSignIn
.
Date
==
item
.
Date
&&
(
this
.
newSignIn
.
RB_Department_Id
==
item
.
RB_Department_Id
||
this
.
newSignIn
.
RB_Department_Id
==
0
)
&&
(
this
.
newSignIn
.
EmployeeId
==
item
.
EmployeeId
||
this
.
newSignIn
.
EmployeeId
==
0
))
{
this
.
isRepetition
=
true
;
}
else
if
(
this
.
newSignIn
.
Date
==
item
.
Date
)
{
this
.
isRepetition
=
true
;
}
})
...
...
@@ -561,10 +642,14 @@
this
.
outerVisible
=
true
;
},
saveSignOut
()
{
let
list
=
[...
this
.
signInDates
,
...
this
.
signOutDates
]
if
(
this
.
picked1
==
'one'
)
{
// 单天设置
this
.
isRepetition
=
false
;
this
.
SpecialDates
.
forEach
(
item
=>
{
if
(
this
.
newSignOut
.
Date
==
item
)
{
list
.
forEach
(
item
=>
{
if
(
this
.
newSignIn
.
Date
==
item
.
Date
&&
(
this
.
newSignIn
.
RB_Department_Id
==
item
.
RB_Department_Id
||
this
.
newSignIn
.
RB_Department_Id
==
0
)
&&
(
this
.
newSignIn
.
EmployeeId
==
item
.
EmployeeId
||
this
.
newSignIn
.
EmployeeId
==
0
))
{
this
.
isRepetition
=
true
;
}
else
if
(
this
.
newSignIn
.
Date
==
item
.
Date
)
{
this
.
isRepetition
=
true
;
}
})
...
...
@@ -784,7 +869,10 @@
},
},
mounted
()
{
this
.
addMsg
.
RB_BranchId
=
this
.
$route
.
query
.
bId
;
let
userInfo
=
this
.
getLocalStorage
();
this
.
departmentMsg
.
RB_Group_Id
=
this
.
employeeMsg
.
RB_Group_id
=
userInfo
.
RB_Group_id
;
//集团
this
.
addMsg
.
RB_BranchId
=
this
.
departmentMsg
.
RB_Branch_Id
=
this
.
$route
.
query
.
bId
;
this
.
getDepartment
()
if
(
this
.
$route
.
query
.
id
!=
undefined
)
{
this
.
addMsg
.
attendanceId
=
this
.
$route
.
query
.
id
;
this
.
getUpdateList
();
...
...
src/components/administrative/Survey.vue
View file @
bed9752d
...
...
@@ -6,7 +6,7 @@
<li>
<span>
<em>
团号
</em>
<el-input
v-model=
"msg.TC
ID
"
></el-input>
<el-input
v-model=
"msg.TC
NUM
"
></el-input>
</span>
</li>
<li>
...
...
@@ -111,7 +111,7 @@
center
:before-close=
"closeDialog"
>
<div
class=
"main NewSurveyList"
>
<el-select
filterable
v-model=
"GuestId"
value-key=
"LineID"
>
<el-select
filterable
v-model=
"GuestId"
value-key=
"LineID"
@
change=
"getOrderID(GuestId)"
>
<el-option
v-for=
"item in ppList"
:label=
'item.GuestName'
:value=
'item.GuestId'
:key=
'item.GuestId'
></el-option>
</el-select>
<div
class=
""
>
...
...
@@ -190,7 +190,7 @@ export default {
msg
:{
pageSize
:
10
,
pageIndex
:
1
,
TC
ID
:
''
,
TC
NUM
:
''
,
lineID
:
0
,
LineteamId
:
0
,
reStartDate
:
''
,
...
...
@@ -235,10 +235,16 @@ export default {
this
.
GetSurveyShowList
();
},
methods
:{
getOrderID
(
id
){
this
.
ppList
.
map
(
x
=>
{
if
(
id
===
x
.
GuestId
){
this
.
OrderID
=
x
.
OrderID
;
}
})
},
setInfo
(
obj
){
console
.
log
(
obj
)
this
.
TCID
=
obj
.
tcid
;
this
.
OrderID
=
obj
.
orderId
;
this
.
DiaoChaShow
=
true
;
this
.
getppList
();
},
...
...
@@ -397,7 +403,7 @@ export default {
return
false
}
})
}
}
if
(
!
isHave
){
let
obj
=
{
tcid
:
x
.
tCID
,
...
...
src/components/index.vue
View file @
bed9752d
...
...
@@ -1698,12 +1698,13 @@ export default {
}
},
LogSetReadStatus
(
s
)
{
console
.
log
(
s
)
this
.
apipost
(
"SystemLog_post_LogSetReadStatus"
,
{
LogId
:
s
.
ID
},
r
=>
{
if
(
s
.
Link
)
{
this
.
goUrl
(
s
.
Link
);
this
.
goUrl
(
s
.
Link
+
'&MsgUrl=1'
);
}
this
.
IM_bodyIsShow
=
false
;
this
.
refreshSysNoteDate
();
...
...
src/components/scenicSpot/ScenTicketOrder.vue
View file @
bed9752d
...
...
@@ -250,8 +250,8 @@
<span
v-if=
"item.reFund"
>
{{
item
.
reFund
}}
</span>
<span
v-else
>
0
</span>
</td>
<td>
{{
item
.
discountMoney
}}
</td>
<td>
{{
item
.
duein
}}
</td>
<td>
{{
item
.
discountMoney
}}
</td>
<td>
<span
v-if=
"item.status==1"
>
正常
</span>
<span
class=
"color_red_order"
v-if=
"item.status==2"
>
取消
</span>
...
...
src/router/config.js
View file @
bed9752d
...
...
@@ -2669,6 +2669,14 @@ export default {
title
:
'制作报价单'
},
},
{
//新版制作报价单
path
:
'/QuotationNewPrice'
,
name
:
'QuotationNewPrice'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelNewQuotation/QuotationNewPrice'
],
resolve
),
meta
:
{
title
:
'制作报价单'
},
},
{
//团控-我的机票
path
:
'/TravelMyTicket'
,
name
:
'TravelMyTicket'
,
...
...
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