Commit 8b64e9b3 authored by 黄奎's avatar 黄奎

页面修改

parent 84cadde8
...@@ -894,13 +894,13 @@ ...@@ -894,13 +894,13 @@
<el-form-item label="客户类型" prop="CustomerType"> <el-form-item label="客户类型" prop="CustomerType">
<el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTypePrice" :disabled="true"> @change="getTypePrice" :disabled="true">
<el-option v-for="(item, index) in khlxList" :label="item.Name" :value="item.Id" :key="index"> <el-option v-for="(item, index) in khlxList" :label="item.Name" :value="item.Id" :key="index+1000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="参团类型" prop="GroupType"> <el-form-item label="参团类型" prop="GroupType">
<el-select v-model="addMsg.GroupType" disabled filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.GroupType" disabled filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="(item, index) in ctlxList" :label="item.Name" :value="item.Id" :key="index"> <el-option v-for="(item, index) in ctlxList" :label="item.Name" :value="item.Id" :key="index+2000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -925,7 +925,7 @@ ...@@ -925,7 +925,7 @@
<el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt" <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt"
v-if="addMsg.OrderForm !== 4" :disabled="true"> v-if="addMsg.OrderForm !== 4" :disabled="true">
<el-option v-for="(item, index) in khmdList" :label="item.customerName" :value="item.customerId" <el-option v-for="(item, index) in khmdList" :label="item.customerName" :value="item.customerId"
:key="index"> :key="index+3000">
</el-option> </el-option>
</el-select> </el-select>
<el-input v-else v-model="addMsg.allName" :disabled="true"></el-input> <el-input v-else v-model="addMsg.allName" :disabled="true"></el-input>
...@@ -1016,8 +1016,8 @@ ...@@ -1016,8 +1016,8 @@
<el-select :disabled="isUpdateSharePeople" filterable clearable @change="getTicheng" <el-select :disabled="isUpdateSharePeople" filterable clearable @change="getTicheng"
v-model="addMsg.CommissionSharePeople" :placeholder="$t('pub.pleaseSel')"> v-model="addMsg.CommissionSharePeople" :placeholder="$t('pub.pleaseSel')">
<el-option label="无" :value="comSelect"></el-option> <el-option label="无" :value="comSelect"></el-option>
<el-option v-for="item in employeeList" :label="item.EmName" :value="item.EmployeeId" <el-option v-for="(item,index) in employeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option> :key="index+4000"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1053,7 +1053,7 @@ ...@@ -1053,7 +1053,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="客人来源" prop="ClientSource"> <el-form-item label="客人来源" prop="ClientSource">
<el-select v-model="addMsg.ClientSource" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.ClientSource" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id+5000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1061,7 +1061,8 @@ ...@@ -1061,7 +1061,8 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.dictId"> <el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId"
:key="item.dictId+6000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1069,7 +1070,7 @@ ...@@ -1069,7 +1070,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="交易方式" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item label="交易方式" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.TradeWay" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.TradeWay" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+7000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1117,7 +1118,7 @@ ...@@ -1117,7 +1118,7 @@
<el-form-item label="客户类型" prop="CustomerType"> <el-form-item label="客户类型" prop="CustomerType">
<el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTypePrice" :disabled="true"> @change="getTypePrice" :disabled="true">
<el-option v-for="item in khlxList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in khlxList" :label="item.Name" :value="item.Id" :key="item.Id+8000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1125,7 +1126,7 @@ ...@@ -1125,7 +1126,7 @@
<el-select v-model="addMsg.GroupType" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.GroupType" filterable :placeholder="$t('pub.pleaseSel')"
@change="gettypechange(addMsg.GroupType)"> @change="gettypechange(addMsg.GroupType)">
<!-- v-if="item.Id != 5" --> <!-- v-if="item.Id != 5" -->
<el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id+9000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1150,7 +1151,7 @@ ...@@ -1150,7 +1151,7 @@
<el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt" <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt"
:disabled="true"> :disabled="true">
<el-option v-for="item in khmdList" :label="item.customerName" :value="item.customerId" <el-option v-for="item in khmdList" :label="item.customerName" :value="item.customerId"
:key="item.customerId"> :key="item.customerId+10000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1159,7 +1160,7 @@ ...@@ -1159,7 +1160,7 @@
<el-form-item label="出发城市" prop="DepartureCityId"> <el-form-item label="出发城市" prop="DepartureCityId">
<el-select filterable v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select filterable v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsIntermodal = 2"> @change="addMsg.IsIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+20000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1179,7 +1180,7 @@ ...@@ -1179,7 +1180,7 @@
<el-form-item label="返回城市" prop="ReturnArriveCityId"> <el-form-item label="返回城市" prop="ReturnArriveCityId">
<el-select filterable v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select filterable v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsReturnIntermodal = 2"> @change="addMsg.IsReturnIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+30000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1220,7 +1221,7 @@ ...@@ -1220,7 +1221,7 @@
<el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice(2)"> @change="getTotalPrice(2)">
<el-option v-for="(item, index) in Unit_PriceList" :label="item.LessMoney" :value="item.ID" <el-option v-for="(item, index) in Unit_PriceList" :label="item.LessMoney" :value="item.ID"
:key="index + 1"> :key="index + 40000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1439,7 +1440,7 @@ ...@@ -1439,7 +1440,7 @@
v-model="addMsg.CommissionSharePeople" :placeholder="$t('pub.pleaseSel')"> v-model="addMsg.CommissionSharePeople" :placeholder="$t('pub.pleaseSel')">
<el-option label="无" :value="comSelect"></el-option> <el-option label="无" :value="comSelect"></el-option>
<el-option v-for="(item, index) in employeeList" :label="item.EmName" :value="item.EmployeeId" <el-option v-for="(item, index) in employeeList" :label="item.EmName" :value="item.EmployeeId"
:key="index"></el-option> :key="index+50000"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1530,7 +1531,7 @@ ...@@ -1530,7 +1531,7 @@
<el-form-item label="客人来源" prop="ClientSource"> <el-form-item label="客人来源" prop="ClientSource">
<el-select v-model="addMsg.ClientSource" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable <el-select v-model="addMsg.ClientSource" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Name"> <el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id+60000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1538,7 +1539,8 @@ ...@@ -1538,7 +1539,8 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId" :key="item.brandName"> <el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId"
:key="item.dictId+70000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1547,7 +1549,7 @@ ...@@ -1547,7 +1549,7 @@
<el-form-item label="交易方式" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item label="交易方式" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable <el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Name"> <el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+80000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1555,7 +1557,8 @@ ...@@ -1555,7 +1557,8 @@
<el-col :span="4" v-if="addMsg.TradeWay == 1"> <el-col :span="4" v-if="addMsg.TradeWay == 1">
<el-form-item label="收款账户"> <el-form-item label="收款账户">
<el-select filterable v-model="addMsg.PlatformAccount" @change="changeSelect"> <el-select filterable v-model="addMsg.PlatformAccount" @change="changeSelect">
<el-option v-for="item in PlatformAccountList" :label="item.Alias" :value="item.ID" :key="item.Alias"> <el-option v-for="item in PlatformAccountList" :label="item.Alias" :value="item.ID"
:key="item.ID+90000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1774,15 +1777,15 @@ ...@@ -1774,15 +1777,15 @@
暂无数据 暂无数据
</td> </td>
</tr> </tr>
<template v-for="op in list"> <template v-for="(op,rootIndex) in list">
<tbody class="not_border"> <tbody class="not_border" :key="rootIndex+1000000">
<tr> <tr>
<td colspan="18"> <td colspan="18">
类型:<span style="color: #e95252">{{ op.groupName }}</span> 类型:<span style="color: #e95252">{{ op.groupName }}</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody v-for="(item, index) in op.list" :key="index"> <tbody v-for="(item, index) in op.list" :key="index+rootIndex+100000">
<tr> <tr>
<td rowspan="3" style="position: relative"> <td rowspan="3" style="position: relative">
<span class="TC_neibu" <span class="TC_neibu"
...@@ -1950,7 +1953,7 @@ ...@@ -1950,7 +1953,7 @@
<th>类型</th> <th>类型</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-if="orderList.length > 0" v-for="(item2, index2) in orderList" :key="index2"> <tr v-if="orderList.length > 0" v-for="(item2, index2) in orderList" :key="index2+110000">
<td>{{ item2.FrID }}</td> <td>{{ item2.FrID }}</td>
<td> <td>
<span v-if=" <span v-if="
...@@ -1990,7 +1993,7 @@ ...@@ -1990,7 +1993,7 @@
<th>获取日期</th> <th>获取日期</th>
</tr> </tr>
<tr v-if="item.couponAllotList.length > 0" v-for="(item2, index2) in item.couponAllotList" <tr v-if="item.couponAllotList.length > 0" v-for="(item2, index2) in item.couponAllotList"
:key="index2"> :key="index2+120000">
<td>{{ item2.couponsName }}</td> <td>{{ item2.couponsName }}</td>
<td> <td>
<span v-if="item2.couponsType == 1">抵用券</span> <span v-if="item2.couponsType == 1">抵用券</span>
...@@ -2031,7 +2034,7 @@ ...@@ -2031,7 +2034,7 @@
align="center">查看更多</span> align="center">查看更多</span>
</th> </th>
</tr> </tr>
<tr v-for="(item2, index2) in redBagList" :key="index2"> <tr v-for="(item2, index2) in redBagList" :key="index2+130000">
<td>{{ item2.Money }}</td> <td>{{ item2.Money }}</td>
<td> <td>
{{ item2.Type == 1 ? "收入" : "折扣" }} {{ item2.Type == 1 ? "收入" : "折扣" }}
...@@ -2133,7 +2136,7 @@ ...@@ -2133,7 +2136,7 @@
<div class="priceContentDiv"> <div class="priceContentDiv">
<div class="AuditLog">日志</div> <div class="AuditLog">日志</div>
<div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0"> <div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
<div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index"> <div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index+140000">
<div class="clearfix"> <div class="clearfix">
<div class="Auditcircle" style="left: 6px !important"></div> <div class="Auditcircle" style="left: 6px !important"></div>
<div class="operateName" style="color: #005caa"> <div class="operateName" style="color: #005caa">
...@@ -2336,7 +2339,7 @@ ...@@ -2336,7 +2339,7 @@
<span class="">取消名单:</span> <span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span style="color: red" n v-for="(childItem, childIndex) in item.cancelGuestList" <span style="color: red" n v-for="(childItem, childIndex) in item.cancelGuestList"
:key="childIndex">{{ childItem.userName }} &nbsp;&nbsp;</span> :key="childIndex+150000">{{ childItem.userName }} &nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<span style="display: block">房间信息<span v-if="item.oneSex > 0" <span style="display: block">房间信息<span v-if="item.oneSex > 0"
...@@ -2373,7 +2376,7 @@ ...@@ -2373,7 +2376,7 @@
text-decoration: underline; text-decoration: underline;
color: blue; color: blue;
cursor: pointer; cursor: pointer;
" v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span> " v-for="(id, i) in item.tipFrId" :key="i+160000">{{ id }}</span>
</span> </span>
<!--&&item==userId--> <!--&&item==userId-->
<div v-if="item.contractNum && item.contractNum.length==0 &&item.isOwn==1" class="GO_Contract" <div v-if="item.contractNum && item.contractNum.length==0 &&item.isOwn==1" class="GO_Contract"
...@@ -2438,18 +2441,18 @@ ...@@ -2438,18 +2441,18 @@
</div> </div>
<template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0"> <template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderGuestFlightList"> <template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div :key="uIndex+20000"> <div :key="uIndex+170000">
{{uItem.guestNames}} 航班信息: {{uItem.guestNames}} 航班信息:
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span> v-else>【暂定】</span>
<br /> <br />
<template v-for="(sfItem,sfIndex) in uItem.guestFlightList"> <template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+30000"> <span style="color:blue;" :key="sfIndex+180000">
{{sfItem.flightDateStr}} {{sfItem.flight_number}} {{sfItem.flightDateStr}} {{sfItem.flight_number}}
{{sfItem.departure_time}}-{{sfItem.arrival_time}} {{sfItem.departure_time}}-{{sfItem.arrival_time}}
{{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}}) {{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}})
</span> </span>
<br :key="sfIndex+40000" /> <br :key="sfIndex+190000" />
</template> </template>
</div> </div>
</template> </template>
...@@ -2465,7 +2468,7 @@ ...@@ -2465,7 +2468,7 @@
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>历史备注</div> <div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList"
:key="index2"> :key="index2+200000">
<span>{{ item2.remarks }}</span> <span>{{ item2.remarks }}</span>
<span>{{ item2.createByName }} <span>{{ item2.createByName }}
<span style="color: #666666">{{ <span style="color: #666666">{{
...@@ -2522,7 +2525,7 @@ ...@@ -2522,7 +2525,7 @@
"> ">
<div>收款单据:</div> <div>收款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.financeList" :key="index2"> <span v-for="(item2, index2) in item.financeList" :key="index2+210000">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2539,7 +2542,7 @@ ...@@ -2539,7 +2542,7 @@
"> ">
<div>付款单据:</div> <div>付款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2554,7 +2557,7 @@ ...@@ -2554,7 +2557,7 @@
<div> <div>
<div>发票单据:</div> <div>发票单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.invoiceApplyList" :key="index2"> <span v-for="(item2, index2) in item.invoiceApplyList" :key="index2+230000">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{ item2.id }}</span> @click="goIisDetail(item2.id)">{{ item2.id }}</span>
<span v-else-if=" <span v-else-if="
...@@ -2667,7 +2670,7 @@ ...@@ -2667,7 +2670,7 @@
}}</span></span> }}</span></span>
</td> </td>
</tr> </tr>
<tbody v-if="isShowCancelOrder" v-for="(item, index) in cancelRtData" :key="index + 1000"> <tbody v-if="isShowCancelOrder" v-for="(item, index) in cancelRtData" :key="index + 240000">
<tr> <tr>
<td rowspan="3" style="position: relative"> <td rowspan="3" style="position: relative">
<p v-if="item.isUnionOrder == 1" class="GO_union"></p> <p v-if="item.isUnionOrder == 1" class="GO_union"></p>
...@@ -2787,7 +2790,7 @@ ...@@ -2787,7 +2790,7 @@
<th>类型</th> <th>类型</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-if="orderList.length > 0" v-for="(item2, index2) in orderList" :key="index2"> <tr v-if="orderList.length > 0" v-for="(item2, index2) in orderList" :key="index2+250000">
<td>{{ item2.FrID }}</td> <td>{{ item2.FrID }}</td>
<td> <td>
<span v-if=" <span v-if="
...@@ -2879,7 +2882,7 @@ ...@@ -2879,7 +2882,7 @@
<span class="">取消名单:</span> <span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span style="color: red" v-for="(childItem, childIndex) in item.cancelGuestList" <span style="color: red" v-for="(childItem, childIndex) in item.cancelGuestList"
:key="childIndex">{{ childItem.userName }} &nbsp;&nbsp;</span> :key="childIndex+260000">{{ childItem.userName }} &nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<span style="display: block">房间信息<span v-if="item.oneSex > 0" <span style="display: block">房间信息<span v-if="item.oneSex > 0"
...@@ -2922,7 +2925,8 @@ ...@@ -2922,7 +2925,8 @@
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>历史备注</div> <div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2"> <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList"
:key="index2+270000">
<span>{{ item2.remarks }}</span> <span>{{ item2.remarks }}</span>
<span>{{ item2.createByName }} <span>{{ item2.createByName }}
<span style="color: #666666">{{ <span style="color: #666666">{{
...@@ -2958,7 +2962,7 @@ ...@@ -2958,7 +2962,7 @@
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据:</div> <div>收款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.financeList" :key="index2"> <span v-for="(item2, index2) in item.financeList" :key="index2+280000">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2972,7 +2976,7 @@ ...@@ -2972,7 +2976,7 @@
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>付款单据:</div> <div>付款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2986,7 +2990,7 @@ ...@@ -2986,7 +2990,7 @@
<div> <div>
<div>发票单据:</div> <div>发票单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.invoiceApplyList" :key="index2"> <span v-for="(item2, index2) in item.invoiceApplyList" :key="index2+300000">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{ item2.id }}</span> @click="goIisDetail(item2.id)">{{ item2.id }}</span>
<span v-else-if=" <span v-else-if="
......
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