Skip to content

S
SuperMan
Commit d572da05 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 31cd576e
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 48 deletions
src/components/DomesticTravelcontract.vue
View file @ d572da05
......@@ -122,6 +122,39 @@
margin: 5px 30px 0;
border-bottom: 1px dashed #ccc;
font: normal 15px "microsoft yahei";
display: flex;
align-items: center;
}
.TC-MainContent .dmc-info-container {
display: flex;
flex-wrap: wrap;
padding: 15px 30px;
gap: 15px;
}
.TC-MainContent .dmc-item-box {
border: 1px dashed #dcdfe6;
border-radius: 4px;
padding: 15px;
position: relative;
background: #fff;
min-width: 350px;
}
.TC-MainContent .dmc-item-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 15px;
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
.TC-MainContent .dmc-index-tag {
font-weight: bold;
color: #409EFF;
font-size: 14px;
}
.TC-MainContent .createTable {
......@@ -509,43 +542,36 @@
</tr>
</tbody>
</table>
<div class="createTableTitle">地接社信息</div>
<table class="createTable">
<tbody>
<tr>
<td>
<el-form-item label="地接社名称" prop="DmcName">
<el-input type="text" v-model="CtObj.DmcName" class="w300">
<el-select placeholder="快捷" @change="changeDmcCompany" slot="append" style="width:80px">
<el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName" :value="ditem"> </el-option>
<div class="createTableTitle">
地接社信息
<el-button type="primary" size="mini" @click="addDmcInfo" icon="el-icon-plus" style="margin-left: 15px;">添加地接社</el-button>
</div>
<div class="dmc-info-container">
<div v-for="(dmcItem, dmcIndex) in CtObj.DmcInfoList" :key="dmcIndex" class="dmc-item-box">
<div class="dmc-item-header">
<span class="dmc-index-tag">地接社 {{ dmcIndex + 1 }}</span>
<el-button type="danger" size="mini" icon="el-icon-minus" @click="removeDmcInfo(dmcIndex)"
v-if="CtObj.DmcInfoList.length > 1" title="删除地接社">删除</el-button>
</div>
<el-form-item label="地接社名称" :prop="'DmcInfoList.' + dmcIndex + '.DmcName'">
<el-input type="text" v-model="dmcItem.DmcName" class="w300">
<el-select placeholder="快捷" @change="(val) => changeDmcCompany(val, dmcIndex)" slot="append" style="width:80px">
<el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName"
:value="ditem"> </el-option>
</el-select>
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="地址" prop="DmcAddress">
<el-input type="text" class="w300" v-model="CtObj.DmcAddress"></el-input>
<el-form-item label="地址" :prop="'DmcInfoList.' + dmcIndex + '.DmcAddress'">
<el-input type="text" class="w300" v-model="dmcItem.DmcAddress"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="联系人" prop="DmcContact">
<el-input type="text" class="w300" v-model="CtObj.DmcContact"></el-input>
<el-form-item label="联系人" :prop="'DmcInfoList.' + dmcIndex + '.DmcContact'">
<el-input type="text" class="w300" v-model="dmcItem.DmcContact"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="联系电话" prop="DmcContactPhone">
<el-input type="text" class="w300" v-model="CtObj.DmcContactPhone"></el-input>
<el-form-item label="联系电话" :prop="'DmcInfoList.' + dmcIndex + '.DmcContactPhone'">
<el-input type="text" class="w300" v-model="dmcItem.DmcContactPhone"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="block mtop15" id="anchor-1" ref="anchor1">
<div class="blockTitle">
......@@ -976,7 +1002,7 @@
<tr>
<td colspan="5" contenteditable="true">
<div style="display: flex">
<span>地接社名称：四川和平国际旅行社有限公司</span>
<span>地接社名称：{{(CtObj.DmcInfoList&&CtObj.DmcInfoList.length>0 && CtObj.DmcInfoList[0].DmcName!=''?CtObj.DmcInfoList[0].DmcName:'四川和平国际旅行社有限公司')}}</span>
</div>
</td>
</tr>
......@@ -1044,7 +1070,7 @@
<td contenteditable="true">
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}<br/></span>
<span v-else>无</span>
</template>
</template>
......@@ -1483,11 +1509,18 @@
OrderId: 0,
GuestNum: 0, //旅客人数
SignType: 0, //0-四川和平，1-日本PIC，2-成都欧亚
//地接社
//地接社（单个字段已弃用，改为 dmcInfoList）
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: "",
//地接社列表（多个地接社）
DmcInfoList: [{
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: ""
}],
},
//旅客名单
guestList: [],
......@@ -1711,6 +1744,10 @@
if (this.CtObj.ContractTripList && this.CtObj.ContractTripList.length > 0) {
this.CtObj.ContractTripList[0].TravelContent = this.$refs.TcTravel_Table.innerHTML;
}
// 过滤掉未填写地接社名称的项
if (this.CtObj.DmcInfoList && this.CtObj.DmcInfoList.length > 0) {
this.CtObj.DmcInfoList = this.CtObj.DmcInfoList.filter(item => item.DmcName && item.DmcName.trim() !== "");
}
this.isSubmit = false;
this.apipost(
"travelcontract_post_SetTravelContractService",
......@@ -1915,6 +1952,26 @@
};
this.CtObj.ContractTripList.push(tripObj);
}
// 处理地接社列表（兼容旧数据和初始化）
if (!this.CtObj.DmcInfoList || this.CtObj.DmcInfoList.length === 0) {
// 如果有旧的单个地接社字段，转换为列表
if (this.CtObj.DmcName) {
this.CtObj.DmcInfoList = [{
DmcName: this.CtObj.DmcName || "",
DmcAddress: this.CtObj.DmcAddress || "",
DmcContact: this.CtObj.DmcContact || "",
DmcContactPhone: this.CtObj.DmcContactPhone || ""
}];
} else {
// 新增合同，初始化一个空的地接社
this.CtObj.DmcInfoList = [{
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: ""
}];
}
}
this.changeSignType();
this.dataLoading = false
} else {
......@@ -2201,11 +2258,24 @@
}
});
},
changeDmcCompany(item){
this.CtObj.DmcName = item.CompanyName;
this.CtObj.DmcAddress = item.Address;
this.CtObj.DmcContact = item.ContactName;
this.CtObj.DmcContactPhone = item.ContactPhone;
changeDmcCompany(item, index){
this.CtObj.DmcInfoList[index].DmcName = item.CompanyName;
this.CtObj.DmcInfoList[index].DmcAddress = item.Address;
this.CtObj.DmcInfoList[index].DmcContact = item.ContactName;
this.CtObj.DmcInfoList[index].DmcContactPhone = item.ContactPhone;
},
// 添加地接社
addDmcInfo() {
this.CtObj.DmcInfoList.push({
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: ""
});
},
// 删除地接社
removeDmcInfo(index) {
this.CtObj.DmcInfoList.splice(index, 1);
},
GetDmcCompanyList(){
this.apipost(
......
src/components/TravelContractNew.vue
View file @ d572da05
......@@ -440,7 +440,8 @@
<tr>
<td>
<el-form-item :label="$t('scen.sc_tel')" prop="clientCall">
<el-input type="text" v-model="CtObj.clientCall" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.clientCall" maxlength="100" class="w300"></el-input><br/>
<span style="color: red">*旅游局合同，将根据此号码发送合同签名短信</span>
</el-form-item>
</td>
</tr>
......@@ -1104,7 +1105,7 @@
<tr>
<td colspan="5" contenteditable="true">
<div style="display: flex">
<span>地接社名称：{{(CtObj.dmcInfoList&&CtObj.dmcInfoList.length>0?CtObj.dmcInfoList[0].DmcName:'株式会社ピースインターナショナル')}} </span>
<span>地接社名称：{{(CtObj.dmcInfoList&&CtObj.dmcInfoList.length>0 && CtObj.dmcInfoList[0].DmcName!=''?CtObj.dmcInfoList[0].DmcName:'株式会社ピースインターナショナル')}} </span>
</div>
</td>
</tr>
......
src/components/onedayTripContract.vue
View file @ d572da05
......@@ -1036,7 +1036,7 @@
<td contenteditable="true">
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}<br/></span>
<span v-else>无</span>
</template>
</template>
......
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