Skip to content

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

1111

parent d55adca6
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 176 deletions
src/components/Buying/AdManageList.vue
View file @ d8e815ab
......@@ -170,7 +170,6 @@
mounted() {
this.getList();
},
filters: {},
methods: {
//获取数据
getList() {
......
src/components/Buying/BuyingList.vue
View file @ d8e815ab
......@@ -144,9 +144,6 @@ export default {
this.getCommodityTypeList();
this.getGoodsTypeManager();
},
filters: {
},
methods: {
setPrice(id){
this.$router.push({ name: 'BuyingPrice',query:{blank: 'y', proId: id} })
......
src/components/Buying/BuyingPrice.vue
View file @ d8e815ab
......@@ -166,9 +166,6 @@ export default {
this.msg.CommodityId = this.addMsg.CommodityId = this.$route.query.proId
this.getList();
},
filters: {
},
methods: {
regDate(t){
if (t) {
......
src/components/Buying/BuyingType.vue
View file @ d8e815ab
......@@ -248,8 +248,6 @@ export default {
this.getList();
this.getGoodsTypeManager()
},
filters: {},
methods: {
changeParentId(){
if(this.addMsg.ParentId !== 0) {
......
src/components/Buying/CommondityOrderList.vue
View file @ d8e815ab
......@@ -200,7 +200,6 @@
//this.getCustomerList();
this.getList();
},
filters: {},
methods: {
ChangeList(){
let list = []
......
src/components/Buying/GuestAccountList.vue
View file @ d8e815ab
......@@ -132,7 +132,6 @@
mounted() {
this.getList();
},
filters: {},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
......
src/components/Buying/GuestAddressList.vue
View file @ d8e815ab
......@@ -49,7 +49,6 @@
this.msg.GuestAccountId=this.$route.query.Id;
this.getList();
},
filters: {},
methods: {
//获取数据
getList() {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d8e815ab
......@@ -2130,7 +2130,8 @@
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
<span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
@click="goToPassenger(childItem, 2)">{{ childItem.userName }}
<span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?'占床':'不占床'}}） </span>
<span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?'占床':'不占床'}}）
</span>
<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
</span>
......@@ -2181,8 +2182,10 @@
<template v-for="(uItem,uIndex) in item.OrderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.GuestNames}} 航班信息：
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)" @click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)"
@click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{
SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
......@@ -2677,7 +2680,9 @@
<template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
<span style="color: blue !important" :key="fourthIndex"
@click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
<span :style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?'占床':'不占床'}}） </span>
<span
:style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?'占床':'不占床'}}）
</span>
<span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
</span>
<span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}
......@@ -2915,27 +2920,26 @@
<div>
{{$t('objFill.tejiasheqinghan')}}:
<template v-if="childItem.OrderspecialofferId === 0">
<span class="font-color-blur">{{$t('objFill.weishenqing')}</span>
<span class="font-color-blur">{{$t('objFill.weishenqing')}}</span>
</template>
<template v-else>
<span class="font-color-red" v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}</span>
<span class="font-color-green" v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
<span class="font-color-red"
v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org"
v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
{{$t('objFill.shengqingsm')}：<span>{{
childItem.OrderspecialofferApplyReason
}}</span>
{{$t('objFill.shengqingsm')}}：<span>{{ childItem.OrderspecialofferApplyReason }}</span>
</div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
{{$t('objFill.shengpism')}：<span>{{ childItem.OrderspecialofferReason }}</span>
{{$t('objFill.shengpism')}}：<span>{{ childItem.OrderspecialofferReason }}</span>
</div>
</td>
<td colspan="3" style="height: 40px; cursor: pointer">
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)
">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem) ">
<span>{{$t('fnc.skdanju')}}：</span>
<span v-for="(item2, index2) in childItem.FinanceList" :key="index2">
<span v-if="item2.ColorState === 1"
......@@ -3378,19 +3382,20 @@
<div>
{{$t('objFill.tejiasheqinghan')}}:
<template v-if="item.OrderspecialofferId === 0">
<span class="font-color-blur">{{$t('objFill.weishenqing')}</span>
<span class="font-color-blur">{{$t('objFill.weishenqing')}}</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}</span>
<span class="font-color-org"
v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green" v-if="item.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
{{$t('objFill.shengqingsm')}：<span>{{ item.OrderspecialofferApplyReason }}</span>
{{$t('objFill.shengqingsm')}}：<span>{{ item.OrderspecialofferApplyReason }}</span>
</div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
{{$t('objFill.shengpism')}：<span>{{ item.OrderspecialofferReason }}</span>
{{$t('objFill.shengpism')}}：<span>{{ item.OrderspecialofferReason }}</span>
</div>
</td>
<td colspan="2">
......@@ -4102,7 +4107,7 @@
orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
isopOperation: true,
GuestIds:'',
GuestIds: '',
},
employeeMsg: {
BranchId: "-1",
......@@ -4404,26 +4409,6 @@
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return this.$t('objFill.yibaohan');
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = this.$t('objFill.yibaohan');
}
return result;
},
},
methods: {
//显示订单联运信息
......@@ -4471,7 +4456,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('pub.cancelBtn')+'！');
this.$message.info(this.$t('pub.cancelBtn') + '！');
});
},
//上传
......@@ -4910,7 +4895,6 @@
(err) => {}
);
},
// 获取订单收损详情
OrderLossInfo(childItem) {
this.OrderLossMsg.OrderId = childItem.OrderId;
......@@ -5204,13 +5188,13 @@
},
});
},
toTrip: function (obj, TicketUnionId,GuestIds) {
toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigId;
this.tripObj.orderId = obj.OrderId;
this.tripObj.cityId = obj.DepartureCityId;
this.tripObj.unionfid =0;
this.tripObj.GuestIds =GuestIds;
this.tripObj.unionfid = 0;
this.tripObj.GuestIds = GuestIds;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
......
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ d8e815ab
......@@ -854,7 +854,7 @@
}}
</td>
<td>
{{ item.VisaPrice | priceFormat2(item.VisaPrice) }}（-{{
{{ item.VisaPrice | priceFormat(item.VisaPrice) }}（-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}）
</td>
......@@ -1014,25 +1014,6 @@
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return this.$t('objFill.yibaohan');
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = this.$t('objFill.yibaohan');
}
return result;
},
},
methods: {
//刷新页面
......
src/components/administrative/ShareMeDocuments.vue
View file @ d8e815ab
......@@ -6,14 +6,16 @@
@click='dowloadSingle()'>{{$t('objFill.xz')}}</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-download"
@click='yzmVisible=true,createCode()'>{{$t('objFill.v101.administrative.yasuoxz')}}</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" @click='moveFiles'>{{$t('objFill.v101.administrative.yidongdao')}}</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" @click='moveFiles'>
{{$t('objFill.v101.administrative.yidongdao')}}</el-button>
</el-button-group>
<el-button-group v-if='isChildFiles'>
<el-button v-if='notFileListInside.length==1&&fileListInside.length<1' type="danger" icon="el-icon-download"
@click='dowloadSingleInside()'>{{$t('objFill.v101.administrative.xiazali')}}</el-button>
<el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" icon="el-icon-download"
@click='yzmVisible=true,createCode()'>{{$t('objFill.v101.administrative.yasuoxz')}}</el-button>
<el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" @click='moveFiles'>{{$t('objFill.v101.administrative.yidongdl')}}
<el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" @click='moveFiles'>
{{$t('objFill.v101.administrative.yidongdl')}}
</el-button>
</el-button-group>
<div class="fr" v-if='!isChildFiles'>
......@@ -31,7 +33,8 @@
<table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0">
<tbody v-if='!isChildFiles'>
<tr>
<th width="400"><input v-model="isCkedAll" type="checkbox" @click='checkedAll()' />{{$t('objFill.v101.chat.wenjianming')}}</th>
<th width="400"><input v-model="isCkedAll" type="checkbox"
@click='checkedAll()' />{{$t('objFill.v101.chat.wenjianming')}}</th>
<th width="200">&nbsp;</th>
<th>{{$t('objFill.v101.chat.daxiao')}}</th>
<th width="200">{{$t('objFill.v101.administrative.fenxiangren')}}</th>
......@@ -73,7 +76,8 @@
<tbody v-if='isChildFiles'>
<tr>
<th width="400"><input v-model="isCkedAllInside" type="checkbox" @click='checkedAllInside()' />{{$t('objFill.v101.chat.wenjianming')}}</th>
<th width="400"><input v-model="isCkedAllInside" type="checkbox"
@click='checkedAllInside()' />{{$t('objFill.v101.chat.wenjianming')}}</th>
<th width="400">&nbsp;</th>
<th width="400">{{$t('objFill.v101.chat.daxiao')}}</th>
</tr>
......@@ -143,10 +147,12 @@
</el-carousel>
</div>
<el-dialog custom-class='w400' :title="$t('objFill.v101.administrative.yasuoxz')" :visible.sync="yzmVisible" center>
<el-dialog custom-class='w400' :title="$t('objFill.v101.administrative.yasuoxz')" :visible.sync="yzmVisible"
center>
<p>
<span>{{$t('objFill.yanzhengma')}} : </span>
<el-input class='w150' type="text" :placeholder="$t('objFill.qingshuruyzm')" v-model="picLyanzhengma"></el-input>
<el-input class='w150' type="text" :placeholder="$t('objFill.qingshuruyzm')" v-model="picLyanzhengma">
</el-input>
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode" />
</p>
<div slot="footer" class="dialog-footer">
......@@ -157,12 +163,11 @@
@click="downloadTotalInside()" />
</div>
</el-dialog>
<a target="_blank" style="display:none" id="blankLink"></a>
<a target="_blank" style="display:none" id="blankLink"></a>
</div>
</template>
<script>
// let browserMD5File = require('browser-md5-file');
export default {
data() {
return {
......@@ -170,7 +175,6 @@
picLyanzhengma: '',
checkCode: '',
yzmVisible: false,
initialIndex: 0,
picObj: [],
picIsShow: false,
......@@ -286,14 +290,14 @@
rules: { //表单验证
FolderName: [{
required: true,
message: this.$t('objFill.v101.administrative.qingshurwjjmc') ,
message: this.$t('objFill.v101.administrative.qingshurwjjmc'),
trigger: 'blur'
}]
},
rules1: { //表单验证
FileName: [{
required: true,
message: this.$t('objFill.v101.administrative.qingsrwjmc') ,
message: this.$t('objFill.v101.administrative.qingsrwjmc'),
trigger: 'blur'
}]
},
......@@ -388,7 +392,6 @@
this.initialIndex = i
return false
}
})
this.picIsShow = true
//this.picPath=obj.FilePath
......@@ -563,11 +566,11 @@
}
if (obj.shareFileType == 2) {
let reg = /^http(s)?:\/\/(.*?)\//
let dom = document.querySelector("#blankLink")
dom.href = obj.fileUrl
dom.click()
return
this.downloadFileRename(obj.fileUrl.replace(reg, ''), obj.FolderName);
let dom = document.querySelector("#blankLink")
dom.href = obj.fileUrl
dom.click()
return
this.downloadFileRename(obj.fileUrl.replace(reg, ''), obj.FolderName);
}
},
downloadTotal() {
......@@ -624,11 +627,11 @@
}
if (obj.DataType == 2) {
let reg = /^http(s)?:\/\/(.*?)\//
let dom = document.querySelector("#blankLink")
dom.href = obj.fileUrl
dom.click()
return
this.downloadFileRename(obj.fileUrl.replace(reg, ''), obj.FolderName);
let dom = document.querySelector("#blankLink")
dom.href = obj.fileUrl
dom.click()
return
this.downloadFileRename(obj.fileUrl.replace(reg, ''), obj.FolderName);
}
},
downloadTotalInside() {
......@@ -727,7 +730,7 @@
}, err => {})
},
deleteFiles() {
this.$confirm(this.$t('objFill.v101.administrative.shancwjfxzwjjbs')+'?', this.$t('tips.tips'), {
this.$confirm(this.$t('objFill.v101.administrative.shancwjfxzwjjbs') + '?', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
......@@ -1170,7 +1173,6 @@
created() {
this.createCode()
}
}
</script>
......
src/components/administrative/Temporarystaff.vue
View file @ d8e815ab
......@@ -481,15 +481,6 @@
this.getPost();
this.getTotalNum()
},
filters: {
// leaveTimeFormat(value) {
// if (value == '') {
// return this.leaves.t1
// } else {
// return value
// }
// }
},
methods: {
leaveTimeFormat(value) {
if (value == '') {
......
src/components/administrative/VotingManagement.vue
View file @ d8e815ab
......@@ -259,8 +259,6 @@ export default {
that.VotingShow = false
});
},
filters: {},
methods: {
getDetails (ID) {
this.apipost(
......
src/components/administrative/VoucherInquiry.vue
View file @ d8e815ab
......@@ -254,7 +254,6 @@
this.getList();
this.getTypeList();
},
filters: {},
methods: {
// 获取类型名称
getTypeName: function (type) {
......
src/components/administrative/userManagement.vue
View file @ d8e815ab
......@@ -646,18 +646,7 @@
this.getDerpartMent();
this.getPost();
this.getTotalNum();
},
filters: {
// leaveTimeFormat(value) {
// if (value == "") {
// return this.getLeaves();
// } else {
// return value;
// }
// }
},
methods: {
leaveTimeFormat(value) {
if (value == "") {
......
src/components/busManagement/BusApportionManagement.vue
View file @ d8e815ab
......@@ -577,10 +577,6 @@ export default {
titleAlign: "left",
columnAlign: "left",
isResize: true,
// result: "",
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let ShareTeam = {
field: "TCIDList",
......@@ -590,10 +586,6 @@ export default {
isResize: true,
width: 80,
componentName:'table-teamList'
// orderBy: "desc",
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let ProductDoc = {
field: "FinanceIdList",
......@@ -603,10 +595,6 @@ export default {
isResize: true,
width: 80,
componentName:'table-docment',
// filterMultiple: true,
// result: [],
// filters: [{}],
// type: "text"
};
let operaler = {
title: this.$t('visa.v_czuser'),
......
src/components/dmc/manager/GroundingStatistics.vue
View file @ d8e815ab
......@@ -225,7 +225,6 @@ export default {
}else{
return date;
}
}
},
......
src/components/dmc/manager/swtBaoJiaConfig.vue
View file @ d8e815ab
......@@ -144,7 +144,6 @@
this.getConfigTypeList();
this.getList();
},
filters: {},
methods: {
//新增地区
addBaoJiaData() {
......
src/components/orderCommon/productOrderList.vue
View file @ d8e815ab
......@@ -1068,25 +1068,6 @@
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return this.$t('objFill.yibaohan');
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = this.$t('objFill.yibaohan');
}
return result;
},
},
methods: {
//刷新页面
......
src/pubComponents/buyGroup.vue
View file @ d8e815ab
......@@ -696,25 +696,6 @@
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return this.$t('objFill.yibaohan');
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = this.$t('objFill.yibaohan');
}
return result;
},
},
methods: {
setDanren(e) {
......
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