Commit ac67918a authored by 黄奎's avatar 黄奎

页面修改

parent 0d55d84a
......@@ -5,44 +5,18 @@
<li>
<span>
<em>{{ $t("scen.sc_cp") }}</em>
<el-select
class="w135"
v-model="msg.OutBranchId"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
:label="$t('pub.unlimitedSel')"
:value="-1"
></el-option>
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
<el-select class="w135" v-model="msg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{ $t("advmanager.v_line") }}</em>
<el-select
class="w135"
v-model="msg.LineId"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
:label="$t('pub.unlimitedSel')"
:value="-1"
></el-option>
<el-option
v-for="item in LineList"
:label="item.LineName"
:value="item.LineID"
:key="item.LineID"
>
<el-select class="w135" v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
</el-option>
</el-select>
</span>
......@@ -50,51 +24,28 @@
<li>
<span>
<em>{{ $t("Operation.Op_baomingCompany") }}</em>
<el-select
class="w135"
v-model="msg.BranchId"
filterable
:placeholder="$t('pub.pleaseSel')"
@change="
<el-select class="w135" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="
(getDepartmentMsg.RB_Branch_Id = msg.BranchId),
(msg.RB_Department_Id = ''),
(msg.CreateBy = ''),
getDepartment()
"
>
<el-option
:label="$t('pub.unlimitedSel')"
:value="-1"
></el-option>
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{ $t("fnc.bmxuanze") }}</em>
<el-select
class="w135"
filterable
v-model="msg.RB_Department_Id"
@change="
<el-select class="w135" filterable v-model="msg.RB_Department_Id" @change="
(employeeMsg.DepartmentId = msg.RB_Department_Id),
getEmployee(),
(msg.CreateBy = '')
"
>
">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
>
<el-option v-for="item in DepartmentList" :label="item.DepartmentName" :value="item.DepartmentID"
:key="item.DepartmentID">
</el-option>
</el-select>
</span>
......@@ -103,100 +54,50 @@
<span>
<em>{{ $t("Operation.Op_peopleChoice") }}</em>
</span>
<el-select
class="w135"
v-model="msg.CreateBy"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-select class="w135" v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</li>
<li>
<span>
<em>{{ $t("hotel.order_Number") }}</em>
</span>
<el-input
class="w135"
v-model="msg.tempOrderId"
@keyup.native="checkInteger(msg, 'tempOrderId')"
maxlength="10"
></el-input>
<el-input class="w135" v-model="msg.tempOrderId" @keyup.native="checkInteger(msg, 'tempOrderId')"
maxlength="10"></el-input>
</li>
<li>
<span>
<em>{{ $t("hotel.hotel_OrderStates") }}</em>
</span>
<el-select
class="w135"
v-model="msg.OrderState"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-select class="w135" v-model="msg.OrderState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option
v-for="item in ddztList"
:label="item.Name"
:value="item.Id"
:key="item.Id"
></el-option>
<el-option v-for="item in ddztList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</li>
<li>
<span
><em>{{ $t("fnc.bmriqi") }}</em>
<el-date-picker
v-model="msg.CStartDate"
@change="dataDui()"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
<span><em>{{ $t("fnc.bmriqi") }}</em>
<el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker>
-
<el-date-picker
v-model="msg.CEndDate"
@change="dataDui()"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
<el-date-picker v-model="msg.CEndDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</span>
</li>
<li>
<span
><em>{{ $t("scen.sc_ftTime") }}</em>
<el-date-picker
v-model="msg.QStartDate"
class="w135"
value-format="yyyy-MM-dd"
type="date"
>
<span><em>{{ $t("scen.sc_ftTime") }}</em>
<el-date-picker v-model="msg.QStartDate" class="w135" value-format="yyyy-MM-dd" type="date">
</el-date-picker>
-
<el-date-picker
v-model="msg.QEndDate"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
<el-date-picker v-model="msg.QEndDate" class="w135" value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="
resetPageIndex();
getList();
"
/>
" />
</li>
</ul>
</div>
......@@ -210,23 +111,16 @@
<span>{{ $t("Operation.Op_salesTotal") }}</span>
</div>
<p>
<span
>{{ $t("Operation.Op_yingPay") }}{{
<span>{{ $t("Operation.Op_yingPay") }}{{
countData.PreferPrice !=null ?countData.PreferPrice:'0'
}};</span
>
<span
>{{ $t("Operation.Op_yiShou") }}{{ countData.Income!=null ?countData.Income:'0' }};</span
>
<span
:class="{
}};</span>
<span>{{ $t("Operation.Op_yiShou") }}{{ countData.Income!=null ?countData.Income:'0' }};</span>
<span :class="{
color_red_order:
countData.DueinMoney !== countData.PreferPrice,
}"
>{{ $t("Operation.Op_weiShou") }}{{
}">{{ $t("Operation.Op_weiShou") }}{{
countData.DueinMoney !=null ?countData.DueinMoney:'0'
}};</span
>
}};</span>
<span>应收小费:
{{countData.PreferTipAmount}}
</span>
......@@ -245,45 +139,35 @@
<span>{{ countData.NormalGuestNum !=null ? countData.NormalGuestNum:'0' }}</span>
</div>
<p>
<span
>{{ $t("Airticket.Air_EconomyClass") }}{{
<span>{{ $t("Airticket.Air_EconomyClass") }}{{
countData.NormalYSeatNum !=null?countData.NormalYSeatNum:'0'
}};</span
>
<span
>{{ $t("Airticket.Air_businessClass") }}{{
}};</span>
<span>{{ $t("Airticket.Air_businessClass") }}{{
countData.NormalESeatNum !=null ?countData.NormalESeatNum:'0'
}};</span
>
<span
>{{ $t("Airticket.Air_firstClass") }}{{
}};</span>
<span>{{ $t("Airticket.Air_firstClass") }}{{
countData.NormalFSeatNum!=null ? countData.NormalFSeatNum:'0'
}};</span
>
}};</span>
</p>
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
<span>{{ $t("salesModule.AirNum") }}</span>
</div>
<p>
<span class="color_red_order"
>{{ $t("op.Zong") }}: {{ countData.YSeat!=null ? countData.YSeat:'0' }}({{
<span class="color_red_order">{{ $t("op.Zong") }}: {{ countData.YSeat!=null ? countData.YSeat:'0' }}({{
$t("Airticket.Air_EconomyClass")
}})+{{ countData.CSeat !=null? countData.CSeat:'0' }}({{
$t("Airticket.Air_businessClass")
}})+{{ countData.FSeat!=null?countData.FSeat:'0' }}({{ $t("Airticket.Air_firstClass") }})
;</span
>
<span class="color_red_order"
>{{ $t("op.Sheng") }}:
;</span>
<span class="color_red_order">{{ $t("op.Sheng") }}:
{{ countData.YSeat - countData.SurplusYSeat }}({{
$t("Airticket.Air_EconomyClass")
}})+{{ countData.CSeat - countData.SurplusCSeat }}({{
$t("Airticket.Air_businessClass")
}})+{{ countData.FSeat - countData.SurplusFSeat }}({{
$t("Airticket.Air_firstClass")
}}) ;</span
>
}}) ;</span>
</p>
</div>
</el-col>
......@@ -295,21 +179,15 @@
<span>{{ countData.CancelGuestNum !=null ?countData.CancelGuestNum:'0' }}</span>
</div>
<p>
<span
>{{ $t("Airticket.Air_EconomyClass") }}{{
<span>{{ $t("Airticket.Air_EconomyClass") }}{{
countData.CancelYSeatNum !=null ?countData.CancelYSeatNum:'0'
}};</span
>
<span
>{{ $t("Airticket.Air_businessClass") }}{{
}};</span>
<span>{{ $t("Airticket.Air_businessClass") }}{{
countData.CancelESeatNum !=null ?countData.CancelESeatNum:'0'
}};</span
>
<span
>{{ $t("Airticket.Air_firstClass") }}{{
}};</span>
<span>{{ $t("Airticket.Air_firstClass") }}{{
countData.CancelFSeatNum!=null?countData.CancelFSeatNum:'0'
}};</span
>
}};</span>
</p>
</div>
</el-col>
......@@ -320,9 +198,7 @@
<span>{{ $t("fnc.qtxtongji") }}</span>
</div>
<p>
<span
>{{ $t("fnc.nbbaoming") }}{{ countData.InteriorNum !=null ? countData.InteriorNum:'0' }};</span
>
<span>{{ $t("fnc.nbbaoming") }}{{ countData.InteriorNum !=null ? countData.InteriorNum:'0' }};</span>
<span>{{ $t("fnc.B2BWAP") }}{{ countData.B2BNum!=null?countData.B2BNum:'0' }};</span>
</p>
</div>
......@@ -363,13 +239,7 @@
</div>
<!-- 表格 -->
<div style="clear: both; width: 100%; height: 20px"></div>
<table
class="enrollTotalSearchTable"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="80">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
<th width="70">{{ $t("advmanager.v_type") }}</th>
......@@ -398,11 +268,7 @@
</th>
</tr>
<tr>
<td
v-show="OrderList.length == 0"
:colspan="isEditOrderCreate == 1 ? 18 : 17"
align="center"
>
<td v-show="OrderList.length == 0" :colspan="isEditOrderCreate == 1 ? 18 : 17" align="center">
{{ $t("system.content_noData") }}
</td>
</tr>
......@@ -412,62 +278,29 @@
<p v-if="item.isChargeLossOrders == 1" style="color: red">
{{ $t("fnc.sun") }}
</p>
<p
class="fbold over_ellipsis"
style="width: 100%; cursor: pointer; text-decoration: underline"
:title="item.orderId"
@click="
<p class="fbold over_ellipsis" style="width: 100%; cursor: pointer; text-decoration: underline"
:title="item.orderId" @click="
goUrlX('团报名清单', 'RegistrationList', item.tcid, item.tcnum)
"
title="点击跳转到报名清单"
>
">
{{ item.orderId }}
<el-tooltip
class="item"
effect="dark"
content="通过小程序确认单报名"
placement="top"
v-show="item.orderForm == 4"
>
<i
class="iconfont icon-xiaochengxu"
style="
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm == 4">
<i class="iconfont icon-xiaochengxu" style="
font-size: 22px;
color: red;
text-decoration: none;
display: inline-block;
"
></i
></el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="通过B2B确认单报名"
placement="top"
v-show="item.isFormB2B == 1"
>
<i
class="iconfont icon-tiaozheng"
style="font-size: 22px; color: #297bef"
></i
></el-tooltip>
"></i></el-tooltip>
<el-tooltip class="item" effect="dark" content="通过B2B确认单报名" placement="top" v-show="item.isFormB2B == 1">
<i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
</p>
<p
class="fz12 over_ellipsis"
style="width: 100%; text-decoration: underline; cursor: pointer"
title="点击跳转到团控列表"
@click="
goUrlX('团控列表', 'TravelControlList', item.tcid, item.tcnum)
"
>
<p class="fz12 over_ellipsis" style="width: 100%; text-decoration: underline; cursor: pointer"
title="点击跳转到团控列表" @click="goToTravelList(item)">
{{ item.tcnum }}
</p>
<p class="fz12 over_ellipsis" style="width: 100%">
{{ item.createBy
}}<span v-if="item.leaveStr != ''" style="color: red"
>({{ item.leaveStr }})</span
>
}}<span v-if="item.leaveStr != ''" style="color: red">({{ item.leaveStr }})</span>
</p>
<p class="fz12 over_ellipsis">
{{ $t("restaurant.res_oderTime") }}{{ item.createDate }}
......@@ -488,12 +321,9 @@
}}
</p>
<div>
<div
style="color: green"
v-if="
<div style="color: green" v-if="
item.commissionMoney == '' || item.commissionMoney == '-1'
"
>
">
<p v-if="item.extraRewardMoney > 0">
{{ $t("salesModule.EWJLJE") }}{{ item.extraRewardMoney }}
</p>
......@@ -515,11 +345,8 @@
</p>
</div>
</div>
<div
v-if="item.orderTypeName === '单团'"
style="color: red; cursor: pointer"
@click="seeBJD(item.quotationUrl)"
>
<div v-if="item.orderTypeName === '单团'" style="color: red; cursor: pointer"
@click="seeBJD(item.quotationUrl)">
查看报价单
</div>
</td>
......@@ -529,36 +356,24 @@
</p>
</td>
<td class="fz12">
<p
style="
<p style="
max-width: 160px;
display: block;
text-decoration: underline;
cursor: pointer;
"
title="点击跳转到报名清单"
class="over_ellipsis"
:title="item.lineName"
@click="
" title="点击跳转到报名清单" class="over_ellipsis" :title="item.lineName" @click="
goUrlX('团报名清单', 'RegistrationList', item.tcid, item.tcnum)
"
>
">
<span>{{ item.lineName }}</span>
</p>
<p
style="
<p style="
max-width: 160px;
display: block;
text-decoration: underline;
cursor: pointer;
"
title="点击跳转到报名清单"
class="over_ellipsis"
:title="item.ltName"
@click="
" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName" @click="
goUrlX('团报名清单', 'RegistrationList', item.tcid, item.tcnum)
"
>
">
{{ item.ltName }}
</p>
</td>
......@@ -596,11 +411,8 @@
<th>{{ $t("active.cl_huoqufangshi") }}</th>
<th>{{ $t("active.cl_hqriqi") }}</th>
</tr>
<tr
v-if="item.couponAllotList.length > 0"
v-for="(item2, index2) in item.couponAllotList"
:key="index2"
>
<tr v-if="item.couponAllotList.length > 0" v-for="(item2, index2) in item.couponAllotList"
:key="index2">
<td>{{ item2.couponsName }}</td>
<td>
<span v-if="item2.couponsType == 1">{{
......@@ -630,24 +442,15 @@
</tr>
</table>
</div>
<span
style="
<span style="
cursor: pointer;
color: #e95252;
text-decoration: underline;
"
slot="reference"
>{{ item.discountMoney }}</span
>
" slot="reference">{{ item.discountMoney }}</span>
</el-popover>
</td>
<td>
<el-popover
v-if="item.customerId || item.customerId == 0"
style="padding: 0"
width="600"
trigger="click"
>
<el-popover v-if="item.customerId || item.customerId == 0" style="padding: 0" width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
......@@ -655,13 +458,8 @@
<th>{{ $t("salesModule.Type") }}</th>
<th>{{ $t("system.label_info") }}</th>
<th>
{{ $t("adm.adm_time") }}(<span
@click="goUrlHappy(item)"
style="cursor: pointer"
colspan="4"
align="center"
>{{ $t("salesModule.LookMore") }}</span
>)
{{ $t("adm.adm_time") }}(<span @click="goUrlHappy(item)" style="cursor: pointer" colspan="4"
align="center">{{ $t("salesModule.LookMore") }}</span>)
</th>
</tr>
<tr v-for="(item2, index2) in redBagList" :key="index2">
......@@ -682,27 +480,18 @@
</tr>
</table>
</div>
<span
@click="getRedBag(item)"
style="
<span @click="getRedBag(item)" style="
cursor: pointer;
color: #e95252;
padding: 0 15px;
text-decoration: underline;
"
slot="reference"
>{{ item.redEnvelopeMoney }}</span
>
" slot="reference">{{ item.redEnvelopeMoney }}</span>
</el-popover>
<span
v-else
style="
<span v-else style="
cursor: pointer;
color: #e95252;
text-decoration: underline;
"
>{{ item.redEnvelopeMoney }}</span
>
">{{ item.redEnvelopeMoney }}</span>
</td>
<td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
<td v-if="item.tipMoney">{{ item.tipMoney }}</td>
......@@ -711,31 +500,16 @@
<td>{{ item.platformTax }}</td>
<td>{{ item.zaiTuMoney }}</td>
<td>
<span
:class="{ color_red_order: item.dueInMoney !== item.preferPrice }"
>{{ item.dueInMoney }}</span
>
<span :class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ item.dueInMoney }}</span>
</td>
<td
v-if="item.isChargeLossOrders == 1"
class="fz12"
style="color: #e95252"
>
<td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252">
{{ $t("fnc.shousun") }}
</td>
<td
v-else
class="fz12"
:style="item.orderState === 3 ? 'color: #e95252;' : ''"
>
<td v-else class="fz12" :style="item.orderState === 3 ? 'color: #e95252;' : ''">
{{ item.statsstr }}
</td>
<td>
<p
class="over_ellipsis"
style="width: 150px"
:title="item.contactName"
>
<p class="over_ellipsis" style="width: 150px" :title="item.contactName">
{{ item.contactName }}
</p>
<p>{{ item.contactMobile }}</p>
......@@ -755,10 +529,9 @@
<div>
<span>{{ $t("hotel.hotel_remark") }}</span>
<p>
<span v-if="item.clientSource == 1 && item.brandName != ''"
>{{ item.brandName }}{{ $t("fnc.dingdan") }}
{{ item.platformOrder }};</span
>{{ item.remarks }}
<span
v-if="item.clientSource == 1 && item.brandName != ''">{{ item.brandName }}{{ $t("fnc.dingdan") }}
{{ item.platformOrder }};</span>{{ item.remarks }}
</p>
</div>
<div>
......@@ -766,11 +539,7 @@
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>{{ $t("fnc.lsbeizhu") }}</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">
<span>{{ item2.remarks }}</span>
<span>
{{ item2.createByName }}
......@@ -783,16 +552,11 @@
$t("system.content_noData")
}}</span>
</div>
<el-button
slot="reference"
icon="iconfont icon-gengduo"
style="
<el-button slot="reference" icon="iconfont icon-gengduo" style="
padding: 0px;
border: none;
background-color: transparent;
"
class="groupTourOrder_remarks_btn"
>
" class="groupTourOrder_remarks_btn">
</el-button>
</el-popover>
</div>
......@@ -802,78 +566,38 @@
<span style="color: red;">{{ item.unionRemark }}</span>
</div>
</td>
<td
:colspan="isEditOrderCreate == 1 ? 10 : 9"
class="groupTourOrder_tickets"
style="height: 20px; cursor: pointer"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"
>
<td :colspan="isEditOrderCreate == 1 ? 10 : 9" class="groupTourOrder_tickets"
style="height: 20px; cursor: pointer" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div style="white-space: nowrap">
{{ $t("fnc.skdanju") }}<span
v-if="item.financeList.length === 0"
style="cursor: default"
>{{ $t("system.content_noData") }}</span
>
{{ $t("fnc.skdanju") }}<span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span>
<span v-for="(item2, index2) in item.financeList" :key="index2">
<span
v-if="item2.colorState === 1"
class="groupTourOrder_tickets_blue"
>
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">
{{ item2.frID }}
</span>
<span
v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green"
>
{{ item2.frID }}</span
>
<span v-else-if="item2.colorState === 2" class="groupTourOrder_tickets_green">
{{ item2.frID }}</span>
<span
v-else-if="item2.colorState === 3"
class="groupTourOrder_tickets_red"
>{{ item2.frID }}
<span v-else-if="item2.colorState === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}
</span>
<span
v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black"
>{{ item2.frID }}
<span v-else-if="item2.colorState === 4" class="groupTourOrder_tickets_black">{{ item2.frID }}
</span>
</span>
</div>
</div>
<div>
<div style="white-space: nowrap">
{{ $t("fnc.fkdanju") }}<span
v-if="item.financeList.length === 0"
style="cursor: default"
>{{ $t("system.content_noData") }}</span
>
<span
v-for="(item2, index2) in item.refundFinanceList"
:key="index2"
>
<span
v-if="item2.colorState === 1"
class="groupTourOrder_tickets_blue"
>{{ item2.frID }}</span
>
<span
v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green"
>{{ item2.frID }}</span
>
<span
v-else-if="item2.colorState === 3"
class="groupTourOrder_tickets_red"
>{{ item2.frID }}</span
>
<span
v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black"
>{{ item2.frID }}</span
>
{{ $t("fnc.fkdanju") }}<span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
</div>
</div>
......@@ -881,30 +605,20 @@
</tr>
</tbody>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height: 200px">
<updateSalesMan
@closeUpdiv="closeSalseDiv"
@getList="getList"
:subInfo="subInfo"
></updateSalesMan>
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
</div>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: {
Treeselect,
updateSalesMan,
......@@ -921,8 +635,7 @@ export default {
children: node.ChildList,
};
},
defaultImg:
'this.src="' + require("../../../assets/img/litheader.png") + '"',
defaultImg: 'this.src="' + require("../../../assets/img/litheader.png") + '"',
currentPage: 1,
total: 0,
loading: false,
......@@ -999,6 +712,14 @@ export default {
};
},
methods: {
//跳转到团控列表
goToTravelList(item) {
if (item.teamType == 1) {
this.goUrlX('团控列表', 'TravelControlListSale', item.tcid, item.tcnum);
} else {
this.goUrlX('团控列表', 'TravelControlList', item.tcid, item.tcnum);
}
},
goUrlHappy(item) {
this.$router.push({
name: "HappyPassbook",
......@@ -1021,8 +742,7 @@ export default {
(res) => {
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {
}
} else {}
},
(err) => {}
);
......@@ -1120,8 +840,7 @@ export default {
},
getDdztList() {
this.apipost(
"sellorder_post_GetSellOrderStatusEnumList",
{},
"sellorder_post_GetSellOrderStatusEnumList", {},
(res) => {
if (res.data.resultCode == 1) {
this.ddztList = res.data.data;
......@@ -1233,7 +952,7 @@ export default {
this.getLineList();
this.getDepartment();
this.getDdztList();
let nowDay =this.FormartDate(new Date());
let nowDay = this.FormartDate(new Date());
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
......@@ -1249,108 +968,109 @@ export default {
}
this.getList();
},
};
};
</script>
<style>
.personNolayer p {
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
}
.personNolayer p > span {
.personNolayer p>span {
font-size: 12px;
color: #333;
margin-right: 25px;
}
}
.personNolayer table {
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
}
.personNolayer table th {
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
}
.personNolayer table td {
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
}
.personNolayer table ._color_666 {
.personNolayer table ._color_666 {
color: #666666;
}
}
.personNolayer table tr._color_666 th {
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
}
.enrollTotalSearch {
.enrollTotalSearch {
width: 100%;
min-height: auto;
padding: 0 0 20px 0;
}
}
.enrollTotalSearch::after {
.enrollTotalSearch::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
}
.enrollTotalSearch li {
.enrollTotalSearch li {
float: left;
font-size: 12px;
height: 40px;
color: #666;
margin: 20px 10px 10px 0;
}
}
.enrollTotalSearch li > span {
.enrollTotalSearch li>span {
display: inline-block;
}
}
.enrollTotalSearch li span > em {
.enrollTotalSearch li span>em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
}
.enrollTotalSearch li:last-child {
.enrollTotalSearch li:last-child {
float: right;
position: fixed;
top: 36px;
right: 20px;
text-align: right;
z-index: 50;
}
}
.enrollTotalSearchTable {
.enrollTotalSearchTable {
width: 100%;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
}
}
.enrollTotalSearchTable tr {
.enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */
}
}
.enrollTotalSearchTable tr th {
.enrollTotalSearchTable tr th {
background: #bdbdbd;
height: 30px;
font-size: 12px;
......@@ -1358,98 +1078,98 @@ export default {
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.enrollTotalSearchTable tr {
.enrollTotalSearchTable tr {
background: #fff;
text-align: left;
}
}
.enrollTotalSearchTable tr td {
.enrollTotalSearchTable tr td {
height: 50px;
padding: 10px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.enrollTotalSearchTable tr td > img {
.enrollTotalSearchTable tr td>img {
width: 32px;
height: 32px;
border-radius: 16px;
vertical-align: middle;
margin-right: 5px;
}
}
.enrollTotalSearchTable tr td p {
.enrollTotalSearchTable tr td p {
line-height: 20px;
}
}
.groupTourOrder_count_green {
.groupTourOrder_count_green {
color: #1bc594;
}
}
.groupTourOrder_count_blue {
.groupTourOrder_count_blue {
color: #4d7afd;
}
}
.groupTourOrder_count_yellow {
.groupTourOrder_count_yellow {
color: #ff9c00;
}
}
.groupTourOrder_count_gray {
.groupTourOrder_count_gray {
color: #999999;
}
}
.groupTourOrder_count {
.groupTourOrder_count {
margin: 0 0 20px 0;
width: 100%;
height: auto;
}
}
.groupTourOrder_count_col {
.groupTourOrder_count_col {
height: 110px;
}
}
.groupTourOrder_count_item {
.groupTourOrder_count_item {
font-weight: 400;
padding: 10px;
height: 100%;
border: 1px solid #e6e6e6;
background-color: #ffffff;
color: #333333;
}
}
.groupTourOrder_count_item > div > i {
.groupTourOrder_count_item>div>i {
font-size: 12px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > div > span:nth-child(2) {
.groupTourOrder_count_item>div>span:nth-child(2) {
font-size: 14px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > div > span:nth-child(3) {
.groupTourOrder_count_item>div>span:nth-child(3) {
font-weight: bold;
font-size: 16px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > p {
.groupTourOrder_count_item>p {
font-size: 12px;
line-height: 18px;
}
}
.groupTourOrder_count_item > p > span {
.groupTourOrder_count_item>p>span {
margin: 0 5px 0 0;
white-space: nowrap;
}
}
.groupTourOrder_more {
.groupTourOrder_more {
margin: 0 -12px;
}
}
.groupTourOrder_more > div {
.groupTourOrder_more>div {
width: 100%;
height: 30px;
line-height: 30px;
......@@ -1458,97 +1178,96 @@ export default {
color: #333333;
background-color: #ffffff;
cursor: pointer;
}
}
.groupTourOrder_more > div:hover {
.groupTourOrder_more>div:hover {
color: #297bef;
background-color: #dcebff;
}
}
.groupTourOrder_remarks {
.groupTourOrder_remarks {
font-size: 0px;
}
}
.groupTourOrder_remarks > div {
}
.groupTourOrder_remarks>div {}
.groupTourOrder_remarks > div > div:nth-child(1) {
.groupTourOrder_remarks>div>div:nth-child(1) {
float: left;
display: flex;
align-items: flex-start;
}
}
.groupTourOrder_remarks > div > div:nth-child(1) > span {
.groupTourOrder_remarks>div>div:nth-child(1)>span {
line-height: 20px;
font-size: 12px;
color: #e95252;
white-space: nowrap;
}
}
.groupTourOrder_remarks > div > div:nth-child(1) > p {
.groupTourOrder_remarks>div>div:nth-child(1)>p {
line-height: 20px;
font-size: 12px;
color: #e95252;
}
}
.groupTourOrder_remarks > div > div:nth-child(2) {
.groupTourOrder_remarks>div>div:nth-child(2) {
float: right;
text-align: right;
font-size: 12px;
color: #e95252;
}
}
.groupTourOrder_remarks > div > div:nth-child(2) > i {
.groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px;
cursor: pointer;
}
}
.groupTourOrder_remarks > div::after {
.groupTourOrder_remarks>div::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
}
.groupTourOrder_remarks_btn {
.groupTourOrder_remarks_btn {
padding: 0px;
width: 12px;
height: 12px;
border: none;
background-color: transparent;
}
}
.groupTourOrder_remarks_btn > i {
.groupTourOrder_remarks_btn>i {
color: #e95252;
font-size: 12px;
}
}
.groupTourOrder_remarks_popover > div {
.groupTourOrder_remarks_popover>div {
display: inline-block;
font-size: 14px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > div::before {
.groupTourOrder_remarks_popover>div::before {
content: "";
display: inline-block;
margin: 0 5px 0 0;
width: 2px;
height: 12px;
background-color: #e95252;
}
}
.groupTourOrder_remarks_popover > span {
.groupTourOrder_remarks_popover>span {
display: block;
margin: 0 0 0 0;
width: 100%;
text-align: center;
font-size: 12px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > p {
.groupTourOrder_remarks_popover>p {
margin: 5px 0 0 0;
padding: 3px;
width: 100%;
......@@ -1556,75 +1275,76 @@ export default {
overflow-y: auto;
font-size: 12px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > p:nth-child(even) {
.groupTourOrder_remarks_popover>p:nth-child(even) {
background-color: #e6e6e6;
}
}
.groupTourOrder_remarks_popover > p > span:nth-child(1) {
.groupTourOrder_remarks_popover>p>span:nth-child(1) {
float: left;
}
}
.groupTourOrder_remarks_popover > p > span:nth-child(2) {
.groupTourOrder_remarks_popover>p>span:nth-child(2) {
margin: 0 10px 0 0;
float: right;
}
}
.groupTourOrder_remarks_popover > p::after {
.groupTourOrder_remarks_popover>p::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
}
.groupTourOrder_tickets > div > span {
.groupTourOrder_tickets>div>span {
margin: 0 5px 0 0;
cursor: pointer;
}
}
.groupTourOrder_tickets_red {
.groupTourOrder_tickets_red {
color: #ff0000;
cursor: pointer;
/* text-decoration: underline; */
}
}
.groupTourOrder_tickets_blue {
.groupTourOrder_tickets_blue {
color: #0000ff;
/* text-decoration: underline; */
cursor: pointer;
}
}
.groupTourOrder_tickets_green {
.groupTourOrder_tickets_green {
color: #008000;
cursor: pointer;
/* text-decoration: underline; */
}
}
.groupTourOrder_tickets_black {
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
}
.groupTourOrderByTuan_ico {
.groupTourOrderByTuan_ico {
margin: 0 10px 0 0;
}
}
.groupTourOrderByTuan_ico > i {
.groupTourOrderByTuan_ico>i {
display: inline-block;
margin: 0 2px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
}
.groupTourOrderByTuan_ico > span {
.groupTourOrderByTuan_ico>span {
vertical-align: middle;
}
}
.color_red_order {
.color_red_order {
color: #e95252 !important;
}
}
</style>
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