Skip to content

S
SuperMan
Commit cab8218f authored by Mac's avatar Mac
Browse files
Options

处理飞猪情况订单的修改

parent c3ec6559
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 10 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ cab8218f
...@@ -1156,7 +1156,7 @@ ...@@ -1156,7 +1156,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId">
</el-option> </el-option>
...@@ -1164,7 +1164,7 @@ ...@@ -1164,7 +1164,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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 <el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id"> <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 @@ ...@@ -1059,7 +1059,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId">
</el-option> </el-option>
...@@ -1067,7 +1067,7 @@ ...@@ -1067,7 +1067,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
...@@ -1536,7 +1536,7 @@ ...@@ -1536,7 +1536,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.brandName">
</el-option> </el-option>
...@@ -1544,7 +1544,7 @@ ...@@ -1544,7 +1544,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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 <el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Name"> <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 @@ ...@@ -1207,6 +1207,7 @@
v-model="addMsg.ClientSource" v-model="addMsg.ClientSource"
filterable filterable
:placeholder="$t('pub.pleaseSel')" :placeholder="$t('pub.pleaseSel')"
@change='getclSource'
> >
<el-option <el-option
v-for="item in ddlyList" v-for="item in ddlyList"
...@@ -4398,6 +4399,12 @@ export default { ...@@ -4398,6 +4399,12 @@ export default {
removeFile(e) { removeFile(e) {
this.addMsg.QuotationUrl = ""; this.addMsg.QuotationUrl = "";
}, },
getclSource(){
let text = '飞猪订单'
if(this.addMsg.ClientSource==4 && this.addMsg.Remarks.indexOf(text)==-1){
this.addMsg.Remarks = '飞猪订单；'+this.addMsg.Remarks
}
}
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ cab8218f
...@@ -1215,7 +1215,7 @@ ...@@ -1215,7 +1215,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId">
</el-option> </el-option>
...@@ -1223,7 +1223,7 @@ ...@@ -1223,7 +1223,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
...@@ -1686,7 +1686,7 @@ ...@@ -1686,7 +1686,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId">
</el-option> </el-option>
...@@ -1694,7 +1694,7 @@ ...@@ -1694,7 +1694,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment