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
2cdc4053
Commit
2cdc4053
authored
May 29, 2023
by
沈良进
Browse files
Options
Browse Files
Download
Plain Diff
save
parents
d91f9ad0
3c7b9713
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
125 additions
and
155 deletions
+125
-155
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
+125
-148
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 @
2cdc4053
...
@@ -998,7 +998,6 @@
...
@@ -998,7 +998,6 @@
})
})
})
})
});
});
console
.
log
(
"list"
,
list
);
this
.
list
=
list
;
this
.
list
=
list
;
this
.
$forceUpdate
();
this
.
$forceUpdate
();
}
}
...
...
src/components/SalesModule/Common/productOrderList.vue
View file @
2cdc4053
...
@@ -683,7 +683,6 @@ export default {
...
@@ -683,7 +683,6 @@ export default {
},
},
methods
:
{
methods
:
{
changeSelect
()
{
changeSelect
()
{
console
.
log
(
"changeSelect"
);
this
.
list
.
forEach
((
element
)
=>
{
this
.
list
.
forEach
((
element
)
=>
{
element
.
check
=
this
.
allCheck
;
element
.
check
=
this
.
allCheck
;
});
});
...
@@ -922,7 +921,6 @@ export default {
...
@@ -922,7 +921,6 @@ export default {
this
.
$tripUtils
.
GotoB2CPage
(
B2BDomain
,
item
.
ConfigID
,
item
.
TCID
);
this
.
$tripUtils
.
GotoB2CPage
(
B2BDomain
,
item
.
ConfigID
,
item
.
TCID
);
},
},
goUrlT
(
path
,
obj
,
outItem
,
title
)
{
goUrlT
(
path
,
obj
,
outItem
,
title
)
{
console
.
log
(
'goUrlTO'
,
path
,
obj
,
outItem
,
title
)
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
path
,
name
:
path
,
query
:
{
query
:
{
...
...
src/components/SalesModule/MyCustomer.vue
View file @
2cdc4053
...
@@ -574,20 +574,19 @@
...
@@ -574,20 +574,19 @@
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"統一编号"
prop=
"UniqueCode"
>
<el-form-item
label=
"統一编号"
prop=
"UniqueCode"
>
<el-input
v-model=
"addMsg.UniqueCode"
placeholder=
"请输入統一编号"
<el-input
v-model=
"addMsg.UniqueCode"
placeholder=
"请输入統一编号"
maxlength=
"20"
></el-input>
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"LINE ID"
prop=
"LINEID"
>
<el-form-item
label=
"LINE ID"
prop=
"LINEID"
>
<el-input
v-model=
"addMsg.LINEID"
placeholder=
"请输入LINE ID"
<el-input
v-model=
"addMsg.LINEID"
placeholder=
"请输入LINE ID"
maxlength=
"20"
></el-input>
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"Email"
prop=
"Email"
>
<el-form-item
label=
"Email"
prop=
"Email"
>
<el-input
v-model=
"addMsg.Email"
placeholder=
"请输入Email"
style=
"width: 240px;"
></el-input>
<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-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -636,8 +635,6 @@
...
@@ -636,8 +635,6 @@
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"签约资料"
prop=
"SigningFile"
>
<el-form-item
label=
"签约资料"
prop=
"SigningFile"
>
<el-upload
v-if=
"!saveMsg || !saveMsg.length"
class=
"upload-demo"
:disabled=
"!addMsg.SigningType"
<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"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:show-file-list=
"false"
action=
""
>
:show-file-list=
"false"
action=
""
>
...
@@ -722,7 +719,8 @@
...
@@ -722,7 +719,8 @@
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"联系电话"
>
<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-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
...
@@ -1070,11 +1068,11 @@
...
@@ -1070,11 +1068,11 @@
// this.$message.error('请输入联系电话')
// this.$message.error('请输入联系电话')
// return
// return
// }
// }
if
(
!
this
.
updateMsg
.
CustomerName
)
{
if
(
!
this
.
updateMsg
.
CustomerName
)
{
this
.
$message
.
error
(
'请输入客户名称'
)
this
.
$message
.
error
(
'请输入客户名称'
)
return
return
}
}
if
(
!
this
.
updateMsg
.
Contact
)
{
if
(
!
this
.
updateMsg
.
Contact
)
{
this
.
$message
.
error
(
'请输入联系人'
)
this
.
$message
.
error
(
'请输入联系人'
)
return
return
}
}
...
@@ -1135,7 +1133,7 @@
...
@@ -1135,7 +1133,7 @@
})
})
let
AreaName
=
sheng
+
shi
+
qu
let
AreaName
=
sheng
+
shi
+
qu
this
.
updateMsg
.
Address
=
AreaName
+
','
+
this
.
updateMsg
.
Address
this
.
updateMsg
.
Address
=
AreaName
+
','
+
this
.
updateMsg
.
Address
if
(
!
this
.
updateMsg
.
Address
)
{
if
(
!
this
.
updateMsg
.
Address
)
{
this
.
$message
.
error
(
'请输入输入详情地址'
)
this
.
$message
.
error
(
'请输入输入详情地址'
)
return
return
}
}
...
@@ -1182,13 +1180,6 @@
...
@@ -1182,13 +1180,6 @@
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
x
=
res
.
data
.
data
;
let
x
=
res
.
data
.
data
;
// this.customerInfo=res.data.data
// if(this.customerInfo.address.indexOf(',')!=-1){
// this.customerInfo.address=this.customerInfo.address.split(',')[1]
// }else{
// this.customerInfo.address=this.customerInfo.address
// }
// this.contact=res.data.data.contact
this
.
updateMsg
.
contactNumber
=
x
.
contactNumber
this
.
updateMsg
.
contactNumber
=
x
.
contactNumber
this
.
updateMsg
.
CustomerName
=
x
.
customerName
this
.
updateMsg
.
CustomerName
=
x
.
customerName
this
.
updateMsg
.
Contact
=
x
.
contactName
this
.
updateMsg
.
Contact
=
x
.
contactName
...
@@ -1223,9 +1214,6 @@
...
@@ -1223,9 +1214,6 @@
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
cityList
=
res
.
data
.
data
;
this
.
cityList
=
res
.
data
.
data
;
// this.regionList=[]
// this.updateMsg.City=''
// this.updateMsg.District=''
}
}
},
err
=>
{})
},
err
=>
{})
},
},
...
@@ -1235,8 +1223,7 @@
...
@@ -1235,8 +1223,7 @@
"level"
:
3
"level"
:
3
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
regionList
=
res
.
data
.
data
this
.
regionList
=
res
.
data
.
data
;
// this.updateMsg.District=''
}
}
},
err
=>
{})
},
err
=>
{})
},
},
...
@@ -1327,7 +1314,6 @@
...
@@ -1327,7 +1314,6 @@
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
data
.
customerInfo
.
customerId
>
0
)
{
if
(
res
.
data
.
data
.
customerInfo
.
customerId
>
0
)
{
this
.
isOldPerson
=
true
this
.
isOldPerson
=
true
let
x
=
res
.
data
.
data
.
customerInfo
let
x
=
res
.
data
.
data
.
customerInfo
this
.
addMsg
=
x
this
.
addMsg
=
x
...
@@ -1462,7 +1448,6 @@
...
@@ -1462,7 +1448,6 @@
blank
:
'y'
blank
:
'y'
}
}
})
})
},
},
goUrlT
(
path
,
id
)
{
goUrlT
(
path
,
id
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
...
@@ -1480,17 +1465,19 @@
...
@@ -1480,17 +1465,19 @@
this
.
msg
.
CustomerStatus
=
type
this
.
msg
.
CustomerStatus
=
type
this
.
getList
()
this
.
getList
()
},
},
getList
()
{
// 获取列表数据
// 获取列表数据
getList
()
{
this
.
dataList
=
[]
this
.
loading
=
true
;
this
.
apipost
(
'app_get_my_customer_list'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'app_get_my_customer_list'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
0
)
{
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
dataList
=
[]
if
(
res
.
data
.
resultCode
==
1
)
{
}
else
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
loading
=
false
;
}
}
},
err
=>
{})
},
err
=>
{
this
.
loading
=
false
;
})
},
},
getCustomerBrandList
()
{
// 获取品牌
getCustomerBrandList
()
{
// 获取品牌
this
.
apipost
(
'app_get_customer_brand'
,
{},
res
=>
{
this
.
apipost
(
'app_get_customer_brand'
,
{},
res
=>
{
...
@@ -1501,42 +1488,32 @@
...
@@ -1501,42 +1488,32 @@
}
}
},
err
=>
{})
},
err
=>
{})
},
},
saveVisa
()
{
//
saveVisa
()
{
this
.
addMsg
.
SigningType
=
this
.
addMsg
.
SigningType
?
1
:
0
this
.
addMsg
.
SigningType
=
this
.
addMsg
.
SigningType
?
1
:
0
console
.
log
(
'save'
,
this
.
addMsg
,
this
.
updateMsg
)
if
(
!
this
.
addMsg
.
contactNumber
)
{
if
(
!
this
.
addMsg
.
contactNumber
){
this
.
$message
.
error
(
'请输入联系电话'
)
this
.
$message
.
error
(
'请输入联系电话'
)
return
return
}
}
if
(
!
this
.
addMsg
.
customerName
)
{
if
(
!
this
.
addMsg
.
customerName
)
{
this
.
$message
.
error
(
'请输入客户名称'
)
this
.
$message
.
error
(
'请输入客户名称'
)
return
return
}
}
if
(
!
this
.
addMsg
.
contact
)
{
if
(
!
this
.
addMsg
.
contact
)
{
this
.
$message
.
error
(
'请输入联系人'
)
this
.
$message
.
error
(
'请输入联系人'
)
return
return
}
}
if
(
this
.
addMsg
.
SigningType
&&
!
this
.
saveMsg
.
length
)
{
if
(
this
.
addMsg
.
SigningType
&&
!
this
.
saveMsg
.
length
)
{
this
.
$message
.
error
(
'请上传签约材料'
)
this
.
$message
.
error
(
'请上传签约材料'
)
return
return
}
else
{
}
else
{
if
(
this
.
saveMsg
&&
this
.
saveMsg
.
length
>
0
)
if
(
this
.
saveMsg
&&
this
.
saveMsg
.
length
>
0
)
{
{
this
.
addMsg
.
SigningFile
=
this
.
saveMsg
[
0
].
Path
this
.
addMsg
.
SigningFile
=
this
.
saveMsg
[
0
].
Path
}
}
}
}
// if(!this.addMsg.UniqueCode){
// this.$message.error('请输入统一编码')
if
(
this
.
updateMsg
.
Email
)
{
// return
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.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
)){
this
.
$message
.
error
(
'请输入有效的邮箱'
)
this
.
$message
.
error
(
'请输入有效的邮箱'
)
return
return
}
}
...
@@ -1583,7 +1560,7 @@
...
@@ -1583,7 +1560,7 @@
})
})
let
AreaName
=
sheng
+
shi
+
qu
let
AreaName
=
sheng
+
shi
+
qu
this
.
addMsg
.
address
=
AreaName
+
','
+
this
.
addMsg
.
address
this
.
addMsg
.
address
=
AreaName
+
','
+
this
.
addMsg
.
address
if
(
!
this
.
addMsg
.
address
)
{
if
(
!
this
.
addMsg
.
address
)
{
this
.
$message
.
error
(
'请输入输入详情地址'
)
this
.
$message
.
error
(
'请输入输入详情地址'
)
return
return
}
}
...
...
src/components/SalesModule/signedFinance.vue
View file @
2cdc4053
...
@@ -568,7 +568,6 @@
...
@@ -568,7 +568,6 @@
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:
(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:
(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
this
.
saveMsg
=
[]
this
.
saveMsg
=
[]
console
.
log
(
'file'
,
file
,
x
)
this
.
saveMsg
.
push
({
this
.
saveMsg
.
push
({
Path
:
x
.
data
.
FilePath
,
Path
:
x
.
data
.
FilePath
,
FileName
:
file
.
file
.
name
,
FileName
:
file
.
file
.
name
,
...
...
src/components/SalesModule/signedFinanceALL.vue
View file @
2cdc4053
...
@@ -887,7 +887,6 @@ export default {
...
@@ -887,7 +887,6 @@ export default {
methods
:
{
methods
:
{
financeCheck
(
item
)
{
financeCheck
(
item
)
{
this
.
checkObj
=
item
;
this
.
checkObj
=
item
;
console
.
log
(
"financeCheck"
,
item
);
this
.
showCheck
=
true
this
.
showCheck
=
true
},
},
checkSubmit
()
{
checkSubmit
()
{
...
...
src/components/orderCommon/order-form2.vue
View file @
2cdc4053
...
@@ -2292,7 +2292,6 @@
...
@@ -2292,7 +2292,6 @@
this
.
addMsg
.
GoCityTime
=
this
.
starTime
=
oldValue
.
StartCityTime
;
this
.
addMsg
.
GoCityTime
=
this
.
starTime
=
oldValue
.
StartCityTime
;
this
.
addMsg
.
BackCityTime
=
this
.
endTime
=
oldValue
.
BackCityTime
;
this
.
addMsg
.
BackCityTime
=
this
.
endTime
=
oldValue
.
BackCityTime
;
this
.
addMsg
.
SonControlID
=
oldValue
.
SonControlID
;
this
.
addMsg
.
SonControlID
=
oldValue
.
SonControlID
;
console
.
log
(
"this.addMsg.SonControlID "
,
this
.
addMsg
.
SonControlID
);
this
.
priceObj
=
JSON
.
parse
(
JSON
.
stringify
(
oldValue
));
this
.
priceObj
=
JSON
.
parse
(
JSON
.
stringify
(
oldValue
));
if
(
this
.
pagesTitle
==
"当地游产品"
)
{
if
(
this
.
pagesTitle
==
"当地游产品"
)
{
let
str
=
""
;
let
str
=
""
;
...
...
src/components/orderCommon/order-remark.vue
View file @
2cdc4053
...
@@ -115,7 +115,6 @@
...
@@ -115,7 +115,6 @@
remarksMsg
:
{
remarksMsg
:
{
immediate
:
true
,
immediate
:
true
,
handler
(
newVal
)
{
handler
(
newVal
)
{
console
.
log
(
"old"
,
newVal
);
this
.
postMsg
.
OrderId
=
this
.
remarksMsg
.
OrderId
;
this
.
postMsg
.
OrderId
=
this
.
remarksMsg
.
OrderId
;
this
.
postMsg
.
OldRemarks
=
this
.
remarksMsg
.
OldRemarks
;
this
.
postMsg
.
OldRemarks
=
this
.
remarksMsg
.
OldRemarks
;
this
.
postMsg
.
Remarks
=
this
.
remarksMsg
.
Remarks
;
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