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
914359e2
Commit
914359e2
authored
Mar 01, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面日志删除
parent
9b21779b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
2775 additions
and
3025 deletions
+2775
-3025
App.vue
src/App.vue
+0
-2
OrderList.vue
src/components/CarDealerOrder/components/OrderList.vue
+64
-59
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+0
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+288
-273
index.vue
...components/FinancialModule/MonthlyCostStatement/index.vue
+918
-949
TravelContractNew.vue
src/components/TravelContractNew.vue
+0
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+56
-60
empBankAccount.vue
src/components/administrative/empBankAccount.vue
+6
-7
automaticLogin.vue
src/components/automaticLogin.vue
+17
-15
index.vue
src/components/index.vue
+180
-187
OrderList.vue
src/components/myOrdersAllType/components/OrderList.vue
+1000
-1214
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+0
-1
PriceDetail.vue
src/components/orderCommon/PriceDetail.vue
+246
-256
No files found.
src/App.vue
View file @
914359e2
...
...
@@ -49,8 +49,6 @@
handler
(
newValue
)
{
if
(
window
.
location
.
ancestorOrigins
.
length
==
0
)
localStorage
.
setItem
(
'typeSystem'
,
0
)
else
localStorage
.
setItem
(
'typeSystem'
,
1
)
// console.log(window.location.href)
// console.log(localStorage.typeSystem,'=-===')
},
deep
:
true
,
immediate
:
true
...
...
src/components/CarDealerOrder/components/OrderList.vue
View file @
914359e2
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/BasicDocuments.vue
View file @
914359e2
...
...
@@ -3771,7 +3771,6 @@ else if (Type==2) {
OrderId
:
data
.
OrderID
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"this.DataOrderList"
,
this
.
DataOrderList
);
let
data
=
res
.
data
.
data
;
this
.
DataOrderList
=
data
.
FinanceList
;
this
.
DataOrderPreferPrice
=
data
.
PreferPrice
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
914359e2
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @
914359e2
This diff is collapsed.
Click to expand it.
src/components/TravelContractNew.vue
View file @
914359e2
...
...
@@ -1562,7 +1562,6 @@
if
(
res
.
data
.
resultCode
===
1
)
{
var
tempObj
=
res
.
data
.
data
;
this
.
CtObj
=
tempObj
;
console
.
log
(
"this.CtObj"
,
this
.
CtObj
);
this
.
guestList
=
tempObj
.
allGuestList
;
this
.
CtObj
.
tcid
=
this
.
$route
.
query
.
TCID
;
this
.
CtObj
.
orderId
=
this
.
$route
.
query
.
orderID
;
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
914359e2
...
...
@@ -1035,30 +1035,32 @@
.RegistrationList
.el-upload-list
{
width
:
200px
;
}
.PQ_detail
{
width
:
100%
;
border-collapse
:
collapse
;
}
.PQ_detail
tr
th
,
.v-table-title-cell
{
background
:
#e6e6e6
;
height
:
40px
;
font-size
:
14px
;
border-right
:
1px
solid
#e6e6e6
;
color
:
#333
;
}
.PQ_detail
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;
}
.PQ_detail
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#e5e5e5
;
}
width
:
100%
;
border-collapse
:
collapse
;
}
.PQ_detail
tr
th
,
.v-table-title-cell
{
background
:
#e6e6e6
;
height
:
40px
;
font-size
:
14px
;
border-right
:
1px
solid
#e6e6e6
;
color
:
#333
;
}
.PQ_detail
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;
}
.PQ_detail
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#e5e5e5
;
}
</
style
>
<
template
>
...
...
@@ -1252,9 +1254,9 @@
</el-select>
</el-form-item>
</el-col>
</el-col>
</el-col>
<el-col
:span=
"4"
v-if=
"addMsg.TradeWay == 1"
>
<el-form-item
:label=
"$t('salesModule.PlatOrder')"
prop=
"PlatformOrder"
>
<el-input
v-model=
"addMsg.PlatformOrder"
@
input=
"platformOrderMethods"
:disabled=
"isAllowUpdate == 0"
>
...
...
@@ -1662,11 +1664,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"行李数量"
v-if=
"addMsg.IsOneDay==1"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"行李数量"
v-if=
"addMsg.IsOneDay==1"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1 || addMsg.ClientSource == 4"
>
...
...
@@ -2688,7 +2690,7 @@
<span
v-for=
"subItem in childItem.CancelGuestList"
>
{{ subItem.userName }}
<span
style=
"color:#f56c6c"
>
{{subItem.VisaType==1?'(个签)':''}}
</span>
</span>
</span>
</p
>
</p>
<span
style=
"display: block"
>
{{ $t("salesModule.RoomInfo")
}}
<span
v-if=
"childItem.OneSex > 0"
...
...
@@ -4069,8 +4071,8 @@
RefuseVisaNum
:
0
,
//拒签人数
OneSex
:
""
,
QuotationUrl
:
""
,
//单团附件
LuggageNum
:
""
,
IsOneDay
:
0
,
LuggageNum
:
""
,
IsOneDay
:
0
,
},
uploadLloading
:
false
,
fileFujianList
:
[],
...
...
@@ -4130,7 +4132,7 @@
message
:
"请输入联系人姓名"
,
trigger
:
"blur"
,
},
],
LuggageNum
:
[{
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
...
...
@@ -4173,7 +4175,7 @@
trigger
:
"blur"
,
},
],
},
RemarksRules
:
{
Remarks
:
[{
required
:
true
,
...
...
@@ -4371,41 +4373,35 @@
if
(
value
==
null
)
{
return
0.0
;
}
console
.
log
(
"value"
,
value
);
let
nStr
=
value
.
toFixed
(
2
);
let
x
=
nStr
.
split
(
"."
);
let
x1
=
x
[
0
];
console
.
log
(
"X1"
,
x1
);
let
x2
=
x
.
length
>
1
?
"."
+
x
[
1
]
:
""
;
console
.
log
(
"X2"
,
x2
);
var
rgx
=
/
(\d
+
)(\d{3})
/
;
while
(
rgx
.
test
(
x1
))
{
x1
=
x1
.
replace
(
rgx
,
"$1"
+
","
+
"$2"
);
}
return
x1
+
x2
;
},
priceFormat2
(
value
)
{
if
(
value
==
null
)
{
return
"已包含"
;
}
let
nStr
=
value
.
toFixed
(
2
);
nStr
+=
""
;
let
x
=
nStr
.
split
(
"."
);
let
x1
=
x
[
0
];
let
x2
=
x
.
length
>
1
?
"."
+
x
[
1
]
:
""
;
var
rgx
=
/
(\d
+
)(\d{3})
/
;
while
(
rgx
.
test
(
x1
))
{
x1
=
x1
.
replace
(
rgx
,
"$1"
+
","
+
"$2"
);
}
let
result
=
x1
+
x2
;
if
(
result
===
"0.00"
)
{
result
=
"已包含"
;
}
return
result
;
},
if
(
value
==
null
)
{
return
"已包含"
;
}
let
nStr
=
value
.
toFixed
(
2
);
nStr
+=
""
;
let
x
=
nStr
.
split
(
"."
);
let
x1
=
x
[
0
];
let
x2
=
x
.
length
>
1
?
"."
+
x
[
1
]
:
""
;
var
rgx
=
/
(\d
+
)(\d{3})
/
;
while
(
rgx
.
test
(
x1
))
{
x1
=
x1
.
replace
(
rgx
,
"$1"
+
","
+
"$2"
);
}
let
result
=
x1
+
x2
;
if
(
result
===
"0.00"
)
{
result
=
"已包含"
;
}
return
result
;
},
},
methods
:
{
...
...
src/components/administrative/empBankAccount.vue
View file @
914359e2
...
...
@@ -159,7 +159,8 @@
</el-col>
<el-col
:span=
"4"
:gutter=
"35"
>
<el-form-item
:label=
"nameC"
prop=
"CardNum"
>
<el-input
type=
"text"
v-model=
"addMsg.CardNum"
onkeyup=
"value=value.replace(/[^0-9]/g, '')"
placeholder=
"卡号只能输入数字,不能以0开头"
>
<el-input
type=
"text"
v-model=
"addMsg.CardNum"
onkeyup=
"value=value.replace(/[^0-9]/g, '')"
placeholder=
"卡号只能输入数字,不能以0开头"
>
</el-input>
</el-form-item>
</el-col>
...
...
@@ -192,8 +193,8 @@
</el-col>
<el-col
:span=
"4"
:gutter=
"35"
>
<el-form-item
label=
"供应商:"
prop=
"SupplierName"
>
<el-input
type=
"text"
v-model=
"addMsg.SupplierName"
:disabled=
"$route.query.FeatureType?true:false"
>
</el-input>
<el-input
type=
"text"
v-model=
"addMsg.SupplierName"
:disabled=
"$route.query.FeatureType?true:false"
>
</el-input>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -430,8 +431,8 @@
},
methods
:
{
// 车系统 添加账户
getCarDatas
(){
if
(
this
.
$route
.
query
.
FeatureType
)
{
getCarDatas
()
{
if
(
this
.
$route
.
query
.
FeatureType
)
{
this
.
addMsg
.
ObjID
=
this
.
$route
.
query
.
ObjID
this
.
addMsg
.
ObjIdStr
=
this
.
$route
.
query
.
SupplierName
this
.
addMsg
.
SupplierName
=
this
.
$route
.
query
.
SupplierName
...
...
@@ -696,7 +697,6 @@
this
.
$message
.
error
(
'请选择客户名称'
)
return
}
console
.
log
(
"this.addMsg.Type"
,
this
.
addMsg
.
Type
);
if
(
this
.
addMsg
.
Type
!=
7
&&
this
.
addMsg
.
Type
!=
9
&&
this
.
addMsg
.
Type
!=
10
&&
this
.
addMsg
.
Type
!=
12
)
{
if
(
this
.
addMsg
.
DutyNo
==
''
||
this
.
addMsg
.
DutyNo
==
undefined
)
{
this
.
$message
.
error
(
'请填写税号'
)
...
...
@@ -842,7 +842,6 @@
this
.
currentPage
=
1
},
submitForm
(
addMsg
)
{
//提交创建、修改表单
console
.
log
(
'卡号:'
+
this
.
addMsg
.
CardNum
)
this
.
$refs
[
addMsg
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
addData
();
...
...
src/components/automaticLogin.vue
View file @
914359e2
<
style
>
@import
"../assets/css/login2019.css"
;
.Autologin
{
position
:
fixed
;
left
:
0
;
...
...
@@ -9,6 +10,7 @@
background
:
url('../assets/img/login/load.gif')
no-repeat
center
;
background-size
:
350px
auto
;
}
</
style
>
<
template
>
<div>
...
...
@@ -42,13 +44,12 @@
}
else
{
var
data
=
JSON
.
parse
(
localStorage
.
crmuserInfo
)
let
query
console
.
log
(
data
.
parameter
,
'---parameter'
)
if
(
data
.
parameter
.
FeatureType
)
{
console
.
log
(
data
.
parameter
,
'---parameter'
)
if
(
data
.
parameter
.
FeatureType
)
{
query
=
{
...
data
.
parameter
,
// Type: data.parameter.Type
}
}
else
{
}
else
{
query
=
{
crmOrderObj
:
JSON
.
stringify
(
data
.
parameter
),
Type
:
data
.
parameter
.
type
...
...
@@ -68,8 +69,8 @@
if
(
param
)
{
this
.
obj
.
parameter
=
param
[
0
]
localStorage
.
crmuserInfo
=
JSON
.
stringify
(
this
.
obj
);
if
(
param
[
0
].
language
)
{
localStorage
.
setItem
(
'language'
,
param
[
0
].
language
)
if
(
param
[
0
].
language
)
{
localStorage
.
setItem
(
'language'
,
param
[
0
].
language
)
}
}
}
...
...
@@ -77,14 +78,15 @@
},
methods
:
{
getLogin
(
data
){
if
(
localStorage
.
typeSystem
&&
localStorage
.
typeSystem
==
1
)
{
getLogin
(
data
)
{
if
(
localStorage
.
typeSystem
&&
localStorage
.
typeSystem
==
1
)
{
let
href
=
this
.
domainManager
().
CarUrl
window
.
parent
.
postMessage
({
event_id
:
'login'
,
data
:
{
loginState
:
data
?
data
:
''
,
}},
`
${
href
}
`
)
event_id
:
'login'
,
data
:
{
loginState
:
data
?
data
:
''
,
}
},
`
${
href
}
`
)
}
},
autoLogin
()
{
...
...
@@ -116,12 +118,11 @@
var
data
=
JSON
.
parse
(
localStorage
.
crmuserInfo
)
let
crmOrderObj
=
JSON
.
parse
(
JSON
.
stringify
(
data
.
parameter
))
let
query
=
{}
console
.
log
(
data
,
'---data.parameter.tradeObj'
)
if
(
data
.
parameter
.
FeatureType
){
if
(
data
.
parameter
.
FeatureType
)
{
query
=
{
...
data
.
parameter
}
}
else
{
}
else
{
query
=
{
crmOrderObj
:
JSON
.
stringify
(
crmOrderObj
),
Type
:
data
.
parameter
.
type
...
...
@@ -148,4 +149,5 @@
}
},
}
</
script
>
src/components/index.vue
View file @
914359e2
This diff is collapsed.
Click to expand it.
src/components/myOrdersAllType/components/OrderList.vue
View file @
914359e2
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
914359e2
...
...
@@ -310,7 +310,6 @@
if
(
event
&&
event
.
data
)
{
try
{
if
(
event
.
data
==
'行程数据保存成功'
||
event
.
data
.
indexOf
(
'行程特色高'
)
!=
-
1
)
{
// this.$emit('ConfigInfo',this.myIframeUrl)
this
.
PostMessageText
=
''
//行程特色高
if
(
event
.
data
&&
typeof
(
event
.
data
)
==
'string'
&&
event
.
data
.
indexOf
(
'行程特色高'
)
!=
-
1
)
{
...
...
src/components/orderCommon/PriceDetail.vue
View file @
914359e2
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