Skip to content

S
SuperMan
Commit a19029e8 authored by 罗超's avatar 罗超
Browse files
Options

修改订单里列表部分功能

parent 9f12491b
Show whitespace changes
Inline Side-by-side
Showing with 1077 additions and 634 deletions
src/components/Contract/ElectronicContract.vue
View file @ a19029e8
...@@ -920,7 +920,7 @@ ...@@ -920,7 +920,7 @@
<div class="EC_div" :class="{'checkedNav':cked==7}"> <div class="EC_div" :class="{'checkedNav':cked==7}">
<div class="EC_ComTitle">委托授权书</div> <div class="EC_ComTitle">委托授权书</div>
<template v-for="(item,index) in dataList.guestList"> <template v-for="(item,index) in dataList.guestList">
<p class="shouquanNum">{{index+1}}</p> <p class="shouquanNum" >{{index+1}}</p>
<div class="shouquanDiv"> <div class="shouquanDiv">
<p class="ShouDiv_Title">委托授权书</p> <p class="ShouDiv_Title">委托授权书</p>
<p><span>{{dataList.company}}</span>：</p> <p><span>{{dataList.company}}</span>：</p>
...@@ -939,7 +939,7 @@ ...@@ -939,7 +939,7 @@
联系电话：<span>{{dataList.clientCall}}</span> 联系电话：<span>{{dataList.clientCall}}</span>
</p> </p>
<p>受托人承诺：本授权委托书为<span>{{item.surName+''+item.name}} <p>受托人承诺：本授权委托书为<span>{{item.surName+''+item.name}}
</span（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。> </span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
</p> </p>
<p style="text-align:right;margin:20px 40px 20px 0">委托日期：<span>{{getDate(dataList.payDate)}}</span></p> <p style="text-align:right;margin:20px 40px 20px 0">委托日期：<span>{{getDate(dataList.payDate)}}</span></p>
</div> </div>
......
src/components/FinancialModule/Kingdee/SubjectContrast.vue
View file @ a19029e8
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<li class="hight_query"> <li class="hight_query">
<button class="hollowFixedBtn" @click="title='关联',outerVisible=true,clickDaoRu(11)">关联导入</button> <button class="hollowFixedBtn" @click="title='关联',outerVisible=true,clickDaoRu(11)">关联导入</button>
<button class="normalBtn"> <button class="normalBtn">
<template v-slot:default> <template>
<a style="color:#fff;width:84px;" :href="downList">导入模板下载</a> <a style="color:#fff;width:84px;" :href="downList">导入模板下载</a>
</template> </template>
</button> </button>
...@@ -379,4 +379,3 @@ ...@@ -379,4 +379,3 @@
</style> </style>
\ No newline at end of file
src/components/Hotel/reservation/HotelOrderList.vue
View file @ a19029e8
...@@ -219,12 +219,12 @@ ...@@ -219,12 +219,12 @@
}, },
//获取酒店订单列表 //获取酒店订单列表
GetList() { GetList() {
if(this.msg.StartTime==''){ // if(this.msg.StartTime==''){
this.msg.StartTime = this.getyMDOne() // this.msg.StartTime = this.getyMDOne()
} // }
if(this.msg.EndTime==''){ // if(this.msg.EndTime==''){
this.msg.EndTime = this.getyMDTwo() // this.msg.EndTime = this.getyMDTwo()
} // }
this.loading = true this.loading = true
this.apipost( this.apipost(
"dict_post_GetAdminCustomerOrderPageList", this.msg, "dict_post_GetAdminCustomerOrderPageList", this.msg,
...@@ -309,4 +309,3 @@ ...@@ -309,4 +309,3 @@
<style> <style>
</style> </style>
\ No newline at end of file
src/components/Hotel/reservation/OrderList.vue
View file @ a19029e8
<style scoped> <style scoped>
.row{display: flex;}.row-c{ display: flex; align-items:center;} .row {
.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;} display: flex;
.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;} .row-c {
.cblack{color: black;}.cf{ color: #ffffff;}.c9e{ color: #9e9e9e;}.c20C997{color: #20C997;}.c02C854{color: #02C854;} display: flex;
.cff9800{ color: #ff9800;}.cF1416C{ color: #F1416C;}.cF57A98{ color: #F57A98;} align-items: center;
.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;} .column {
.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;} display: flex;
.py{ padding: 15px 0;}.py5{padding: 5px 0;}.px5{ padding: 0 5px;}.px15{padding: 0 15px;}.py20{padding: 20px 0;}.pb5{padding: 0 0 5px 0;} flex-direction: column;
.pa{padding: 10px 20px;}.pa20{padding: 20px;}.pt20{padding: 20px 0;} }
.borderD{border-bottom: 1px dashed #DDDDDD} .column-jac {
.bgf{background:#ffffff;}.bgf5{background:#F5F5F5;}.bgE8F5E9{background:#E8F5E9;}.bgD9F3FF{background:#D9F3FF;}.bgFAEAED{background: #FAEAED;}.bj{background: #ffffff;} display: flex;
.radius5{border-radius: 5px;}.cursor-pointer{cursor: pointer;} flex-direction: column;
.relative{position: relative;}.absolute{position: absolute;}.left0{left: 0;}.right0{right: 0;}.top0{top: 0;}.bottom0{bottom: 0;} align-items: center;
.left20{left: 020px;}.right20{right: 20px;}.top20{top: 20px;}.bottom20{bottom: 20px;} justify-content: center;
.text-center{text-align: center;} }
.orderType{ .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;
}
.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;
}
.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; padding: 3px 15px;
border-radius: 3px; border-radius: 3px;
background: #F57A98; background: #f57a98;
margin-right: 15px; margin-right: 15px;
} }
.orderType.active{ .orderType.active {
background: #4DD0E1; background: #4dd0e1;
} }
.copy{ .copy {
display: inline-block; display: inline-block;
padding: 3px 15px; padding: 3px 15px;
border-radius: 3px; border-radius: 3px;
margin-left: 20px; margin-left: 20px;
} }
.copy:hover{ .copy:hover {
background: #F5F5F5; background: #f5f5f5;
} }
.see-rec div{ .see-rec div {
padding: 1px 5px; padding: 1px 5px;
border-radius: 3px; border-radius: 3px;
} }
.see{ .see {
border: 1px solid #04C8C8; border: 1px solid #04c8c8;
} }
.seeLK{ .seeLK {
border: 1px solid #059FF6; border: 1px solid #059ff6;
} }
.see:hover{ .see:hover {
background-color: rgba(4,200,200,.1); background-color: rgba(4, 200, 200, 0.1);
} }
.rec{ .rec {
border: 1px solid #04C8C8; border: 1px solid #04c8c8;
background-color: rgba(4,200,200,1); background-color: rgba(4, 200, 200, 1);
} }
.rec:hover{ .rec:hover {
border: 1px solid rgba(4,200,200,.9); border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4,200,200,.9); background-color: rgba(4, 200, 200, 0.9);
} }
.cancel:hover{ .cancel:hover {
background-color: #F3DCE2; background-color: #f3dce2;
} }
.confirm:hover{ .confirm:hover {
background-color: #DCEDC8; background-color: #dcedc8;
} }
.change:hover{ .change:hover {
background-color: #D7E9F3; background-color: #d7e9f3;
} }
.change1:hover{ .change1:hover {
background-color: #DCEDC8; background-color: #dcedc8;
} }
.orderop{ .orderop {
text-align: center; text-align: center;
} }
.orderop div{ .orderop div {
width: 100px; width: 100px;
height: 50%; height: 50%;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.RoomList div{ .RoomList div {
border-bottom: 1px solid #E7E7E7; border-bottom: 1px solid #e7e7e7;
} }
.RoomList div:last-child{ .RoomList div:last-child {
border: 0; border: 0;
} }
.el-table{ .el-table {
font-size: 13px; font-size: 13px;
} }
.shezhifrom{position: relative;} .shezhifrom {
.shebox{ position: absolute;top: 0;left: -100px;display: none;} position: relative;
.shezhifrom:hover .shebox{display: block;} }
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
.shezhifrom:hover .shebox {
display: block;
}
</style>
</style> <template>
<template>
<div> <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"
>
<div class="row-c justify-sb align-c py"> <div class="row-c justify-sb align-c py">
<div class="row-c"> <div class="row-c">
<div> <div>
<div class="orderType cf fz12" <div
:class="{'active':item.OrderType==1}"> class="orderType cf fz12"
{{item.OrderType==1?'散拼订房':'团队订房'}} :class="{ active: item.OrderType == 1 }"
>
{{ item.OrderType == 1 ? "散拼订房" : "团队订房" }}
</div> </div>
</div> </div>
<div class="c9e fz12"> <div class="c9e fz12">
<span>订单编号：</span> <span>订单编号：</span>
<span>{{item.OrderNo}}</span> <span>{{ item.OrderNo }}</span>
<span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span> <span
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</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> </div>
<div class="c9e fz12"> <div class="c9e fz12">
<span v-if="item.OrderType==1">联系人信息：{{item.ContactName}}/{{item.ContactNumber}}</span> <span v-if="item.OrderType == 1"
<span v-else>组团号：{{item.TCNum}}</span> >联系人信息：{{ item.ContactName }}/{{ item.ContactNumber }}</span
>
<span v-else>组团号：{{ item.TCNum }}</span>
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<span>创建人：</span>
<span class="mr"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
item.CustomerTel
}})</span
>
<span>下单时间：</span> <span>下单时间：</span>
<span class="mr">{{item.CreateTime}}</span> <span class="mr">{{ item.CreateTime }}</span>
<div class=""> <div class="">
<i class="mx5" <i
:class="{'el-icon-alarm-clock c20C997':item.OrderStatus==1, class="mx5"
'el-icon-check cblack':item.OrderStatus==2, :class="{
'el-icon-warning cff9800':item.OrderStatus==3, 'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
'el-icon-refresh cF1416C':item.OrderStatus==4}"></i> 'el-icon-check cblack': item.OrderStatus == 2,
<span class="fz12 cblack" :class="{'c20C997':item.OrderStatus==1,'cblack':item.OrderStatus==2, 'el-icon-warning cff9800': item.OrderStatus == 3,
'cff9800':item.OrderStatus==3,'cF1416C':item.OrderStatus==4}"> 'el-icon-refresh cF1416C': item.OrderStatus == 4
{{item.OrderStatusName}} }"
></i>
<span
class="fz12 cblack"
:class="{
c20C997: item.OrderStatus == 1,
cblack: item.OrderStatus == 2,
cff9800: item.OrderStatus == 3,
cF1416C: item.OrderStatus == 4
}"
>
{{ item.OrderStatusName }}
</span> </span>
</div> </div>
</div> </div>
</div> </div>
<div class="mb"> <div class="mb">
<el-table :data="item.DetailList" style="width:100%" border> <el-table :data="item.DetailList" 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 slot-scope="scope">
{{scope.row.Date}} {{ scope.row.Date }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="酒店名称" style="background:#EAEAEA"> <el-table-column label="酒店名称" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.HotelName}} {{ scope.row.HotelName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column min-width="240"> <el-table-column min-width="240">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span>入驻信息</span> <span>入驻信息</span>
<el-tooltip class="item" effect="dark" content="按照入住人数*房型单价=房型总价小计（不含稅）" placement="bottom"> <el-tooltip
class="item"
effect="dark"
content="按照入住人数*房型单价=房型总价小计（不含稅）"
placement="bottom"
>
<i class="el-icon-question c059FF6 cursor-pointer"></i> <i class="el-icon-question c059FF6 cursor-pointer"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="RoomList"> <div class="RoomList">
<div class="fz12 c9e" v-for="(x,i) in scope.row.RoomList"> <div class="fz12 c9e" v-for="(x, i) in scope.row.RoomList">
<span class="mr">{{x.RoomTypeName}}：{{x.Number}} 人间</span> <span class="mr"
<span class="ml mr">人数：{{x.PeopleNumber}} 人</span> >{{ x.RoomTypeName }}：{{ x.Number }} 人间</span
<span class="ml mr">单价：{{x.Unit_Price}}</span> >
<span class="ml">小计：{{x.Money}} {{scope.row.CurrencyName}}</span> <span class="ml mr">人数：{{ x.PeopleNumber }} 人</span>
<span class="ml mr">单价：{{ x.Unit_Price }}</span>
<span class="ml"
>小计：{{ x.Money }} {{ scope.row.CurrencyName }}</span
>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单号" min-width="100"> <el-table-column label="订房号" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.ReserveRoomNo" class="radius5 bgFAEAED cF1416C px5 fz12">未确认</span> <span
v-if="!scope.row.ReserveRoomNo"
class="radius5 bgFAEAED cF1416C px5 fz12"
>未确认</span
>
<template v-else> <template v-else>
<span class="radius5 bgE8F5E9 c20C997 px5 fz12">{{scope.row.ReserveRoomNo}}</span> <span class="radius5 bgE8F5E9 c20C997 px5 fz12">{{
scope.row.ReserveRoomNo
}}</span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="城市税" min-width="60"> <el-table-column label="城市税" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}} {{ scope.row.Tax > 0 ? scope.row.Tax.toFixed(2) : "-" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入汤税" min-width="60" style="background:#EAEAEA"> <el-table-column
label="入汤税"
min-width="60"
style="background:#EAEAEA"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.Tax2>0?scope.row.Tax2.toFixed(2):'-'}} {{ scope.row.Tax2 > 0 ? scope.row.Tax2.toFixed(2) : "-" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小计" min-width="70" style="background:#EAEAEA"> <el-table-column
label="小计"
min-width="70"
style="background:#EAEAEA"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.HotelMoeny.toFixed(2)}} {{ scope.row.HotelMoeny.toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款方式" min-width="80" style="background:#EAEAEA"> <el-table-column
label="付款方式"
min-width="80"
style="background:#EAEAEA"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.CustomerPayType==1?'到店自付':'出发前付款'}} {{ scope.row.CustomerPayType == 1 ? "到店自付" : "出发前付款" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手配費" min-width="80" style="background:#EAEAEA"> <el-table-column
label="手配費"
min-width="80"
style="background:#EAEAEA"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{item.HandFittingFee?item.HandFittingFee:'-'}} {{ item.HandFittingFee ? item.HandFittingFee : "-" }}
</template> </template>
</el-table-column> </el-table-column>
<template v-slot:append v-if="item.Remark">
<div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
</template>
</el-table> </el-table>
</div> </div>
<el-table :data="item.list" style="width:100%" border> <el-table :data="item.list" style="width:100%" border v-if="item.OrderStatus!=3">
<el-table-column label="实收" min-width="100"> <el-table-column label="实收" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.Income?scope.row.Income:'-'}}</span> <span>{{ scope.row.Income ? scope.row.Income : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成本" min-width="100"> <el-table-column label="成本" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.CostMoney?scope.row.CostMoney:'-'}}</span> <span>{{ scope.row.CostMoney ? scope.row.CostMoney : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="平台税金" min-width="100"> <el-table-column label="平台税金" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.PlatformTax?scope.row.PlatformTax:'-'}}</span> <span>{{
scope.row.PlatformTax ? scope.row.PlatformTax : "-"
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退款" min-width="100"> <el-table-column label="退款" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.Refund?scope.row.Refund:'-'}}</span> <span>{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手配费应收" min-width="100"> <el-table-column label="手配费应收" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.HandFittingIncome?scope.row.HandFittingIncome:'-'}}</span> <span>{{
scope.row.HandFittingIncome ? scope.row.HandFittingIncome : "-"
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手配费平台税金" min-width="100"> <el-table-column label="手配费平台税金" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.HandFittingTax?scope.row.HandFittingTax:'-'}}</span> <span>{{
scope.row.HandFittingTax ? scope.row.HandFittingTax : "-"
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="row justify-sb mt mb20"> <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
<div class="row pt20" v-if="item.GuestFileList.length>0"> <div class="row pt20" v-if="item.GuestFileList.length > 0">
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> --> <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div class="column"> <div class="column">
<!-- <div class="wrap fz12 c9e"> <!-- <div class="wrap fz12 c9e">
...@@ -241,9 +533,16 @@ ...@@ -241,9 +533,16 @@
旅客名单 旅客名单
</div> </div>
<div class="row fz12 see-rec mt"> <div class="row fz12 see-rec mt">
<div class="text-accent q-mr-md c">{{item.GuestFileList[0].split('/').at(-1)}}</div> <div class="text-accent q-mr-md c">
{{ item.GuestFileList[0].split("/").at(-1) }}
</div>
<div class="cursor-pointer ml mr rec cf"> <div class="cursor-pointer ml mr rec cf">
<a class="cf" style="text-decoration:none" :href="item.GuestFileList[0]">下载</a> <a
class="cf"
style="text-decoration:none"
:href="item.GuestFileList[0]"
>下载</a
>
</div> </div>
<!-- <div class="cursor-pointer see c04C8C8">查看支付方式</div> <!-- <div class="cursor-pointer see c04C8C8">查看支付方式</div>
<div class="cursor-pointer ml rec cf">提交付费凭证</div> --> <div class="cursor-pointer ml rec cf">提交付费凭证</div> -->
...@@ -262,57 +561,108 @@ ...@@ -262,57 +561,108 @@
<div class="column px15 bgf5 radius5 flex-g pa relative"> <div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.IncomeList" <span
@click="openDetails(x)">{{x.FrID}}</span> class="cursor-pointer radius5 bgD9F3FF mr px5"
<span v-if="item.IncomeList.length==0" class="c9e fz12"> v-for="(x, i) in item.IncomeList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.IncomeList.length == 0" class="c9e fz12">
暂无收款单据 暂无收款单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6" v-if="item.OrderStatus == 2"
@click="makeAdocument(item,index,1)"></i> 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> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.RefundList" <span
@click="openDetails(x)">{{x.FrID}}</span> class="cursor-pointer radius5 bgD9F3FF mr px5"
<span v-if="item.RefundList.length==0" class="c9e fz12"> v-for="(x, i) in item.RefundList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.RefundList.length == 0" class="c9e fz12">
暂无退款单据 暂无退款单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6" v-if="item.OrderStatus == 2"
@click="makeAdocument(item,index,2)"></i> 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> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.CostList" <span
@click="openDetails(x)">{{x.FrID}}</span> class="cursor-pointer radius5 bgD9F3FF mr px5"
<span v-if="item.CostList.length==0" class="c9e fz12"> v-for="(x, i) in item.CostList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span v-if="item.CostList.length == 0" class="c9e fz12">
暂无成本单据 暂无成本单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6" v-if="item.OrderStatus == 2"
@click="makeAdocument(item,index,2)"></i> 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> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.HandFittingFinanceList" <span
@click="openDetails(x)">{{x.FrID}}</span> class="cursor-pointer radius5 bgD9F3FF mr px5"
<span v-if="item.HandFittingFinanceList.length==0" class="c9e fz12"> v-for="(x, i) in item.HandFittingFinanceList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span
v-if="item.HandFittingFinanceList.length == 0"
class="c9e fz12"
>
暂无手配费单据 暂无手配费单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6" v-if="item.OrderStatus == 2"
@click="makeAdocument(item,index,1,'Hand')"></i> class="item"
effect="dark"
content="制单"
placement="top"
>
<i
class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 1, 'Hand')"
></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
...@@ -320,46 +670,71 @@ ...@@ -320,46 +670,71 @@
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
<span class="fz12 ml">¥</span> <span class="fz12 ml">¥</span>
<span class="fz15 fbold">{{item.Money.toFixed(2)}}</span> <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
<span class="fz15">{{item.CurrencyName}}</span> <span class="fz15">{{ item.CurrencyName }}</span>
</div> </div>
</div> </div>
<div class="row-c justify-sb borderD py5" v-if="item.CustomerPayType==1 ||item.CustomerPayType==3"> <div
class="row-c justify-sb borderD py5"
v-if="item.CustomerPayType == 1 || item.CustomerPayType == 3"
>
<span class="fz12 c9e">到店自付</span> <span class="fz12 c9e">到店自付</span>
<div class="ml"> <div class="ml">
<span class="fz10 ml">¥</span> <span class="fz10 ml">¥</span>
<span class="fz14">{{item.SelfPayMoney.toFixed(2)}}</span> <span class="fz14">{{ item.SelfPayMoney.toFixed(2) }}</span>
<span class="fz14">{{item.CurrencyName}}</span> <span class="fz14">{{ item.CurrencyName }}</span>
</div> </div>
</div> </div>
<div class="row-c justify-sb py5" v-if="item.CustomerPayType==2 ||item.CustomerPayType==3"> <div
class="row-c justify-sb py5"
v-if="item.CustomerPayType == 2 || item.CustomerPayType == 3"
>
<span class="fz12 c9e">出发前付款</span> <span class="fz12 c9e">出发前付款</span>
<div class="ml"> <div class="ml">
<span class="fz10 ml">¥</span> <span class="fz10 ml">¥</span>
<span class="fz14">{{item.BeforeMoney.toFixed(2)}}</span> <span class="fz14">{{ item.BeforeMoney.toFixed(2) }}</span>
<span class="fz14">{{item.CurrencyName}}</span> <span class="fz14">{{ item.CurrencyName }}</span>
</div> </div>
</div> </div>
</div> </div>
<div v-if="item.OrderStatus>3||item.OrderStatus<3" class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"> <div
<div v-if="item.OrderStatus==1&&(item.IncomeList.length==0&& v-if="item.OrderStatus > 3 || item.OrderStatus < 3"
item.RefundList.length==0&& class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
item.CostList.length==0&& >
item.HandFittingFinanceList.length==0)" class="row-c cursor-pointer radius5 cancel py5" <div
@click="clickRightButtom(item,0)"> v-if="
item.OrderStatus == 1 &&
item.IncomeList.length == 0 &&
item.RefundList.length == 0 &&
item.CostList.length == 0 &&
item.HandFittingFinanceList.length == 0
"
class="row-c cursor-pointer radius5 cancel py5"
@click="clickRightButtom(item, 0)"
>
<i v-loading="loading0"></i> <i v-loading="loading0"></i>
<span class="cF1416C">取消订单</span> <span class="cF1416C">取消订单</span>
</div> </div>
<div v-if="item.OrderStatus==1" class="row-c cursor-pointer radius5 confirm py5" <div
@click="clickRightButtom(item,1)"> v-if="item.OrderStatus == 1"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(item, 1)"
>
<i v-loading="loading1"></i> <i v-loading="loading1"></i>
<span class="c20C997">确认订单</span> <span class="c20C997">确认订单</span>
</div> </div>
<div v-if="item.OrderStatus==2||item.OrderStatus==4" class="row-c cursor-pointer radius5 change py5" @click="goRoomDetails(item,'订房详情')"> <div
v-if="item.OrderStatus == 2 || item.OrderStatus == 4"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '订房详情')"
>
<span class="c059FF6">明细/编辑</span> <span class="c059FF6">明细/编辑</span>
</div> </div>
<div v-if="item.OrderStatus==2" class="row-c cursor-pointer radius5 change1 py5" <div
@click="clickRightButtom(item,2)"> v-if="item.OrderStatus == 2"
class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 2)"
>
<i v-loading="loading2"></i> <i v-loading="loading2"></i>
<span class="c20C997">收损</span> <span class="c20C997">收损</span>
</div> </div>
...@@ -377,27 +752,88 @@ ...@@ -377,27 +752,88 @@
</div> </div>
</div> --> </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>
</div>
</div> </div>
<el-dialog custom-class="w400" title="修改收损金额" :visible.sync="outerVisible"> <el-dialog
<div class="MyCustomerDetailbottomLayer ownScrollbarStyle" style="height:150px;"> custom-class="w400"
title="修改收损金额"
:visible.sync="outerVisible"
>
<div
class="MyCustomerDetailbottomLayer ownScrollbarStyle"
style="height:150px;"
>
<el-form label-width="80px" :model="msg" :rules="rules" ref="msg"> <el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="收损金额" prop="LossMoney"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: 20px;"> <el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<input type="button" class="normalBtn" value="保存" @click="submitForm('msg')" /> <input
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible=false,$refs[msg].resetFields()" /> type="button"
class="normalBtn"
value="保存"
@click="submitForm('msg')"
/>
<input
type="button"
class="hollowFixedBtn"
value="取消"
@click="(outerVisible = false), $refs[msg].resetFields()"
/>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</el-dialog> </el-dialog>
<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-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"
/>
</el-col>
</el-row>
</div>
</el-dialog>
<!-- <div class="shezhi column"> <!-- <div class="shezhi column">
<el-input v-model="msg.LossMoney":placeholder="$t('pub.pleaseImport')"></el-input> <el-input v-model="msg.LossMoney":placeholder="$t('pub.pleaseImport')"></el-input>
<div> <div>
...@@ -405,38 +841,42 @@ ...@@ -405,38 +841,42 @@
</div> </div>
</div> --> </div> -->
</div> </div>
</template>
</template> <script>
<script> export default {
export default { props: ["OrderList"],
props:['OrderList'],
data() { data() {
return { return {
copyId:0, copyId: 0,
loading0:false, loading0: false,
loading1:false, loading1: false,
loading2:false, loading2: false,
BillMakingMsg:{ BillMakingMsg: {
// PeroidsId: null, // PeroidsId: null,
// Type: null, // Type: null,
// EmpIds:'', // EmpIds:'',
OtherType: 61, OtherType: 61,
ReFinanceId: '', ReFinanceId: "",
ReFinanceId2: '' ReFinanceId2: ""
}, },
userInfo:{}, userInfo: {},
msg:{ msg: {
OrderId: '', OrderId: "",
LossMoney: 0 LossMoney: 0
}, },
outerVisible: false, outerVisible: false,
rules: { rules: {
LossMoney: [{ LossMoney: [
{
required: true, required: true,
message: '请输入收损金额', message: "请输入收损金额",
trigger: "blur" trigger: "blur"
}],
} }
]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0
}; };
}, },
...@@ -444,35 +884,35 @@ ...@@ -444,35 +884,35 @@
// 单据详情 // 单据详情
openDetails(item) { openDetails(item) {
let query = { let query = {
id: item.FrID, id: item.FrID
} };
this.$router.push({ this.$router.push({
path: "/FinancialDocumentsDetail", path: "/FinancialDocumentsDetail",
query query
}); });
}, },
// 制作单据 // 制作单据
makeAdocument(row, index, num, name){ makeAdocument(row, index, num, name) {
this.BillMakingMsg.ReFinanceId = row.OrderId this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num this.BillMakingMsg.ReFinanceId2 = num;
if(name=='Hand'){ if (name == "Hand") {
this.BillMakingMsg.OtherType = 62 this.BillMakingMsg.OtherType = 62;
}else{ } else {
this.BillMakingMsg.OtherType = 61 this.BillMakingMsg.OtherType = 61;
} }
let text = '' let text = "";
let query = {} let query = {};
if(num==1){ if (num == 1) {
text = '收款' text = "收款";
}else if(num==2){ } else if (num == 2) {
text = '付款' text = "付款";
} }
query = { query = {
blank: "y", blank: "y",
tab: `新增${text}单据`, tab: `新增${text}单据`,
Type: num, Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg) tradeObj: JSON.stringify(this.BillMakingMsg)
} };
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({ this.$router.push({
path: "/ChoiceAddFinancialDocuments", path: "/ChoiceAddFinancialDocuments",
...@@ -488,28 +928,29 @@ ...@@ -488,28 +928,29 @@
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj.OrderId, id: obj.OrderId,
'OrderType': 1, OrderType: 1,
blank: 'y', blank: "y",
tab: title tab: title
} }
}) });
}, },
clickRightButtom(item,type){ clickRightButtom(item, type) {
// 0取消订单 1确认订单 // 0取消订单 1确认订单
if(type==0){ if (type == 0) {
if(!this.loading0){ if (!this.loading0) {
this.cancelFun(item) this.cancelOrderDialog = true;
this.cancelOrderId = item.OrderId
} }
}else if(type==1){ } else if (type == 1) {
if(!this.loading1){ if (!this.loading1) {
this.confirmFun(item) this.confirmFun(item);
} }
}else if(type==2){ } else if (type == 2) {
if(!this.loading2){ if (!this.loading2) {
this.outerVisible = true this.outerVisible = true;
this.msg.OrderId = item.OrderId this.msg.OrderId = item.OrderId;
this.msg.LossMoney = item.LossMoney?item.LossMoney:0 this.msg.LossMoney = item.LossMoney ? item.LossMoney : 0;
} }
} }
}, },
...@@ -518,7 +959,7 @@ ...@@ -518,7 +959,7 @@
//提交创建、修改表单 //提交创建、修改表单
this.$refs[msg].validate(valid => { this.$refs[msg].validate(valid => {
if (valid) { if (valid) {
if(!this.loading2){ if (!this.loading2) {
this.saveUpdate(); this.saveUpdate();
} }
} else { } else {
...@@ -526,85 +967,90 @@ ...@@ -526,85 +967,90 @@
return false; return false;
} }
}); });
}, },
saveUpdate(){ cancelOrderHandler() {
this.$confirm("是否确认设置收损?", "提示", { if (this.cancelRemark == "") {
confirmButtonText: "确定", this.Error("请填写取消订单的缘由");
cancelButtonText: "取消", return;
type: "warning" }
}) if (this.loading0) return;
.then(() => { this.loading0 = true
this.loading2 = true
this.apipost( this.apipost(
"dict_post_SetCustomerOrderLoss", this.msg, "dict_post_CancelAdminCustomerOrder",
{
OrderId: this.cancelOrderId,
CancelRemark: this.cancelRemark
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.$emit('success') this.cancelOrderDialog=false
}else { this.cancelOrderId=0
this.cancelRemark=''
this.$emit("success");
} else {
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading2 = false this.loading0 = false;
this.outerVisible = false
}, },
err => {this.loading2 = false,this.outerVisible = false} err => {
this.loading0 = false;
}
); );
})
.catch(() => {
});
}, },
cancelFun(item){ saveUpdate() {
this.$confirm("是否确认取消订单?", "提示", { this.$confirm("是否确认设置收损?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.loading0 = true this.loading2 = true;
this.apipost( this.apipost(
"dict_post_CancelAdminCustomerOrder", { "dict_post_SetCustomerOrderLoss",
OrderId: item.OrderId this.msg,
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.$emit('success') this.$emit("success");
}else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading0 = false this.loading2 = false;
this.outerVisible = false;
}, },
err => {this.loading0 = false} err => {
(this.loading2 = false), (this.outerVisible = false);
}
); );
}) })
.catch(() => { .catch(() => {});
});
}, },
confirmFun(item){ confirmFun(item) {
this.$confirm("是否确认订单?", "提示", { this.$confirm("是否确认订单?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.loading1 = true this.loading1 = true;
this.apipost( this.apipost(
"dict_post_ConfirmAdminCustomerOrder", { "dict_post_ConfirmAdminCustomerOrder",
{
OrderId: item.OrderId OrderId: item.OrderId
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.$emit('success') this.$emit("success");
}else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading1 = false this.loading1 = false;
}, },
err => {this.loading1 = false} err => {
this.loading1 = false;
}
); );
}) })
.catch(() => { .catch(() => {
...@@ -613,21 +1059,24 @@ ...@@ -613,21 +1059,24 @@
}, },
//复制信息 //复制信息
CopyHandler(item) { CopyHandler(item) {
this.copyId = item.OrderId this.copyId = item.OrderId;
setTimeout(() => { setTimeout(() => {
this.copyId = 0 this.copyId = 0;
}, 2000) }, 2000);
}, },
setEdate() { setEdate() {
return this.addMoth(new Date().Format("yyyy-MM-dd"), 1) return this.addMoth(new Date().Format("yyyy-MM-dd"), 1);
}, },
addMoth(d, m) { addMoth(d, m) {
let ds = d.split('-'), let ds = d.split("-"),
_d = ds[2] - 0; _d = ds[2] - 0;
let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0); let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
let max = nextM.getDate(); let max = nextM.getDate();
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d); 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() { com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定， //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
...@@ -638,7 +1087,7 @@ ...@@ -638,7 +1087,7 @@
} }
//设置table的行高 //设置table的行高
// this.tableHeight = h; // this.tableHeight = h;
}, }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
...@@ -646,13 +1095,9 @@ ...@@ -646,13 +1095,9 @@
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
this.com_onresize(); this.com_onresize();
}
},
}; };
}
};
</script>
</script> <style></style>
<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