Commit f73b4f20 authored by 黄奎's avatar 黄奎

页面修改

parent b2249cf3
<style scoped>
.tatusText.grey {
color: grey;
}
}
.tatusText.success {
.tatusText.success {
color: #21ba45;
}
}
.tatusText.error {
.tatusText.error {
color: #f2c037;
}
}
.tatusText.cancel {
.tatusText.cancel {
color: #c1c1c1;
}
}
.tatusText.Black {
.tatusText.Black {
color: Black;
}
}
.OrderId-text {
font-size: 19px;
/* text-decoration:underline; */
font-weight: bold;
color: #2961fe;
margin-bottom: 3px;
cursor: pointer;
}
.CreateByName-text.Commission {
color: red;
margin-top: 5px;
margin-bottom: 5px;
}
.el-checkbox-group,.el-radio-group{
.el-checkbox-group,
.el-radio-group {
display: flex !important;
margin-bottom: 10px !important;
}
.font-color-link{
.font-color-link {
cursor: pointer;
}
.OrderType-text{
.OrderType-text {
font-size: 11px;
font-weight: 100;
margin-left: 5px;
......@@ -47,88 +51,112 @@
display: inline-block;
padding: 0 1px;
}
.line-through{
.line-through {
text-decoration: line-through;
}
.OrderType-text.one{
.OrderType-text.one {
color: rgb(41, 97, 254);
background-color: rgba(41, 97, 254,.2);
background-color: rgba(41, 97, 254, .2);
}
.OrderType-text.two{
.OrderType-text.two {
color: rgb(242, 140, 29);
background-color: rgba(242, 140, 29,.2);
background-color: rgba(242, 140, 29, .2);
}
.OrderType-text.three{
.OrderType-text.three {
color: rgb(63, 196, 255);
background-color: rgba(63, 196, 255,.2);
background-color: rgba(63, 196, 255, .2);
}
.OrderType-text.four{
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
.OrderType-text.four {
color: rgb(255, 111, 0);
background-color: rgba(255, 111, 0, .2);
}
.OrderType-text.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
.OrderType-text.five {
color: rgb(197, 225, 165);
background-color: rgba(97, 225, 165, .2);
}
.row {
display: flex;
}
.row-c {
display: flex;
align-items: center;
}
.column {
display: flex;
flex-direction: column;
}
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
.wrap {
flex-wrap: wrap;
}
.justify-sb {
justify-content: space-between;
}
.justify-c {
justify-content: center;
}
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
.flex-g {
flex-grow: 1;
}
.flex-s {
flex-shrink: 0;
}
.align-c {
align-items: center;
}
.cblack {
color: black;
}
.cf {
color: #ffffff;
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
color: #20c997;
}
.c02C854 {
color: #02c854;
}
.cff9800 {
color: #ff9800;
}
......@@ -136,377 +164,447 @@
.cF1416C {
color: #f1416c;
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
color: #3fc4ff;
}
.fz10 {
font-size: 10px;
}
.fz11 {
font-size: 11px;
}
.fz12 {
font-size: 12px;
}
.fz13 {
font-size: 13px;
}
.fz14 {
font-size: 14px;
}
.fz15 {
font-size: 15px;
}
.fz16 {
font-size: 16px;
}
.fz17 {
font-size: 17px;
}
.fz18 {
font-size: 18px;
}
.fbold {
font-weight: bold;
}
.ml {
margin-left: 10px;
}
.mr {
margin-right: 10px;
}
.mt {
margin-top: 10px;
}
.mt20 {
margin-top: 20px;
}
.mb {
margin-bottom: 10px;
}
.mb20 {
margin-bottom: 20px;
}
.mx {
margin-left: 10px;
margin-right: 10px;
}
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.py {
padding: 15px 0;
}
.py5 {
padding: 5px 0;
}
.px5 {
padding: 0 5px;
}
.px15 {
padding: 0 15px;
}
.pa15 {
padding: 15px;
}
.py20 {
padding: 20px 0;
}
.pb5 {
padding: 0 0 5px 0;
}
.pa {
padding: 10px 20px;
}
.pa20 {
padding: 20px;
}
.pt20 {
padding: 20px 0;
}
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
.relative {
position: relative;
}
.absolute {
position: absolute;
}
.left0 {
left: 0;
}
.right0 {
right: 0;
}
.top0 {
top: 0;
}
.bottom0 {
bottom: 0;
}
.left20 {
left: 020px;
}
.right20 {
right: 20px;
}
.top20 {
top: 20px;
}
.bottom20 {
bottom: 20px;
}
.text-center {
text-align: center;
}
.orderType {
padding: 3px 15px;
border-radius: 3px;
background: #f57a98;
margin-right: 15px;
}
.orderType.active {
background: #4dd0e1;
}
.orderType.activeB {
background: #E95252;
}
.copy {
display: inline-block;
padding: 3px 15px;
border-radius: 3px;
margin-left: 20px;
}
.copy:hover {
background: #f5f5f5;
}
.see-rec div {
padding: 1px 5px;
border-radius: 3px;
}
.see {
border: 1px solid #04c8c8;
}
.seeLK {
border: 1px solid #059ff6;
}
.see:hover {
background-color: rgba(4, 200, 200, 0.1);
}
.rec {
border: 1px solid #04c8c8;
background-color: rgba(4, 200, 200, 1);
}
.rec:hover {
border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4, 200, 200, 0.9);
}
.cancel:hover {
background-color: #f3dce2;
}
.confirm:hover {
background-color: #dcedc8;
}
.change:hover {
background-color: #d7e9f3;
}
.change1:hover {
background-color: #dcedc8;
}
.orderop {
text-align: center;
}
.orderop div {
width: 100px;
height: 50%;
display: flex;
justify-content: center;
}
.RoomList div {
border-bottom: 1px solid #e7e7e7;
}
.RoomList div:last-child {
border: 0;
}
.el-table {
font-size: 13px;
}
.shezhifrom {
position: relative;
}
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
.shezhifrom:hover .shebox {
display: block;
}
.flexOne-form-bj h3{
.flexOne-form-bj h3 {
font-size: 18px;
color: black;
padding: 0 0 20px 0;
font-weight: 400;
}
.flexOne-type{
.flexOne-type {
display: flex;
align-items: center;
padding: 0 0 20px 0;
}
.flexOne-type b{
.flexOne-type b {
font-size: 13px;
width: 100px;
flex-shrink: 0;
}
.flexOne-type div{
.flexOne-type div {
display: flex;
}
.flexOne-description{
.flexOne-description {
padding: 15px 15px;
border-radius: 5px;
background: #E1F5FE;
margin-bottom: 20px;
}
.flexOne-description b{
.flexOne-description b {
font-size: 14px;
}
.flexOne-description p{
.flexOne-description p {
font-size: 12px;
color: #4C5759;
padding: 10px 0 0 0;
}
.flexOne-infor-box b{
.flexOne-infor-box b {
font-size: 13px;
}
.infor-list{
.infor-list {
display: flex;
flex-direction: column;
}
.list-title{
.list-title {
padding: 20px 0;
border-bottom: 1px dashed #eeeeee;
color: #7E8299;
font-size: 13px;
}
.list-title,.list-centent{
.list-title,
.list-centent {
display: flex;
flex-wrap: wrap;
margin-top: 20px;
}
.infor-list li{
.infor-list li {
width: 25%;
}
.list-centent li {
width: 33.33%;
}
.list-centent.active li {
width: 25%;
}
/deep/.el-table tr td:first-child{
/deep/.el-table tr td:first-child {
border-bottom: 0;
}
/deep/.el-table tr:last-child td{
/deep/.el-table tr:last-child td {
border-bottom: 1px solid #EBEEF5;
}
/deep/.el-table tr td{
/deep/.el-table tr td {
border-bottom: 1px solid #EBEEF5;
}
.cp{
.cp {
cursor: pointer;
}
</style>
<template>
</style>
<template>
<div>
<div
v-for="(item, index) in OrderList"
class="column bgf radius5 px15 mb20"
>
<div v-for="(item, index) in OrderList" class="column bgf radius5 px15 mb20" :key="index">
<div class="row-c justify-sb align-c py">
<div class="row-c">
<div>
<!-- <div
class="orderType cf fz12"
:class="{ active: item.OrderType == 1,
activeB: item.OrderType == 3}"
>
</div> -->
<span
class="orderType OrderType-text cf fz12"
:class="[items.Id==1?'one':
<span class="orderType OrderType-text cf fz12" :class="[items.Id==1?'one':
(items.Id==2?'two':
(items.Id==3?'three':
(items.Id==4?'four':
(items.Id==5?'five':'')))),{'line-through':items.show}]"
v-for="(items,i) in item.MultipleChoiceList"
>
v-for="(items,i) in item.MultipleChoiceList" :key="i+10000">
{{items.Name}}
</span>
<!-- <span class="OrderType-text"
:class="[items.Id==1?'one':
(items.Id==2?'two':
(items.Id==3?'three':
(items.Id==4?'four':
(items.Id==5?'five':'')))),{'line-through':items.show}]"
v-for="(items,i) in item.MultipleChoiceList">{{items.Name}}</span> -->
</div>
<div class="c9e fz12">
<span>订单Id:</span>
<span>{{ item.OrderId }}</span>
<span
class="copy cblack cursor-pointer"
v-if="copyId != item.OrderId"
@click="CopyHandler(item)"
>复制</span
>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else
><i class="el-icon-check mr"></i>已复制</span
>
<span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
</div>
</div>
<div class="c9e fz12">
......@@ -521,49 +619,36 @@
<span>下单时间:</span>
<span class="mr">{{ item.CreateTime }}</span>
<div class="">
<i
class="mx5"
:class="{
<i class="mx5" :class="{
'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
'el-icon-warning cff9800': item.OrderStatus == 2,
'el-icon-check cblack': item.OrderStatus == 3,
'el-icon-coin cF1416C': item.OrderStatus == 4,
'el-icon-refresh cF1416C': item.OrderStatus == 5,
'el-icon-refresh cF1416C': item.OrderStatus == 6
}"
>
}">
{{item.OrderStatusName}}
<!-- {{item.OrderStatus}} -->
</i>
<!-- <div class="Order-list-Status" :class="item.OrderStatus=='1'?'one':
(item.OrderStatus=='2'?'two':
(item.OrderStatus=='3'?'three':
(item.OrderStatus=='4'?'four':
(item.OrderStatus=='5'?'five':
(item.OrderStatus=='6'?'six':'')))))">
<span>{{item.OrderStatusName}}</span>
</div> -->
</div>
</div>
</div>
<div class="mb">
<el-table :data="[item]" style="width:100%" border>
<el-table-column
label="日期"
min-width="100"
style="background:#EAEAEA"
>
<el-table-column label="日期" min-width="100" style="background:#EAEAEA">
<template slot-scope="scope">
<template>
<p class="CreateByName-text" v-if="scope.row.DepartTime">出发:<span>{{scope.row.DepartTime}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 5">完结:<span>{{scope.row.FinishTime}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 6">完结:<span >{{scope.row.LossFinishTime}}</span></p>
<p class="CreateByName-text Commission cp" v-else-if="scope.row.Commission" @click="commissionDetails(scope.row)">提成:<span>{{scope.row.Commission}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 5">
完结:<span>{{scope.row.FinishTime}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 6">
完结:<span>{{scope.row.LossFinishTime}}</span></p>
<p class="CreateByName-text Commission cp" v-else-if="scope.row.Commission"
@click="commissionDetails(scope.row)">提成:<span>{{scope.row.Commission}}</span></p>
<template v-else>-</template>
</template>
</template>
</el-table-column>
<el-table-column label="人数" >
<el-table-column label="人数">
<template slot-scope="scope">
{{scope.row.GuestCount}}
</template>
......@@ -603,7 +688,8 @@
<span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
</template>
</el-table-column>
<el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
<el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)"
label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0">
<span class="float-l">销售:</span>
......@@ -617,25 +703,18 @@
</el-table-column>
<el-table-column label="出票状态" style="background:#EAEAEA">
<template slot-scope="scope">
<span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''"
class="cp tatusText"
:class="item.TicketStatus==1?'grey':
<span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" class="cp tatusText" :class="item.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'cancel':
(scope.row.TicketStatus==5?'Black':''))))">
{{item.TicketStatusName}}
</span>
<!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="viewCredentials(scope.row)"></i> -->
</template>
</el-table-column>
<el-table-column label="签证状态" style="background:#EAEAEA">
<template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText"
:class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" class="tatusText" :class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
(scope.row.VisaStatus==2?'success':
(scope.row.VisaStatus==0?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
......@@ -644,133 +723,57 @@
@click="CheckOutDetails(scope.row)"></i>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
min-width="70"
style="background:#EAEAEA"
>
<template slot-scope="scope">
<input type="button" class="normalBtn" value="查看"
@click="goDetails(scope.row)" />
</template>
</el-table-column> !-->
<template slot="append" v-if="item.Remark">
<div style="padding:10px;color:#f1416c">客户备注:{{item.Remark}}</div>
</template>
</el-table>
</div>
<!-- <el-table :data="[item]" style="width:100%" border v-if="item.OrderStatus!=3">
<el-table-column label="实收" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income ? scope.row.Income : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="成本" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney ? scope.row.CostMoney : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="平台税金" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{
scope.row.PlatformTax ? scope.row.PlatformTax : "-"
}}</span>
</template>
</el-table-column>
<el-table-column label="退款" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
</template>
</el-table-column>
</el-table> -->
<div class="row justify-sb mt mb20">
<div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.IncomeFinance"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
v-for="(x, i) in item.IncomeFinance" @click="openDetails(x)" :key="i+20000">{{ x.FrID }}</span>
<span v-if="item.IncomeFinance.length == 0" class="c9e fz12">
暂无收款单据
</span>
</div>
<!--<el-tooltip
v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6"
class="item"
effect="dark"
content="制单"
placement="top"
>
<i
class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 1)"
></i>
</el-tooltip>!-->
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.BackFinance"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" v-for="(x, i) in item.BackFinance"
@click="openDetails(x)" :key="i+30000">{{ x.FrID }}</span>
<span v-if="item.BackFinance.length == 0" class="c9e fz12">
暂无退款单据
</span>
</div>
<!-- <el-tooltip
v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6"
class="item"
effect="dark"
content="制单"
placement="top"
>
<i
class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"
></i>
</el-tooltip>!-->
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.PayFinance"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" v-for="(x, i) in item.PayFinance"
@click="openDetails(x)" :key="i+40000">{{ x.FrID }}</span>
<span v-if="item.PayFinance.length == 0" class="c9e fz12">
暂无成本单据
</span>
</div>
<!-- <div class="item absolute right20 bottom20" v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6 && pagesTitle != '销售'">
<el-tooltip class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"></i>
</el-tooltip>
</div> -->
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">发票单据</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState==0,'bgFAEAED':x.InvoiceApplyState==1,'bjFFF3E0':x.InvoiceApplyState==2,
'c3FC4FF':x.InvoiceApplyState==0,'cF1416C':x.InvoiceApplyState==1,'cff9800':x.InvoiceApplyState==2}"
v-for="(x, i) in item.InvoiceApplyList" @click="goInvoiceDetail(x)" :key="i+40000">{{ x.ID }}</span>
<span v-if="item.InvoiceApplyList.length == 0" class="c9e fz12">
暂无发票单据
</span>
</div>
</div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
......@@ -782,10 +785,7 @@
</span>
</div>
</div>
<div
class="row-c justify-sb py5"
v-if="item.DiscountsMoney>0"
>
<div class="row-c justify-sb py5" v-if="item.DiscountsMoney>0">
<span class="fz12 c9e">优惠金额</span>
<div class="ml">
<span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
......@@ -796,95 +796,61 @@
</div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
<div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由:</div>
<div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{item.CancelRemark}}</div>
<div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{item.CancelRemark}}
</div>
<div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
{{item.CancelEmpName}} {{item.CancelTime}}
</div>
</div>
</div>
<el-dialog
custom-class="w400"
title="设置收损金额"
:visible.sync="outerVisible"
>
<el-dialog custom-class="w400" title="设置收损金额" :visible.sync="outerVisible">
<div>
<el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item label="收损金额" prop="LossMoney">
<el-input-number
class="w200"
v-model="msg.LossMoney"
:min="0"
:max="10000000"
></el-input-number>
<el-input-number class="w200" v-model="msg.LossMoney" :min="0" :max="10000000"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px;margin-bottom: 20px;">
<el-col :span="24" style="text-align: right;">
<input
type="button"
class="normalBtn"
value="保存"
@click="submitForm('msg')"
/>
<input
type="button"
class="hollowFixedBtn"
value="取消"
@click="(outerVisible = false), $refs['msg'].resetFields()"
/>
<input type="button" class="normalBtn" value="保存" @click="submitForm('msg')" />
<input type="button" class="hollowFixedBtn" value="取消"
@click="(outerVisible = false), $refs['msg'].resetFields()" />
</el-col>
</el-row>
</el-form>
</div>
</el-dialog>
<el-dialog
custom-class="w600"
title="取消订单"
:visible.sync="cancelOrderDialog"
>
<el-dialog custom-class="w600" title="取消订单" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
<el-input
type="textarea"
autofocus
rows="5"
placeholder="请填写取消订单的缘由"
clear="w300"
v-model="cancelRemark"
></el-input>
<el-input type="textarea" autofocus rows="5" placeholder="请填写取消订单的缘由" clear="w300" v-model="cancelRemark">
</el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input
type="button"
class="normalBtn"
value="取消订单"
@click="cancelOrderHandler"
/>
<input
type="button"
class="hollowFixedBtn"
value="关闭"
@click="cancelOrderDialog = false"
/>
<input type="button" class="normalBtn" value="取消订单" @click="cancelOrderHandler" />
<input type="button" class="hollowFixedBtn" value="关闭" @click="cancelOrderDialog = false" />
</el-col>
</el-row>
</div>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
</div>
</template>
<script>
</template>
<script>
import offset from '../../public/offset.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset,commissionDialog },
props: ["OrderList","pagesTitle"],
components: {
offset,
commissionDialog
},
props: ["OrderList", "pagesTitle"],
data() {
return {
queryObj:null,
queryObj: null,
cdState: false,
copyId: 0,
loading0: false,
......@@ -892,9 +858,6 @@
loading2: false,
loading3: false,
BillMakingMsg: {
// PeroidsId: null,
// Type: null,
// EmpIds:'',
OtherType: 61,
ReFinanceId: "",
ReFinanceId2: ""
......@@ -903,7 +866,7 @@
msg: {
OrderId: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
State: '', //状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
},
msgParameter: {
......@@ -911,18 +874,18 @@
OrderId: 0,
Money: 0.0,
Remark: '',
MailingState: '1',//邮寄状态 1自取 2邮寄
MailingAddress: '',//MailingState =2 填写邮寄
UseDate:'',//门票日期
Name:'',
EName:'',
Sex: '1',//1男2女
MailingState: '1', //邮寄状态 1自取 2邮寄
MailingAddress: '', //MailingState =2 填写邮寄
UseDate: '', //门票日期
Name: '',
EName: '',
Sex: '1', //1男2女
Birthday: '',
Mobile:'',
CouponsId:'',//景点id
DetailList:[],
Mobile: '',
CouponsId: '', //景点id
DetailList: [],
},
rules2:{
rules2: {
Name: [{
required: true,
message: '请输入中文名',
......@@ -933,8 +896,11 @@
message: '请输入英文名',
trigger: 'blur'
}],
Mobile: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
Mobile: [{
required: true,
message: "请输入联系电话",
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
......@@ -948,41 +914,46 @@
},
outerVisible: false,
rules: {
State: [
{
State: [{
required: true,
message: "请选择订单状态",
trigger: "change"
}
],
SelffetchAddress: [
{
}],
SelffetchAddress: [{
required: true,
message: "请输入自提地址",
trigger: "blur"
}
],
LossMoney: [
{
}],
LossMoney: [{
required: true,
message: "请输入收损金额",
trigger: "blur"
}
]
}]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0,
cancelOrderId: 0,
uploadOrderId: 0,
loading: false,
fileList:[],
fileList: [],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType:[
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
},
{
Name: this.$t('OrderList.orderStatus.check'),
ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
items: null,
typeState: '',
......@@ -990,23 +961,28 @@
};
},
watch: {
pagesTitle(val,oldval){
pagesTitle(val, oldval) {
this.Title = val
},
OrderList:{
handler(val, oldVal){
OrderList: {
handler(val, oldVal) {
}
}
},
methods: {
goDetails(item){
let data = [
{
// 跳转发票详情页面
goInvoiceDetail(item) {
this.OpenNewPage('/invoicesManagerDetail', {
id: item.ID,
InvoiceApplyType:4
});
},
goDetails(item) {
let data = [{
path: "myCustomerOrder",
OrderId: item.OrderId
},
];
}, ];
let href = this.domainManager().crmRoutingUrl +
"automaticLogin?token=" +
this.getLocalStorage().token +
......@@ -1015,30 +991,30 @@
window.open(href);
},
// 签证状态
AmendVisa(){
AmendVisa() {
},
// 签证
CheckOutDetails(){
CheckOutDetails() {
},
// 提成
commissionDetails(){
commissionDetails() {
},
// 修改订单状态
modifyStatus(row){
modifyStatus(row) {
},
// 查看出票状态
viewCredentials(item){
viewCredentials(item) {
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
isOffset(row, index, num) {
this.makeAdocument(row, index, num, 'Offset')
},
submit2(){
if(this.loading3) return
submit2() {
if (this.loading3) return
this.$refs['msgParameter'].validate((valid) => {
if (valid) {
this.setFormMsg2()
......@@ -1047,8 +1023,8 @@
}
});
},
setFormMsg2(){
if(this.msgParameter.MailingState=='1'){
setFormMsg2() {
if (this.msgParameter.MailingState == '1') {
this.msgParameter.MailingAddress = ''
}
let m = {
......@@ -1059,11 +1035,11 @@
UseDate: this.msgParameter.UseDate,
Birthday: this.msgParameter.Birthday,
DetailList: this.msgParameter.DetailList,
MailingState: this.msgParameter.MailingState,//邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress,//MailingState =2 填写邮寄
MailingState: this.msgParameter.MailingState, //邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress, //MailingState =2 填写邮寄
Name: this.msgParameter.Name,
EName: this.msgParameter.EName,
Sex: this.msgParameter.Sex,//1男2女
Sex: this.msgParameter.Sex, //1男2女
Mobile: this.msgParameter.Mobile,
Remark: this.msgParameter.Remark,
}
......@@ -1084,10 +1060,10 @@
this.Error(err.message)
});
},
uploadFileBtn(file){
uploadFileBtn(file) {
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let typeOk = false;
let FileName = file.file.name.substring(0,file.file.name.lastIndexOf("."))
let FileName = file.file.name.substring(0, file.file.name.lastIndexOf("."))
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
......@@ -1098,21 +1074,21 @@
}, 1);
},
// 上传旅客名单
uploadHandleChange(){
if(this.loading) return
uploadHandleChange() {
if (this.loading) return
let msg = {
OrderId: this.uploadOrderId,
GuestFileList: [this.GuestFile]
}
this.loading = true
this.apipost(
"dict_post_SetSaleOrderGuestFile",msg,
"dict_post_SetSaleOrderGuestFile", msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.uploadOrderId=0
this.GuestFile=''
this.uploadOrderId = 0
this.GuestFile = ''
this.$emit("success");
} else {
this.Error(res.data.message);
......@@ -1136,17 +1112,17 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.IncomeMoney<=0){
if ((num == 2 || num == 3) && row.IncomeMoney <= 0) {
this.Info('请先制收款单据,再制成本或退款单据!')
return
}
if(Offset){
if (Offset) {
this.cdState = true
}
let type = 0
if(num==3){
if (num == 3) {
type = 2
}else{
} else {
type = num
}
let data = {
......@@ -1183,7 +1159,7 @@
});
return
this.queryObj = query
if(!Offset){
if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
......@@ -1194,7 +1170,7 @@
// 订单明细
goRoomDetails(obj, title) {
var path
if(title==='订房详情'){
if (title === '订房详情') {
path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
......@@ -1208,7 +1184,7 @@
tab: title
}
});
}else{//变更预定
} else { //变更预定
this.$router.push({
name: 'CharterPreview',
query: {
......@@ -1230,9 +1206,9 @@
if (!this.loading0) {
this.cancelOrderId = item.OrderId
// 销售 OP
if(this.Title!='销售'){
if (this.Title != '销售') {
this.cancelOrderDialog = true;
}else{
} else {
let that = this
that.$confirm(`是否确定取消订单?`, '提示', {
confirmButtonText: '确定',
......@@ -1240,8 +1216,8 @@
type: 'warning'
}).then(() => {
this.cancelOrderHandler()
}).catch(err=>{
this.loading0= false
}).catch(err => {
this.loading0 = false
})
}
}
......@@ -1249,7 +1225,7 @@
if (!this.loading1) {
this.confirmFun(item, type);
}
}else if (type == 2) {
} else if (type == 2) {
if (!this.loading2) {
this.outerVisible = true;
this.msg.LossMoney = item.LossMoney ? item.LossMoney : 0;
......@@ -1268,21 +1244,21 @@
this.loading0 = true
this.apipost("ticket_post_CancelSaleTicketOrder", {
OrderId: this.cancelOrderId,
IsOPCancel: this.Title!='销售'?1:0,
IsOPCancel: this.Title != '销售' ? 1 : 0,
Remark: this.cancelRemark
},
res => {
this.loading0= false
this.loading0 = false
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("success");
} else {
this.Error(res.data.message);
}
}).catch(err=>{
this.loading0= false
}).catch(err => {
this.loading0 = false
})
}).catch(()=>{
}).catch(() => {
this.loading0 = false
})
},
......@@ -1301,25 +1277,24 @@
});
},
cancelOrderHandler() {
if (this.cancelRemark == ""&&this.Title!='销售') {
if (this.cancelRemark == "" && this.Title != '销售') {
this.Error("请填写取消订单的缘由");
return;
}
if (this.loading0) return;
this.loading0 = true
this.apipost(
"CarSingle_post_CancelSaleCarOrder",
{
"CarSingle_post_CancelSaleCarOrder", {
OrderId: this.cancelOrderId,
IsOPCancel: this.Title!='销售'?1:0,
Remark: this.Title!='销售'?this.cancelRemark:''
IsOPCancel: this.Title != '销售' ? 1 : 0,
Remark: this.Title != '销售' ? this.cancelRemark : ''
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.cancelOrderDialog=false
this.cancelOrderId=0
this.cancelRemark=''
this.cancelOrderDialog = false
this.cancelOrderId = 0
this.cancelRemark = ''
this.$emit("success");
} else {
this.Error(res.data.message);
......@@ -1330,9 +1305,7 @@
this.loading0 = false;
}
);
},
saveUpdate() {
let text = '是否确认设置收损?'
this.$confirm(text, "提示", {
......@@ -1343,8 +1316,7 @@
.then(() => {
this.loading2 = true;
this.apipost(
"CarSingle_post_SetAdminCarOrderState",
{
"CarSingle_post_SetAdminCarOrderState", {
OrderId: this.msg.OrderId,
State: this.typeState,
LossMoney: this.msg.LossMoney,
......@@ -1366,7 +1338,7 @@
})
.catch(() => {});
},
confirmFun(item,type) {
confirmFun(item, type) {
let text = '是否确认订单?'
this.$confirm(text, "提示", {
confirmButtonText: "确定",
......@@ -1376,11 +1348,10 @@
.then(() => {
this.loading1 = true;
this.apipost(
"CarSingle_post_SetAdminCarOrderState",
{
"CarSingle_post_SetAdminCarOrderState", {
OrderId: item.OrderId,
State: type,
LossMoney: type==2?this.msg.LossMoney:'',
LossMoney: type == 2 ? this.msg.LossMoney : '',
},
res => {
if (res.data.resultCode == 1) {
......@@ -1404,7 +1375,7 @@
CopyHandler(item) {
this.copyId = item.OrderId;
let copyText = item.OrderId;
const save = function(e) {
const save = function (e) {
e.clipboardData.setData('text/plain', copyText)
e.preventDefault() // 阻止默认行为
}
......@@ -1448,6 +1419,5 @@
};
}
};
</script>
<style></style>
</script>
......@@ -110,11 +110,6 @@
class="w200" />
</span>
</li>
<!-- <li>
<span><em>电话</em>
<el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
</span>
</li> -->
<li>
<span><em>客人姓名</em>
<el-input clearable v-model="msg.GuestName" placeholder="客人姓名" class="w200" />
......@@ -233,22 +228,6 @@
</p>
</div>
</el-col>
<!-- <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.qtxtongji')}}</span>
</div>
<p>
<span class="groupTourOrder_count_green">{{$t('fnc.nbbaoming')}}
{{TotalMsg.totalERP}}
</span>
<span class="color_red_order">{{$t('fnc.B2BWAP')}}
{{TotalMsg.totalB2B}}
</span>
</p>
</div>
</el-col> -->
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_totalFinacel">
<div>
......@@ -268,19 +247,13 @@
</el-row>
</div>
<!-- <div style="display: flex;justify-content: end;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div> -->
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()">
</OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div>
</template>
<script>
......@@ -556,8 +529,7 @@
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 ?
true :
false,
true : false,
},
{
Name: "订单转交",
......@@ -571,8 +543,7 @@
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
(item.TicketStatus == 1 || item.VisaStatus == 1) ?
true :
false,
true : false,
},
{
Name: "修改出票状态",
......@@ -581,8 +552,7 @@
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.TicketStatus < 3 ?
true :
false,
true : false,
},
{
Name: "修改出签状态",
......@@ -591,24 +561,21 @@
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.VisaStatus == 1 ?
true :
false,
true : false,
},
{
Name: "订单收损",
Id: "8",
show: item.OrderStatus != 2 &&
item.OrderStatus != 6 ?
true :
false,
true : false,
},
{
Name: "收损完结",
Id: "9",
show: (item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 ?
true :
false,
true : false,
},
{
Name: '订单完结',
......@@ -656,6 +623,7 @@
}
}
});
this.OrderList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.TotalMsg = res.data.data.StatModel
......@@ -690,7 +658,6 @@
}
let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.Title = this.pagesTitle
......@@ -698,7 +665,7 @@
this.getEmployee()
}
this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
this.msg.EndTime = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
this.DatelistBM = [new Date(this.msg.StartTime), new Date()]
this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList()
......
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