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
cab8218f
Commit
cab8218f
authored
Nov 18, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理飞猪情况订单的修改
parent
c3ec6559
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
10 deletions
+17
-10
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+2
-2
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+4
-4
productQuery.vue
src/components/SalesModule/productQuery.vue
+7
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+4
-4
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
cab8218f
...
...
@@ -1156,7 +1156,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.BrandId"
:disabled=
"false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ssptList"
:label=
"item.brandName"
:value=
"item.dictId"
:key=
"item.dictId"
>
</el-option>
...
...
@@ -1164,7 +1164,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.TradeWay"
:disabled=
"addMsg.OrderForm !== 4 ? true : false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in jyfsList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
cab8218f
...
...
@@ -1059,7 +1059,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"所属平台"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
label=
"所属平台"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.BrandId"
:disabled=
"false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ssptList"
:label=
"item.brandName"
:value=
"item.dictId"
:key=
"item.dictId"
>
</el-option>
...
...
@@ -1067,7 +1067,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"交易方式"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
label=
"交易方式"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.TradeWay"
:disabled=
"true"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in jyfsList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
...
...
@@ -1536,7 +1536,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"所属平台"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
label=
"所属平台"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.BrandId"
:disabled=
"false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ssptList"
:label=
"item.brandName"
:value=
"item.dictId"
:key=
"item.brandName"
>
</el-option>
...
...
@@ -1544,7 +1544,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"交易方式"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
label=
"交易方式"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.TradeWay"
:disabled=
"addMsg.OrderForm !== 4 ? true : false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in jyfsList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Name"
>
...
...
src/components/SalesModule/productQuery.vue
View file @
cab8218f
...
...
@@ -1207,6 +1207,7 @@
v-model=
"addMsg.ClientSource"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
'getclSource'
>
<el-option
v-for=
"item in ddlyList"
...
...
@@ -4398,6 +4399,12 @@ export default {
removeFile
(
e
)
{
this
.
addMsg
.
QuotationUrl
=
""
;
},
getclSource
(){
let
text
=
'飞猪订单'
if
(
this
.
addMsg
.
ClientSource
==
4
&&
this
.
addMsg
.
Remarks
.
indexOf
(
text
)
==-
1
){
this
.
addMsg
.
Remarks
=
'飞猪订单;'
+
this
.
addMsg
.
Remarks
}
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
cab8218f
...
...
@@ -1215,7 +1215,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.BrandId"
:disabled=
"true"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ssptList"
:label=
"item.brandName"
:value=
"item.dictId"
:key=
"item.dictId"
>
</el-option>
...
...
@@ -1223,7 +1223,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.TradeWay"
:disabled=
"true"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in jyfsList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
...
...
@@ -1686,7 +1686,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.BrandId"
:disabled=
"true"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ssptList"
:label=
"item.brandName"
:value=
"item.dictId"
:key=
"item.dictId"
>
</el-option>
...
...
@@ -1694,7 +1694,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1"
>
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
v-show=
"addMsg.ClientSource == 1
|| addMsg.ClientSource == 4
"
>
<el-select
v-model=
"addMsg.TradeWay"
:disabled=
"true"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in jyfsList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
...
...
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