Skip to content

S
SuperMan
Commit 02da3a32 authored by youjie's avatar youjie
Browse files
Options

no message

parent 63d2604d
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 7 deletions
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 02da3a32
...@@ -1269,6 +1269,7 @@ ...@@ -1269,6 +1269,7 @@
<th width="20%" style="min-width: 260px;">姓名</th> <th width="20%" style="min-width: 260px;">姓名</th>
<th width="20%" style="min-width: 220px;">性别</th> <th width="20%" style="min-width: 220px;">性别</th>
<th width="20%" style="min-width: 220px;">生日</th> <th width="20%" style="min-width: 220px;">生日</th>
<th width="20%" style="min-width: 220px;">国籍</th>
<th width="20%" style="min-width: 220px;">护照号</th> <th width="20%" style="min-width: 220px;">护照号</th>
<th width="20%" style="min-width: 220px;">电话</th> <th width="20%" style="min-width: 220px;">电话</th>
</tr> </tr>
...@@ -1329,6 +1330,19 @@ ...@@ -1329,6 +1330,19 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;">
<el-form-item
:label="`国籍 ${index+1} `"
:prop="`GuestList.${index}.Nationality`"
:rules="rules.PassportNo"
label-width="80px"
label-position="left">
<el-select v-model="item.Nationality" filterable size=mini class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item
:label="`护照号 ${index+1} `" :label="`护照号 ${index+1} `"
...@@ -2456,6 +2470,8 @@ ...@@ -2456,6 +2470,8 @@
ESurName: '', ESurName: '',
EName: '', EName: '',
Birthday: '', Birthday: '',
Nationality: 2,
Nationality: '',
PassportNo: '', PassportNo: '',
Remarks: '', Remarks: '',
MobilePhone: ''} MobilePhone: ''}
...@@ -2550,6 +2566,13 @@ ...@@ -2550,6 +2566,13 @@
trigger: 'blur' trigger: 'blur'
}, },
], ],
Nationality: [
{
required: true,
message: '请选择国籍',
trigger: 'change'
},
],
PassportNo: [ PassportNo: [
{ {
required: true, required: true,
...@@ -2749,8 +2772,8 @@ ...@@ -2749,8 +2772,8 @@
{Name:'女',Id:2}, {Name:'女',Id:2},
], ],
TotalNumber: 0, TotalNumber: 0,
isGuest: 0 isGuest: 0,
countryList: [],//国籍
}; };
}, },
...@@ -2775,6 +2798,22 @@ ...@@ -2775,6 +2798,22 @@
} }
}, },
methods: { methods: {
getCountry() {
//获取国家
let msg = {};
this.apipost(
"dict_post_Destination_GetCountry",
msg,
res => {
if (res.data.resultCode == 1) {
this.countryList = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
// 跳转调查列表 // 跳转调查列表
goInvetig: function (path, tcid, orderId) { goInvetig: function (path, tcid, orderId) {
this.$router.push({ this.$router.push({
...@@ -3385,6 +3424,7 @@ ...@@ -3385,6 +3424,7 @@
ESurName: items.ESurName, ESurName: items.ESurName,
EName: items.EName, EName: items.EName,
Birthday: items.Birthday, Birthday: items.Birthday,
Nationality: items.Nationality?items.Nationality:2,
PassportNo: items.PassportNo, PassportNo: items.PassportNo,
Remarks: items.Remarks, Remarks: items.Remarks,
MobilePhone: items.MobilePhone, MobilePhone: items.MobilePhone,
...@@ -4241,10 +4281,13 @@ ...@@ -4241,10 +4281,13 @@
let obj = this.khmdList.find( let obj = this.khmdList.find(
item => item.customerId == this.addMsg.CustomerId item => item.customerId == this.addMsg.CustomerId
); );
this.customerId = obj.customerId; if(obj){
this.createByInfo = obj.createByInfo; this.customerId = obj.customerId;
this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")"; this.createByInfo = obj.createByInfo;
this.addMsg.ContactMobile = obj.contactNumber; this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")";
this.addMsg.ContactMobile = obj.contactNumber;
}
} }
this.apipost( this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId", { "app_today_visit_GetCustomerBrandByCustomerId", {
...@@ -4718,6 +4761,7 @@ ...@@ -4718,6 +4761,7 @@
this.getFylx(); this.getFylx();
this.getTuanInfo(); this.getTuanInfo();
this.canEditUnitPrice(); this.canEditUnitPrice();
this.getCountry()//国籍
} }
}; };
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 02da3a32
...@@ -1146,6 +1146,7 @@ ...@@ -1146,6 +1146,7 @@
<th width="20%" style="min-width: 260px;">姓名</th> <th width="20%" style="min-width: 260px;">姓名</th>
<th width="20%" style="min-width: 220px;">性别</th> <th width="20%" style="min-width: 220px;">性别</th>
<th width="20%" style="min-width: 220px;">生日</th> <th width="20%" style="min-width: 220px;">生日</th>
<th width="20%" style="min-width: 220px;">国籍</th>
<th width="20%" style="min-width: 220px;">护照号</th> <th width="20%" style="min-width: 220px;">护照号</th>
<th width="20%" style="min-width: 220px;">电话</th> <th width="20%" style="min-width: 220px;">电话</th>
<!-- <th width="5%" style="min-width: 80px;">操作</th> --> <!-- <th width="5%" style="min-width: 80px;">操作</th> -->
...@@ -1208,6 +1209,19 @@ ...@@ -1208,6 +1209,19 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;">
<el-form-item
:label="`国籍 ${index+1} `"
:prop="`GuestList.${index}.Nationality`"
:rules="rules.PassportNo"
label-width="80px"
label-position="left">
<el-select v-model="item.Nationality" filterable size=mini class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item
:label="`护照号 ${index+1} `" :label="`护照号 ${index+1} `"
...@@ -2145,6 +2159,7 @@ ...@@ -2145,6 +2159,7 @@
ESurName: '', ESurName: '',
EName: '', EName: '',
Birthday: '', Birthday: '',
Nationality: '',
PassportNo: '', PassportNo: '',
Remarks: '', Remarks: '',
MobilePhone: '', MobilePhone: '',
...@@ -2241,6 +2256,13 @@ ...@@ -2241,6 +2256,13 @@
trigger: 'blur' trigger: 'blur'
}, },
], ],
Nationality: [
{
required: true,
message: '请选择国籍',
trigger: 'change'
},
],
PassportNo: [ PassportNo: [
{ {
required: true, required: true,
...@@ -2379,6 +2401,7 @@ ...@@ -2379,6 +2401,7 @@
SuperiorPeople: [], SuperiorPeople: [],
TransferMission:'',//订单转团权限 TransferMission:'',//订单转团权限
Unit_Price:0, Unit_Price:0,
addObj:{},
goLVurl:{ //跳转到旅客页面的参数 goLVurl:{ //跳转到旅客页面的参数
orderId:'', orderId:'',
tcid:'', tcid:'',
...@@ -2391,6 +2414,7 @@ ...@@ -2391,6 +2414,7 @@
], ],
TotalNumber: 0, TotalNumber: 0,
isGuest: 0, isGuest: 0,
countryList: [],//国籍
} }
}, },
components: { components: {
...@@ -2414,6 +2438,22 @@ ...@@ -2414,6 +2438,22 @@
} }
}, },
methods: { methods: {
getCountry() {
//获取国家
let msg = {};
this.apipost(
"dict_post_Destination_GetCountry",
msg,
res => {
if (res.data.resultCode == 1) {
this.countryList = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
// 跳转调查列表 // 跳转调查列表
goInvetig: function (path, tcid, orderId) { goInvetig: function (path, tcid, orderId) {
this.$router.push({ this.$router.push({
...@@ -4209,6 +4249,7 @@ ...@@ -4209,6 +4249,7 @@
this.getDdztList() this.getDdztList()
this.getJyfs() this.getJyfs()
this.getFylx() this.getFylx()
this.getCountry()//国籍
}, },
......
src/components/SalesModule/productQueryOne.vue
View file @ 02da3a32
...@@ -527,6 +527,7 @@ ...@@ -527,6 +527,7 @@
<th width="20%" style="min-width: 260px;">姓名</th> <th width="20%" style="min-width: 260px;">姓名</th>
<th width="20%" style="min-width: 220px;">性别</th> <th width="20%" style="min-width: 220px;">性别</th>
<th width="20%" style="min-width: 220px;">生日</th> <th width="20%" style="min-width: 220px;">生日</th>
<th width="20%" style="min-width: 220px;">国籍</th>
<th width="20%" style="min-width: 220px;">护照号</th> <th width="20%" style="min-width: 220px;">护照号</th>
<th width="20%" style="min-width: 220px;">电话</th> <th width="20%" style="min-width: 220px;">电话</th>
</tr> </tr>
...@@ -588,6 +589,19 @@ ...@@ -588,6 +589,19 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;">
<el-form-item
:label="`国籍 ${index+1} `"
:prop="`GuestList.${index}.Nationality`"
:rules="rules.PassportNo"
label-width="80px"
label-position="left">
<el-select v-model="item.Nationality" filterable size=mini class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item
:label="`护照号 ${index+1} `" :label="`护照号 ${index+1} `"
...@@ -1058,6 +1072,7 @@ ...@@ -1058,6 +1072,7 @@
ESurName: '', ESurName: '',
EName: '', EName: '',
Birthday: '', Birthday: '',
Nationality: '',
PassportNo: '', PassportNo: '',
Remarks: '', Remarks: '',
MobilePhone: ''} MobilePhone: ''}
...@@ -1069,6 +1084,7 @@ ...@@ -1069,6 +1084,7 @@
ESurName: '', ESurName: '',
EName: '', EName: '',
Birthday: '', Birthday: '',
Nationality: 2,
PassportNo: '', PassportNo: '',
Remarks: '', Remarks: '',
MobilePhone: '', MobilePhone: '',
...@@ -1153,6 +1169,13 @@ ...@@ -1153,6 +1169,13 @@
trigger: 'blur' trigger: 'blur'
}, },
], ],
Nationality: [
{
required: true,
message: '请选择国籍',
trigger: 'change'
},
],
PassportNo: [ PassportNo: [
{ {
required: true, required: true,
...@@ -1251,7 +1274,8 @@ ...@@ -1251,7 +1274,8 @@
{Name:'男',Id:1}, {Name:'男',Id:1},
{Name:'女',Id:2}, {Name:'女',Id:2},
], ],
TotalNumber: 0 TotalNumber: 0,
countryList: [],//国籍
} }
}, },
components: { components: {
...@@ -1303,6 +1327,23 @@ ...@@ -1303,6 +1327,23 @@
} }
}, },
methods: { methods: {
getCountry() {
//获取国家
let msg = {};
this.apipost(
"dict_post_Destination_GetCountry",
msg,
res => {
if (res.data.resultCode == 1) {
this.countryList = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
groupTypeChange: function (val) { groupTypeChange: function (val) {
if (val === '4') { if (val === '4') {
this.addMsg.ManNum = 0 this.addMsg.ManNum = 0
...@@ -2425,6 +2466,7 @@ ...@@ -2425,6 +2466,7 @@
// this.getKhmdList() // this.getKhmdList()
this.getJyfs() this.getJyfs()
this.getFylx() this.getFylx()
this.getCountry()//国籍
} }
} }
......
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