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
a834bf06
Commit
a834bf06
authored
May 29, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
7a900e43
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
127 additions
and
144 deletions
+127
-144
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+0
-1
productOrderList.vue
src/components/SalesModule/Common/productOrderList.vue
+0
-2
MyCustomer.vue
src/components/SalesModule/MyCustomer.vue
+127
-137
signedFinance.vue
src/components/SalesModule/signedFinance.vue
+0
-1
signedFinanceALL.vue
src/components/SalesModule/signedFinanceALL.vue
+0
-1
order-form2.vue
src/components/orderCommon/order-form2.vue
+0
-1
order-remark.vue
src/components/orderCommon/order-remark.vue
+0
-1
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
a834bf06
...
...
@@ -998,7 +998,6 @@
})
})
});
console
.
log
(
"list"
,
list
);
this
.
list
=
list
;
this
.
$forceUpdate
();
}
...
...
src/components/SalesModule/Common/productOrderList.vue
View file @
a834bf06
...
...
@@ -683,7 +683,6 @@ export default {
},
methods
:
{
changeSelect
()
{
console
.
log
(
"changeSelect"
);
this
.
list
.
forEach
((
element
)
=>
{
element
.
check
=
this
.
allCheck
;
});
...
...
@@ -922,7 +921,6 @@ export default {
this
.
$tripUtils
.
GotoB2CPage
(
B2BDomain
,
item
.
ConfigID
,
item
.
TCID
);
},
goUrlT
(
path
,
obj
,
outItem
,
title
)
{
console
.
log
(
'goUrlTO'
,
path
,
obj
,
outItem
,
title
)
this
.
$router
.
push
({
name
:
path
,
query
:
{
...
...
src/components/SalesModule/MyCustomer.vue
View file @
a834bf06
...
...
@@ -574,133 +574,132 @@
<el-row
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"統一编号"
prop=
"UniqueCode"
>
<el-input
v-model=
"addMsg.UniqueCode"
placeholder=
"请输入統一编号"
maxlength=
"20"
></el-input>
<el-input
v-model=
"addMsg.UniqueCode"
placeholder=
"请输入統一编号"
maxlength=
"20"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"LINE ID"
prop=
"LINEID"
>
<el-input
v-model=
"addMsg.LINEID"
placeholder=
"请输入LINE ID"
maxlength=
"20"
></el-input>
<el-input
v-model=
"addMsg.LINEID"
placeholder=
"请输入LINE ID"
maxlength=
"20"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"Email"
prop=
"Email"
>
<el-input
v-model=
"addMsg.Email"
placeholder=
"请输入Email"
style=
"width: 240px;"
></el-input>
<span
class=
"q-pl-lg text-grey-8"
style=
"cursor: pointer;margin-left: 10px;color: gray;"
@
click=
"isShow=!isShow"
>
{{
isShow
?
'收起'
:
'展开'
}}
</span>
<span
class=
"q-pl-lg text-grey-8"
style=
"cursor: pointer;margin-left: 10px;color: gray;"
@
click=
"isShow=!isShow"
>
{{
isShow
?
'收起'
:
'展开'
}}
</span>
</el-form-item>
</el-col>
</el-row>
<template>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.CustomerSource')"
prop=
"CustomerSourceType"
>
<el-select
filterable
v-model=
'addMsg.CustomerSourceType'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in khly'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.Belongbrand')"
prop=
"brandIds"
>
<el-select
filterable
class=
'multiple_input'
multiple
v-model=
'addMsg.brandIds'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in CustomerBrandList'
:label=
'item.name'
:value=
'item.id'
:key=
'item.id'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('visaT.post')"
prop=
"Duty"
>
<el-select
filterable
v-model=
'addMsg.Duty'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in zw'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.premises')"
prop=
"Premises"
>
<el-select
filterable
v-model=
'addMsg.Premises'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in jycs'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"签约月结客户"
prop=
"SigningType"
>
<el-checkbox
v-model=
'addMsg.SigningType'
>
</el-checkbox>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"签约资料"
prop=
"SigningFile"
>
<el-upload
v-if=
"!saveMsg || !saveMsg.length"
class=
"upload-demo"
:disabled=
"!addMsg.SigningType"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:show-file-list=
"false"
action=
""
>
<el-button
size=
"small"
type=
"primary"
>
签约材料
</el-button>
</el-upload>
<template
v-if=
"addMsg.SigningType && saveMsg&& saveMsg.length>0"
>
<template
v-for=
"(subItem,subIndex) in saveMsg"
>
<a
style=
"margin-left:20px;color:blue;cursor:pointer;"
target=
"_blank"
:key=
"subIndex"
@
click=
"downloadFile(subItem.Path,subItem.FileName)"
>
{{
subItem
.
FileName
}}
</a>
<a
:key=
"subIndex+1000"
style=
"margin-left:20px;color:blue;cursor:pointer;"
@
click=
"DeleteFile(subIndex)"
>
删除
</a>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.CustomerSource')"
prop=
"CustomerSourceType"
>
<el-select
filterable
v-model=
'addMsg.CustomerSourceType'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in khly'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.Belongbrand')"
prop=
"brandIds"
>
<el-select
filterable
class=
'multiple_input'
multiple
v-model=
'addMsg.brandIds'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in CustomerBrandList'
:label=
'item.name'
:value=
'item.id'
:key=
'item.id'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('visaT.post')"
prop=
"Duty"
>
<el-select
filterable
v-model=
'addMsg.Duty'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in zw'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.premises')"
prop=
"Premises"
>
<el-select
filterable
v-model=
'addMsg.Premises'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
'item in jycs'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"签约月结客户"
prop=
"SigningType"
>
<el-checkbox
v-model=
'addMsg.SigningType'
>
</el-checkbox>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"签约资料"
prop=
"SigningFile"
>
<el-upload
v-if=
"!saveMsg || !saveMsg.length"
class=
"upload-demo"
:disabled=
"!addMsg.SigningType"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:show-file-list=
"false"
action=
""
>
<el-button
size=
"small"
type=
"primary"
>
签约材料
</el-button>
</el-upload>
<template
v-if=
"addMsg.SigningType && saveMsg&& saveMsg.length>0"
>
<template
v-for=
"(subItem,subIndex) in saveMsg"
>
<a
style=
"margin-left:20px;color:blue;cursor:pointer;"
target=
"_blank"
:key=
"subIndex"
@
click=
"downloadFile(subItem.Path,subItem.FileName)"
>
{{
subItem
.
FileName
}}
</a>
<a
:key=
"subIndex+1000"
style=
"margin-left:20px;color:blue;cursor:pointer;"
@
click=
"DeleteFile(subIndex)"
>
删除
</a>
</
template
>
</template>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"18"
>
<el-form-item
:label=
"$t('hotel.hotel_remark')"
prop=
"remark"
>
<el-input
v-model=
"addMsg.remark"
type=
"textarea"
maxlength=
"500"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.CustomerInfo')"
prop=
"remark"
v-show=
'addMsg.CustomerSourceType==6'
>
<el-input
v-model=
"addMsg.CustomerSource"
maxlength=
"20"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.BusinessPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"BusinessCardPhotos"
:src=
"BusinessCardPhotos"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.doorPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg1"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"HousePhotos"
:src=
"HousePhotos"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.businessPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg2"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"Images"
:src=
"Images"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
</el-col>
</el-row>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"18"
>
<el-form-item
:label=
"$t('hotel.hotel_remark')"
prop=
"remark"
>
<el-input
v-model=
"addMsg.remark"
type=
"textarea"
maxlength=
"500"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.CustomerInfo')"
prop=
"remark"
v-show=
'addMsg.CustomerSourceType==6'
>
<el-input
v-model=
"addMsg.CustomerSource"
maxlength=
"20"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
v-if=
"isShow"
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.BusinessPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"BusinessCardPhotos"
:src=
"BusinessCardPhotos"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.doorPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg1"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"HousePhotos"
:src=
"HousePhotos"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('salesModule.businessPhoto')"
>
<el-upload
class=
"avatar-uploader"
action=
""
:http-request=
"uploadImg2"
accept=
"image/jpeg,image/gif,image/png,image/bmp"
:show-file-list=
"false"
>
<img
v-if=
"Images"
:src=
"Images"
class=
"avatar"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
</el-col>
</el-row>
</template>
</el-form>
</div>
<!-- 编辑客户信息 -->
...
...
@@ -722,7 +721,8 @@
<el-row
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"联系电话"
>
<el-input
class=
'w200'
v-model=
"updateMsg.contactNumber"
@
input=
'searchHistory(updateMsg.contactNumber)'
placeholder=
"请输入联系电话"
></el-input>
<el-input
class=
'w200'
v-model=
"updateMsg.contactNumber"
@
input=
'searchHistory(updateMsg.contactNumber)'
placeholder=
"请输入联系电话"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
...
...
@@ -1027,7 +1027,6 @@
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:
(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
this
.
saveMsg
=
[]
console
.
log
(
'file'
,
file
,
x
)
this
.
saveMsg
.
push
({
Path
:
x
.
data
.
FilePath
,
FileName
:
file
.
file
.
name
,
...
...
@@ -1068,11 +1067,11 @@
// this.$message.error('请输入联系电话')
// return
// }
if
(
!
this
.
updateMsg
.
CustomerName
)
{
if
(
!
this
.
updateMsg
.
CustomerName
)
{
this
.
$message
.
error
(
'请输入客户名称'
)
return
}
if
(
!
this
.
updateMsg
.
Contact
)
{
if
(
!
this
.
updateMsg
.
Contact
)
{
this
.
$message
.
error
(
'请输入联系人'
)
return
}
...
...
@@ -1133,7 +1132,7 @@
})
let
AreaName
=
sheng
+
shi
+
qu
this
.
updateMsg
.
Address
=
AreaName
+
','
+
this
.
updateMsg
.
Address
if
(
!
this
.
updateMsg
.
Address
)
{
if
(
!
this
.
updateMsg
.
Address
)
{
this
.
$message
.
error
(
'请输入输入详情地址'
)
return
}
...
...
@@ -1499,42 +1498,33 @@
}
},
err
=>
{})
},
saveVisa
()
{
//
this
.
addMsg
.
SigningType
=
this
.
addMsg
.
SigningType
?
1
:
0
console
.
log
(
'save'
,
this
.
addMsg
,
this
.
updateMsg
)
if
(
!
this
.
addMsg
.
contactNumber
){
saveVisa
()
{
this
.
addMsg
.
SigningType
=
this
.
addMsg
.
SigningType
?
1
:
0
if
(
!
this
.
addMsg
.
contactNumber
)
{
this
.
$message
.
error
(
'请输入联系电话'
)
return
}
if
(
!
this
.
addMsg
.
customerName
)
{
if
(
!
this
.
addMsg
.
customerName
)
{
this
.
$message
.
error
(
'请输入客户名称'
)
return
}
if
(
!
this
.
addMsg
.
contact
)
{
if
(
!
this
.
addMsg
.
contact
)
{
this
.
$message
.
error
(
'请输入联系人'
)
return
}
if
(
this
.
addMsg
.
SigningType
&&
!
this
.
saveMsg
.
length
)
{
if
(
this
.
addMsg
.
SigningType
&&
!
this
.
saveMsg
.
length
)
{
this
.
$message
.
error
(
'请上传签约材料'
)
return
}
else
{
if
(
this
.
saveMsg
&&
this
.
saveMsg
.
length
>
0
)
{
if
(
this
.
saveMsg
&&
this
.
saveMsg
.
length
>
0
)
{
this
.
addMsg
.
SigningFile
=
this
.
saveMsg
[
0
].
Path
}
}
// if(!this.addMsg.UniqueCode){
// this.$message.error('请输入统一编码')
// return
// }
// if(!this.addMsg.LINEID){
// this.$message.error('请输入LINE ID')
// return
// }
if
(
this
.
updateMsg
.
Email
){
var
reg
=
/^
[
A-Za-z0-9
\u
4e00-
\u
9fa5
]
+@
[
a-zA-Z0-9_-
]
+
(\.[
a-zA-Z0-9_-
]
+
)
+$/
;
if
(
!
reg
.
test
(
this
.
updateMsg
.
Email
)){
if
(
this
.
updateMsg
.
Email
)
{
var
reg
=
/^
[
A-Za-z0-9
\u
4e00-
\u
9fa5
]
+@
[
a-zA-Z0-9_-
]
+
(\.[
a-zA-Z0-9_-
]
+
)
+$/
;
if
(
!
reg
.
test
(
this
.
updateMsg
.
Email
))
{
this
.
$message
.
error
(
'请输入有效的邮箱'
)
return
}
...
...
@@ -1581,7 +1571,7 @@
})
let
AreaName
=
sheng
+
shi
+
qu
this
.
addMsg
.
address
=
AreaName
+
','
+
this
.
addMsg
.
address
if
(
!
this
.
addMsg
.
address
)
{
if
(
!
this
.
addMsg
.
address
)
{
this
.
$message
.
error
(
'请输入输入详情地址'
)
return
}
...
...
src/components/SalesModule/signedFinance.vue
View file @
a834bf06
...
...
@@ -539,7 +539,6 @@
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:
(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
this
.
saveMsg
=
[]
console
.
log
(
'file'
,
file
,
x
)
this
.
saveMsg
.
push
({
Path
:
x
.
data
.
FilePath
,
FileName
:
file
.
file
.
name
,
...
...
src/components/SalesModule/signedFinanceALL.vue
View file @
a834bf06
...
...
@@ -887,7 +887,6 @@ export default {
methods
:
{
financeCheck
(
item
)
{
this
.
checkObj
=
item
;
console
.
log
(
"financeCheck"
,
item
);
this
.
showCheck
=
true
},
checkSubmit
()
{
...
...
src/components/orderCommon/order-form2.vue
View file @
a834bf06
...
...
@@ -2292,7 +2292,6 @@
this
.
addMsg
.
GoCityTime
=
this
.
starTime
=
oldValue
.
StartCityTime
;
this
.
addMsg
.
BackCityTime
=
this
.
endTime
=
oldValue
.
BackCityTime
;
this
.
addMsg
.
SonControlID
=
oldValue
.
SonControlID
;
console
.
log
(
"this.addMsg.SonControlID "
,
this
.
addMsg
.
SonControlID
);
this
.
priceObj
=
JSON
.
parse
(
JSON
.
stringify
(
oldValue
));
if
(
this
.
pagesTitle
==
"当地游产品"
)
{
let
str
=
""
;
...
...
src/components/orderCommon/order-remark.vue
View file @
a834bf06
...
...
@@ -115,7 +115,6 @@
remarksMsg
:
{
immediate
:
true
,
handler
(
newVal
)
{
console
.
log
(
"old"
,
newVal
);
this
.
postMsg
.
OrderId
=
this
.
remarksMsg
.
OrderId
;
this
.
postMsg
.
OldRemarks
=
this
.
remarksMsg
.
OldRemarks
;
this
.
postMsg
.
Remarks
=
this
.
remarksMsg
.
Remarks
;
...
...
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