Skip to content

S
SuperMan
Commit 5d34ced9 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 59bfd7bb
Show whitespace changes
Inline Side-by-side
Showing with 3677 additions and 3451 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 5d34ced9
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/SalesModule/Common/productOrderList.vue
View file @ 5d34ced9
<style>
@import "../../../assets/css/newTravelManager.css";
.people-item {
@import "../../../assets/css/newTravelManager.css";
.people-item {
margin-top: 5px;
font-size: 14px;
}
.people-item-title {
}
.people-item-title {
font-size: 12px;
color: #666;
margin-right: 4px;
}
.productQueryList {
}
.productQueryList {
width: 100%;
min-width: 1366px;
padding-left: 10px;
}
}
.productQueryList li {
.productQueryList li {
width: 100%;
border: 1px solid #e5e5e5;
background: #fff;
margin-bottom: 10px;
color: #333;
font-size: 14px;
}
}
.productQueryList li::after {
.productQueryList li::after {
content: "";
display: block;
clear: both;
}
}
.productQueryList li i.iconfont {
.productQueryList li i.iconfont {
color: #bbb;
margin-right: 8px;
}
}
.productQueryList li > div:first-child {
.productQueryList li>div:first-child {
display: table;
width: 100%;
}
}
.productQueryList li > div > div {
.productQueryList li>div>div {
display: table-cell;
border-right: 1px dashed #dcdfe6;
}
}
.productQueryList li > div > div:last-child {
.productQueryList li>div>div:last-child {
border-right: none;
}
}
.productQueryList li .d11 {
.productQueryList li .d11 {
float: left;
width: 160px;
height: 120px;
margin: 14px 14px 0 14px;
}
}
.productQueryList li .d11 > li {
.productQueryList li .d11>li {
width: 160px;
height: 120px;
border: none;
}
}
.productQueryList li .d11 > li > img {
.productQueryList li .d11>li>img {
width: 160px;
height: 120px;
}
}
.productQueryList li .d12 {
.productQueryList li .d12 {
float: left;
padding-top: 18px;
width: 200px;
}
}
.productQueryList li .d12 .d12p {
.productQueryList li .d12 .d12p {
margin-top: 3px;
font-size: 12px;
color: #999;
......@@ -85,32 +88,32 @@
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
}
.productQueryList li .d12 .d12p:hover {
.productQueryList li .d12 .d12p:hover {
text-decoration: underline;
color: #333;
}
}
.productQueryList li .d12 .d12TC {
.productQueryList li .d12 .d12TC {
margin: 5px 0;
color: #666666;
font-size: 12px;
}
}
.productQueryList li .d1 {
.productQueryList li .d1 {
width: 18%;
position: relative;
padding: 0 20px;
}
}
.productQueryList li .d2 {
.productQueryList li .d2 {
width: 14%;
text-align: center;
padding-top: 20px;
}
}
.productQueryList li .d2 p.flightNo {
.productQueryList li .d2 p.flightNo {
background: #ccc;
width: 136px;
margin: 5px 0;
......@@ -119,210 +122,210 @@
line-height: 22px;
display: inline-block;
font-size: 14px;
}
}
.productQueryList li .d2 p.flightNo em {
.productQueryList li .d2 p.flightNo em {
font-style: normal;
color: #333;
font-size: 12px;
font-weight: bold;
}
}
.productQueryList li .d2 p.flightNo .flem {
.productQueryList li .d2 p.flightNo .flem {
height: 22px;
width: 50px;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.productQueryList li .d2 p > span {
.productQueryList li .d2 p>span {
color: #fff;
font-size: 12px;
border-radius: 10px;
background: #2aaef2;
padding: 2px 5px;
cursor: pointer;
}
}
.productQueryList li .d2 > div > div {
.productQueryList li .d2>div>div {
display: inline-block;
line-height: 24px;
font-size: 12px;
}
}
.productQueryList li .d3 {
.productQueryList li .d3 {
width: 17%;
padding-left: 40px;
padding-top: 20px;
}
}
.productQueryList li .d3 p {
.productQueryList li .d3 p {
line-height: 24px;
}
}
.productQueryList li .d3 p > span {
.productQueryList li .d3 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
}
.productQueryList li .d3 p > em {
.productQueryList li .d3 p>em {
background: #ff9c00;
font-style: normal;
margin-left: 8px;
color: #fff;
border-radius: 4px;
padding: 2px 5px;
}
}
.productQueryList li .d4 {
.productQueryList li .d4 {
width: 10%;
padding-left: 20px;
padding-top: 20px;
}
}
.productQueryList li .d4 p span.price {
.productQueryList li .d4 p span.price {
color: #333;
text-decoration: underline;
font-size: 12px;
}
}
.productQueryList li .d4 p span.price:hover {
.productQueryList li .d4 p span.price:hover {
color: #e95252;
font-weight: bold;
cursor: pointer;
}
}
.productQueryList li .d5 {
.productQueryList li .d5 {
width: 15%;
padding-left: 40px;
padding-top: 20px;
}
}
.productQueryList li .d5 p {
.productQueryList li .d5 p {
line-height: 26px;
}
}
.productQueryList li .d5 p > span {
.productQueryList li .d5 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
}
.productQueryList li .d5 p > i {
.productQueryList li .d5 p>i {
font-weight: bold;
font-style: normal;
}
}
.productQueryList li .d8 {
.productQueryList li .d8 {
width: 15%;
padding-left: 40px;
padding-top: 20px;
}
}
.productQueryList li .d8 p {
.productQueryList li .d8 p {
line-height: 26px;
}
}
.productQueryList li .d8 p > span {
.productQueryList li .d8 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
}
.productQueryList li .d8 p > i {
.productQueryList li .d8 p>i {
font-style: normal;
}
}
.productQueryList li .d6 {
.productQueryList li .d6 {
padding: 20px 40px;
width: 100%;
height: inherit;
border-top: 1px solid #e5e5e5;
}
}
.productQueryList li .d6 p {
.productQueryList li .d6 p {
display: table-cell;
color: #e95252;
}
}
.productQueryList li .d6 p:nth-child(1) {
.productQueryList li .d6 p:nth-child(1) {
width: 60px;
font-size: 12px;
}
}
.productQueryList li .d7 {
.productQueryList li .d7 {
width: 10%;
min-width: 160px;
text-align: center;
padding: 40px 20px;
border-right: none;
}
}
.productQueryList li .d7 button {
.productQueryList li .d7 button {
width: 30px;
height: 30px;
border-radius: 4px;
}
}
.productQueryList li .d7 .el-button--primary {
.productQueryList li .d7 .el-button--primary {
padding: 5px;
margin: 0;
font-size: 14px !important;
color: #fff;
}
}
.productQueryList li .d7 i.iconfont {
.productQueryList li .d7 i.iconfont {
color: #fff;
margin: 0;
}
}
.pro_tripDetails {
.pro_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
}
.pro_tripDetails .popper__arrow::after {
.pro_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
}
.pro_tripDetails table {
.pro_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
}
.pro_tripDetails table th {
.pro_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
}
.pro_tripDetails table td {
.pro_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
}
.pro_tripDetails table td._d_name {
.pro_tripDetails table td._d_name {
background-color: #ededed;
}
}
.pro_tripDetails table ._color_666 {
.pro_tripDetails table ._color_666 {
color: #666666;
}
}
.pro_tripDetails table tr._color_666 th {
.pro_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
}
.productQuerybottomLayer {
.productQuerybottomLayer {
overflow: auto;
position: fixed;
/* max-height: 300px; */
......@@ -333,13 +336,13 @@
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;
}
}
.productQuerybottomLayer .el-form-item__label {
.productQuerybottomLayer .el-form-item__label {
font-size: 12px !important;
}
}
.productQuerybottomLayer > p {
.productQuerybottomLayer>p {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
......@@ -348,18 +351,18 @@
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
}
.productQuerybottomLayer .el-input {
.productQuerybottomLayer .el-input {
width: auto !important;
}
}
.productQueryList .disabledBtn {
.productQueryList .disabledBtn {
background: #999 !important;
border-color: #999 !important;
}
}
.product_union {
.product_union {
position: absolute;
top: 0px;
left: 0px;
......@@ -369,9 +372,9 @@
border-bottom: 15px solid transparent;
border-left: 15px solid red;
border-right: 15px solid transparent;
}
}
.product_union::after {
.product_union::after {
content: "联";
position: absolute;
top: -14px;
......@@ -379,9 +382,9 @@
white-space: nowrap;
color: #ffffff;
font-size: 12px;
}
}
.product_union1 {
.product_union1 {
position: absolute;
top: 0px;
left: 0px;
......@@ -391,9 +394,9 @@
border-bottom: 15px solid transparent;
border-left: 15px solid red;
border-right: 15px solid transparent;
}
}
.product_union1::after {
.product_union1::after {
content: "内";
position: absolute;
top: -14px;
......@@ -401,9 +404,9 @@
white-space: nowrap;
color: #ffffff;
font-size: 12px;
}
}
.product_warning {
.product_warning {
position: absolute;
top: 0px;
right: 0px;
......@@ -413,9 +416,9 @@
border-bottom: 10px solid transparent;
border-left: 10px solid transparent;
border-right: 10px solid red;
}
}
.product_warning::after {
.product_warning::after {
content: "!";
position: absolute;
top: -12px;
......@@ -423,102 +426,83 @@
white-space: nowrap;
color: #ffffff;
font-size: 12px;
}
}
.PQ_detail {
.PQ_detail {
width: 100%;
border-collapse: collapse;
}
}
.PQ_detail tr th,
.v-table-title-cell {
.PQ_detail tr th,
.v-table-title-cell {
background: #e6e6e6;
height: 40px;
font-size: 14px;
border-right: 1px solid #e6e6e6;
color: #333;
}
}
.PQ_detail tr {
.PQ_detail tr {
background: #fff;
text-align: center;
height: 40px;
}
}
.PQ_detail tr td {
.PQ_detail tr td {
font-size: 12px;
border: 1px solid #e5e5e5;
}
}
.PQ_HotelPop {
.PQ_HotelPop {
overflow: auto;
max-height: 350px;
}
}
.PQ_HotelPop table td {
.PQ_HotelPop table td {
padding: 5px 0;
text-align: center;
}
}
.PQ_HotelPop table th {
.PQ_HotelPop table th {
text-align: center;
}
}
.productQuerybottomLayer .el-upload-list {
.productQuerybottomLayer .el-upload-list {
width: 200px;
}
.flex-center {
}
.flex-center {
display: flex;
justify-content: center;
}
}
</style>
<template>
<template>
<div class="productQueryList" v-loading="loading">
<div style="margin-bottom: 10px">
<el-checkbox v-model="allCheck" @change="changeSelect">全选</el-checkbox>
<el-button
style="margin-left: 10px"
type="primary"
size="small"
@click="eidtItems"
>批量操作</el-button
>
<el-button style="margin-left: 10px" type="primary" size="small" @click="eidtItems">批量操作</el-button>
</div>
<ul v-if="list.length != 0">
<li v-for="(item, index) in list" :key="index">
<div class="dline">
<div>
<div class="flex-center">
<el-checkbox
v-model="item.check"
@change="changeSelectItem()"
></el-checkbox>
<el-checkbox v-model="item.check" @change="changeSelectItem()"></el-checkbox>
</div>
</div>
<div class="d1">
<div v-if="item.IsB2B === 0" class="product_union1"></div>
<div v-if="item.IsUnionTravel === 1" class="product_union"></div>
<div v-if="item.IsWarning === 1" class="product_warning"></div>
<div
class="d12"
style="float: none; margin: auto"
:style="{ width: pagesTitle == '跟团游产品' ? '200px' : 'auto' }"
>
<div class="d12" style="float: none; margin: auto"
:style="{ width: pagesTitle == '跟团游产品' ? '200px' : 'auto' }">
<p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
<p class="d12TC">{{ item.TCNUM }}（{{ item.TCID }}）</p>
<p>{{ item.LtName }}</p>
<el-tooltip
class="item"
effect="dark"
:content="item.Title"
placement="top-start"
popper-class="max-w250"
>
<p
class="d12p"
@click="getTitledetail(item)"
:title="item.Title"
>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start"
popper-class="max-w250">
<p class="d12p" @click="getTitledetail(item)" :title="item.Title">
{{ item.Title }}
</p>
</el-tooltip>
......@@ -527,8 +511,7 @@
<div class="d3" v-if="pagesTitle == '跟团游产品'">
<div> <span class="people-item-title">出团公司: </span>{{ item.OutBranchName }}</div>
<p class="people-item">
<span>{{ $t("Airticket.Air_StartTime") }}:</span
>{{ item.StartDate }}
<span>{{ $t("Airticket.Air_StartTime") }}:</span>{{ item.StartDate }}
</p>
<div class="people-item">
<span class="people-item-title">创建人:</span>
......@@ -537,11 +520,8 @@
</div>
<div class="d5">
<p>
<span>{{ $t("visa.v_yibaoru") }}</span
><i
>{{ item.Seat == "" ? "0" : item.Seat
}}{{ $t("salesModule.PeoPle") }}</i
>({{ $t("Operation.Op_takeSeat") }}：{{ item.Occupied
<span>{{ $t("visa.v_yibaoru") }}</span><i>{{ item.Seat == "" ? "0" : item.Seat
}}{{ $t("salesModule.PeoPle") }}</i>({{ $t("Operation.Op_takeSeat") }}：{{ item.Occupied
}}{{ $t("salesModule.PeoPle") }})
</p>
<span style="font-size: 12px"><span class="people-item-title">联运人数: </span>{{ item.IntermodalCount }}</span>
......@@ -570,9 +550,7 @@
</div>
<div>
<div class="flex-center">
<el-button type="primary" size="small" @click="editItem(item)"
>编辑</el-button
>
<el-button type="primary" size="small" @click="editItem(item)">编辑</el-button>
</div>
</div>
</div>
......@@ -581,102 +559,51 @@
<div class="noData" v-else>
{{ $t("system.content_noData") }}
</div>
<el-dialog
title="编辑"
:visible.sync="showDialog"
width="600px"
height="40%"
>
<el-dialog title="编辑" :visible.sync="showDialog" width="600px" height="40%">
<div v-if="!isVisa">
<span style="width: 15%; display: inline-block">团OP</span>
<el-select
style="width: 80%"
v-model="queryData.OPId"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
<el-select style="width: 80%" v-model="queryData.OPId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
</el-option>
</el-select>
</div>
<div v-if="!isVisa" style="margin-top: 10px">
<span style="width: 15%; display: inline-block">助手</span>
<el-select
style="width: 80%"
v-model="queryData.AssistantId"
multiple
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
<el-select style="width: 80%" v-model="queryData.AssistantId" multiple filterable
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
</el-option>
</el-select>
</div>
<div style="margin-top: 10px">
<span style="width: 15%; display: inline-block">签证OP</span>
<el-select
filterable
style="width: 80%"
v-model="queryData.VisaOPId"
:placeholder="$t('pub.pleaseSel')"
>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
<el-select filterable style="width: 80%" v-model="queryData.VisaOPId" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
</el-option>
</el-select>
</div>
<div style="margin-top: 10px">
<span style="width: 15%; display: inline-block">签证助手</span>
<el-select
style="width: 80%"
v-model="queryData.VisaAssistantId"
multiple
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
<el-select style="width: 80%" v-model="queryData.VisaAssistantId" multiple filterable
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
</el-option>
</el-select>
</div>
<div style="margin-top: 10px" v-if="editNum">
<span style="width: 15%; display: inline-block">签证人数</span
><el-input
type="number"
style="width: 80%; margin-left: 4px"
v-model="queryData.VisaNum"
/>
<span style="width: 15%; display: inline-block">签证人数</span>
<el-input type="number" style="width: 80%; margin-left: 4px" v-model="queryData.VisaNum" />
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="showDialog = false">取 消</el-button>
<el-button style="margin-right: 24px" type="primary" @click="submitOP"
>确 定</el-button
>
<el-button style="margin-right: 24px" type="primary" @click="submitOP">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
<script>
export default {
props: ["loading", "list", "pagesTitle", "isVisa"],
data() {
return {
......@@ -752,7 +679,6 @@ export default {
},
methods: {
changeSelect() {
console.log("changeSelect");
this.list.forEach((element) => {
element.check = this.allCheck;
});
......@@ -765,7 +691,10 @@ export default {
});
},
submitOP() {
let params = { TCIDs: this.TCIDs, Type: this.isVisa ? 1 : 0 };
let params = {
TCIDs: this.TCIDs,
Type: this.isVisa ? 1 : 0
};
if (!this.isVisa) {
params.OPId = this.queryData.OPId;
if (!this.queryData.AssistantId || !this.queryData.AssistantId.length) {
......@@ -810,18 +739,17 @@ export default {
editItem(item) {
this.TCIDs = item.TCID;
this.editObj = item;
console.log("editItem", item);
this.queryData = {
OPId: item.OPId || "",
AssistantId:
!item.AssistantId || item.AssistantId == "0"
? []
: item.AssistantId.split(",").map((item) => Number(item)),
!item.AssistantId || item.AssistantId == "0" ?
[] :
item.AssistantId.split(",").map((item) => Number(item)),
VisaOPId: item.VisaOPId || "",
VisaAssistantId:
!item.VisaAssistantId || item.VisaAssistantId == "0"
? []
: item.VisaAssistantId.split(",").map((item) => Number(item)),
!item.VisaAssistantId || item.VisaAssistantId == "0" ?
[] :
item.VisaAssistantId.split(",").map((item) => Number(item)),
VisaNum: item.VisaNum == -1 ? item.NeedVisaNum : item.VisaNum,
};
this.editNum = true;
......@@ -829,7 +757,6 @@ export default {
},
eidtItems() {
this.TCIDs = this.getSelcetedIds();
console.log("eidtItems eidtItems", this.TCIDs);
if (!this.TCIDs) {
this.$message.error("请选择要编辑的内容");
return;
......@@ -847,8 +774,7 @@ export default {
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
this.apipost(
"admin_get_EmployeeGetList",
{},
"admin_get_EmployeeGetList", {},
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
......@@ -887,8 +813,7 @@ export default {
if (this.list[key].wxImage === "") {
this.wxLoading = true;
this.apipost(
"TaskManagemnet_get_GetWeiXinShare",
{
"TaskManagemnet_get_GetWeiXinShare", {
ConfigId: this.list[key].ConfigID,
TCID: this.list[key].TCID,
},
......@@ -987,8 +912,7 @@ export default {
"b2b_post_SetHotelClickService",
msg,
(res) => {
if (res.data.resultCode == 1) {
}
if (res.data.resultCode == 1) {}
},
(err) => {}
);
......@@ -1010,6 +934,6 @@ export default {
this.TCIDList = this.$route.query.TCIDList;
}
},
};
</script>
};
</script>
src/components/SalesModule/productOrderList.vue
View file @ 5d34ced9
......@@ -524,7 +524,6 @@
},
},
mounted() {
console.log('this.router', this.$route, this.$router)
if(this.$route.path === '/productOrderList') {
this.isVisa = false
} else {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 5d34ced9
......@@ -193,7 +193,6 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData", tempData);
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 5d34ced9
......@@ -159,7 +159,6 @@
return currencyNumList
}
this.postData.TravelState = type;
// console.log('this.postData', this.postData, this.postData.LineId)
// 线路必填
if(!this.postData.LineId) {
this.$message.error('请选择线路')
......
src/components/rank/entryForm.vue
View file @ 5d34ced9
<style scoped>
.groupTourOrder_count_item > p > span {
.groupTourOrder_count_item>p>span {
margin: 0;
}
.color_red_order {
}
.color_red_order {
color: red;
}
.HT_total {
}
.HT_total {
display: flex;
flex-direction: column;
margin: 5px 0;
}
.HT_total p {
}
.HT_total p {
width: 100%;
display: block;
}
.HT_total p > span {
}
.HT_total p>span {
float: left;
display: inline-block;
width: 25%;
}
.TC_leftSearch > div {
}
.TC_leftSearch>div {
padding: 5px 0;
}
.groupTourOrderByTuan_ico {
}
.groupTourOrderByTuan_ico {
margin-left: 5px;
}
.groupTourOrderByTuan_ico > i {
}
.groupTourOrderByTuan_ico>i {
display: inline-block;
margin: 0 5px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #eaeaea !important;
}
}
.HotelWorkList .HW_hotelDialog {
.HotelWorkList .HW_hotelDialog {
width: 900px;
}
}
.HotelWorkList .Hw_tableOne {
.HotelWorkList .Hw_tableOne {
width: 100%;
height: 40px;
background-color: #eaeaea;
}
}
.HotelWorkList .Hw_tableOne th {
.HotelWorkList .Hw_tableOne th {
text-align: center;
}
}
.HotelWorkList .HotelWorkInput .el-input {
.HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
}
.HotelWorkList .HworkInput .el-input {
.HotelWorkList .HworkInput .el-input {
width: 210px;
}
/deep/.query-box li span > em {
}
/deep/.query-box li span>em {
min-width: 60px;
}
}
</style>
<template>
<template>
<div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none">
<ul>
<li>
<span>
<em>公司</em>
<el-select
filterable
v-model="queryMsg.RB_Branch_Id"
@change="getDepartment"
>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
<el-select filterable v-model="queryMsg.RB_Branch_Id" @change="getDepartment">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>部门</em>
<el-select
filterable
v-model="queryMsg.RB_Department_Id"
@change="getEmployee"
>
<el-select filterable v-model="queryMsg.RB_Department_Id" @change="getEmployee">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
></el-option>
<el-option v-for="item in DepartmentList" :label="item.DepartmentName" :value="item.DepartmentID"
:key="item.DepartmentID"></el-option>
</el-select>
</span>
</li>
......@@ -112,49 +102,30 @@
<em>人员</em>
<el-select filterable v-model="queryMsg.EnterID" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出团日期</em>
<el-date-picker
v-model="queryMsg.tStartDates"
type="daterange"
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
></el-date-picker>
<el-date-picker v-model="queryMsg.tStartDates" type="daterange" range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions"></el-date-picker>
</span>
</li>
<li>
<span>
<em>报名日期</em>
<el-date-picker
v-model="queryMsg.qStartDates"
type="daterange"
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
></el-date-picker>
<el-date-picker v-model="queryMsg.qStartDates" type="daterange" range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"></el-date-picker>
</span>
</li>
<li>
<input
type="button"
class="normalBtn"
:value="$t('pub.searchBtn')"
@click.stop="(msg.pageIndex = 1), (currentPage = 1), GetList()"
/>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click.stop="(msg.pageIndex = 1), (currentPage = 1), GetList()" />
</li>
</ul>
</div>
......@@ -168,24 +139,20 @@
<span>{{ item.CurrencyName }}</span>
</div>
<p>
<span
>销售额：
<span>销售额：
{{ (item.SumPreferPrice|| 0).toFixed(2) }}
</span>
<span
>收款金额：
<span>收款金额：
{{ (item.Income|| 0).toFixed(2) }}
</span>
<!-- <span
>手续费：
{{ item.PlatformTax.toFixed(2) }}
</span> -->
<span
>未收金额：
<span>未收金额：
{{ (item.notInCome|| 0).toFixed(2) }}
</span>
<span
>正常收客数：
<span>正常收客数：
{{ item.TotalGuestNum }}
</span>
<!-- <span
......@@ -198,36 +165,24 @@
</template>
</el-row>
</div>
<OrderList
:pagesTitle="Title"
:OrderList="OrderList"
v-loading="loading"
@success="(msg.pageIndex = 1), GetList()"
>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="(msg.pageIndex = 1), GetList()">
</OrderList>
<div
v-if="OrderList && OrderList.length == 0"
style="text-align: center; padding: 100px"
>
<div v-if="OrderList && OrderList.length == 0" style="text-align: center; padding: 100px">
暂无数据
</div>
<el-pagination
v-if="OrderList && OrderList.length > 0"
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
>
<el-pagination v-if="OrderList && OrderList.length > 0" background @current-change="handleCurrentChange"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size="msg.pageSize"
:total="total">
</el-pagination>
</div>
</template>
<script>
import OrderList from "./OrderList.vue";
export default {
<script>
import OrderList from "./OrderList.vue";
export default {
props: ["pagesTitle", "dataObj"],
components: { OrderList },
components: {
OrderList
},
data() {
return {
pickerOptions: {
......@@ -327,14 +282,27 @@ export default {
total: 0,
currentPage: 1,
OrderTypeList: [],
OrderStateType: [
{ Name: "接机", ID: "1" },
{ Name: "送机", ID: "2" },
{ Name: "包车", ID: "3" },
OrderStateType: [{
Name: "接机",
ID: "1"
},
{
Name: "送机",
ID: "2"
},
{
Name: "包车",
ID: "3"
},
],
orderType: [
{ Name: this.$t("OrderList.orderType.tour"), ID: "1" },
{ Name: this.$t("OrderList.orderType.guest"), ID: "2" },
orderType: [{
Name: this.$t("OrderList.orderType.tour"),
ID: "1"
},
{
Name: this.$t("OrderList.orderType.guest"),
ID: "2"
},
],
Datelist: "",
DatelistUse: "",
......@@ -372,11 +340,9 @@ export default {
"admin_get_BranchGetList",
this.getCompanyMsg,
(res) => {
console.log("getCompanyList", res);
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
} else {}
},
(err) => {}
);
......@@ -500,29 +466,23 @@ export default {
let param = {
pageIndex: this.msg.pageIndex,
pageSize: 15,
RB_Branch_Id:
this.queryMsg.RB_Branch_Id == -1 ? null : this.queryMsg.RB_Branch_Id,
RB_Department_Id:
this.queryMsg.RB_Department_Id == 0
? null
: this.queryMsg.RB_Department_Id,
RB_Branch_Id: this.queryMsg.RB_Branch_Id == -1 ? null : this.queryMsg.RB_Branch_Id,
RB_Department_Id: this.queryMsg.RB_Department_Id == 0 ?
null :
this.queryMsg.RB_Department_Id,
EnterID: this.queryMsg.EnterID == 0 ? null : this.queryMsg.EnterID,
QStartDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[0]
: null,
QEndDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[1]
: null,
CStartDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[0]
: null,
CEndDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[1]
: null,
QStartDate: this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2 ?
this.queryMsg.tStartDates[0] :
null,
QEndDate: this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2 ?
this.queryMsg.tStartDates[1] :
null,
CStartDate: this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2 ?
this.queryMsg.qStartDates[0] :
null,
CEndDate: this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2 ?
this.queryMsg.qStartDates[1] :
null,
GroupBy: this.queryMsg.GroupBy,
QueryType: this.queryMsg.QueryType,
};
......@@ -557,7 +517,7 @@ export default {
);
},
getSummaryData() {
if(this.msg.pageIndex != 1) {
if (this.msg.pageIndex != 1) {
return
}
let param = this.getParams();
......@@ -597,14 +557,14 @@ export default {
}
let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
const { BranchId = 0, EnterID = 0, RB_Department_Id = 0, tStartDates = [],qStartDates=[] } = this.$route.query;
console.log("this.$route.query.", this.$route);
const {
BranchId = 0, EnterID = 0, RB_Department_Id = 0, tStartDates = [], qStartDates = []
} = this.$route.query;
this.queryMsg.RB_Branch_Id = Number(BranchId);
this.queryMsg.EnterID = Number(EnterID);
this.queryMsg.RB_Department_Id = Number(RB_Department_Id);
......@@ -634,6 +594,6 @@ export default {
this.com_onresize();
};
},
};
</script>
};
</script>
src/components/rank/salesVolumeRank.vue
View file @ 5d34ced9
......@@ -532,7 +532,6 @@ export default {
let date = moment().format('yyyy-MM-DD')
let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
this.msg.tStartDates = [start, date]
console.log('settStartDates',date,start)
},
handleClick(tab, event) {
this.msg.EnterID = 0;
......
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