Commit dc78dbc3 authored by 黄奎's avatar 黄奎

前端页面优化

parent c1cfb22e
......@@ -8,7 +8,7 @@
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="border: 1px solid rgb(230, 230, 230);background: #ccc;" v-loading="loading">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
<tr>
<th colspan="8">导游操作</th>
<th colspan="8">地接OP</th>
......@@ -35,46 +35,44 @@
<td colspan="13">暂无数据</td>
</tr>
<tbody v-for="(item,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<tr>
<td class="more_td">
<tr v-for="(subItem,subIndex) in item.ShopDetailsList">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--进店团号-->
<el-input v-model="item.ShopDetailsList[0].ShopNum"></el-input>
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--购物店名称-->
{{item.ShopName}}
</td>
<td class="_height_45">
<!--公司-->
<div v-for="childItem in item.ShopDetailsList">
{{childItem.BName}}
</div>
{{subItem.BName}}
</td>
<td class="more_td">
<el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01" @change="formatDateTime(item.ShopDetailsList[0].EnterTime,item)"></el-input>
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01"
@change="formatDateTime(item.ShopDetailsList[0].EnterTime,item)"></el-input>
<!--EnterTime 进店时间-->
</td>
<td class="more_td">
<el-input type="number" v-model="item.ShopDetailsList[0].EnterNum" maxlength="3"></el-input>
<el-input type="number" v-model="subItem.EnterNum" maxlength="3"></el-input>
<!--EnterNum 进店人数-->
</td>
<td class="more_td _height_45">
<div v-for="childItem in item.ShopDetailsList">
<el-input type="number" v-model="childItem.TotalMoney"></el-input>
</div>
<el-input type="number" v-model="subItem.TotalMoney"></el-input>
<!--TotalMoney 总金额【公司】-->
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--CommissionStatus 佣金领取状况-->
<el-select v-model="item.ShopDetailsList[0].CommissionStatus">
<el-option label="现场领取" :value='1'></el-option>
<el-option label="公司领取" :value='2'></el-option>
</el-select>
</td>
<td class="more_td" @click="upIndex = outindex">
<td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<p v-for="(img, imgIndex) in item.ShopDetailsList[0].imgList" @click="downLoadPZ(img)" v-if="img !== ''"
style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span style="text-align: right;color: red;"
@click.stop="UploadType=1,deleteImg(outindex,imgIndex)">X</span></p>
style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span
style="text-align: right;color: red;" @click.stop="UploadType=1,deleteImg(outindex,imgIndex)">X</span>
</p>
<img v-for="(img, imgIndex) in item.ShopDetailsList[0].imgList" @click="downLoadPZ(img)" v-if="img !== ''"
:src="img" style="width: 10px;height: 10px;" alt="">
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
......@@ -84,45 +82,43 @@
<!--Credentials 凭证【导游】-->
</td>
<td class="more_td">
<div v-for="childItem in item.ShopDetailsList">
<el-input type="number" v-model="childItem.LeaderCommission"></el-input>
</div>
<el-input type="number" v-model="subItem.LeaderCommission"></el-input>
<!--LeaderCommission 领队佣金应付-->
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<el-input type="number" v-model="item.ShopDetailsList[0].GuideCommission"></el-input>
<!--GuideCommission 导游佣金应付-->
</td>
<td class="more_td _height_45">
<div v-for="childItem in item.ShopDetailsList">
<el-input type="number" v-model="childItem.CompanyCommission"></el-input>
</div>
<td class="more_td _height_45" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<el-input type="number" v-model="subItem.CompanyCommission"></el-input>
<!--CompanyCommission 公司佣金应收-->
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<el-input type="number" v-model="item.ShopDetailsList[0].OtherDeduct"></el-input>
<!--返佣余额 OtherDeduct-->
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--返佣总计 BackTotalMoney-->
<el-input type="number" v-model="item.ShopDetailsList[0].BackTotalMoney"></el-input>
</td>
<td class="more_td">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--汇率 DMCRate-->
<el-input type="number" v-model="item.ShopDetailsList[0].DMCRate"></el-input>
</td>
<td @click="upIndex = outindex">
<td @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--DMCOPCredentials (地接OP上传凭证)-->
<p v-for="(img, imgIndex) in item.ShopDetailsList[0].dmcImageList" @click="downLoadPZ(img)" v-if="img !== ''" style="cursor: pointer;padding: 5px;"
title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span style="text-align: right;color: red;" @click.stop="UploadType=2,deleteImg(outindex,imgIndex)">X</span></p>
<img v-for="(img, imgIndex) in item.ShopDetailsList[0].dmcImageList" @click="downLoadPZ(img)" v-if="img !== ''" :src="img"
style="width: 10px;height: 10px;" alt="">
<p v-for="(img, imgIndex) in item.ShopDetailsList[0].dmcImageList" @click="downLoadPZ(img)"
v-if="img !== ''" style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span
style="text-align: right;color: red;" @click.stop="UploadType=2,deleteImg(outindex,imgIndex)">X</span>
</p>
<img v-for="(img, imgIndex) in item.ShopDetailsList[0].dmcImageList" @click="downLoadPZ(img)"
v-if="img !== ''" :src="img" style="width: 10px;height: 10px;" alt="">
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon" @click="UploadType=2"></i>
<div class="el-upload__text" @click="UploadType=2">点击上传</div>
</el-upload>
</td>
<td>
<td v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--Remarks 备注-->
<el-input type="textarea" v-model="item.ShopDetailsList[0].Remarks"></el-input>
</td>
......@@ -191,13 +187,13 @@
newArr.push(file.file);
let path = "/Upload/ShopZhang/";
this.$message.info('上传中...');
var that=this;
var that = this;
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.list.forEach((item, index) => {
if (index == that.upIndex) {
item.ShopDetailsList.forEach((subItem,subIndex) => {
item.ShopDetailsList.forEach((subItem, subIndex) => {
if (subIndex == 0) {
if (that.UploadType == 1) {
subItem.imgList.push(fileUrl);
......@@ -254,7 +250,7 @@
this.currentPage = 1;
},
getList() {
this.loading=true;
this.loading = true;
this.apipost(
"dmcstatistics_get_GetPriceShopStaticsDetail", {
TCIDs: this.$route.query.id
......@@ -262,16 +258,16 @@
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(item=>{
item.ShopDetailsList.forEach(subItem=>{
subItem.EnterTime=subItem.EnterTimeStr;
data.forEach(item => {
item.ShopDetailsList.forEach(subItem => {
subItem.EnterTime = subItem.EnterTimeStr;
});
})
this.list = data;
} else {
this.Error(res.data.message);
}
this.loading=false;
this.loading = false;
},
err => {}
);
......@@ -305,46 +301,20 @@
}
.roomReservationsTalbe {
background: #ccc;
border-collapse: collapse;
}
.roomReservationsTalbe tr th {
background: #E6E6E6;
background: #eee;
height: 40px;
font-size: 12px;
color: #333;
}
.roomReservationsTalbe tr {
background: #fff;
text-align: center;
height: 40px;
border: 1px solid #d1d1d1;
}
.roomReservationsTalbe tr td {
font-size: 12px;
padding: 6px 6px 0 6px;
}
.roomReservationsTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc;
min-height: 24px;
line-height: 24px;
margin-top: 0;
box-sizing: content-box;
padding: 0 10px;
}
.roomReservationsTalbe tr td .pDateStyle:last-child {
border-bottom: none;
}
.roomReservationsTalbe tr td .pDateStyle>span:after {
content: '/';
}
.roomReservationsTalbe tr td .pDateStyle>span:last-child:after {
content: ''
border: 1px solid #d1d1d1;
}
.roomReservationsTalbe tr td .link p:hover {
......@@ -352,72 +322,5 @@
cursor: pointer;
}
.roomReservationsTalbe tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.roomReservations_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.roomReservations_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.roomReservations_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.roomReservations_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.roomReservations_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.roomReservations_tripDetails table td._d_name {
background-color: #ededed;
}
.roomReservations_tripDetails table ._color_666 {
color: #666666;
}
.roomReservations_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.more_td>div {
height: 40px;
/*line-height: 40px;*/
border-bottom: 1px solid rgb(204, 204, 204);
}
.more_td>div:last-child {
border-bottom: 0;
}
.roomReservationsTalbe tr td._height_45 {
padding: 0;
}
.roomReservationsTalbe tr td._height_45 div {
height: 45px;
border-bottom: 1px solid rgb(230, 230, 230);
line-height: 45px;
}
</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