|
|
@@ -61,6 +61,13 @@
|
|
|
{{ scope.row.sex == 0 ? '男' : '女' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="isAccompany" label="是否陪同" width="80">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.isAccompany == 1 ? '否' : '是' }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="operator" label="操作人" width="80">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button @click.native.prevent="PostTourClientListDetails(scope.$index, scope.row)"
|
|
|
@@ -89,7 +96,7 @@
|
|
|
</div>
|
|
|
<el-form :model="pickupinif" :rules="pickupinifRules" ref="pickupinif" label-width="110px"
|
|
|
class="demo-OpHotelReservationsData pickuplist-form">
|
|
|
- <div style="display: flex;flex-wrap: wrap;justify-content: space-between;">
|
|
|
+ <div style="display: flex;flex-wrap: wrap;">
|
|
|
<div style="width:395px ;display: flex;">
|
|
|
<el-form-item style="width:50% ;" label="姓" prop="surname">
|
|
|
<el-autocomplete popper-class="el-autocomplete-suggestion" :popper-append-to-body="false"
|
|
|
@@ -131,6 +138,12 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item style="width:395px ;" label="是否陪同">
|
|
|
+ <el-radio-group v-model="pickupinif.isAccompany">
|
|
|
+ <el-radio label="是"></el-radio>
|
|
|
+ <el-radio label="否"></el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item style="width:395px ;" label="手机号">
|
|
|
<el-input size="medium" type="text" v-model.trim="pickupinif.phone"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -151,7 +164,7 @@
|
|
|
<el-input :rows="2" type="textarea" v-model="pickupinif.remark"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- <el-dialog class="dutzl" width="1242px" title="添加多条资料" :visible.sync="dialogTableVisible"
|
|
|
+ <el-dialog class="dutzl" width="1392px" title="添加多条资料" :visible.sync="dialogTableVisible"
|
|
|
:before-close="closeExpertFormDialog">
|
|
|
<div class="dialog-hade">
|
|
|
<label>PS:自动填写补全功能可能有误差请仔细核实，补全或修改(没有可用‘-’或‘暂无’代替)</label>
|
|
|
@@ -206,6 +219,14 @@
|
|
|
</el-radio-group>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="是否陪同" width="150">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-radio-group size="mini" v-model="scope.row.isAccompany">
|
|
|
+ <el-radio label="是"></el-radio>
|
|
|
+ <el-radio label="否"></el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="出生日期" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker :clearable="false" size="mini" type="date" placeholder="出生日期"
|
|
|
@@ -240,6 +261,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -256,6 +278,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -272,6 +295,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -288,6 +312,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -304,6 +329,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -320,6 +346,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -336,6 +363,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -352,6 +380,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -368,6 +397,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -384,6 +414,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -418,6 +449,7 @@ export default {
|
|
|
office: '',//职务
|
|
|
phone: '',//手机号
|
|
|
gender: '男',//性别
|
|
|
+ isAccompany:'否',//是否陪同
|
|
|
identity: '',//身份证
|
|
|
birth: '',//出生日期
|
|
|
Accommodation: '',//舱位类型
|
|
|
@@ -496,6 +528,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -512,6 +545,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -528,6 +562,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -544,6 +579,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -560,6 +596,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -576,6 +613,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -592,6 +630,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -608,6 +647,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -624,6 +664,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -640,6 +681,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
|
|
@@ -871,6 +913,7 @@ export default {
|
|
|
office: res.data.data.job,//职务
|
|
|
phone: res.data.data.phone,//手机号
|
|
|
gender: res.data.data.sex == 0 ? '男' : '女',//性别
|
|
|
+ isAccompany: res.data.data.isAccompany == 1 ? '否' : '是',//性别
|
|
|
identity: res.data.data.idCardNo,//身份证
|
|
|
birth: res.data.data.birthDay,//出生日期
|
|
|
Accommodation: res.data.data.shippingSpaceTypeId,//舱位类型
|
|
|
@@ -907,9 +950,13 @@ export default {
|
|
|
},
|
|
|
//保存修改api
|
|
|
PostTourClientListAddOrEdit() {
|
|
|
- console.log(this.tableData.length);
|
|
|
- console.log(this.GroupInfo.visitPNumber);
|
|
|
- if(this.tableData.length>=this.GroupInfo.visitPNumber){
|
|
|
+ let pdarr=[];
|
|
|
+ for (let k = 0; k < this.tableData.length; k++) {
|
|
|
+ if(this.tableData[k].isAccompany==1){
|
|
|
+ pdarr.push(this.tableData[k])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(pdarr.length>=this.GroupInfo.visitPNumber&&this.id==0){
|
|
|
this.$message.error("保存失败！录入的客户名单超过本团组的出访人数，请检查仔细删除多余人！");
|
|
|
return
|
|
|
}
|
|
|
@@ -932,6 +979,7 @@ export default {
|
|
|
firstName: that.pickupinif.name,//名
|
|
|
pinyin: that.pickupinif.Pinyin,//姓名拼音
|
|
|
sex: that.pickupinif.gender == '男' ? 0 : 1,//性别 0 男1 女 其他值 未设置
|
|
|
+ isAccompany:that.pickupinif.isAccompany == '否' ? 1 : 2,
|
|
|
phone: that.pickupinif.phone,//手机号
|
|
|
companyFullName: that.pickupinif.flats,//公司名全称
|
|
|
job: that.pickupinif.office,//职位
|
|
|
@@ -979,6 +1027,7 @@ export default {
|
|
|
office: '',//职务
|
|
|
phone: '',//手机号
|
|
|
gender: '男',//性别
|
|
|
+ isAccompany: '否',//陪同
|
|
|
identity: '',//身份证
|
|
|
birth: '',//出生日期
|
|
|
Accommodation: '',//舱位类型
|
|
|
@@ -1051,6 +1100,7 @@ export default {
|
|
|
tourClientList = JSON.parse(JSON.stringify(tourClientList))
|
|
|
for (var x = 0; x < tourClientList.length; x++) {
|
|
|
tourClientList[x].sex = tourClientList[x].sex == '男' ? 0 : 1
|
|
|
+ tourClientList[x].isAccompany = tourClientList[x].isAccompany == '否' ? 1 : 2
|
|
|
}
|
|
|
if (tourClientList) {
|
|
|
this.PostTourClientListAddMultiple(tourClientList)
|
|
|
@@ -1058,7 +1108,19 @@ export default {
|
|
|
},
|
|
|
//多存api
|
|
|
PostTourClientListAddMultiple(listinif) {
|
|
|
- if((this.tableData.length+listinif.length)>this.GroupInfo.visitPNumber){
|
|
|
+ let pdarr=[];
|
|
|
+ let pdarrs=[];
|
|
|
+ for (let k = 0; k < this.tableData.length; k++) {
|
|
|
+ if(this.tableData[k].isAccompany==1){
|
|
|
+ pdarr.push(this.tableData[k])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (let g = 0; g < listinif.length; g++) {
|
|
|
+ if(listinif[g].isAccompany==1){
|
|
|
+ pdarrs.push(listinif[g])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if((pdarr.length+pdarrs.length)>this.GroupInfo.visitPNumber){
|
|
|
this.$message.error("保存失败！录入的客户名单超过本团组的出访人数，请检查仔细删除多余人！");
|
|
|
return
|
|
|
}
|
|
|
@@ -1193,6 +1255,7 @@ export default {
|
|
|
firstName: dataarr[i].firstName,
|
|
|
pinyin: dataarr[i].pinyin,
|
|
|
sex: dataarr[i].sex == 0 ? '男' : '女',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: dataarr[i].companyFullName,
|
|
|
job: dataarr[i].job,
|
|
|
idCardNo: dataarr[i].iDcard,
|
|
|
@@ -1216,6 +1279,7 @@ export default {
|
|
|
firstName: "",
|
|
|
pinyin: '',
|
|
|
sex: '男',
|
|
|
+ isAccompany: '否',//陪同
|
|
|
companyFullName: "",
|
|
|
job: "",
|
|
|
idCardNo: "",
|
