Skip to content

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

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

parents 1fd87d6a cde10dde
Expand all Show whitespace changes
Inline Side-by-side
Showing with 416 additions and 199 deletions
src/assets/common/lang/Japan/Ground.js
View file @ ed9e9fab
......@@ -8,7 +8,6 @@ export const obj = {
daituanshu: "バンド数",
qingshurugjz: "入力キーワード検索、",
mimabaoguantips: "パスワードは安全に保管してください。パスワードを修正して行政者に連絡してください。",
gouwudian: "ショッピングショップ",
jindianriqi: "お店に入る日",
guanliantuanhao: "関連団体番号",
zongjiaoyie: "総取引額",
......@@ -45,7 +44,6 @@ export const obj = {
zifeizonge: "自費総額",
zifeirenjun: " 1人あたりの自費",
zifeicishu: "自費回数、",
gouwudian: "ショッピングショップ:",
ci: "回",
tuozhuaishezhi: "引きずって引っ张って(ガイド)に対する設置できる」と、",
jingwaihao: "オフショア号",
......@@ -184,7 +182,6 @@ export const obj = {
jiudianzhuangtai: "ホテルの状態",
jiudianztS: ["全部OKです", "一晩だけさしあげる", "仮の二晩", "暫定3晩", "暫定四晩", "暫定5晩", "暫定6晩", "暫定的に7泊以上"],
chufadi: "出発地",
hangbanshijian: "フライトタイム",
gongsituanhao: "会社番号",
jiweishu: "総机位数",
zhanchuang: "占床",
......@@ -431,7 +428,6 @@ export const obj = {
gstyxinxi:'会社共通情報',
tdxuqiubiao:'チーム需要表',
djieopcaozuo:'接地op操作',
hangbanshijian:'フライト時間',
huiyuanjia:'会員価格',
dingdan:'受注',
yikaipiao:'開票済み',
......@@ -490,5 +486,64 @@ export const obj = {
anyuechakan:'月別に見る',
antianchakan:'天別に見る',
xgddssje:'注文書の損失金額を修正します。',
opszssrs:'op受信設定人数',
pwssjne:'チケットの破損金額',
qzssjine:'ビザの受取損失金額',
djshousunjine:'地受信損金額',
opbuchongjine:'OP補足金額',
weishezhi:'未設定',
shousunzonge:'収入総額',
quanbujineshezhi:'注：全部の金額が設定されてから注文の未収金額を更新します。',
yshezhi:'設定済み',
dyldyxjhb:'ガイドリーダー運行計画表',
ctmchen:'出団名称',
tianshu:'日数',
ctrenshu:'出団人数',
tsyaoqiu:'特別な要求',
bmfzr:'部門長',
jpfzren:'航空券の担当者',
dffzren:'予約係',
zlfzren:'車両責任者',
dcfzeren:'注文係',
mpfzeren:'チケット担当者',
clgs:'車両会社',
chepaihao:'ナンバープレート',
sijiName:'運転手の名前',
sijiPhone:'運転手さんの電話番号',
clshiyong:'車両使用',
jdshiyong:'ホテルの利用',
dfanghao:'部屋を予約する',
canshishiyong:'食事は使用します',
dchao:'注文番号',
youlanshijian:'観光時間',
mpshiyong:'チケットのご利用',
CustomerName:'お客様の名前',
csnianyue:'生年月日',
zhiye:'職業',
xcneirong:'スケジュール内容',
cichubuhe:'注：ここではどのチームのスケジュールともバインディングしません。配車表をダウンロードする必要があれば、車両バインディングチームの後でダウンロードしてください。',
ddrenshu:'オーダー人数',
huisongfei:'返送料',
shuruhsf:'返送料を入力してください',
cphaoma:'ナンバープレート',
gsjiesuan:'会社の決算',
htgszf:'合団会社が支払う',
zyhdwyc:'自由活動-車なし',
jdjiesong:'ホテルの送迎',
htzfth:'合団支払団番号',
tongshang:'同上',
sjzhusu:'運転手が宿泊する',
qsrwsdz:'外泊先を入力してください。',
bcsm:'駐車場の説明',
qsrsm:'説明を入力してください',
gsfeiyong:'高速料金',
qsrfyong:'料金を入力してください',
gsfkfs:'高速料金の支払い方法',
cbenjia:'原価',
xiaoji:'小計',
xzdanbuneng:'もうオーダーしましたが、価格と支払方法はもう修正できません。',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhCN/Ground.js
View file @ ed9e9fab
......@@ -8,7 +8,6 @@ export const obj = {
daituanshu: "带团数",
qingshurugjz: "输入关键字搜索",
mimabaoguantips: "密码请妥善保管，修改密码请联系行政人员",
gouwudian: "购物店",
jindianriqi: "进店日期",
guanliantuanhao: "关联团号",
zongjiaoyie: "总交易额",
......@@ -45,7 +44,6 @@ export const obj = {
zifeizonge: "自费总金额",
zifeirenjun: "自费人均",
zifeicishu: "自费次数",
gouwudian: "购物店：",
ci: "次",
tuozhuaishezhi: "可拖拽对（导游）进行设置",
jingwaihao: "境外号",
......@@ -174,7 +172,6 @@ export const obj = {
jiudianzhuangtai: "酒店状态",
jiudianztS: ["全部OK", "暂定一晚", "暂定两晚", "暂定三晚", "暂定四晚", "暂定五晚", "暂定六晚", "暂定七晚以上"],
chufadi: "出发地",
hangbanshijian: "航班时间",
gongsituanhao: "公司团号",
jiweishu: "机位总数",
zhanchuang: "占床",
......@@ -416,7 +413,6 @@ export const obj = {
gstyxinxi:'公司通用信息',
tdxuqiubiao:'团队需求表',
djieopcaozuo:'地接op操作',
hangbanshijian:'航班时间',
huiyuanjia:'会员价',
dingdan:'订单',
yikaipiao:'已开票',
......@@ -459,7 +455,6 @@ export const obj = {
shopStore:'购物店',
choiceShop:'选择购物店',
zczysx:'政策，注意事项',
dycaozuo:'导游操作',
dijieop:'地接OP',
jindianNum:'进店团号',
......@@ -475,5 +470,65 @@ export const obj = {
anchakan:'按年查看',
anyuechakan:'按月查看',
antianchakan:'按天查看',
xgddssje:'修改订单收损金额',
opszssrs:'op收损设置人数',
pwssjne:'票务收损金额',
qzssjine:'签证收损金额',
djshousunjine:'地接收损金额',
opbuchongjine:'op补充金额',
weishezhi:'未设置',
shousunzonge:'收损总额',
quanbujineshezhi:'注：只有全部金额都设置完成才会更新订单应收金额',
yshezhi:'已设置',
dyldyxjhb:'导游领队运行计划表',
ctmchen:'出团名称',
tianshu:'天数',
ctrenshu:'出团人数',
tsyaoqiu:'特殊要求',
bmfzr:'部门负责人',
jpfzren:'机票负责人',
dffzren:'订房负责人',
zlfzren:'车辆负责人',
dcfzeren:'订餐负责人',
mpfzeren:'门票负责人',
clgs:'车辆公司',
chepaihao:'车牌号',
sijiName:'司机姓名',
sijiPhone:'司机电话',
clshiyong:'车辆使用',
jdshiyong:'酒店使用',
dfanghao:'订房号',
canshishiyong:'餐食使用',
dchao:'订餐号',
youlanshijian:'游览时间',
mpshiyong:'门票使用',
CustomerName:'客人姓名',
csnianyue:'出生年月日',
zhiye:'职业',
xcneirong:'行程内容',
cichubuhe:'注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载',
ddrenshu:'订单人数',
huisongfei:'回送费',
shuruhsf:'请输入回送费',
cphaoma:'车牌号码',
gsjiesuan:'公司结算',
htgszf:'合团公司支付',
zyhdwyc:'自由活动-无用车',
jdjiesong:'酒店接送',
htzfth:'合团支付团号',
tongshang:'同上',
sjzhusu:'司机住宿',
qsrwsdz:'请输入外宿地址',
bcsm:'泊车说明',
qsrsm:'请输入说明',
gsfeiyong:'高速费用',
qsrfyong:'请输入费用',
gsfkfs:'高速费用付款方式',
cbenjia:'成本价',
xiaoji:'小计',
xzdanbuneng:'已制单，不能再修改价格和付款方式！',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ ed9e9fab
......@@ -8,7 +8,6 @@ export const obj = {
daituanshu:"帶團數",
qingshurugjz:"輸入關鍵字蒐索",
mimabaoguantips:"密碼請妥善保管,修改密碼請聯系行政人員",
gouwudian:"購物店",
jindianriqi:"進店日期",
guanliantuanhao:"關聯團號",
zongjiaoyie:"總交易額",
......@@ -45,7 +44,6 @@ export const obj = {
zifeizonge:"自費總金額",
zifeirenjun:"自費人均",
zifeicishu:"自費次數",
gouwudian:"購物店：",
ci:"次",
tuozhuaishezhi:"可拖拽對（導遊）進行設定",
jingwaihao:"境外號",
......@@ -165,8 +163,8 @@ export const obj = {
qingxuanzefkfs: "請選擇付款方式!",
qingxuanzekssjs: "請選擇開始時間!",
qingxuanzejssjs: "請選擇結束時間!",
xiazaidangejiud: "下載（單個飯店）",
xiazaixuanbu: "下載（全部）",
xiazaidangejiud: "下載(單個飯店)",
xiazaixuanbu: "下載(全部)",
jiudiantjg: "飯店統計 共",
jiandangqsy: "間，當前使用",
jianzhanbi: "間，占比",
......@@ -174,7 +172,6 @@ export const obj = {
jiudianzhuangtai: "飯店狀態",
jiudianztS: ["全部OK", "暫定一晚", "暫定兩晚", "暫定三晚", "暫定四晚", "暫定五晚", "暫定六晚", "暫定七晚以上"],
chufadi: "出發地",
hangbanshijian: "班機時間",
gongsituanhao: "公司團號",
jiweishu: "機位總數",
zhanchuang: "占床",
......@@ -231,7 +228,7 @@ export const obj = {
jinexiaoji:"金額小計",
fanyongyjin:"返傭金額",
jinezongji:"金額總計",
fukuanbzdth:"付款方式&訂團號&備註",
fukuanbzdth:"付款方式&訂團號&備註",
qingxuanzegys:"請選擇供應商",
shoupeifei:"手配費",
wshoupeifei:"無手配費",
......@@ -417,7 +414,6 @@ daiqueding:'待確定',
gstyxinxi:'公司通用資訊',
tdxuqiubiao:'團隊需求錶',
djieopcaozuo:'地接op操作',
hangbanshijian:'班機時間',
huiyuanjia:'會員價',
dingdan:'訂單',
yikaipiao:'已開票',
......@@ -475,5 +471,64 @@ liebiao:'清單',
anchakan:'按年查看',
anyuechakan:'按月查看',
antianchakan:'按天查看',
xgddssje:'修改訂單收損金額',
opszssrs:'op收損設定人數',
pwssjne:'票務收損金額',
qzssjine:'簽證收損金額',
djshousunjine:'地接收損金額',
opbuchongjine:'op補充金額',
weishezhi:'未設定',
shousunzonge:'收損總額',
quanbujineshezhi:'注：只有全部金額都設定完成才會更新訂單應收金額',
yshezhi:'已設定',
dyldyxjhb:'導遊領隊運行計畫表',
ctmchen:'出團名稱',
tianshu:'天數',
ctrenshu:'出團人數',
tsyaoqiu:'特殊要求',
bmfzr:'部門負責人',
jpfzren:'機票負責人',
dffzren:'訂房負責人',
zlfzren:'車輛負責人',
dcfzeren:'訂餐負責人',
mpfzeren:'門票負責人',
clgs:'車輛公司',
chepaihao:'車牌號',
sijiName:'司機姓名',
sijiPhone:'司機電話',
clshiyong:'車輛使用',
jdshiyong:'飯店使用',
dfanghao:'訂房號',
canshishiyong:'餐食使用',
dchao:'訂餐號',
youlanshijian:'遊覽時間',
mpshiyong:'門票使用',
CustomerName:'客人姓名',
csnianyue:'出生年月日',
zhiye:'職業',
xcneirong:'行程內容',
cichubuhe:'注：此處不和任何團隊行程做綁定，如需下載車配錶，請在車輛綁定團隊以後再行下載',
ddrenshu:'訂單人數',
huisongfei:'回送費',
shuruhsf:'請輸入回送費',
cphaoma:'車牌號碼',
gsjiesuan:'公司結算',
htgszf:'合團公司支付',
zyhdwyc:'自由活動-無用車',
jdjiesong:'飯店接送',
htzfth:'合團支付團號',
tongshang:'同上',
sjzhusu:'司機住宿',
qsrwsdz:'請輸入外宿地址',
bcsm:'泊車說明',
qsrsm:'請輸入說明',
gsfeiyong:'高速費用',
qsrfyong:'請輸入費用',
gsfkfs:'高速費用付款方式',
cbenjia:'成本價',
xiaoji:'小計',
xzdanbuneng:'已制單，不能再修改價格和付款方式！',
}
export default obj;
\ No newline at end of file
src/components/DomesticModule/SettlementOrder.vue
View file @ ed9e9fab
......@@ -112,6 +112,10 @@
<el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>确
</el-button>
</el-tooltip>
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="删除" placement="top">
<el-button v-if="item.Status==0" type="danger" class="_bth_bg_br" @click="delperiods(item)" circle>删
</el-button>
</el-tooltip>
</td>
</tr>
</table>
......@@ -200,6 +204,28 @@
});
});
},
delperiods(obj) {
this.$confirm('是否删除' + '“' + obj.Term + '”' + '期？删除后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('DomesticTicket_post_DelBillInfo', {
BillId: obj.ID
}, r => {
if (r.data.resultCode == 1) {
let data = r.data.data;
this.$message.success(r.data.message);
this.getList();
}
}, null);
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
getDetails(id) {
this.Details = [];
this.apipost('Financial_post_GetOrderFinanceList', {
......
src/components/Hotel/roomReservations.vue
View file @ ed9e9fab
......@@ -107,11 +107,11 @@
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%" v-loading='loading'>
<tr>
<th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('ground.chufadi')}}</th>
<th width="90">{{$t('ground.hangbanshijian')}}</th>
<th width="90">{{$t('ground.hbsj')}}</th>
<th width="145">{{$t('ground.gongsituanhao')}}</th>
<th width="100">{{$t('ground.jiweishu')}}<br />(Y/E/F)</th>
<th width="80">{{$t('ground.zhanchuang')}}<br />{{$t('ground.bzhanchuang')}}</th>
......
src/components/LeaderManagement/leaderManagement.vue
View file @ ed9e9fab
......@@ -1064,7 +1064,7 @@ export default {
},
deletelist(ID) {
var that = this;
that.Confirm("是否删除?", function() {
that.Confirm(this.$t('tips.shifoushanchu'), function() {
that.apipost(
"leader_post_Remove",
{
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ ed9e9fab
......@@ -42,7 +42,7 @@
<tr>
<th width="110">{{$t('active.ad_xuhao')}}</th>
<th width="100">{{$t('sm.chufadi')}}</th>
<th width="120">{{$t('ground.hangbanshijian')}}</th>
<th width="120">{{$t('ground.hbsj')}}</th>
<th width="140">{{$t('ground.gongsituanhao')}}</th>
<th width="120">{{$t('ground.jiweishokzs')}}</th>
<th width="120">{{$t('adm.adm_time')}}</th>
......
src/components/ShoppingStore/ShoppingReceipt.vue
View file @ ed9e9fab
......@@ -29,7 +29,7 @@
<td width="150px">{{StartCityNames}}</td>
</tr>
<tr>
<td colspan="3" width="450px">{{$t('ground.shopStore')}}</td>
<td colspan="3" width="450px">{{$t('ground.gwd')}}</td>
<td width="150px">{{$t('ground.choiceShop')}}</td>
<td colspan="2" width="300px">{{$t('ground.zczysx')}}</td>
</tr>
......
src/components/administrative/userManagement.vue
View file @ ed9e9fab
......@@ -98,7 +98,7 @@
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_bindaccountinfo')" placement="top">
<el-button type="primary" class='zidingyiFz' icon="iconfont icon-bangdingzhagnhuxinxi" circle @click="goUrl('empBankAccount',item.EmployeeId)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="单据交接" placement="top">
<el-tooltip v-if="isSelectFinaceJJ" class="item" effect="dark" content="单据交接" placement="top">
<el-button type="primary" class='zidingyiFz' icon="iconfont icon-zhuanhuan2" circle @click="goUrl('GetWOrkTransferPageLis',item.EmployeeId)"></el-button>
</el-tooltip>
</td>
......@@ -319,6 +319,7 @@
isRight: true,
dialogTitle: '',
insideDialogTxt: '',
isSelectFinaceJJ: false,
//请求
msg: {
pageIndex: 1,
......@@ -460,6 +461,10 @@
this.getPostMsg.RB_Department_Id=userInfo.RB_Department_Id; //部门
this.msg.IsParentCompany=userInfo.IsParentCompany;//是否为总公司
if((","+userInfo.ActionMenuCode+",").indexOf(',F_WorkTransfer,')!=-1){
this.isSelectFinaceJJ = true;
}
this.getList();
this.getCompany();
this.getDerpartMent();
......
src/components/busManagement/BusInfo.vue
View file @ ed9e9fab
This diff is collapsed.
src/components/commonPage/commonShouSun.vue
View file @ ed9e9fab
......@@ -41,62 +41,62 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="comShouSunTable">
<tr>
<td colspan="4">
op收损设置人数：
{{$t('ground.opszssrs')}}：
<template v-if="Type==1">
<el-input class="w180" placeholder="请输入" @keyup.native="checkInteger(dataList,'OpSetLossPeople')" v-model="dataList.OpSetLossPeople" type="text" ></el-input>
<el-input class="w180" :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(dataList,'OpSetLossPeople')" v-model="dataList.OpSetLossPeople" type="text" ></el-input>
</template>
<template v-else>{{dataList.OpSetLossPeople}}</template>
</td>
</tr>
<tr>
<td>
票务收损金额
{{$t('ground.pwssjne')}}
</td>
<td>
签证收损金额
{{$t('ground.qzssjine')}}
</td>
<td>
地接收损金额
{{$t('ground.djshousunjine')}}
</td>
<td>
op补充金额
{{$t('ground.opbuchongjine')}}
</td>
</tr>
<tr>
<td>
<template v-if="Type==2">
<el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney',true),getTotalSun(dataList)" :placeholder="$t('pub.pleaseImport')" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.TicketIsSet==1">{{dataList.LossTicketMoney}}</span>
<span class="SnotSet" v-else>未设置</span>
<span class="SnotSet" v-else>{{$t('ground.weishezhi')}}</span>
</template>
</td>
<td>
<template v-if="Type==3">
<el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney',true),getTotalSun(dataList)" :placeholder="$t('pub.pleaseImport')" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.VisaIsSet==1">{{dataList.LossVisaMoney}}</span>
<span class="SnotSet" v-else>未设置</span>
<span class="SnotSet" v-else>{{$t('ground.opbuchongjine')}}{{$t('ground.weishezhi')}}</span>
</template>
</td>
<td>
<template v-if="Type==4">
<el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney',true),getTotalSun(dataList)" :placeholder="$t('pub.pleaseImport')" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.DiJieIsSet==1">{{dataList.LossDiJieMoney}}</span>
<span class="SnotSet" v-else>未设置</span>
<span class="SnotSet" v-else>{{$t('ground.weishezhi')}}</span>
</template>
</td>
<td>
<template v-if="Type==1">
<el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney',true),getTotalSun(dataList)" :placeholder="$t('pub.pleaseImport')" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.OPIsSet==1">{{dataList.LossOPMoney}}</span>
<span class="SnotSet" v-else>未设置</span>
<span class="SnotSet" v-else>{{$t('ground.weishezhi')}}</span>
</template>
</td>
</tr>
......@@ -104,13 +104,13 @@
<tr>
<td class="cmShouLastTd" colspan="4" style="text-align:right">
<span class="totalShouSan">
收损总额：<span class="TotalShouSun">{{totalSun}}</span>
{{$t('ground.shousunzonge')}}：<span class="TotalShouSun">{{totalSun}}</span>
</span>
<span class="totalRemarkSpan">
注：只有全部金额都设置完成才会更新订单应收金额
{{$t('ground.quanbujineshezhi')}}
</span>
<input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
<input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
<input type="button" class="normalBtn" @click="closeDialog()" :value="$t('pub.cancelBtn')" />
<input type="button" class="normalBtn" @click="setShouSun()" :value="$t('pub.saveBtn')" />
</td>
</tr>
</tfoot>
......
src/components/dmc/manager/dmcShouSun.vue
View file @ ed9e9fab
......@@ -70,15 +70,15 @@
</el-select>
</li>
<li><span><em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.QStartDate' :picker-options="pickerBegin1" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.QEndDate' :picker-options="pickerBegin2" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>{{$t('fnc.bmriqi')}}</em>
<el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.CStartDate' :picker-options="pickerBegin3" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.CEndDate' :picker-options="pickerBegin4" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>{{$t('ground.shousunShezhi')}}</em>
......@@ -121,7 +121,7 @@
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
......@@ -301,7 +301,7 @@
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
<el-dialog custom-class='w600' :title="$t('ground.xgddssje')" :visible.sync="shousunDialog" center>
<commonShouSun ref="childShou" :Type="4" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog>
......@@ -359,13 +359,13 @@
//收损设置下拉
shouSunSelect:[{
Id:0,
label:'不限'
label:this.$t('pub.unlimitedSel')
},{
Id:1,
label:'已设置'
label:this.$t('ground.yshezhi')
},{
Id:2,
label:'未设置'
label:this.$t('ground.weishezhi')
}],
employeeMsg: {
RB_Group_id: "0",
......@@ -423,6 +423,40 @@
ParentId: -1,
Tier: 0,
},
pickerBegin1: {
disabledDate: time => {
if (this.msg.QEndDate == null) {
return false;
} else {
let endTime = new Date(this.msg.QEndDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBegin2: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate)
return startTime.getTime() >= time.getTime()
}
},
pickerBegin3: {
disabledDate: time => {
if (this.msg.CEndDate == null) {
return false;
} else {
let endTime = new Date(this.msg.CEndDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBegin4: {
disabledDate: time => {
let startTime = new Date(this.msg.CStartDate)
return startTime.getTime() >= time.getTime()
}
}
};
},
methods: {
......@@ -464,19 +498,6 @@
query: { blank: 'y', tab: name, item: JSON.stringify(obj)}
});
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.CEndDate = "";
}
},
dataDuiQ() {
if (this.msg.QStartDate > this.msg.QEndDate && this.msg.QEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.QEndDate = "";
}
},
goUrl(name, path, id, tcmun) {
this.$router.push({
name: path,
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ ed9e9fab
......@@ -160,7 +160,7 @@
<th width="130">{{$t('active.ad_xuhao')}}</th>
<th width="75">{{$t('scen.sc_cp')}}</th>
<th width="75">{{$t('sm.chufadi')}}</th>
<th width="80">{{$t('ground.hangbanshijian')}}</th>
<th width="80">{{$t('ground.hbsj')}}</th>
<th width="140">{{$t('salesModule.CompanyNum')}}</th>
<th width="90">{{$t('salesModule.Trade')}}<br />{{$t('ground.huiyuanjia')}}</th>
<th width="75">{{$t('advmanager.v_line')}}<br />{{$t('admin.admin_leader')}}</th>
......@@ -532,7 +532,7 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<el-dialog custom-class='w450' :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon>
</el-dialog>
......
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