Skip to content

S
SuperMan
Commit dafe174a authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 6cb9b7cc 984bf9d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1263 additions and 614 deletions
src/App.vue
View file @ dafe174a
......@@ -113,7 +113,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_te20a5sctn.css";
@import "//at.alicdn.com/t/font_635492_dxcl6yumgsq.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/components/FinancialModule/BasicDocuments.vue
View file @ dafe174a
......@@ -262,17 +262,22 @@
<div class="page_bdm" v-if="GetDetail" v-loading="loading">
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4">
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4">
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template>
</template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<template v-else>
<my-DJ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-DJ-Bill>
</template>
<div class="_explain">
<p>附加说明：</p>
......@@ -1105,15 +1110,18 @@ import newBill from "./FinancialSubmodule/NewBillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import myDJBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import { truncate } from 'fs';
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
return{
otherTable: true,
imageOptions:{
navbar:false,
title:false
......@@ -1240,6 +1248,7 @@ export default {
"new-Bill":newBill,
"my-RVB-Bill":myrbvBill,
"my-GZ-Bill": myGZBill,
'my-DJ-Bill': myDJBill,
'TicketingModule':TicketingModule,
'teamProductModule':teamProductModule,
'SaleOrderModule':SaleOrderModule,
......@@ -1841,7 +1850,10 @@ export default {
let AuditSteps=this.GetDetail.AuditSteps;
AuditSteps.forEach(item=>{
if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
this.Ststus=1;
if (this.GetDetail.DijieBathFinanceList.length) {
this.otherTable = false
}
this.Ststus = 1;
item.AuditRecordList.forEach(audit=>{
if(audit.AuditStatus==2){
this.Ststus=0;
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ dafe174a
......@@ -150,7 +150,8 @@
data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
// 如果不是吴珊，只显示49
if (this.OrderSource === '5' && this.showTab === '2') {
// 如果没有 OrderSource 则49和50都不显示
if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
if (x.Id === 49 || x.Id === 50){
x.bigShow = false
if (x.Id === 49){
......@@ -158,11 +159,11 @@
} else if (x.Id === 50 && this.EmployeeId === 639){
x.bigShow = true
}
console.log('if',x.Id,x.bigShow)
} else {
x.bigShow = false
console.log('else',x.Id,x.bigShow)
}
} else if (x.Id === 49 || x.Id === 50){
x.bigShow = false
} else {
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ dafe174a
......@@ -427,6 +427,7 @@
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
<!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
<div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0">
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
......@@ -782,6 +783,7 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
export default {
data(){
return{
......@@ -855,7 +857,8 @@ export default {
'teamProductModule':teamProductModule,
'TicketingModule':TicketingModule,
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace
'TicketFinace':TicketFinace,
'myDJieBill': myDJieBill,
},
created(){
this.ID = this.$route.query.id;
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ dafe174a
......@@ -154,7 +154,7 @@
<td height="34px">{{item.BName}}</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page" @click="jumpPage('productQuery',o.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
<p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
......
src/components/SalesModule/enrollTotal.vue
View file @ dafe174a
......@@ -185,7 +185,9 @@
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
......
src/components/SalesModule/groupTourOrder.vue
View file @ dafe174a
......@@ -1513,9 +1513,11 @@
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
@click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip></p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ dafe174a
......@@ -1520,7 +1520,9 @@
<td rowspan="3" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<div>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</div>
......@@ -1883,7 +1885,9 @@
<tr>
<td rowspan="2" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</p>
</td>
......
src/components/Ticketing/TicketManager.vue
View file @ dafe174a
......@@ -2209,7 +2209,8 @@
FlyState: "0",
LineId: 0, //线路编号
ID: 0,
TicketType: 0 //定金类型(1定，2定等)
TicketType: 0, //定金类型(1定，2定等)
IsLimit:1
},
addMsg: {
ID: "0",
......@@ -2610,7 +2611,6 @@
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
this.noData = !this.total > 0;
console.log(this.dataList,'datalist');
}
if (this.msg.ID == 0) {
this.msg.ID = "";
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ dafe174a
......@@ -1062,6 +1062,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -1243,14 +1244,14 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
......@@ -1274,12 +1275,6 @@
<el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
......@@ -1287,11 +1282,14 @@
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
......@@ -1402,8 +1400,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
<el-col :span="4" style="display:none;">
<el-form-item label="是否可清位">
<el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
<el-option label='可以清位' :value='0' :key='0'></el-option>
<el-option label='不可以清位' :value='1' :key='1'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1445,6 +1448,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -1568,6 +1572,7 @@
<!-- @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)"-->
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId">
{{item.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''"
style="color:red">({{item.LeaveStr}})</span></div>
......@@ -1768,6 +1773,7 @@
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
{{childItem.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</div>
<div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''"
style="color:red">({{childItem.LeaveStr}})</span></div>
......@@ -2078,7 +2084,9 @@
<td rowspan="3">
<div>
<p class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId"
@click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}}</p>
@click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p v-if="item.IsLeaderOrder==1">(领队)</p>
<p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==1">(散拼跟团)</p>
<p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==2">(小包团)</p>
......@@ -2768,6 +2776,7 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum:0,//拒签人数
IsCanClear:0 //是否可清位
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3082,6 +3091,7 @@
},
res => {
if (res.data.resultCode == 1) {
console.log(res,'data');
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice;
......@@ -3108,6 +3118,8 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.IsCanClear=x.IsCanClear;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ dafe174a
......@@ -264,8 +264,8 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" />
</template>
</div>
<div class="clearfix TB_PrintDiv">
......@@ -578,7 +578,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
<div class="clearfix TB_PrintDiv">
......@@ -1062,7 +1062,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
......@@ -1269,11 +1269,11 @@
</div>
</div>
<div class="Team_BtnList" v-if="IsHaveAuth">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus"
:value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
</div>
<el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
......@@ -1306,7 +1306,7 @@
TCNUM: '',
FrIds: '',
},
IsHaveAuth:false,//权限判断按钮是否显示
IsHaveAuth: false, //权限判断按钮是否显示
zhuanLoading: false,
moneyAll: {
Moneyall: 0,
......@@ -1724,27 +1724,32 @@
},
//权限验证
checkHasAuth() {
this.apipost(
'travel_get_CheckBalancePaymentAuth', {
TCID: this.TCID
},
res => {
if (res.data.resultCode == 1) {
this.IsHaveAuth=true;
}
else
{
this.IsHaveAuth=false;
}
},
err => {}
)
// this.apipost(
// 'travel_get_CheckBalancePaymentAuth', {
// TCID: this.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// this.IsHaveAuth=true;
// }
// else
// {
// this.IsHaveAuth=false;
// }
// },
// err => {}
// )
}
},
mounted() {
this.TCID = this.$route.query.id;
this.OutBranchId = this.$route.query.OutBranchId;
this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn;
if (this.$route.query.IsHaveAuth) {
this.IsHaveAuth = true;
} else {
this.IsHaveAuth = false;
}
this.checkHasAuth();
this.getList();
this.getAllCont();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ dafe174a
......@@ -1473,7 +1473,8 @@
name: 'TeamBalancePayment',
query: {
id: id,
OutBranchId: OutBranchId,
OutBranchId:OutBranchId,
IsHaveAuth:true,
blank: 'y',
tab: '团队收支明细'
}
......
src/components/busManagement/busHandBook.vue
View file @ dafe174a
......@@ -9,7 +9,9 @@
text-align: center;
height: 40px;
}
.busManagerTalbe tr td{
padding:0 5px;
}
.commonBackColor {
background-color: #E6E6E6;
color: #333;
......@@ -25,7 +27,15 @@
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{
margin-right: 5px;
color: seagreen;
cursor: pointer;
visibility: hidden;
}
.addHandBookDIS{
visibility: visible!important;
}
</style>
<template>
<div>
......@@ -73,9 +83,10 @@
<td class="commonBackColor">ホテル</td>
<td class="commonBackColor">ホテルTEL</td>
</tr>
<tr v-for="subItem in DataObj.Details_Extends">
<tr v-for="(subItem,index) in DataObj.Details_Extends">
<td>
{{subItem.UseDate}}
<i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i>
<el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-input type="text" v-model="subItem.BusType" />
......@@ -163,6 +174,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.DataObj = res.data.data;
console.log(this.DataObj,'dataObj');
} else {
this.Error(res.data.message);
}
......@@ -182,6 +194,30 @@
this.isSave = false;
}, err => {})
}
},
//添加
addHand(index){
var obj = {
BusContent:'',
BusType:'',
FlightNum:'',
HotelName:'',
HotelTel:'',
Id:0,
MainId:0,
UseDate:''
}
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year+'-'+month+"-"+day;
obj.UseDate = UseDate
if(index==0){
this.DataObj.Details_Extends.unshift(obj)
}else{
this.DataObj.Details_Extends.push(obj);
}
}
},
mounted() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ dafe174a
......@@ -92,11 +92,11 @@
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
</td>
<td>
{{item.StartCityNames}}
<td>
{{item.OutBranchName}}
</td>
<td>
{{item.OutBranchName}}
{{item.StartCityNames}}
</td>
<td>
<div class="w120">
......
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