Skip to content

S
SuperMan
Commit b38506f1 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 66e610cf 4625c090
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 31 deletions
src/components/SingleContract.vue
View file @ b38506f1
...@@ -579,7 +579,12 @@ ...@@ -579,7 +579,12 @@
<el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice"> <el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice">
<el-input type="text" class="w300" v-model="CtObj.C_TotalPrice" <el-input type="text" class="w300" v-model="CtObj.C_TotalPrice"
@keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)" @keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)"
maxlength="10"></el-input>&nbsp;元 maxlength="10"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
<el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px"> <el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px">
<el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>&nbsp;元 <el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>&nbsp;元
...@@ -686,9 +691,24 @@ ...@@ -686,9 +691,24 @@
<th width="15%">出发地</th> <th width="15%">出发地</th>
<th width="12%">目的地</th> <th width="12%">目的地</th>
<th width="12%">航班号</th> <th width="12%">航班号</th>
<th width="12%">机票金额（元/张）</th> <th width="12%">机票金额（<template v-if="CtObj.SignType==0">
<th width="12%">机场建设费（元/张）</th> 元
<th width="12%">定金（元/张）</th> </template>
<template v-else>
円
</template>/张）</th>
<th width="12%">机场建设费（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="12%">定金（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractTicketList" :key="index"> <tr v-for="(item,index) in CtObj.ContractTicketList" :key="index">
...@@ -760,7 +780,12 @@ ...@@ -760,7 +780,12 @@
<div style="margin-left:50px"> <div style="margin-left:50px">
<el-form-item label="机票预定费用总额：" label-width="140px"> <el-form-item label="机票预定费用总额：" label-width="140px">
<el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'TicketTotalDepositPrice')" <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'TicketTotalDepositPrice')"
v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;元 v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -792,11 +817,21 @@ ...@@ -792,11 +817,21 @@
</th> </th>
<th> <th>
<div>房费</div> <div>房费</div>
<div>（元/间/晚）</div> <div>（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/间/晚）</div>
</th> </th>
<th> <th>
<div>定金</div> <div>定金</div>
<div>（元/间/晚）</div> <div>（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/间/晚）</div>
</th> </th>
<th>入住日期</th> <th>入住日期</th>
<th>离店日期</th> <th>离店日期</th>
...@@ -894,7 +929,12 @@ ...@@ -894,7 +929,12 @@
<div> <div>
<el-form-item style="display:inline-block;" label="费用共计：" label-width="140px"> <el-form-item style="display:inline-block;" label="费用共计：" label-width="140px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'HotelTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'HotelTotalPrice')"
v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;元 v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -971,7 +1011,12 @@ ...@@ -971,7 +1011,12 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="费用共计：" label-width="90px"> <el-form-item style="display:inline-block;" label="费用共计：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'PickUpTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'PickUpTotalPrice')"
v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;元 v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -994,8 +1039,18 @@ ...@@ -994,8 +1039,18 @@
<th width="60">序号</th> <th width="60">序号</th>
<th>国家（个人签证）</th> <th>国家（个人签证）</th>
<th>停留时间</th> <th>停留时间</th>
<th>代办签证费用（元/个）</th> <th>代办签证费用（<template v-if="CtObj.SignType==0">
<th>交付保证金（元/个）</th> 元
</template>
<template v-else>
円
</template>/个）</th>
<th>交付保证金（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/个）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractVisaList" :key="index"> <tr v-for="(item,index) in CtObj.ContractVisaList" :key="index">
...@@ -1040,7 +1095,12 @@ ...@@ -1040,7 +1095,12 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="合计金额：" label-width="90px"> <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'VisaTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'VisaTotalPrice')"
v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;元 v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1067,8 +1127,18 @@ ...@@ -1067,8 +1127,18 @@
<th>目的地</th> <th>目的地</th>
<th>航班号</th> <th>航班号</th>
<th>舱位</th> <th>舱位</th>
<th>机票金额（元/张）</th> <th>机票金额（<template v-if="CtObj.SignType==0">
<th>机场建设费（元/张）</th> 元
</template>
<template v-else>
円
</template>/张）</th>
<th>机场建设费（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractTicketAndHotel.ContractTickets" :key="index"> <tr v-for="(item,index) in CtObj.ContractTicketAndHotel.ContractTickets" :key="index">
...@@ -1205,7 +1275,12 @@ ...@@ -1205,7 +1275,12 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="合计金额：" label-width="90px"> <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'TicketAndHotelTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'TicketAndHotelTotalPrice')"
v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;元 v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1226,7 +1301,12 @@ ...@@ -1226,7 +1301,12 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="其他服务费用合计：" label-width="140px"> <el-form-item style="display:inline-block;" label="其他服务费用合计：" label-width="140px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'OtherConventionPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'OtherConventionPrice')"
v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;元 v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
......
src/components/TravelContractConfirm.vue
View file @ b38506f1
...@@ -2285,10 +2285,25 @@ ...@@ -2285,10 +2285,25 @@
<p>旅游费用： <p>旅游费用：
成人<font>{{CtObj.C_AdultNum}}</font>人 成人<font>{{CtObj.C_AdultNum}}</font>人
×<font>{{CtObj.C_AdultPrice}}</font>元/人 ×<font>{{CtObj.C_AdultPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/人
+儿童<font>{{CtObj.C_ChildrenNum}}</font>人 +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
×<font>{{CtObj.C_ChildrenPrice}}</font>元/人 ×<font>{{CtObj.C_ChildrenPrice}}</font><template v-if="CtObj.SignType==0">
= <font>{{CtObj.C_TotalPrice}}</font>元 元
</template>
<template v-else>
円
</template>/人
= <font>{{CtObj.C_TotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</p> </p>
<p> <p>
含：<font>{{CtObj.C_IncludeRemark}}</font> 含：<font>{{CtObj.C_IncludeRemark}}</font>
...@@ -3704,7 +3719,8 @@ ...@@ -3704,7 +3719,8 @@
TripType: 0, //行程类型(0-简易行程，1-标准行程) TripType: 0, //行程类型(0-简易行程，1-标准行程)
Tourists_Sign: '', Tourists_Sign: '',
CreateTimeStr: "", CreateTimeStr: "",
IsTravelAgencySignature: 0 //判断是否盖章 IsTravelAgencySignature: 0, //判断是否盖章
SignType:0,//
}, },
}; };
}, },
...@@ -3851,6 +3867,8 @@ ...@@ -3851,6 +3867,8 @@
this.CtObj.ZhangImg = tempObj.ZhangImg; this.CtObj.ZhangImg = tempObj.ZhangImg;
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name; this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address; this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum=tempObj.TravelAgency_LicenseNum;
this.CtObj.SignType=tempObj.SignType;
this.CtObj.TicketAndHotelTotalPrice = this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice; tempObj.TicketAndHotelTotalPrice;
if ( if (
......
src/components/TravelContractView.vue
View file @ b38506f1
...@@ -1642,7 +1642,7 @@ ...@@ -1642,7 +1642,7 @@
</div> </div>
<div class="contract"> <div class="contract">
<div class="title"> <div class="title">
<h1>四川和平国际旅行社有限公司-全国版国内旅游一日游旅游合同示范文本[2015版]</h1> <h1>{{CtObj.TravelAgency_Name}}-全国版国内旅游一日游旅游合同示范文本[2015版]</h1>
<p class="contractNo">合同编号：<span>{{CtObj.T_ContractNum}}</span></p> <p class="contractNo">合同编号：<span>{{CtObj.T_ContractNum}}</span></p>
</div> </div>
<div class="menu"> <div class="menu">
...@@ -1729,10 +1729,25 @@ ...@@ -1729,10 +1729,25 @@
<p>旅游费用： <p>旅游费用：
成人<font>{{CtObj.C_AdultNum}}</font>人 成人<font>{{CtObj.C_AdultNum}}</font>人
×<font>{{CtObj.C_AdultPrice}}</font>元/人 ×<font>{{CtObj.C_AdultPrice}}</font> <template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/人
+儿童<font>{{CtObj.C_ChildrenNum}}</font>人 +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
×<font>{{CtObj.C_ChildrenPrice}}</font>元/人 ×<font>{{CtObj.C_ChildrenPrice}}</font> <template v-if="CtObj.SignType==0">
= <font>{{CtObj.C_TotalPrice}}</font>元。 元
</template>
<template v-else>
円
</template>/人
= <font>{{CtObj.C_TotalPrice}}</font> <template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>。
</p> </p>
<p> <p>
含：<font>{{CtObj.C_IncludeRemark}}</font> 含：<font>{{CtObj.C_IncludeRemark}}</font>
...@@ -2073,6 +2088,7 @@ ...@@ -2073,6 +2088,7 @@
Tourists_Fax: "", Tourists_Fax: "",
Tourists_EmergencyLinkMan: "", Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "", Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称 TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015", TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
...@@ -2175,6 +2191,7 @@ ...@@ -2175,6 +2191,7 @@
IsTravelAgencySignature: 0, //是否盖章 IsTravelAgencySignature: 0, //是否盖章
ZhangImg: "", //合同章 ZhangImg: "", //合同章
CreateByName: "", //合同创建人 CreateByName: "", //合同创建人
SignType: 0,
}, },
}; };
}, },
...@@ -2233,6 +2250,9 @@ ...@@ -2233,6 +2250,9 @@
tempObj.Tourists_EmergencyLinkMan; tempObj.Tourists_EmergencyLinkMan;
this.CtObj.Tourists_EmergencyLinkTel = this.CtObj.Tourists_EmergencyLinkTel =
tempObj.Tourists_EmergencyLinkTel; tempObj.Tourists_EmergencyLinkTel;
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan; this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum; this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel; this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
...@@ -2303,6 +2323,7 @@ ...@@ -2303,6 +2323,7 @@
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum; this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
this.CtObj.C_PayDayNum = tempObj.C_PayDayNum; this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
this.CtObj.C_SignType = tempObj.C_SignType; this.CtObj.C_SignType = tempObj.C_SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.OtherConvention = tempObj.OtherConvention; this.CtObj.OtherConvention = tempObj.OtherConvention;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
......
src/components/onedayTripContract.vue
View file @ b38506f1
...@@ -429,6 +429,18 @@ ...@@ -429,6 +429,18 @@
<div class="createTableTitle">乙方(旅行社)</div> <div class="createTableTitle">乙方(旅行社)</div>
<table class="createTable"> <table class="createTable">
<tbody> <tbody>
<tr>
<td>
<el-form-item label="合同章">
<el-select v-model="CtObj.SignType" placeholder="请选择" @change="changeSignType">
<el-option key="0" label="和平章" :value="0">
</el-option>
<el-option key="1" label="日本公司章" :value="1">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr> <tr>
<td> <td>
<el-form-item label="名称"> <el-form-item label="名称">
...@@ -709,7 +721,14 @@ ...@@ -709,7 +721,14 @@
</el-form-item> </el-form-item>
<el-form-item label-width="0" style="display:inline-block;"> <el-form-item label-width="0" style="display:inline-block;">
<el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_AdultPrice')" <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_AdultPrice')"
v-model="CtObj.C_AdultPrice"></el-input>&nbsp;元/人&nbsp;+&nbsp;儿童 v-model="CtObj.C_AdultPrice"></el-input>&nbsp;
<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
/人&nbsp;+&nbsp;儿童
</el-form-item> </el-form-item>
<el-form-item label-width="0" style="display:inline-block;"> <el-form-item label-width="0" style="display:inline-block;">
<el-input type="text" class="w150" @keyup.native="checkInteger(CtObj,'C_ChildrenNum')" <el-input type="text" class="w150" @keyup.native="checkInteger(CtObj,'C_ChildrenNum')"
...@@ -717,11 +736,21 @@ ...@@ -717,11 +736,21 @@
</el-form-item> </el-form-item>
<el-form-item label-width="0" style="display:inline-block;"> <el-form-item label-width="0" style="display:inline-block;">
<el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_ChildrenPrice')" <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_ChildrenPrice')"
v-model="CtObj.C_ChildrenPrice"></el-input>&nbsp;元/人 = v-model="CtObj.C_ChildrenPrice"></el-input>&nbsp; <template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/人 =
</el-form-item> </el-form-item>
<el-form-item label-width="0" style="display:inline-block;"> <el-form-item label-width="0" style="display:inline-block;">
<el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_TotalPrice')" <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_TotalPrice')"
v-model="CtObj.C_TotalPrice"></el-input>&nbsp;元 v-model="CtObj.C_TotalPrice"></el-input>&nbsp; <template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
...@@ -1051,6 +1080,7 @@ ...@@ -1051,6 +1080,7 @@
Tourists_Fax: "", Tourists_Fax: "",
Tourists_EmergencyLinkMan: "", Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "", Tourists_EmergencyLinkTel: "",
SignType: 0, //合同章类型
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称 TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015", TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
...@@ -1215,6 +1245,17 @@ ...@@ -1215,6 +1245,17 @@
commonTripList: commonTripList commonTripList: commonTripList
}, },
methods: { methods: {
changeSignType() {
if (this.CtObj.SignType == 0) {
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
} else {
this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル";
this.CtObj.TravelAgency_Address = "";
this.CtObj.TravelAgency_LicenseNum = "";
}
},
//跳转锚点 //跳转锚点
goAnchor(selector) { goAnchor(selector) {
var anchor = this.$el.querySelector(selector); var anchor = this.$el.querySelector(selector);
...@@ -1340,10 +1381,12 @@ ...@@ -1340,10 +1381,12 @@
this.CtObj.Tourists_Email = tempObj.Tourists_Email; this.CtObj.Tourists_Email = tempObj.Tourists_Email;
this.CtObj.Tourists_PostNum = tempObj.Tourists_PostNum; this.CtObj.Tourists_PostNum = tempObj.Tourists_PostNum;
this.CtObj.Tourists_Fax = tempObj.Tourists_Fax; this.CtObj.Tourists_Fax = tempObj.Tourists_Fax;
this.CtObj.Tourists_EmergencyLinkMan = this.CtObj.Tourists_EmergencyLinkMan = tempObj.Tourists_EmergencyLinkMan;
tempObj.Tourists_EmergencyLinkMan; this.CtObj.Tourists_EmergencyLinkTel = tempObj.Tourists_EmergencyLinkTel;
this.CtObj.Tourists_EmergencyLinkTel =
tempObj.Tourists_EmergencyLinkTel; this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan; this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum; this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel; this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
...@@ -1414,6 +1457,7 @@ ...@@ -1414,6 +1457,7 @@
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum; this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
this.CtObj.C_PayDayNum = tempObj.C_PayDayNum; this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
this.CtObj.C_SignType = tempObj.C_SignType; this.CtObj.C_SignType = tempObj.C_SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.OtherConvention = tempObj.OtherConvention; this.CtObj.OtherConvention = tempObj.OtherConvention;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
......
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