Skip to content

S
SuperMan
Commit 726cdb3e authored by youjie's avatar youjie
Browse files
Options

no message

parent 24a670fd
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 37 deletions
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 726cdb3e
......@@ -58,7 +58,7 @@
}
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
background-color: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: left;
......@@ -68,7 +68,7 @@
}
.groupTourOrderSearchTable tr {
background: #fff;
background-color: #fff;
text-align: left;
}
......@@ -207,7 +207,7 @@
display: inline-block;
min-width: 122px;
padding: 10px 0;
background: #fff;
background-color: #fff;
margin: 10px 0;
height: 56px;
border-radius: 4px;
......@@ -492,7 +492,7 @@
font-size: 14px;
color: #e95252;
border: 1px solid #e95252;
background: #fff;
background-color: #fff;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
......@@ -507,7 +507,7 @@
font-size: 14px;
color: #fff;
border: 1px solid #e95252;
background: #e95252;
background-color: #e95252;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
......@@ -719,7 +719,7 @@
z-index: 10000;
top: 0;
width: 700px;
background: #fff;
background-color: #fff;
box-shadow: 0 0 8px #888;
padding: 10px;
box-sizing: border-box;
......@@ -1380,7 +1380,7 @@
<el-input v-model="addMsg.PreferPrice" :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="
background: rgb(0, 198, 255);
background-color: rgb(0, 198, 255);
border-color: rgb(0, 198, 255);
">
<i class="iconfont icon-nav-hangzheng" style="font-size: 12px"></i>
......@@ -1715,7 +1715,7 @@
padding: 0 10px;
height: 34px;
line-height: 34px;
background: #d2d2d2;
background-color: #d2d2d2;
font-size: 14px;
color: #333;
font-weight: bold;
......@@ -1725,7 +1725,7 @@
}}&nbsp;&nbsp;<span style="
padding: 2px 5px;
font-weight: normal;
background: #297bef;
background-color: #297bef;
border-radius: 4px;
color: #fff;
">
......@@ -2132,19 +2132,26 @@
item.isHaveFinance != '1' &&
item.orderState != '1' &&
item.orderState != '4')
" type="primary" style="background: #00c6ff; border-color: #00c6ff"
" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="getDetail(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="IsSupperOrderEdit || item.isOwn == 1" type="primary"
style="background: #a55eea; border-color: #a55eea" icon="iconfont icon-beizhu"
style="background-color: #a55eea !important; border-color: #a55eea" icon="iconfont icon-beizhu"
@click="getRemarks(item)"></el-button>
</el-tooltip>
<!-- <el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" content="编辑小费" placement="top-start" style="float: left">
<el-button @click="
clickEditTip(item)
" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important"
icon="iconfont icon-bianji-smal">
</el-button>
</el-tooltip> -->
<el-tooltip effect="dark" content="日志" placement="top-start" style="float: left">
<el-popover width="230" trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">日志</div>
<div class="logContact" style="background: #f9f9f9; padding: 20px 10px 0">
<div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
<div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index">
<div class="clearfix">
<div class="Auditcircle" style="left: 6px !important"></div>
......@@ -2161,7 +2168,7 @@
</div>
</div>
<el-button slot="reference" @click="getLogDetail(item)" type="primary" style="
background: #47bf8c;
background-color: #47bf8c !important;
border-color: #47bf8c;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
......@@ -2171,6 +2178,9 @@
<el-tooltip effect="dark" content="更多" placement="top-start" style="float: left">
<el-popover width="100" trigger="hover">
<div class="groupTourOrder_more">
<div v-if="S_UpdateOrderMoney" @click="clickEditTip(item)">
编辑小费
</div>
<div @click="goUrlT('confirmationOrder', item.orderId)">
确认函
{{
......@@ -2307,7 +2317,7 @@
</div>
</div>
<el-button slot="reference" type="primary" style="
background: #297bef;
background-color: #297bef !important;
border-color: #297bef;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
......@@ -3161,6 +3171,11 @@
</button>
</div>
</el-dialog>
<el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip"
center :before-close="closeChangeMachie">
<EditTip :TipObj="TipObj" @close="isShowTip=false" @success="isShowTip=false,getList()"></EditTip>
</el-dialog>
</div>
</template>
<script>
......@@ -3169,9 +3184,13 @@
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import EditTip from "./Common/EditTip.vue";
export default {
data() {
return {
S_UpdateOrderMoney: false,
isShowTip: false,
TipObj: {},
userInfo: {},
qjGroupId: -1,
F_Finance_Create: false, //制单权限
......@@ -3545,6 +3564,7 @@
};
},
components: {
EditTip,
payurlItem: payURL,
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
......@@ -3570,6 +3590,13 @@
},
},
methods: {
clickEditTip(item){
this.isShowTip = true
this.TipObj = JSON.parse(JSON.stringify(item))
this.TipObj.guestNum = item.guestNum
this.TipObj.TipMoney = item.preferTipAmount
this.TipObj.OrderId = item.orderId
},
SQPhoto() {
let checkID = [];
this.SQguestList.map((x) => {
......@@ -5872,6 +5899,10 @@
userMenuCode.indexOf(",Sale_TurnGroup,") != -1 ? true : false;
this.userId = this.getLocalStorage().EmployeeId;
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('S_UpdateOrderMoney') != -1 ){
this.S_UpdateOrderMoney = true
}
this.getEmployee();
this.getList();
this.getLineList();
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 726cdb3e
......@@ -50,7 +50,7 @@
}
.RegisTrationTable tr th {
background: #e6e6e6;
background-color: #e6e6e6;
height: 30px;
font-size: 14px;
text-align: left;
......@@ -67,7 +67,7 @@
}
.RegisTrationTable tr {
background: #fff;
background-color: #fff;
text-align: left;
}
......@@ -568,7 +568,7 @@
}
.RS_visaTable tr th {
background: #e6e6e6;
background-color: #e6e6e6;
height: 30px;
font-size: 14px;
color: #333;
......@@ -737,7 +737,7 @@
font-size: 14px;
color: #e95252;
border: 1px solid #e95252;
background: #fff;
background-color: #fff;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
......@@ -752,7 +752,7 @@
font-size: 14px;
color: #fff;
border: 1px solid #e95252;
background: #e95252;
background-color: #e95252;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
......@@ -846,7 +846,7 @@
z-index: 10000;
top: 0;
width: 700px;
background: #fff;
background-color: #fff;
box-shadow: 0 0 8px #888;
padding: 10px;
box-sizing: border-box;
......@@ -885,7 +885,7 @@
color: #fff;
padding: 0 15px;
height: 25px;
background: #297bef;
background-color: #297bef;
border: 1px solid #297bef;
cursor: pointer;
border-radius: 15px;
......@@ -1535,7 +1535,7 @@
<el-input v-model="addMsg.PreferPrice" type="number" @input.native="getTicheng()"
:disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="
background: rgb(0, 198, 255);
background-color: rgb(0, 198, 255);
border-color: rgb(0, 198, 255);
">
<i class="iconfont icon-nav-hangzheng" style="font-size: 12px"></i>
......@@ -2069,14 +2069,14 @@
<td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" placement="top-start">
<el-button type="primary" style="background: green; border-color: green"
<el-button type="primary" style="background-color: green; border-color: green"
icon="iconfont icon-bianji-smal" @click="getRemarks(item)"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left">
<el-popover width="230" trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">{{ $t("fnc.rizhi") }}</div>
<div class="logContact" style="background: #f9f9f9; padding: 20px 10px 0">
<div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
<div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index">
<div class="clearfix">
<div class="Auditcircle" style="left: 6px !important"></div>
......@@ -2095,13 +2095,18 @@
</div>
</div>
<el-button slot="reference" @click="getLogDetail(item)" type="primary" style="
background: #47bf8c;
background-color: #47bf8c;
border-color: #47bf8c;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
" icon="iconfont icon-rizhi1"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" content="编辑小费" placement="top-start" style="float: left">
<el-button @click="clickEditTip(item)" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important"
icon="iconfont icon-bianji-smal">
</el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left">
<el-popover width="100" trigger="hover">
<div class="groupTourOrder_more">
......@@ -2153,7 +2158,7 @@
</div>
</div>
<el-button slot="reference" type="primary" style="
background: #297bef;
background-color: #297bef;
border-color: #297bef;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
......@@ -2537,14 +2542,14 @@
ConfigData.Config.IsCurrentMaxStartData == 0 ||
IsSupperOrderEdit
" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style="background: #00c6ff; border-color: #00c6ff"
<el-button type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left">
<el-popover width="230" trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">{{ $t("fnc.rizhi") }}</div>
<div class="logContact" style="background: #f9f9f9; padding: 20px 10px 0">
<div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
<div v-if="logList.length > 0" v-for="(childItem, index) in logList" :key="index">
<div class="clearfix">
<div class="Auditcircle" style="left: 6px !important"></div>
......@@ -2565,16 +2570,24 @@
</div>
</div>
<el-button slot="reference" @click="getLogDetail(childItem)" type="primary" style="
background: #47bf8c;
background-color: #47bf8c !important;
border-color: #47bf8c;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
" icon="iconfont icon-rizhi1"></el-button>
</el-popover>
</el-tooltip>
<!-- <el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" content="编辑小费" placement="top-start" style="float: left">
<el-button @click="clickEditTip(childItem)" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important"
icon="iconfont icon-bianji-smal">
</el-button>
</el-tooltip> -->
<el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left">
<el-popover width="100" trigger="hover">
<div class="groupTourOrder_more">
<div v-if="S_UpdateOrderMoney" @click="clickEditTip(childItem)">
编辑小费
</div>
<div @click="toTrip(childItem)">
{{ $t("Operation.Op_teamNotice") }}({{
SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
......@@ -2677,7 +2690,7 @@
</div>
</div>
<el-button slot="reference" type="primary" style="
background: #297bef;
background-color: #297bef !important;
border-color: #297bef;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
......@@ -3184,19 +3197,19 @@
</td>
<td class="RL-BTNlist" rowspan="2">
<!--恢复订单-->
<el-button type="primary" v-if="EditBtn" style="background: #00c6ff; border-color: #00c6ff"
<el-button type="primary" v-if="EditBtn" style="background-color: #00c6ff; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="RecoverOrder(item)"></el-button>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
style="display: none">
<el-button type="primary" style="background: #00c6ff; border-color: #00c6ff"
<el-button type="primary" style="background-color: #00c6ff; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="getDetail(item)"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left">
<el-popover width="230" trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">{{ $t("fnc.rizhi") }}</div>
<div class="logContact" style="background: #f9f9f9; padding: 20px 10px 0">
<div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
<div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index">
<div class="clearfix">
<div class="Auditcircle" style="left: 6px !important"></div>
......@@ -3215,7 +3228,7 @@
</div>
</div>
<el-button slot="reference" @click="getLogDetail(item)" type="primary" style="
background: #47bf8c;
background-color: #47bf8c;
border-color: #47bf8c;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
......@@ -3276,7 +3289,7 @@
</div>
</div>
<el-button slot="reference" type="primary" style="
background: #297bef;
background-color: #297bef;
border-color: #297bef;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
......@@ -3868,6 +3881,10 @@
</button>
</div>
</el-dialog>
<el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip"
center>
<EditTip :TipObj="TipObj" @close="isShowTip=false" @success="isShowTip=false,getList()"></EditTip>
</el-dialog>
</div>
</template>
......@@ -3875,9 +3892,13 @@
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import commonShouSun from "../../commonPage/commonShouSun.vue";
import EditTip from "../../SalesModule/Common/EditTip.vue";
export default {
data() {
return {
S_UpdateOrderMoney: false,
isShowTip: false,
TipObj: {},
isShowOpSure: false, //op确认弹窗
IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
IsLookOrder: false, //出纳查看订单权限
......@@ -4311,6 +4332,7 @@
};
},
components: {
EditTip,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commonShouSun: commonShouSun,
......@@ -4333,6 +4355,13 @@
},
methods: {
clickEditTip(item){
this.isShowTip = true
this.TipObj = JSON.parse(JSON.stringify(item))
this.TipObj.guestNum = item.GuestNum
this.TipObj.TipMoney = item.PreferTipAmount
this.TipObj.OrderId = item.OrderId
},
setChargeLoss(obj) {
this.$confirm("确定恢复收损单", "提示", {
confirmButtonText: "确定",
......@@ -6751,6 +6780,10 @@
this.GetAuth();
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('S_UpdateOrderMoney') != -1 ){
this.S_UpdateOrderMoney = true
}
this.RBBranchId = userInfo.RB_Branch_id;
this.userId = userInfo.EmployeeId;
this.msg.TCID = this.$route.query.id;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 726cdb3e
......@@ -1229,8 +1229,8 @@
</el-form>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" title="价格信息">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
</div>
</template>
<script>
......
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