Skip to content

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

1

parent 83a5820f
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 47 deletions
src/components/TravelContractNew.vue
View file @ 31cd576e
...@@ -120,6 +120,39 @@ ...@@ -120,6 +120,39 @@
margin: 5px 30px 0; margin: 5px 30px 0;
border-bottom: 1px dashed #ccc; border-bottom: 1px dashed #ccc;
font: normal 15px "microsoft yahei"; 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 { .TC-MainContent .createTable {
...@@ -517,44 +550,36 @@ ...@@ -517,44 +550,36 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="createTableTitle">地接社信息</div> <div class="createTableTitle">
<table class="createTable"> 地接社信息
<tbody> <el-button type="primary" size="mini" @click="addDmcInfo" icon="el-icon-plus" style="margin-left: 15px;">添加地接社</el-button>
<tr> </div>
<td> <div class="dmc-info-container">
<el-form-item label="地接社名称" prop="dmcName"> <div v-for="(dmcItem, dmcIndex) in CtObj.dmcInfoList" :key="dmcIndex" class="dmc-item-box">
<el-input type="text" v-model="CtObj.dmcName" class="w300"> <div class="dmc-item-header">
<el-select placeholder="快捷" @change="changeDmcCompany" slot="append" style="width:80px"> <span class="dmc-index-tag">地接社 {{ dmcIndex + 1 }}</span>
<el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName" <el-button type="danger" size="mini" icon="el-icon-minus" @click="removeDmcInfo(dmcIndex)"
:value="ditem"> </el-option> v-if="CtObj.dmcInfoList.length > 1" title="删除地接社">删除</el-button>
</el-select> </div>
</el-input> <el-form-item label="地接社名称" :prop="'dmcInfoList.' + dmcIndex + '.DmcName'">
</el-form-item> <el-input type="text" v-model="dmcItem.DmcName" class="w300">
</td> <el-select placeholder="快捷" @change="(val) => changeDmcCompany(val, dmcIndex)" slot="append" style="width:80px">
</tr> <el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName"
<tr> :value="ditem"> </el-option>
<td> </el-select>
<el-form-item label="地址" prop="dmcAddress"> </el-input>
<el-input type="text" class="w300" v-model="CtObj.dmcAddress"></el-input> </el-form-item>
</el-form-item> <el-form-item label="地址" :prop="'dmcInfoList.' + dmcIndex + '.dmcAddress'">
</td> <el-input type="text" class="w300" v-model="dmcItem.DmcAddress"></el-input>
</tr> </el-form-item>
<tr> <el-form-item label="联系人" :prop="'dmcInfoList.' + dmcIndex + '.dmcContact'">
<td> <el-input type="text" class="w300" v-model="dmcItem.DmcContact"></el-input>
<el-form-item label="联系人" prop="dmcContact"> </el-form-item>
<el-input type="text" class="w300" v-model="CtObj.dmcContact"></el-input> <el-form-item label="联系电话" :prop="'dmcInfoList.' + dmcIndex + '.dmcContactPhone'">
</el-form-item> <el-input type="text" class="w300" v-model="dmcItem.DmcContactPhone"></el-input>
</td> </el-form-item>
</tr> </div>
<tr> </div>
<td>
<el-form-item label="联系电话" prop="dmcContactPhone">
<el-input type="text" class="w300" v-model="CtObj.dmcContactPhone"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</div> </div>
<div class="block mtop15" id="anchor-1" ref="anchor1"> <div class="block mtop15" id="anchor-1" ref="anchor1">
<div class="blockTitle"> <div class="blockTitle">
...@@ -1079,7 +1104,7 @@ ...@@ -1079,7 +1104,7 @@
<tr> <tr>
<td colspan="5" contenteditable="true"> <td colspan="5" contenteditable="true">
<div style="display: flex"> <div style="display: flex">
<span>地接社名称：株式会社ピースインターナショナル </span> <span>地接社名称：{{(CtObj.dmcInfoList&&CtObj.dmcInfoList.length>0?CtObj.dmcInfoList[0].DmcName:'株式会社ピースインターナショナル')}} </span>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1149,7 +1174,7 @@ ...@@ -1149,7 +1174,7 @@
<template v-for="subItem in item.dayArray"> <template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3"> <template v-if="subItem.type == 3">
<span <span
v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br /></span> v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}<br /></span>
<span v-else>无</span> <span v-else>无</span>
</template> </template>
</template> </template>
...@@ -1609,10 +1634,17 @@ ...@@ -1609,10 +1634,17 @@
agentName: "", agentName: "",
agentCall: "", agentCall: "",
contractPlace: "", contractPlace: "",
//地接社 //地接社（单个字段，已弃用，改为 dmcInfoList）
dmcAddress: "", dmcAddress: "",
dmcContact: "", dmcContact: "",
dmcContactPhone: "", dmcContactPhone: "",
//地接社列表（多个地接社）
dmcInfoList: [{
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: ""
}],
//合同条款 //合同条款
totalNumber: 2, totalNumber: 2,
eachNumber: 1, eachNumber: 1,
...@@ -1947,6 +1979,26 @@ ...@@ -1947,6 +1979,26 @@
this.CtObj.eachNumber = 1; this.CtObj.eachNumber = 1;
this.VoluntaryArr = this.CtObj.shopProtocolList; this.VoluntaryArr = this.CtObj.shopProtocolList;
this.WillingPayArr = this.CtObj.payProtocolList; this.WillingPayArr = this.CtObj.payProtocolList;
// 处理地接社列表（兼容旧数据和初始化）
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: ""
}];
}
}
if (this.CtObj.clientCountryid > 0) { if (this.CtObj.clientCountryid > 0) {
this.GetSubAreaList(this.CtObj.clientCountryid, 1, 1); this.GetSubAreaList(this.CtObj.clientCountryid, 1, 1);
...@@ -2160,6 +2212,10 @@ ...@@ -2160,6 +2212,10 @@
this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML; this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id; this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id;
// 过滤掉未填写地接社名称的项
if (this.CtObj.dmcInfoList && this.CtObj.dmcInfoList.length > 0) {
this.CtObj.dmcInfoList = this.CtObj.dmcInfoList.filter(item => item.DmcName && item.DmcName.trim() !== "");
}
let newArr = []; let newArr = [];
this.guestList.forEach((x) => { this.guestList.forEach((x) => {
if (x.isCheck) { if (x.isCheck) {
...@@ -2718,12 +2774,25 @@ ...@@ -2718,12 +2774,25 @@
} }
}); });
}, },
changeDmcCompany(item) { changeDmcCompany(item, index) {
this.CtObj.dmcName = item.CompanyName; this.CtObj.dmcInfoList[index].DmcName = item.CompanyName;
this.CtObj.dmcAddress = item.Address; this.CtObj.dmcInfoList[index].DmcAddress = item.Address;
this.CtObj.dmcContact = item.ContactName; this.CtObj.dmcInfoList[index].DmcContact = item.ContactName;
this.CtObj.dmcContactPhone = item.ContactPhone; this.CtObj.dmcInfoList[index].DmcContactPhone = item.ContactPhone;
} },
// 添加地接社
addDmcInfo() {
this.CtObj.dmcInfoList.push({
DmcName: "",
DmcAddress: "",
DmcContact: "",
DmcContactPhone: ""
});
},
// 删除地接社
removeDmcInfo(index) {
this.CtObj.dmcInfoList.splice(index, 1);
},
}, },
mounted() { mounted() {
this.CurrentUserInfo = this.getLocalStorage(); this.CurrentUserInfo = this.getLocalStorage();
......
src/components/onedayTripContract.vue
View file @ 31cd576e
...@@ -399,6 +399,7 @@ ...@@ -399,6 +399,7 @@
<td> <td>
<el-form-item :label="$t('scen.sc_tel')" prop="Tourists_Tel"> <el-form-item :label="$t('scen.sc_tel')" prop="Tourists_Tel">
<el-input type="text" v-model="CtObj.Tourists_Tel" maxlength="100" class="w300"></el-input> <el-input type="text" v-model="CtObj.Tourists_Tel" maxlength="100" class="w300"></el-input>
<span style="color: red">*旅游局合同，将根据此号码发送合同签名短信</span>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
......
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