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
b09f3ccc
Commit
b09f3ccc
authored
Dec 21, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
41e2c58d
c1491964
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
178 additions
and
120 deletions
+178
-120
index.vue
src/components/FinancialModule/HelpBranch/index.vue
+27
-33
customerTransfer.vue
src/components/SalesModule/customerTransfer.vue
+105
-30
confirmationOrderDownLoadNew.vue
src/components/confirmationOrderDownLoadNew.vue
+41
-52
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+1
-1
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+2
-2
TravelDaysTrip_DirectThree.vue
...avelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
+2
-2
No files found.
src/components/FinancialModule/HelpBranch/index.vue
View file @
b09f3ccc
...
...
@@ -61,18 +61,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"费用部门:"
>
<el-select
filterable
v-model=
'msg.RB_Depart_Id'
@
change=
"employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''"
class=
""
>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
'item in DepartmentList'
:label=
'item.DepartmentName'
:value=
'item.DepartmentID'
:key=
'item.DepartmentID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"制单人员:"
>
<el-select
filterable
v-model=
'msg.UpdateBy'
class=
""
>
...
...
@@ -126,17 +115,33 @@
<
/div
>
<
/el-option
>
<
/el-select
>
<!--
<
el
-
select
filterable
v
-
model
=
'msg.ClientID'
>
<
el
-
option
value
=
""
label
=
"不限"
><
/el-option
>
<
el
-
option
v
-
for
=
'item in ClientAccountList'
:
label
=
'`${item.AccountAlias
}
(${item.AccountHolder
}
/${item.CardNum
}
)`'
:
value
=
'item.ID'
:
key
=
'item.ID'
>
<
/el-option
>
<
/el-select> --
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"6"
>
<
el
-
form
-
item
label
=
"制单日期:"
>
<
el
-
date
-
picker
class
=
"h34"
@
change
=
"timeAdd(1)"
v
-
model
=
"productionDate"
type
=
"daterange"
value
-
format
=
"yyyy-MM-dd"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
template
v
-
if
=
"heightQueryBox"
>
<
el
-
col
:
span
=
"4"
>
<
el
-
form
-
item
label
=
"费用部门:"
>
<
el
-
select
filterable
v
-
model
=
'msg.RB_Depart_Id'
@
change
=
"employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''"
class
=
""
>
<
el
-
option
:
value
=
"0"
label
=
"不限"
><
/el-option
>
<
el
-
option
v
-
for
=
'item in DepartmentList'
:
label
=
'item.DepartmentName'
:
value
=
'item.DepartmentID'
:
key
=
'item.DepartmentID'
>
<
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"6"
>
<
el
-
form
-
item
label
=
"金额:"
>
<
div
style
=
"display: flex;flex-direction: row;flex-wrap: nowrap;"
>
<
div
>
...
...
@@ -150,17 +155,6 @@
<
/div
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"6"
>
<
el
-
form
-
item
label
=
"制单日期:"
>
<
el
-
date
-
picker
class
=
"h34"
@
change
=
"timeAdd(1)"
v
-
model
=
"productionDate"
type
=
"daterange"
value
-
format
=
"yyyy-MM-dd"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
template
v
-
if
=
"heightQueryBox"
>
<
el
-
col
:
span
=
"6"
>
<
el
-
form
-
item
label
=
"发团日期:"
>
<
el
-
date
-
picker
class
=
"h34"
...
...
@@ -811,8 +805,8 @@ export default {
if
(
!
this
.
msg
.
KJCostTypeId
)
this
.
msg
.
KJCostTypeId
=
0
;
if
(
!
this
.
msg
.
IsSelectKJSetCostType
)
this
.
msg
.
IsSelectKJSetCostType
=
0
;
let
time
=
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
))
var
fileName
=
`
成本月结
表${time
}
.xls`
;
this
.
GetLocalFile
(
"Financial_get_Get
CostMont
hALLExport"
,
this
.
msg
,
fileName
);
var
fileName
=
`
往来结算
表${time
}
.xls`
;
this
.
GetLocalFile
(
"Financial_get_Get
HelpBranc
hALLExport"
,
this
.
msg
,
fileName
);
}
,
financeRemove
(
id
){
//作废
this
.
$confirm
(
'是否对申请单进行作废操作?作废后不可恢复!'
,
'提示'
,
{
...
...
src/components/SalesModule/customerTransfer.vue
View file @
b09f3ccc
...
...
@@ -6,14 +6,28 @@
<span>
<em>
{{
$t
(
'visaT.sale'
)
}}
</em>
</span>
<el-select
filterable
v-model=
"msg.CreateBy"
>
<!--
<el-select
filterable
v-model=
"msg.CreateBy"
>
-->
<el-select
v-model=
"msg.CreateBy"
class=
"w150"
filterable
remote
reserve-keyword
placeholder=
"请输入关键词"
:remote-method=
"GetClientAccountListByKeyWord"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
value=
"-1"
></el-option>
<el-option
v-for=
"item in employeeList"
:label=
"item.name"
:value=
"item.empId"
:key=
"item.empId"
></el-option>
>
<div>
<span>
{{
`${item.name
}
`
}}
<
/span>
<
span
style
=
"margin-left: 15px;"
>
<
el
-
tag
size
=
"mini"
v
-
if
=
"item.isLeave==1"
>
离职
<
/el-tag>
<
/span
>
<
/div
>
<
/el-option
>
<
/el-select
>
<
/li
>
...
...
@@ -103,17 +117,24 @@
<
p
class
=
"fz12 mt30 color666"
>
<
span
>
{{
$t
(
'salesModule.Recipient'
)
}}
<
/span> 
;
<
el
-
select
filterable
class=
"w180"
v-model=
"RecipientMsg.NewEmployeeId"
:placeholder=
"$t('pub.pleaseSel')"
>
v
-
model
=
"RecipientMsg.NewEmployeeId"
class
=
"w180"
filterable
remote
reserve
-
keyword
placeholder
=
"请输入关键词"
:
remote
-
method
=
"GetClientAccountListByKeyWord1"
>
<
el
-
option
v
-
for
=
"item in employeeList1"
:
label
=
"item.name"
:
value
=
"item.empId"
:
key
=
"item.empId"
></el-option>
><
div
>
<
span
>
{{
`${item.name
}
`
}}
<
/span>
<
span
style
=
"margin-left: 15px;"
>
<
el
-
tag
size
=
"mini"
v
-
if
=
"item.isLeave==1"
>
离职
<
/el-tag>
<
/span
>
<
/div></
el
-
option
>
<
/el-select
>
<
/p
>
<
p
class
=
"fz12 mt30 color666"
>
...
...
@@ -241,18 +262,31 @@
<
p
class
=
"fz12 fbold mt10 color333"
>
{{
$t
(
'fnc.zhuanjiao'
)
}}
<
/p
>
<
p
class
=
"fz12 mt30 color666"
>
<
span
>
{{
$t
(
'salesModule.Recipient'
)
}}
<
/span> 
;
<el-select
<
!--
<
el
-
select
filterable
class
=
"w180"
v
-
model
=
"RecipientMsg.NewEmployeeId"
:
placeholder
=
"$t('pub.pleaseSel')"
>
>
-->
<
el
-
select
v
-
model
=
"RecipientMsg.NewEmployeeId"
class
=
"w150"
filterable
remote
reserve
-
keyword
placeholder
=
"请输入关键词"
:
remote
-
method
=
"GetClientAccountListByKeyWord1"
>
<
el
-
option
v
-
for
=
"item in employeeList1"
:
label
=
"item.name"
:
value
=
"item.empId"
:
key
=
"item.empId"
></el-option>
><
div
>
<
span
>
{{
`${item.name
}
`
}}
<
/span>
<
span
style
=
"margin-left: 15px;"
>
<
el
-
tag
size
=
"mini"
v
-
if
=
"item.isLeave==1"
>
离职
<
/el-tag>
<
/span
>
<
/div></
el
-
option
>
<
/el-select
>
<
/p
>
<
p
class
=
"fz12 mt30 color666"
>
...
...
@@ -590,7 +624,8 @@ export default {
RB_Group_id
:
"0"
,
RB_Branch_id
:
"-1"
,
departmentId
:
"0"
,
IsLeave
:
"0"
IsLeave
:
"0"
,
KeyWord
:
''
,
}
,
isCkedAll
:
false
,
addShow
:
false
,
...
...
@@ -678,6 +713,7 @@ export default {
Address
:
[{
required
:
true
,
message
:
"请输入地址"
,
trigger
:
"blur"
}
]
}
,
employeeList1
:
[],
employeeList2
:
[],
HightUnitPrice
:
'2'
,
departState
:
false
,
}
;
...
...
@@ -1057,6 +1093,7 @@ export default {
}
else
{
this
.
isSelLayer
=
false
;
this
.
employeeList1
=
[];
this
.
employeeList2
=
[];
this
.
list
.
forEach
(
item
=>
{
item
.
disabled
=
false
;
}
);
...
...
@@ -1163,6 +1200,9 @@ export default {
this
.
employeeMsg
.
departmentId
=
0
;
this
.
employeeMsg
.
RB_Group_id
=
this
.
getLocalStorage
().
RB_Group_id
;
this
.
employeeMsg
.
RB_Branch_id
=
-
1
;
this
.
employeeList2
=
[];
this
.
employeeMsg
.
IsLeave
=-
1
;
this
.
apipost
(
"app_get_company_employee"
,
this
.
employeeMsg
,
...
...
@@ -1170,14 +1210,66 @@ export default {
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
!
this
.
isSelLayer
)
{
this
.
employeeList
=
res
.
data
.
data
;
this
.
employeeList
.
forEach
(
item
=>
{
if
(
item
.
isLeave
==
0
){
this
.
employeeList2
.
push
(
item
);
}
}
);
}
else
{
this
.
employeeList1
=
res
.
data
.
data
;
this
.
employeeList1
.
forEach
(
item
=>
{
if
(
item
.
isLeave
==
0
){
this
.
employeeList2
.
push
(
item
);
}
}
);
}
}
}
,
err
=>
{
}
);
}
,
GetClientAccountListByKeyWord
(
query
)
{
console
.
log
(
"query"
,
query
)
if
(
query
!==
''
)
{
this
.
employeeMsg
.
departmentId
=
0
;
this
.
employeeMsg
.
RB_Group_id
=
this
.
getLocalStorage
().
RB_Group_id
;
this
.
employeeMsg
.
RB_Branch_id
=
-
1
;
this
.
employeeList2
=
[];
this
.
employeeMsg
.
IsLeave
=-
1
;
this
.
employeeMsg
.
KeyWord
=
query
;
this
.
apipost
(
"app_get_company_employee"
,
this
.
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
employeeList
=
res
.
data
.
data
;
}
}
,
err
=>
{
}
);
}
}
,
GetClientAccountListByKeyWord1
(
query
)
{
console
.
log
(
"query"
,
query
)
if
(
query
!==
''
)
{
this
.
employeeMsg
.
departmentId
=
0
;
this
.
employeeMsg
.
RB_Group_id
=
this
.
getLocalStorage
().
RB_Group_id
;
this
.
employeeMsg
.
RB_Branch_id
=
-
1
;
this
.
employeeMsg
.
IsLeave
=
0
;
this
.
employeeMsg
.
KeyWord
=
query
;
this
.
apipost
(
"app_get_company_employee"
,
this
.
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
employeeList1
=
res
.
data
.
data
;
}
}
,
err
=>
{
}
);
}
}
,
getCreateByInfoList
()
{
this
.
apipost
(
"app_customer_GetDepartmentEmployee"
,
...
...
@@ -1272,23 +1364,6 @@ export default {
this
.
$message
.
info
(
"已取消移除!"
);
}
);
}
// this.apipost(
// "app_customer_DisabledCustomer",
// {CustomerId:CustomerId,DisabledType:DisabledType},
// res => {
// if (res.data.resultCode == 1) {
// this.$message.success(res.data.message)
// this.getList()
// } else {
// this.$message.error(res.data.message);
// }
// },
// err => {}
// );
}
}
,
...
...
@@ -1301,7 +1376,7 @@ export default {
this
.
bossID
=
userInfo
.
EmployeeId
;
this
.
departmentMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团
this
.
getDepartment
();
this
.
getEmployee
();
//
this.getEmployee();
this
.
getList
();
this
.
getCreateByInfoList
();
this
.
getProvince
();
...
...
src/components/confirmationOrderDownLoadNew.vue
View file @
b09f3ccc
...
...
@@ -35,25 +35,21 @@
出团通知书下载WROD
</el-button>
</
template
>
<
template
v-else
>
<el-button
type=
"primary"
size=
"medium"
@
click=
"toPDF_2023()"
style=
"margin-left:20px;
"
>
<el-button
type=
"primary"
size=
"medium"
@
click=
"toPDF_2023()
"
>
行程下载
</el-button>
<!--
<el-dropdown
size=
"medium"
@
command=
"tripDownLoadClick"
split-button
type=
"primary"
@
click=
"handleClick"
>
行程下载
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
command=
"1"
style=
"display:none;"
>
行程(同行备注)
</el-dropdown-item>
<el-dropdown-item
command=
"2"
style=
"display:none;"
>
行程(无同行备注)
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
-->
<el-button
type=
"primary"
size=
"medium"
@
click=
"toPDF_2023(1)"
style=
"margin-left:20px;"
>
行程下载(云盘)
</el-button>
<el-button
type=
"primary"
size=
"medium"
@
click=
"gernalFeature(1)"
style=
"margin-left:20px;"
>
行程下载WORD
</el-button>
</
template
>
<!-- 可以让销售修改基本信息-->
<el-button
v-if=
"orderId>0"
type=
"primary"
size=
"medium"
value=
"修改信息"
@
click=
"editMsgShow=true"
>
修改信息
</el-button>
<el-checkbox
class=
"marginL11"
style=
"display:none;"
v-model=
"isShowTime"
>
显示行程日期
</el-checkbox>
</el-col>
<el-col
v-if=
"orderId<=0"
>
<span
style=
"color:red;padding-left:10px;"
>
温馨提示:OP保存行程后请等待1-2分钟后再下载行程。
</span>
</el-col>
</el-row>
<div
id=
"pdfNode"
class=
"LeaveGroupDownload-form LeaveGroupDownload-formHV"
>
<div
id=
"pdfDom"
:class=
"[dataAll&&dataAll.featurePageType==1?'pdfDomHV':'']"
>
...
...
@@ -294,14 +290,6 @@
},
2000
)
},
methods
:
{
//每次自动生成行程
handleClick
()
{
this
.
toPDF_2023
();
},
//阿里云
tripDownLoadClick
(
command
)
{
this
.
toPDF_2023
(
command
);
},
//获取微信二维码
getWxCode
:
function
()
{
this
.
apipost
(
'survey_post_GetSurveyWeiXinShare'
,
{
...
...
@@ -551,40 +539,41 @@
title
+=
this
.
orderMsg
.
lineteamName
+
this
.
orderMsg
.
dayNum
+
'日游'
;
}
var
fileName
=
title
+
".pdf"
;
that
.
pdfDownLoad
(
fileName
,
msg
);
// if (this.orderId && this.orderId > 0) {
// //出团通知书下载
// this.pdfDownLoad(fileName, msg);
// } else if (urlObj.IsOnline == 0) {
// //本地行程下载
// this.pdfDownLoad(fileName, msg);
// } else if (command && command == "1") {
// //阿里云行程下载
// var objFileKey = "TripDownLoad"
// objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => {
// if (res.resultCode == 0) {
// msg.isShowB2B = 1;
// that.pdfDownLoad(fileName, msg);
// } else {
// that.pdfLoading = false;
// }
// })
// } else if (command && command == 2) {
// //阿里云行程下载
// var objFileKey = "TripDownLoad"
// objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => {
// if (res.resultCode == 0) {
// msg.isShowB2B = 0;
// that.pdfDownLoad(fileName, msg);
// } else {
// that.pdfLoading = false;
// }
// })
// }
if
(
this
.
orderId
&&
this
.
orderId
>
0
)
{
//出团通知书下载
this
.
pdfDownLoad
(
fileName
,
msg
);
}
else
if
(
urlObj
.
IsOnline
==
0
)
{
//本地行程下载
this
.
pdfDownLoad
(
fileName
,
msg
);
}
else
if
(
command
&&
command
==
1
)
{
//阿里云行程下载
var
objFileKey
=
"TripDownLoad"
objFileKey
+=
"/"
+
msg
.
configId
+
"_"
+
msg
.
tcid
;
objFileKey
+=
"/"
+
msg
.
configId
+
"_"
+
msg
.
tcid
+
"_B2B.pdf"
;
that
.
downloadChengDuFileRename
(
objFileKey
,
fileName
,
res
=>
{
if
(
res
.
resultCode
==
0
)
{
msg
.
isShowB2B
=
1
;
that
.
pdfDownLoad
(
fileName
,
msg
);
}
else
{
that
.
pdfLoading
=
false
;
}
})
}
else
if
(
command
&&
command
==
2
)
{
//阿里云行程下载
var
objFileKey
=
"TripDownLoad"
objFileKey
+=
"/"
+
msg
.
configId
+
"_"
+
msg
.
tcid
;
objFileKey
+=
"/"
+
msg
.
configId
+
"_"
+
msg
.
tcid
+
".pdf"
;
that
.
downloadChengDuFileRename
(
objFileKey
,
fileName
,
res
=>
{
if
(
res
.
resultCode
==
0
)
{
msg
.
isShowB2B
=
0
;
that
.
pdfDownLoad
(
fileName
,
msg
);
}
else
{
that
.
pdfLoading
=
false
;
}
})
}
else
{
that
.
pdfDownLoad
(
fileName
,
msg
);
}
},
pdfDownLoad
:
function
(
fileName
,
msg
)
{
let
urlObj
=
this
.
domainManager
();
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
b09f3ccc
...
...
@@ -222,7 +222,7 @@
TripCityList
:
[],
//行程城市
TripMapList
:
[],
NotQueryCityList
:[],
//使用系统中的经纬度城市
FeaturePageType
:
0
,
//1横版 2竖版
FeaturePageType
:
2
,
//1横版 2竖版
},
//行程
FeatureData
:
{
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
b09f3ccc
...
...
@@ -93,7 +93,7 @@
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.IsUpdateXCTS')}}
</span>
<
!-- <
span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
...
...
@@ -101,7 +101,7 @@
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span>
</span>
-->
</div>
<div
class=
"newTravelDayContent clearfix"
>
<div
class=
"vertical-line"
></div>
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @
b09f3ccc
...
...
@@ -170,7 +170,7 @@
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.IsUpdateXCTS')}}
</span>
<
!-- <
span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
...
...
@@ -178,7 +178,7 @@
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span>
</span>
-->
<
template
v-if=
"true"
>
<span
class=
"TDTextspan"
:class=
"
{'showOther':TeamType==3}">版型
</span>
<span
:class=
"
{'showOther':TeamType==3}">
...
...
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