Skip to content

S
SuperMan
Commit e2bab6fb authored by 沈良进's avatar 沈良进
Browse files
Options

save

parent 6c5b0778
Show whitespace changes
Inline Side-by-side
Showing with 1584 additions and 1361 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ e2bab6fb
......@@ -784,10 +784,18 @@
v-if="item.OrderStatus >1 && item.OrderStatus != 3
&&pagesTitle=='OP'&&is_correlationOP"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item)"
@click="clickCorrelation(item, 1)"
>
<span class="c059FF6">编辑关联OP</span>
</div>
<div
v-if="item.OrderStatus != 3
&&pagesTitle=='OP'"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item,2)"
>
<span class="c059FF6">编辑总金额</span>
</div>
</div>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div>
......@@ -980,10 +988,17 @@ export default {
this.close()
this.$emit('success')
},
clickCorrelation(item){
this.CorrelationObj = item
this.CorrelationObj.TypeNum = 1
this.isShowCorrelation = true
clickCorrelation(item, type){
// this.CorrelationObj = item
// this.CorrelationObj.TypeNum = 1
// this.isShowCorrelation = true
this.CorrelationObj = JSON.parse(JSON.stringify(item));
if (type == 2) {
this.CorrelationObj.TypeNum = 5; //编辑总价
} else {
this.CorrelationObj.TypeNum = 1;
}
this.isShowCorrelation = true;
},
isOffset(row, index, num,name){
this.makeAdocument(row, index, num, name, 'Offset')
......
src/components/Hotel/reservation/correlationOP.vue
View file @ e2bab6fb
<template>
<el-dialog :title="Title" width="400px" :visible.sync="isShow" center @close="close">
<el-form class="cdForm" label-width="90px" :model="msg" :rules="rules" ref="msg">
<template v-if="CorrelationObj.TypeNum!=4">
<template v-if="CorrelationObj.TypeNum!=4 && CorrelationObj.TypeNum!=5 && CorrelationObj.TypeNum!=6">
<el-form-item label="OP" prop="OpEmpId">
<el-select filterable v-model='msg.OpEmpId' placeholder="请选择OP">
<el-option v-for='item in EmployeeList'
......@@ -69,7 +69,7 @@
this.CorrelationObj = newValue
this.msg.OrderId = newValue.OrderId
this.msg.OpEmpId = newValue.OpEmpId?newValue.OpEmpId:null
if(newValue.TypeNum==4){
if(newValue.TypeNum==4 || newValue.TypeNum==5 || newValue.TypeNum==6){
this.msg.Money = newValue.Money
this.Title = '编辑总金额'
}else{
......@@ -87,7 +87,7 @@
mounted() {
this.msg.OrderId = this.CorrelationObj.OrderId
this.msg.OpEmpId = this.CorrelationObj.OpEmpId?this.CorrelationObj.OpEmpId:null
if(this.CorrelationObj.TypeNum==4){
if(this.CorrelationObj.TypeNum==4 || this.CorrelationObj.TypeNum==5 || this.CorrelationObj.TypeNum==6){
this.msg.Money = this.CorrelationObj.Money
this.Title = '修改总价'
}else{
......@@ -98,7 +98,10 @@
methods: {
sureBtn(){
let url
let msg
let msg = {
OrderId: this.msg.OrderId,
OpEmpId: this.msg.OpEmpId
}
if(this.CorrelationObj.TypeNum==1){
url = 'dict_post_SetCustomerOrderOP'
}
......@@ -114,14 +117,19 @@
Money: this.msg.Money
}
url = 'ticket_post_SetTicketOrderMoney'
}else{
} else if(this.CorrelationObj.TypeNum===5){ // 酒店修改总价
msg = {
OrderId: this.msg.OrderId,
OpEmpId: this.msg.OpEmpId
Money: this.msg.Money
}
url = 'dict_post_SetHotelOrderMoney'
} else if(this.CorrelationObj.TypeNum===6){ // 车修改总价
msg = {
OrderId: this.msg.OrderId,
Money: this.msg.Money
}
url = 'CarSingle_post_SetCarOrderMoney'
}
this.$refs['msg'].validate((valid) => {
if (valid) {
this.apipost(url, msg, res => {
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ e2bab6fb
<style scoped>
.row {
.row {
display: flex;
}
.row-c {
}
.row-c {
display: flex;
align-items: center;
}
.column {
}
.column {
display: flex;
flex-direction: column;
}
.column-jac {
}
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.column-ac {
}
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
.wrap {
}
.wrap {
flex-wrap: wrap;
}
.justify-sb {
}
.justify-sb {
justify-content: space-between;
}
.justify-c {
}
.justify-c {
justify-content: center;
}
.justify-e {
}
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
.flex-g {
}
.flex-g {
flex-grow: 1;
}
.flex-s {
}
.flex-s {
flex-shrink: 0;
}
.align-c {
}
.align-c {
align-items: center;
}
.cblack {
}
.cblack {
color: black;
}
.cf {
}
.cf {
color: #ffffff;
}
.c9e {
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
}
.c20C997 {
color: #20c997;
}
.c02C854 {
}
.c02C854 {
color: #02c854;
}
.cff9800 {
}
.cff9800 {
color: #ff9800;
}
}
.cF1416C {
.cF1416C {
color: #f1416c;
}
.cF57A98 {
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
}
.c3FC4FF {
color: #3fc4ff;
}
.fz10 {
}
.fz10 {
font-size: 10px;
}
.fz11 {
}
.fz11 {
font-size: 11px;
}
.fz12 {
}
.fz12 {
font-size: 12px;
}
.fz13 {
}
.fz13 {
font-size: 13px;
}
.fz14 {
}
.fz14 {
font-size: 14px;
}
.fz15 {
}
.fz15 {
font-size: 15px;
}
.fz16 {
}
.fz16 {
font-size: 16px;
}
.fz17 {
}
.fz17 {
font-size: 17px;
}
.fz18 {
}
.fz18 {
font-size: 18px;
}
.fbold {
}
.fbold {
font-weight: bold;
}
.ml {
}
.ml {
margin-left: 10px;
}
.mr {
}
.mr {
margin-right: 10px;
}
.mt {
}
.mt {
margin-top: 10px;
}
.mt20 {
}
.mt20 {
margin-top: 20px;
}
.mb {
}
.mb {
margin-bottom: 10px;
}
.mb20 {
}
.mb20 {
margin-bottom: 20px;
}
.mx {
}
.mx {
margin-left: 10px;
margin-right: 10px;
}
.mx5 {
}
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
.mb5 {
}
.mb5 {
margin-bottom: 5px;
}
.py {
}
.py {
padding: 15px 0;
}
.py5 {
}
.py5 {
padding: 5px 0;
}
.px5 {
}
.px5 {
padding: 0 5px;
}
.px15 {
}
.px15 {
padding: 0 15px;
}
.pa15 {
}
.pa15 {
padding: 15px;
}
.py20 {
}
.py20 {
padding: 20px 0;
}
.pb5 {
}
.pb5 {
padding: 0 0 5px 0;
}
.pa {
}
.pa {
padding: 10px 20px;
}
.pa20 {
}
.pa20 {
padding: 20px;
}
.pt20 {
}
.pt20 {
padding: 20px 0;
}
.borderD {
}
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
}
.bgf {
background: #ffffff;
}
.bgf5 {
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
}
.bgFAEAED {
background: #faeaed;
}
.bj {
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
}
.bjFFF3E0 {
background: #fff3e0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
}
.cursor-pointer {
cursor: pointer;
}
.relative {
}
.relative {
position: relative;
}
.absolute {
}
.absolute {
position: absolute;
}
.left0 {
}
.left0 {
left: 0;
}
.right0 {
}
.right0 {
right: 0;
}
.top0 {
}
.top0 {
top: 0;
}
.bottom0 {
}
.bottom0 {
bottom: 0;
}
.left20 {
}
.left20 {
left: 020px;
}
.right20 {
}
.right20 {
right: 20px;
}
.top20 {
}
.top20 {
top: 20px;
}
.bottom20 {
}
.bottom20 {
bottom: 20px;
}
.text-center {
}
.text-center {
text-align: center;
}
.orderType {
}
.orderType {
padding: 3px 15px;
border-radius: 3px;
background: #f57a98;
margin-right: 15px;
}
.orderType.active {
}
.orderType.active {
background: #4dd0e1;
}
.orderType.activeB {
background: #E95252;
}
.copy {
}
.orderType.activeB {
background: #e95252;
}
.copy {
display: inline-block;
padding: 3px 15px;
border-radius: 3px;
margin-left: 20px;
}
.copy:hover {
}
.copy:hover {
background: #f5f5f5;
}
.see-rec div {
}
.see-rec div {
padding: 1px 5px;
border-radius: 3px;
}
.see {
}
.see {
border: 1px solid #04c8c8;
}
.seeLK {
}
.seeLK {
border: 1px solid #059ff6;
}
.see:hover {
}
.see:hover {
background-color: rgba(4, 200, 200, 0.1);
}
.rec {
}
.rec {
border: 1px solid #04c8c8;
background-color: rgba(4, 200, 200, 1);
}
.rec:hover {
}
.rec:hover {
border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4, 200, 200, 0.9);
}
.cancel:hover {
}
.cancel:hover {
background-color: #f3dce2;
}
.confirm:hover {
}
.confirm:hover {
background-color: #dcedc8;
}
.change:hover {
}
.change:hover {
background-color: #d7e9f3;
}
.change1:hover {
}
.change1:hover {
background-color: #dcedc8;
}
.orderop {
}
.orderop {
text-align: center;
}
.orderop div {
}
.orderop div {
width: 100px;
height: 50%;
display: flex;
justify-content: center;
}
.RoomList div {
}
.RoomList div {
border-bottom: 1px solid #e7e7e7;
}
.RoomList div:last-child {
}
.RoomList div:last-child {
border: 0;
}
.el-table {
}
.el-table {
font-size: 13px;
}
.shezhifrom {
}
.shezhifrom {
position: relative;
}
.shebox {
}
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
.shezhifrom:hover .shebox {
}
.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;
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;
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;
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 {
}
.list-centent li {
width: 33.33%;
}
.list-centent.active li {
}
.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{
border-bottom: 1px solid #EBEEF5;
}
/deep/.el-table tr td{
border-bottom: 1px solid #EBEEF5;
}
</style>
}
/deep/.el-table tr:last-child td {
border-bottom: 1px solid #ebeef5;
}
/deep/.el-table tr td {
border-bottom: 1px solid #ebeef5;
}
</style>
<template>
<div>
......@@ -397,16 +396,19 @@
<div>
<div
class="orderType cf fz12"
:class="{ active: item.OrderType == 1,activeB: item.OrderType == 3 }"
:class="{
active: item.OrderType == 1,
activeB: item.OrderType == 3,
}"
>
<template v-if="item.OrderType==1">接机</template>
<template v-if="item.OrderType==2">送机</template>
<template v-if="item.OrderType==3">包车</template>
<template v-if="item.OrderType == 1">接机</template>
<template v-if="item.OrderType == 2">送机</template>
<template v-if="item.OrderType == 3">包车</template>
</div>
</div>
<div class="c9e fz12">
<span>订单编号：</span>
<span>{{ item.OrderNo }}({{ item.OrderId}})</span>
<span>{{ item.OrderNo }}({{ item.OrderId }})</span>
<span
class="copy cblack cursor-pointer"
v-if="copyId != item.OrderId"
......@@ -419,22 +421,34 @@
</div>
</div>
<div class="c9e fz12">
<span>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span>
<span v-if="pagesTitle!='销售'">
<template v-if="item.SurName||item.Name"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
<template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
<template v-if="item.OrderSource==1">B2C</template>
<span
>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span
>
<span v-if="pagesTitle != '销售'">
<template v-if="item.SurName || item.Name"> /</template
>来源<template v-if="!item.OrderSource && !item.CustomerId"
>销售</template
>
<template v-if="!item.OrderSource && item.CustomerId > 0"
>B2B</template
>
<template v-if="item.OrderSource == 1">B2C</template>
</span>
</div>
<div class="row c9e fz12">
<span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
<span class="mr" v-if="item.LureEmpName"
>引流人：{{ item.LureEmpName }}</span
>
<span class="mr">销售：{{ item.SaleName }}</span>
<span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
<span class="mr" v-if="item.OpName && pagesTitle == 'OP'"
>关联OP：{{ item.OpName }}</span
>
<span class="mr" v-if="item.CustomerName">创建人：</span>
<span class="mr" v-if="item.CustomerName"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
item.CustomerTel
}})</span>
}})</span
>
<span>下单时间：</span>
<span class="mr">{{ item.CreateTime }}</span>
<div class="">
......@@ -444,7 +458,7 @@
'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
'el-icon-check cblack': item.OrderStatus == 2,
'el-icon-warning cff9800': item.OrderStatus == 3,
'el-icon-refresh cF1416C': item.OrderStatus == 4
'el-icon-refresh cF1416C': item.OrderStatus == 4,
}"
></i>
<span
......@@ -453,7 +467,7 @@
c20C997: item.OrderStatus == 1,
cblack: item.OrderStatus == 2,
cff9800: item.OrderStatus == 3,
cF1416C: item.OrderStatus == 4
cF1416C: item.OrderStatus == 4,
}"
>
{{ item.OrderStatusName }}
......@@ -462,36 +476,40 @@
</div>
</div>
<div class="mb">
<el-table :data="[item]" style="width:100%" border>
<el-table :data="[item]" style="width: 100%" border>
<el-table-column
label="产品名称(出发日期)"
min-width="100"
style="background:#EAEAEA"
style="background: #eaeaea"
>
<template slot-scope="scope">
<template>
<div>{{ scope.row.ProductName }}</div>
<span style="color: #999999;">{{scope.row.OrderDate}}</span>
<span style="color: #999999">{{ scope.row.OrderDate }}</span>
</template>
</template>
</el-table-column>
<el-table-column v-if="item.OrderType!=3" label="航班信息" style="background:#EAEAEA">
<el-table-column
v-if="item.OrderType != 3"
label="航班信息"
style="background: #eaeaea"
>
<template slot-scope="scope">
<div>{{scope.row.AirLine}}</div>
<div class="text-grey-9 q-pt-xs">{{scope.row.FlightNumber}}</div>
<div>{{ scope.row.AirLine }}</div>
<div class="text-grey-9 q-pt-xs">
{{ scope.row.FlightNumber }}
</div>
<div class="text-grey-6 q-pt-xs">
{{scope.row.FlightTime}}{{scope.row.OrderType == 1?'抵达':'出发至'}}{{scope.row.AirportName}}
{{ scope.row.FlightTime
}}{{ scope.row.OrderType == 1 ? "抵达" : "出发至"
}}{{ scope.row.AirportName }}
</div>
</template>
</el-table-column>
<el-table-column label="上下车信息" style="background:#EAEAEA">
<el-table-column label="上下车信息" style="background: #eaeaea">
<template slot-scope="scope">
<div>
预定时间：{{ scope.row.OrderDate }}
</div>
<div>
车型：{{ scope.row.CarName }}
</div>
<div>预定时间：{{ scope.row.OrderDate }}</div>
<div>车型：{{ scope.row.CarName }}</div>
<div v-if="scope.row.GetonAddress">
上车点：{{ scope.row.GetonAddress }}
</div>
......@@ -500,30 +518,34 @@
</div>
</template>
</el-table-column>
<el-table-column v-if="item.OrderType!=3" label="行李" style="background:#EAEAEA">
<el-table-column
v-if="item.OrderType != 3"
label="行李"
style="background: #eaeaea"
>
<template slot-scope="scope">
<div v-if="scope.row.HandLuggageNum>0">
<div v-if="scope.row.HandLuggageNum > 0">
手提：{{ scope.row.HandLuggageNum }}
</div>
<div v-if="scope.row.HandLuggageNum>0">
<div v-if="scope.row.HandLuggageNum > 0">
托运：{{ scope.row.RegisteredLuggageNum }}
</div>
</template>
</el-table-column>
<el-table-column label="人员" style="background:#EAEAEA">
<el-table-column label="人员" style="background: #eaeaea">
<template slot-scope="scope">
<div v-if="scope.row.ManNum>0">
<div v-if="scope.row.ManNum > 0">
成人：{{ scope.row.ManNum }}
</div>
<div v-if="scope.row.ChildNum>0">
<div v-if="scope.row.ChildNum > 0">
儿童：{{ scope.row.ChildNum }}
</div>
<div v-if="scope.row.BabyNum>0">
<div v-if="scope.row.BabyNum > 0">
婴儿：{{ scope.row.BabyNum }}
</div>
</template>
</el-table-column>
<el-table-column label="数量" style="background:#EAEAEA">
<el-table-column label="数量" style="background: #eaeaea">
<template slot-scope="scope">
{{ scope.row.Num }}
</template>
......@@ -531,32 +553,82 @@
<el-table-column
label="小计"
min-width="70"
style="background:#EAEAEA"
style="background: #eaeaea"
>
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
</template>
</el-table-column>
<template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
<div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
<i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
<div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.OPRemark" style="padding:10px;color:#f1416c"
:style="{'padding':!item.Remark&&item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
OP备注：{{item.OPRemark}}
<i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
<template
slot="append"
v-if="
item.Remark ||
item.OPRemark ||
item.isMore ||
(item.OrderStatus > 1 && item.OrderStatus != 3)
"
>
<div
v-if="
(item.OrderStatus > 1 && item.OrderStatus != 3) || item.Remark
"
style="padding: 10px; color: #f1416c"
>
客户备注：{{ item.Remark }}
<i
v-if="
pagesTitle == '销售' &&
item.OrderStatus > 1 &&
item.OrderStatus != 3
"
class="el-icon-edit cursor-pointer c059FF6 mx"
@click="editRemark(item)"
></i>
</div>
<div
v-if="
(item.OrderStatus > 1 && item.OrderStatus != 3) || item.OPRemark
"
style="padding: 10px; color: #f1416c"
:style="{
padding:
!item.Remark && item.isMore
? '0 10px 30px 10px'
: '0 10px 10px 10px',
}"
>
OP备注：{{ item.OPRemark }}
<i
v-if="
pagesTitle == 'OP' &&
item.OrderStatus > 1 &&
item.OrderStatus != 3
"
class="el-icon-edit cursor-pointer c059FF6 mx"
@click="editRemark(item)"
></i>
</div>
</template>
</el-table>
</div>
<el-table :data="[item]" style="width:100%" border v-if="item.OrderStatus!=3">
<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>
<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>
<span class="fz15 fbold">{{
scope.row.CostMoney ? scope.row.CostMoney : "-"
}}</span>
</template>
</el-table-column>
<el-table-column label="平台税金" min-width="100">
......@@ -568,20 +640,34 @@
</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>
<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.DueInMoney || '-' }}</span>
<span class="fz15 fbold">{{ scope.row.DueInMoney || "-" }}</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).toFixed(2):'-' }}</span>
<span class="fz15 fbold">{{
scope.row.Income - scope.row.CostMoney - scope.row.Refund > 0
? (
scope.row.Income -
scope.row.CostMoney -
scope.row.Refund
).toFixed(2)
: "-"
}}</span>
</template>
</el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
<el-table-column
v-if="item.SellCommission && item.SellCommission > 0"
label="提成"
style="background: #eaeaea"
>
<template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog>
</template>
......@@ -593,8 +679,14 @@
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
:class="{
bgD9F3FF: x.Status == 1,
bgFAEAED: x.Status == 2,
bjFFF3E0: x.Status == 3,
c3FC4FF: x.Status == 1,
cF1416C: x.Status == 2,
cff9800: x.Status == 3,
}"
v-for="(x, i) in item.IncomeList"
@click="openDetails(x)"
>{{ x.FrID }}</span
......@@ -621,8 +713,14 @@
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
:class="{
bgD9F3FF: x.Status == 1,
bgFAEAED: x.Status == 2,
bjFFF3E0: x.Status == 3,
c3FC4FF: x.Status == 1,
cF1416C: x.Status == 2,
cff9800: x.Status == 3,
}"
v-for="(x, i) in item.RefundList"
@click="openDetails(x)"
>{{ x.FrID }}</span
......@@ -649,8 +747,14 @@
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
:class="{
bgD9F3FF: x.Status == 1,
bgFAEAED: x.Status == 2,
bjFFF3E0: x.Status == 3,
c3FC4FF: x.Status == 1,
cF1416C: x.Status == 2,
cff9800: x.Status == 3,
}"
v-for="(x, i) in item.CostList"
@click="openDetails(x)"
>{{ x.FrID }}</span
......@@ -659,32 +763,41 @@
暂无成本单据
</span>
</div>
<div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2 && pagesTitle != '销售'">
<el-tooltip class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i>
<div
class="item absolute right20 bottom20"
v-if="item.OrderStatus == 2 && 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>
<i
class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"
></i>
</el-tooltip>
</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}">
<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 }"
>
<span class="fz12 c9e">订单总金额</span>
<div class="ml">
<span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
<span class="fz12 ml">
{{item.CurrencyName}}
{{ item.CurrencyName }}
</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>
......@@ -693,7 +806,11 @@
</div>
</div>
<div
v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus!=3"
v-if="
item.OrderStatus > 0 &&
item.OrderStatus < 4 &&
item.OrderStatus != 3
"
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
<div
......@@ -701,24 +818,29 @@
item.OrderStatus == 1 &&
item.IncomeList.length == 0 &&
item.RefundList.length == 0 &&
item.CostList.length == 0 && item.OrderSource!=1
item.CostList.length == 0 &&
item.OrderSource != 1
"
class="row-c cursor-pointer radius5 cancel py5"
@click="clickRightButtom(item, 0)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading0"></i>
<i v-loading="msg.OrderId == item.OrderId && loading0"></i>
<span class="cF1416C">取消订单</span>
</div>
<div
v-if="item.OrderStatus == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
v-if="
item.OrderStatus == 1 &&
pagesTitle != '销售' &&
item.OrderSource != 1
"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(item, 1)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
<i v-loading="msg.OrderId == item.OrderId && loading1"></i>
<span class="c20C997">确认订单</span>
</div>
<div
v-if="item.OrderStatus == 1&&pagesTitle=='销售'"
v-if="item.OrderStatus == 1 && pagesTitle == '销售'"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '变更订单')"
>
......@@ -729,24 +851,52 @@
class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 2)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
<i v-loading="msg.OrderId == item.OrderId && loading2"></i>
<span class="c20C997">收损</span>
</div>
<div
v-if="item.OrderStatus >1 && item.OrderStatus != 3
&&pagesTitle!='销售'&&is_correlationOP"
v-if="
item.OrderStatus > 1 &&
item.OrderStatus != 3 &&
pagesTitle != '销售' &&
is_correlationOP
"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item)"
@click="clickCorrelation(item, 1)"
>
<span class="c059FF6">编辑关联OP</span>
</div>
<div
v-if="item.OrderStatus != 3 && pagesTitle == 'OP'"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item, 2)"
>
<span class="c059FF6">编辑总金额</span>
</div>
</div>
</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;font-family: microsoft yahei;">
{{item.CancelEmpName}} {{item.CancelTime}}
<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;
font-family: microsoft yahei;
"
>
{{ item.CancelEmpName }} {{ item.CancelTime }}
</div>
</div>
</div>
......@@ -770,8 +920,8 @@
</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;">
<el-row :gutter="20" style="margin-top: 20px; margin-bottom: 20px">
<el-col :span="24" style="text-align: right">
<input
type="button"
class="normalBtn"
......@@ -794,7 +944,7 @@
title="取消订单"
:visible.sync="cancelOrderDialog"
>
<div style="padding-bottom:20px">
<div style="padding-bottom: 20px">
<el-input
type="textarea"
autofocus
......@@ -803,8 +953,8 @@
clear="w300"
v-model="cancelRemark"
></el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<el-row :gutter="20" style="margin-top: 20px">
<el-col :span="24" style="text-align: right">
<input
type="button"
class="normalBtn"
......@@ -822,10 +972,16 @@
</div>
</el-dialog>
<!-- op备注 -->
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center width="400px">
<el-row class="flex" style="margin-top: 10px;">
<el-dialog
custom-class="addCompany"
:title="pagesTitle == '销售' ? '编辑客户备注' : '编辑OP备注'"
:visible.sync="isShowRemark"
center
width="400px"
>
<el-row class="flex" style="margin-top: 10px">
<el-col>
<span style="display: block;margin-bottom: 10px;">备注：</span>
<span style="display: block; margin-bottom: 10px">备注：</span>
<span>
<el-input type="textarea" :rows="4" v-model="postMsg.Remark">
</el-input>
......@@ -833,28 +989,36 @@
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isShowRemark = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="submitEditRemark">{{$t('pub.sureBtn')}}</button>
<button class="hollowFixedBtn" @click="isShowRemark = false">
取消
</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitEditRemark">
{{ $t("pub.sureBtn") }}
</button>
</div>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
@close="isShowCorrelation=false"
@success="success"></correlationOP>
<offset :isShow="cdState" :obj="queryObj" @close="cdState = false"></offset>
<correlationOP
:isShowCorrelation="isShowCorrelation"
:CorrelationObj="CorrelationObj"
@close="isShowCorrelation = false"
@success="success"
></correlationOP>
</div>
</template>
</template>
<script>
import offset from '../../../public/offset.vue';
import correlationOP from '../../../Hotel/reservation/correlationOP.vue';
import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset,correlationOP,commissionDialog },
props: ["OrderList","pagesTitle"],
import offset from "../../../public/offset.vue";
import correlationOP from "../../../Hotel/reservation/correlationOP.vue";
import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog";
export default {
components: { offset, correlationOP, commissionDialog },
props: ["OrderList", "pagesTitle"],
data() {
return {
postMsg:{OrderId:0,Type:1,Remark:''},
postMsg: { OrderId: 0, Type: 1, Remark: "" },
isShowRemark: false,
queryObj:null,
queryObj: null,
cdState: false,
copyId: 0,
loading0: false,
......@@ -868,54 +1032,60 @@
OtherType: 61,
ReFinanceId: "",
ReFinanceId2: "",
RelevanceFrId: "",// 1接机 2送机 3包车
RelevanceFrId: "", // 1接机 2送机 3包车
},
userInfo: {},
msg: {
OrderId: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
State: "", //状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: "",
},
msgParameter: {
IsUpdateMailing: 1,
OrderId: 0,
Money: 0.0,
Remark: '',
MailingState: '1',//邮寄状态 1自取 2邮寄
MailingAddress: '',//MailingState =2 填写邮寄
UseDate:'',//门票日期
Name:'',
EName:'',
Sex: '1',//1男2女
Birthday: '',
Mobile:'',
CouponsId:'',//景点id
DetailList:[],
Remark: "",
MailingState: "1", //邮寄状态 1自取 2邮寄
MailingAddress: "", //MailingState =2 填写邮寄
UseDate: "", //门票日期
Name: "",
EName: "",
Sex: "1", //1男2女
Birthday: "",
Mobile: "",
CouponsId: "", //景点id
DetailList: [],
},
rules2:{
Name: [{
rules2: {
Name: [
{
required: true,
message: '请输入中文名',
trigger: 'blur'
}],
EName: [{
message: "请输入中文名",
trigger: "blur",
},
],
EName: [
{
required: true,
message: '请输入英文名',
trigger: 'blur'
}],
message: "请输入英文名",
trigger: "blur",
},
],
Mobile: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
}
message: "请输入正确的电话",
},
],
MailingAddress: [{
MailingAddress: [
{
required: true,
message: '请输入邮寄地址',
trigger: 'blur'
}],
message: "请输入邮寄地址",
trigger: "blur",
},
],
},
outerVisible: false,
rules: {
......@@ -923,112 +1093,122 @@
{
required: true,
message: "请选择订单状态",
trigger: "change"
}
trigger: "change",
},
],
SelffetchAddress: [
{
required: true,
message: "请输入自提地址",
trigger: "blur"
}
trigger: "blur",
},
],
LossMoney: [
{
required: true,
message: "请输入收损金额",
trigger: "blur"
}
]
trigger: "blur",
},
],
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0,
cancelOrderId: 0,
uploadOrderId: 0,
loading: false,
fileList:[],
GuestFile: '',
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: '',
Title: '',
typeState: "",
Title: "",
isShowCorrelation: false,
CorrelationObj:{},
is_correlationOP: false
CorrelationObj: {},
is_correlationOP: false,
};
},
watch: {
pagesTitle(val,oldval){
this.Title = val
pagesTitle(val, oldval) {
this.Title = val;
},
OrderList: {
handler(val, oldVal) {},
},
OrderList:{
handler(val, oldVal){
}
}
},
methods: {
close(){
this.isShowCorrelation = false
close() {
this.isShowCorrelation = false;
},
success(){
this.close()
this.$emit('success')
success() {
this.close();
this.$emit("success");
},
clickCorrelation(item){
this.CorrelationObj = item
this.CorrelationObj.TypeNum = 3
this.isShowCorrelation = true
clickCorrelation(item, type) {
// <!-- this.CorrelationObj = item
// this.CorrelationObj.TypeNum = 3
// this.isShowCorrelation = true -->
this.CorrelationObj = JSON.parse(JSON.stringify(item));
if (type == 2) {
this.CorrelationObj.TypeNum = 6; //编辑总价
} else {
this.CorrelationObj.TypeNum = 3;
}
this.isShowCorrelation = true;
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
this.cdState = true
},100)
isOffset(row, index, num) {
this.makeAdocument(row, index, num, "Offset");
setTimeout(() => {
this.cdState = true;
}, 100);
},
editRemark(item){
this.postMsg.OrderId = item.OrderId
this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
this.isShowRemark = true
editRemark(item) {
this.postMsg.OrderId = item.OrderId;
this.postMsg.Remark =
this.pagesTitle == "销售" ? item.Remark : item.OPRemark;
this.isShowRemark = true;
},
submitEditRemark(){
if(!this.postMsg.Remark){
this.$message.error('OP备注不能为空');
return
submitEditRemark() {
if (!this.postMsg.Remark) {
this.$message.error("OP备注不能为空");
return;
}
this.apipost('CarSingle_post_SetCarOrderRemark', {
this.apipost(
"CarSingle_post_SetCarOrderRemark",
{
OrderId: this.postMsg.OrderId,
Type: this.pagesTitle=='销售'?1:2,
Remark: this.postMsg.Remark
}, res => {
Type: this.pagesTitle == "销售" ? 1 : 2,
Remark: this.postMsg.Remark,
},
(res) => {
if (res.data.resultCode == 1) {
this.isShowRemark = false
this.$emit('success')
this.isShowRemark = false;
this.$emit("success");
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
})
}
);
},
submit2(){
if(this.loading3) return
this.$refs['msgParameter'].validate((valid) => {
submit2() {
if (this.loading3) return;
this.$refs["msgParameter"].validate((valid) => {
if (valid) {
this.setFormMsg2()
this.setFormMsg2();
} else {
return false;
}
});
},
setFormMsg2(){
if(this.msgParameter.MailingState=='1'){
this.msgParameter.MailingAddress = ''
setFormMsg2() {
if (this.msgParameter.MailingState == "1") {
this.msgParameter.MailingAddress = "";
}
let m = {
IsUpdateMailing: 1,
......@@ -1038,66 +1218,80 @@
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,
}
this.loading3 = true
this.apipost("ticket_post_SetSaleTicketOrder", m,
res => {
this.loading3 = false
};
this.loading3 = true;
this.apipost(
"ticket_post_SetSaleTicketOrder",
m,
(res) => {
this.loading3 = false;
if (res.data.resultCode == 1) {
this.Success('变更成功');
this.$emit('success')
this.ChangeOrderDialog = false
this.Success("变更成功");
this.$emit("success");
this.ChangeOrderDialog = false;
} else {
this.Error('变更失败')
this.Error("变更失败");
}
},
err => {
this.loading3 = false
this.Error(err.message)
});
(err) => {
this.loading3 = false;
this.Error(err.message);
}
);
},
uploadFileBtn(file){
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
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/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.GuestFile = this.domainManager().ViittoFileUrl + x.data.FilePath
this.uploadHandleChange()
}, 1);
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(
path,
newArr,
(x) => {
this.GuestFile = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.uploadHandleChange();
},
1
);
},
// 上传旅客名单
uploadHandleChange(){
if(this.loading) return
uploadHandleChange() {
if (this.loading) return;
let msg = {
OrderId: this.uploadOrderId,
GuestFileList: [this.GuestFile]
}
this.loading = true
GuestFileList: [this.GuestFile],
};
this.loading = true;
this.apipost(
"dict_post_SetSaleOrderGuestFile",msg,
res => {
"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);
}
},
err => {
(err) => {
this.loading = false;
}
);
......@@ -1110,18 +1304,18 @@
};
this.$router.push({
path: "/FinancialDocumentsDetail",
query
query,
});
},
// 制作单据
makeAdocument(row, index, num, Offset) {
let type = 0
if(num==3){
type = 2
}else{
type = num
let type = 0;
if (num == 3) {
type = 2;
} else {
type = num;
}
this.BillMakingMsg.RelevanceFrId = row.OrderType//1接机 2送机 3包车
this.BillMakingMsg.RelevanceFrId = row.OrderType; //1接机 2送机 3包车
this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num;
this.BillMakingMsg.OtherType = 67;
......@@ -1138,21 +1332,21 @@
blank: "y",
tab: `新增${text}单据`,
Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg)
tradeObj: JSON.stringify(this.BillMakingMsg),
};
this.queryObj = query
if(!Offset){
this.queryObj = query;
if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
query,
});
}
},
// 订单明细
goRoomDetails(obj, title) {
var path
if(title==='订房详情'){
var path;
if (title === "订房详情") {
path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
......@@ -1163,51 +1357,55 @@
id: obj.OrderId,
OrderType: 1,
blank: "y",
tab: title
}
tab: title,
},
});
}else{//变更预定
} else {
//变更预定
this.$router.push({
name: 'CharterPreview',
name: "CharterPreview",
query: {
OrderId: obj.OrderId,
id: obj.ProductId,
blank: "y",
tab: title
}
tab: title,
},
});
}
},
clickRightButtom(item, type) {
// 0取消订单 1确认订单 2收损
this.msg.OrderId = item.OrderId;
this.msg.SelffetchAddress = item.SelffetchAddress
this.items = item
this.typeState = type
this.msg.SelffetchAddress = item.SelffetchAddress;
this.items = item;
this.typeState = type;
if (type == 0) {
if (!this.loading0) {
this.cancelOrderId = item.OrderId
this.cancelOrderId = item.OrderId;
// 销售 OP
if(this.Title!='销售'){
if (this.Title != "销售") {
this.cancelOrderDialog = true;
}else{
let that = this
that.$confirm(`是否确定取消订单？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.cancelOrderHandler()
}).catch(err=>{
this.loading0= false
} else {
let that = this;
that
.$confirm(`是否确定取消订单？`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.cancelOrderHandler();
})
.catch((err) => {
this.loading0 = false;
});
}
}
} else if (type == 1) {
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;
......@@ -1216,38 +1414,44 @@
},
// 销售取消订单
cancelOrder() {
let that = this
let that = this;
if (this.loading0) return;
that.$confirm(`是否确定取消订单？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading0 = true
this.apipost("ticket_post_CancelSaleTicketOrder", {
that
.$confirm(`是否确定取消订单？`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.loading0 = true;
this.apipost(
"ticket_post_CancelSaleTicketOrder",
{
OrderId: this.cancelOrderId,
IsOPCancel: this.Title!='销售'?1:0,
Remark: this.cancelRemark
IsOPCancel: this.Title != "销售" ? 1 : 0,
Remark: this.cancelRemark,
},
res => {
this.loading0= false
(res) => {
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(()=>{
this.loading0 = false
}
).catch((err) => {
this.loading0 = false;
});
})
.catch(() => {
this.loading0 = false;
});
},
//提交
submitForm(msg) {
//提交创建、修改表单
this.$refs[msg].validate(valid => {
this.$refs[msg].validate((valid) => {
if (valid) {
if (!this.loading2) {
this.saveUpdate();
......@@ -1259,44 +1463,43 @@
});
},
cancelOrderHandler() {
if (this.cancelRemark == ""&&this.Title!='销售') {
if (this.cancelRemark == "" && this.Title != "销售") {
this.Error("请填写取消订单的缘由");
return;
}
if (this.loading0) return;
this.loading0 = true
this.loading0 = true;
this.apipost(
"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 => {
(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);
}
this.loading0 = false;
},
err => {
(err) => {
this.loading0 = false;
}
);
},
saveUpdate() {
let text = '是否确认设置收损?'
let text = "是否确认设置收损?";
this.$confirm(text, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
type: "warning",
})
.then(() => {
this.loading2 = true;
......@@ -1307,7 +1510,7 @@
State: this.typeState,
LossMoney: this.msg.LossMoney,
},
res => {
(res) => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("success");
......@@ -1317,19 +1520,19 @@
this.loading2 = false;
this.outerVisible = false;
},
err => {
(err) => {
(this.loading2 = false), (this.outerVisible = false);
}
);
})
.catch(() => {});
},
confirmFun(item,type) {
let text = '是否确认订单?'
confirmFun(item, type) {
let text = "是否确认订单?";
this.$confirm(text, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
type: "warning",
})
.then(() => {
this.loading1 = true;
......@@ -1338,9 +1541,9 @@
{
OrderId: item.OrderId,
State: type,
LossMoney: type==2?this.msg.LossMoney:'',
LossMoney: type == 2 ? this.msg.LossMoney : "",
},
res => {
(res) => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("success");
......@@ -1349,7 +1552,7 @@
}
this.loading1 = false;
},
err => {
(err) => {
this.loading1 = false;
}
);
......@@ -1362,12 +1565,12 @@
CopyHandler(item) {
this.copyId = item.OrderId;
let copyText = item.OrderId;
const save = function(e) {
e.clipboardData.setData('text/plain', copyText)
e.preventDefault() // 阻止默认行为
}
document.addEventListener('copy', save) // 添加一个copy事件
let x = document.execCommand('copy') // 执行copy方法
const save = function (e) {
e.clipboardData.setData("text/plain", copyText);
e.preventDefault(); // 阻止默认行为
};
document.addEventListener("copy", save); // 添加一个copy事件
let x = document.execCommand("copy"); // 执行copy方法
setTimeout(() => {
this.copyId = 0;
}, 2000);
......@@ -1381,10 +1584,7 @@
let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
let max = nextM.getDate();
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d
.toLocaleDateString()
.match(/\d+/g)
.join("-");
return d.toLocaleDateString().match(/\d+/g).join("-");
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
......@@ -1395,22 +1595,22 @@
}
//设置table的行高
// this.tableHeight = h;
}
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){
this.is_correlationOP = true
if (ActionMenuCode.indexOf("is_correlationOP") != -1) {
this.is_correlationOP = true;
}
//自适应高度调节
this.com_onresize();
window.onresize = () => {
this.com_onresize();
};
}
};
</script>
},
};
</script>
<style></style>
\ No newline at end of file
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