Skip to content

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

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

parents 25d8b4ff 81e45888
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 110 deletions
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @ e79a5d59
<style scoped>
.page_fnDm{background-color: white;}
.query-box{overflow: inherit}
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.el-range-editor.el-input__inner{border-radius: 0}
.query-box{border: none}
.hight_query{position: relative;}
.hight_query span{height: 34px;line-height: 34px;color: #E95252}
.hight_query span .icon-gengduo{font-size: 12px}
.hight_query span em{text-decoration: underline;cursor: pointer;}
.hight_query_box{position: absolute;background-color: white;z-index: 2000;right: 200px;width: 800px;}
._hqb_shadow{box-shadow:3px 2px 10px rgb(204, 203, 203);border: 1px solid #ececec;}
.query-box ul {overflow: initial;}
.hqb_t{padding: 10px 20px;font-size: 16px;background-color: #E95252;border: 1px solid #E95252;color: #fff;text-align: center;margin-bottom: 15px}
.query-box li:last-child{float: left}
.query-box>ul>li:last-child{float: right;}
.query-box .hight_query ul .el-input{width: inherit }
.hight_query_box ul li{margin-top: 0;float: left;margin-right: 15px}
.hight_query_box ul li label{font-size: 14px}
.hight_query_box .el-form{padding: 0 20px}
.hight_query_box ul li._hqb_btn{float: right;margin-right: 25px;padding-top: 5px;position: inherit}
.Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
.rb_tit{font-size: 18px;text-align: center}
.rb_stit{font-size: 14px;text-align: center}
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
.rb_top_row span._r_name{color: #333333}
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table .th{font-weight: 200 !important}
._r_mt10{margin-top: 10px;}
._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px}
._bg_red{background-color: #E95252;}
._bg_green{background-color: #2BB87C}
.text_d{text-decoration: underline;cursor: pointer;}
.PingFangSC{font-weight: bold}
.Bill_par{position: relative;}
tr th,tr td{text-align: left;padding-left: 20px;}
tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;}
tr._item_list td{border-bottom: 1px solid #e5e5e5; padding: 10px;}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child{border-left: 1px solid #e5e5e5;}
tr._item_list td:last-child{border-right: 1px solid #e5e5e5;}
._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;}
._btn_group{font-size: 14px;}
.icon-daiqueren{color: #4BCA81}
.icon-yiqueren{color: #4BCA81}
.icon-yiquxiao{color: #959595}
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.zhuiClass{
}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
._bold{font-weight: bold}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._bank_name{margin-left: 10px;}
._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01}
._font_init{color: #333333;font-size: 12px;vertical-align:top;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
._icon_btn i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
._icon_btn i.edit{background-color: #00C6FF;font-size: 16px;}
._icon_btn i.edit:hover{background-color: #59daff}
._icon_btn i.edit:active{background-color: #00b8ec}
._icon_btn i.icon-sousuo{background-color: #47BF8C;}
._icon_btn i.icon-sousuo:hover{background-color: #66bb97}
._icon_btn i.icon-sousuo:active{background-color: #35ab79}
._icon_btn i.icon-ico_commodity_defaul{background-color: #F16C3C;}
._icon_btn i.icon-ico_commodity_defaul:hover{background-color: #e87c54}
._icon_btn i.icon-ico_commodity_defaul:active{background-color: #f76630}
._icon_btn i.icon-quxiao1{background-color: #E95252;}
._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
._fex_cen{display: flex;align-items: center}
._pad5{padding: 5px 10px;}
._color_gar{color: gray}
._TCIDAndTCNUMList{
display: flex;
}
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
</style>
<template >
......@@ -109,7 +16,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="手配费公司：">
<el-select filterable v-model='msg.KingdeeBranchId'
<el-select filterable v-model='msg.KingdeeBranchId'
:disabled="!isRB_Depart_Id" class="">
<!-- <el-option :value="-1" label="不限"></el-option> -->
<el-option v-for='item in GetHandFeeList'
......@@ -132,7 +39,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' >
......@@ -167,7 +74,7 @@
</el-form-item>
</el-col>
</el-col>
<template v-if="heightQueryBox"></template>
<el-col :span="6">
<el-form-item label="制单日期：">
......@@ -199,7 +106,7 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -347,7 +254,7 @@
</el-table-column>
</el-table>
</div>
<el-dialog custom-class='w400' title="手配费制单" :visible.sync="iszhidanBox" center>
<template>
<div style="color: black;font-size: 17px;padding: 0 0 10px 10px;border-bottom: 1px solid #EBEEF5;">
......@@ -472,7 +379,7 @@ export default {
mathNumber:'',
DepartIDs:'',
tableData: [],
heightQueryBox:false,
BillMakingMsg: {
OtherType: 0,
......@@ -548,7 +455,7 @@ export default {
} else {
return false;
}
});
});
},
DocumentMaking(){
let ids = this.multipleSelection.map(x=>{ return x.FinanceId})
......@@ -568,7 +475,7 @@ export default {
},res=>{
if(res.data.resultCode==1){
this.BillMakingMsg.StandardCurrencyName = res.data.data
}else{
this.Error(res.data.message);
}
......@@ -775,7 +682,7 @@ export default {
}
}, err => {})
}
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
......
src/components/FinancialModule/PrestorageManagement/components/detailList.vue
View file @ e79a5d59
......@@ -36,9 +36,9 @@
<el-table-column prop="" label="单号状态">
<template slot-scope="scope">
<span style="font-size: 12px;">
<i v-if="scope.row.Status===1" class="iconfont icon-yiqueren" style="color: #4BCA81;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===1" class="iconfont icon-daiqueren" style="color: #4BCA81;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===4" class="iconfont icon-yiquxiao" style="color: #4BCA81">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===2" class="iconfont icon-daiqueren" style="color: #959595;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===2" class="iconfont icon-yiqueren" style="color: #959595;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===3" class="iconfont icon-shenhebohui" style="color: #E95252">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===0" class="iconfont icon-zancun" style="color: #FF9C01">{{scope.row.StatusName}}</i>
</span>
......
src/components/Restaurant/RestaurantSalesBoard.vue
View file @ e79a5d59
......@@ -204,7 +204,8 @@
<li>
<span>
<em>{{$t('commonPickUp.Pick_resName')}}</em>
<el-select v-model="msg.DiningID" :placeholder="$t('pub.pleaseSel')" filterable>
<el-select v-model="msg.DiningIDList" :placeholder="$t('pub.pleaseSel')"
multiple collapse-tags filterable @change="getMultipleChoice" style="width: 300px;">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in DinnerList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -276,6 +277,8 @@
Year: 0,
Month: 0,
DiningID: 0,
DiningIDList:[],
DiningIDs: [],
QStatus:0,
loading: false,
uid:0,
......@@ -297,6 +300,27 @@
};
},
methods: {
// 多选餐厅
getMultipleChoice(){
if(this.msg.DiningIDList.length>1){
if(this.msg.DiningIDList.at(-1)==0){
this.msg.DiningIDList = [0]
}else if(this.msg.DiningIDList.at(-1)!=0){
this.msg.DiningIDList.forEach((x,index)=>{
if(x==0){
this.msg.DiningIDList.splice(index,1)
}
})
}
this.msg.DiningID = 0
this.msg.DiningIDs = this.msg.DiningIDList.join(',')
}
if(this.msg.DiningIDList.length==1){
this.msg.DiningID = this.msg.DiningIDList[0]
this.msg.DiningIDs = ''
}
},
stockColor: function (type) {
if (type === 1) {
return 'hasStock_1'
......@@ -405,14 +429,21 @@
},
//下载餐厅统计
DownLoadDinnerSalesBoard() {
if (this.msg.DiningID <= 0) {
if (this.msg.DiningIDList&&this.msg.DiningIDList.length==0) {
this.Info(this.$t('sm.qxzcanting'));
return;
}
let url
if(this.msg.DiningID>0){
url = 'dinner_get_downloadDinnerSalesBoard'
}else{
url ='dinner_get_downloadDinnerSalesBoardNew'
}
this.msg.uid=this.getLocalStorage().EmployeeId;
this.msg.loading = true;
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", this.msg, fileName,
this.GetLocalFile(url, this.msg, fileName,
res => {
this.msg.loading = false;
});
......
src/components/temp/operation.vue
View file @ e79a5d59
......@@ -526,6 +526,7 @@
<p style="font-weight: bold;">备注：</p>
1.以上制度公司会因市场变动与业务实际情况及公司规模採取适当因应或调整,敬请注意!!</br>
2.购物佣金不计入OP毛利奖金</br>
3.如果小包团、落地散团出现利润亏损，需其他团分摊亏损的利润</br>
</div>
<div style="display: none; padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
<p style="font-weight: bold;">关于提成发放流程的补充通知：</p>
......
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