Commit a9d547d6 authored by youjie's avatar youjie

no message

parent f1d78b81
......@@ -591,6 +591,18 @@ input[type="number"] {
</el-select>
</span>
</li>
<li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
<span>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
<template v-if="heightQueryBox">
<li>
<span>
......@@ -730,7 +742,8 @@ input[type="number"] {
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</span>
</li>
<li v-if="msg.Conditon==1">
<!-- 制单日期 -->
<!-- <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
<span>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34"
......@@ -741,7 +754,7 @@ input[type="number"] {
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
</li> -->
<li v-if="msg.Conditon==2">
<span>
<em>{{$t('fnc.spriqi')}}</em>
......@@ -968,7 +981,8 @@ input[type="number"] {
<i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
@click="showjiaoyi(item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" content="手续费设置" placement="top" v-if="active==2 && istransaction == true && item.Type==1">
<el-tooltip class="item" content="手续费设置" placement="top"
v-if="active==2 && item.Type==1 &&(istransaction == true || isJapanCommission == true)">
<i class="iconfont icon-zhifupeizhiguanli"
@click="showTranTax(item.FrID,'1')"></i>
</el-tooltip>
......@@ -1499,6 +1513,7 @@ export default {
F_Update_CurrencyRate: false,
costmodeHL:false,
trabeListHL:[],//修改费率下拉数据
isJapanCommission: false
};
},
created() {
......@@ -1517,6 +1532,9 @@ export default {
if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
this.F_Update_CurrencyRate=true;
}
if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
this.isJapanCommission=true;
}
if (this.$route.query.returnCode) {
this.active = this.$route.query.returnCode;
this.msg.Conditon = this.$route.query.returnCode;
......@@ -1547,6 +1565,9 @@ export default {
"my-GZ-Bill": myGZBill
},
mounted() {
let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1,new Date().Format("yyyy-MM-dd"))
this.productionDate = [StartDate,EndDate]
this.GetAuth();
this.getCostTypeList();
let userInfo = this.getLocalStorage();
......
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