Commit c6d3db89 authored by 黄奎's avatar 黄奎

页面修改

parent 0cde0785
...@@ -140,8 +140,6 @@ export default { ...@@ -140,8 +140,6 @@ export default {
this.handleCurrentChange(); this.handleCurrentChange();
} }
} }
// console.log("divSrcoll",divSrcoll)
}, },
SelectLineId(id){ SelectLineId(id){
this.dataList=[]; this.dataList=[];
...@@ -179,7 +177,6 @@ export default { ...@@ -179,7 +177,6 @@ export default {
} }
this.total = res.data.data.count; this.total = res.data.data.count;
console.log("this.dataList",this.dataList)
} }
} }
); );
......
...@@ -643,7 +643,6 @@ export default { ...@@ -643,7 +643,6 @@ export default {
} }
this.GetDetail = data; this.GetDetail = data;
console.log("this.GetDetail ",this.GetDetail )
this.loading=false this.loading=false
this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
let status=false; let status=false;
......
...@@ -429,7 +429,6 @@ ...@@ -429,7 +429,6 @@
this.GetDetail = data; this.GetDetail = data;
this.loading=false this.loading=false
this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
console.log("this.GetDetail",this.GetDetail)
} }
}, err => {}) }, err => {})
}, },
......
...@@ -123,7 +123,6 @@ export default { ...@@ -123,7 +123,6 @@ export default {
dataList = data dataList = data
} }
this.dataList = dataList; this.dataList = dataList;
console.log(dataList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -262,7 +262,6 @@ export default { ...@@ -262,7 +262,6 @@ export default {
}, },
getEmployee() { getEmployee() {
this.apipost('app_get_company_employee', this.employeeMsg, res => { this.apipost('app_get_company_employee', this.employeeMsg, res => {
console.log("fsasd",res)
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.employeeList = res.data.data; this.employeeList = res.data.data;
} }
......
...@@ -60,7 +60,6 @@ export default { ...@@ -60,7 +60,6 @@ export default {
"ScenicRecomment_Get_GetScenicRecommentService", this.msg, "ScenicRecomment_Get_GetScenicRecommentService", this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'ressss')
this.dataList=res.data.data; this.dataList=res.data.data;
} }
}, },
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary"> <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary" >
{{$t('Operation.Op_tripUpdate')}}</el-button> {{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary"> <el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
......
...@@ -5111,7 +5111,6 @@ ...@@ -5111,7 +5111,6 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data; this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
console.log(this.OrderDataList,'this.OrderDataList');
} }
}, },
err => {} err => {}
...@@ -5150,7 +5149,6 @@ ...@@ -5150,7 +5149,6 @@
this.ConfigData.Config = res.data.data.config; this.ConfigData.Config = res.data.data.config;
this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice; this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
this.ConfigData.Leader = res.data.data.leader; this.ConfigData.Leader = res.data.data.leader;
console.log(" this.ConfigData.Config", this.ConfigData.Config);
} }
} }
); );
......
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> {{item.ShareTeamType}}
<el-button v-if="item.CreateBy==CurrentUserId && item.ShareTeamType<0" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<!-- <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> --> <!-- <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> -->
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button> <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
...@@ -331,7 +332,6 @@ ...@@ -331,7 +332,6 @@
}, },
//跳转至下载 //跳转至下载
goUrlR(path,item){ goUrlR(path,item){
console.log(item,'itemm');
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: path, name: path,
query: { query: {
......
...@@ -945,8 +945,6 @@ ...@@ -945,8 +945,6 @@
}); });
} }
}); });
console.log(res,'resssss');
} }
}, },
err => {} err => {}
......
...@@ -1443,7 +1443,6 @@ ...@@ -1443,7 +1443,6 @@
).toFixed(0); ).toFixed(0);
//房餐车景点价格 //房餐车景点价格
var trip = Number(that.getLocalTotalMoney(x.PeopleNumber)); var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
console.log("trip",trip);
//其他价格 //其他价格
var otherPrice = Number(that.getCostTotalMoney()); var otherPrice = Number(that.getCostTotalMoney());
......
...@@ -1007,8 +1007,6 @@ ...@@ -1007,8 +1007,6 @@
this.getSubtotalMoney(); this.getSubtotalMoney();
}, },
created() { created() {
console.log("CostCurrencyList", this.CostCurrencyList);
console.log("Post", this.postConfig)
}, },
watch: { watch: {
CostNumberList: { CostNumberList: {
......
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
}); });
} }
this.postData.TravelState=type; this.postData.TravelState=type;
console.log("this.postData",this.postData);
var nObj = { var nObj = {
config: this.postData, config: this.postData,
dayCostPriceList: this.dayCostPriceList, dayCostPriceList: this.dayCostPriceList,
......
...@@ -126,7 +126,6 @@ import moment from 'moment' ...@@ -126,7 +126,6 @@ import moment from 'moment'
methods:{ methods:{
getEmployee(val) { //员工 getEmployee(val) { //员工
console.log("val",val)
let str='-1'; let str='-1';
if(val){ if(val){
str=val; str=val;
......
...@@ -1971,7 +1971,6 @@ export default { ...@@ -1971,7 +1971,6 @@ export default {
} }
let path=url+s.Link; let path=url+s.Link;
console.log("path",path)
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: path name: path
}) })
......
...@@ -933,7 +933,6 @@ ...@@ -933,7 +933,6 @@
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.addShow=true; this.addShow=true;
var dataList = res.data.data; var dataList = res.data.data;
console.log("dataList",dataList)
this.getPostList(); this.getPostList();
this.getDepartmentList(); this.getDepartmentList();
this.getEmployeeList('all'); this.getEmployeeList('all');
......
...@@ -461,7 +461,6 @@ export default { ...@@ -461,7 +461,6 @@ export default {
}); });
}, },
addData() { addData() {
console.log(this.addMsg);
this.addMsg.BeginTime = this.addMsg.TimeRanges[0]; this.addMsg.BeginTime = this.addMsg.TimeRanges[0];
this.addMsg.EndTime = this.addMsg.TimeRanges[1]; this.addMsg.EndTime = this.addMsg.TimeRanges[1];
this.addMsg.Tags = this.addMsg.Tags =
......
...@@ -565,7 +565,6 @@ export default { ...@@ -565,7 +565,6 @@ export default {
if (this.d.w.ZongExamineStatus!=0) { if (this.d.w.ZongExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ZongExamineDate.replace(/-/g, "/")) let dateBegin = new Date(this.d.w.ZongExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime(); let dateDiff = dateEnd.getTime() - dateBegin.getTime();
console.log(dateDiff)
if(dateDiff/1000/60<5){ if(dateDiff/1000/60<5){
this.canCancel3=true; this.canCancel3=true;
} }
...@@ -573,7 +572,6 @@ export default { ...@@ -573,7 +572,6 @@ export default {
if (this.d.w.ZongFinishExamineStatus!=0) { if (this.d.w.ZongFinishExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ZongFinishExamineDate.replace(/-/g, "/")) let dateBegin = new Date(this.d.w.ZongFinishExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime(); let dateDiff = dateEnd.getTime() - dateBegin.getTime();
console.log(dateDiff)
if(dateDiff/1000/60<5){ if(dateDiff/1000/60<5){
this.canCancel4=true; this.canCancel4=true;
} }
...@@ -627,8 +625,6 @@ export default { ...@@ -627,8 +625,6 @@ export default {
this.$message.error("请填写审批意见"); this.$message.error("请填写审批意见");
return; return;
} }
// console.log(this.radio);
// return;
this.apipost( this.apipost(
"user_post_SetWorkExamine", "user_post_SetWorkExamine",
{ {
......
...@@ -327,7 +327,6 @@ export default { ...@@ -327,7 +327,6 @@ export default {
getList() { getList() {
//获取数据 //获取数据
this.loading = true; this.loading = true;
console.log(this.msg.timeRange)
if(this.msg.timeRange && this.msg.timeRange.length==2){ if(this.msg.timeRange && this.msg.timeRange.length==2){
this.msg.bt=this.msg.timeRange[0]; this.msg.bt=this.msg.timeRange[0];
this.msg.et=this.msg.timeRange[1]; this.msg.et=this.msg.timeRange[1];
...@@ -406,7 +405,6 @@ export default { ...@@ -406,7 +405,6 @@ export default {
if(res.data.data && res.data.data.length>0){ if(res.data.data && res.data.data.length>0){
this.findMyDepartment(res.data.data[0]); this.findMyDepartment(res.data.data[0]);
} }
console.log(this.departmentList);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -415,9 +413,7 @@ export default { ...@@ -415,9 +413,7 @@ export default {
); );
}, },
findMyDepartment(data){ findMyDepartment(data){
console.log(data)
if(data.DepartmentId==this.userInfo.RB_Department_Id){ if(data.DepartmentId==this.userInfo.RB_Department_Id){
console.log('yes',data)
this.changeDeparent(data) this.changeDeparent(data)
}else{ }else{
if (data.ChildList && data.ChildList.length>0) { if (data.ChildList && data.ChildList.length>0) {
......
...@@ -297,7 +297,6 @@ export default { ...@@ -297,7 +297,6 @@ export default {
getList() { getList() {
//获取数据 //获取数据
this.loading = true; this.loading = true;
console.log(this.msg.timeRange)
if(this.msg.timeRange && this.msg.timeRange.length==2){ if(this.msg.timeRange && this.msg.timeRange.length==2){
this.msg.bt=this.msg.timeRange[0]; this.msg.bt=this.msg.timeRange[0];
this.msg.et=this.msg.timeRange[1]; this.msg.et=this.msg.timeRange[1];
...@@ -362,7 +361,6 @@ export default { ...@@ -362,7 +361,6 @@ export default {
if(res.data.data && res.data.data.length>0){ if(res.data.data && res.data.data.length>0){
this.findMyDepartment(res.data.data[0]); this.findMyDepartment(res.data.data[0]);
} }
console.log(this.departmentList);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -371,9 +369,7 @@ export default { ...@@ -371,9 +369,7 @@ export default {
); );
}, },
findMyDepartment(data){ findMyDepartment(data){
console.log(data)
if(data.DepartmentId==this.userInfo.RB_Department_Id){ if(data.DepartmentId==this.userInfo.RB_Department_Id){
console.log('yes',data)
this.changeDeparent(data) this.changeDeparent(data)
}else{ }else{
if (data.ChildList && data.ChildList.length>0) { if (data.ChildList && data.ChildList.length>0) {
......
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