From c6d3db890fe081d23e070aa36933ef7eba033844 Mon Sep 17 00:00:00 2001
From: HK <461671400@qq.com>
Date: Mon, 17 Feb 2020 11:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Educationvideo.vue | 3 ---
.../FinancialModule/FinancialSubmodule/BillModuleNew.vue | 1 -
.../FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue | 1 -
src/components/LeaderManagement/leaderPayTicketDetail.vue | 1 -
src/components/SalesModule/PublishvideoList.vue | 1 -
src/components/ScenicStrategyview.vue | 1 -
src/components/TravelManager/TravelList/OpTripList.vue | 2 +-
src/components/TravelManager/TravelList/RegistrationList.vue | 2 --
src/components/TravelManager/TravelList/SaleTripList.vue | 4 ++--
.../TravelManager/TravelList/TravelControlListSale.vue | 2 --
.../TravelManager/TravelNewQuotation/CostNewPrice.vue | 1 -
.../TravelManager/TravelNewQuotation/CostNewPriceAudit.vue | 2 --
.../TravelManager/TravelNewQuotation/QuotationNewPrice.vue | 1 -
src/components/administrative/WorkOvertime.vue | 1 -
src/components/index.vue | 1 -
src/components/systemManagement/CostType.vue | 1 -
src/components/work/mywork.vue | 1 -
src/components/work/workDetails.vue | 4 ----
src/components/work/workManager.vue | 4 ----
src/components/work/workManager2.vue | 4 ----
20 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/src/components/Educationvideo.vue b/src/components/Educationvideo.vue
index 7bc23827f..ab9a31ef8 100644
--- a/src/components/Educationvideo.vue
+++ b/src/components/Educationvideo.vue
@@ -140,8 +140,6 @@ export default {
this.handleCurrentChange();
}
}
-
- // console.log("divSrcoll",divSrcoll)
},
SelectLineId(id){
this.dataList=[];
@@ -179,7 +177,6 @@ export default {
}
this.total = res.data.data.count;
- console.log("this.dataList",this.dataList)
}
}
);
diff --git a/src/components/FinancialModule/FinancialSubmodule/BillModuleNew.vue b/src/components/FinancialModule/FinancialSubmodule/BillModuleNew.vue
index a1d4fa2b1..41d1474d8 100644
--- a/src/components/FinancialModule/FinancialSubmodule/BillModuleNew.vue
+++ b/src/components/FinancialModule/FinancialSubmodule/BillModuleNew.vue
@@ -643,7 +643,6 @@ export default {
}
this.GetDetail = data;
- console.log("this.GetDetail ",this.GetDetail )
this.loading=false
this.$set(this.$data,"GetDetail",data);
let status=false;
diff --git a/src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue b/src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue
index e88ccf002..cdd44ddf1 100644
--- a/src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue
+++ b/src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue
@@ -429,7 +429,6 @@
this.GetDetail = data;
this.loading=false
this.$set(this.$data,"GetDetail",data);
- console.log("this.GetDetail",this.GetDetail)
}
}, err => {})
},
diff --git a/src/components/LeaderManagement/leaderPayTicketDetail.vue b/src/components/LeaderManagement/leaderPayTicketDetail.vue
index affdb6726..bbf568e4a 100644
--- a/src/components/LeaderManagement/leaderPayTicketDetail.vue
+++ b/src/components/LeaderManagement/leaderPayTicketDetail.vue
@@ -123,7 +123,6 @@ export default {
dataList = data
}
this.dataList = dataList;
- console.log(dataList)
} else {
this.Error(res.data.message);
}
diff --git a/src/components/SalesModule/PublishvideoList.vue b/src/components/SalesModule/PublishvideoList.vue
index 696fca164..1cf807791 100644
--- a/src/components/SalesModule/PublishvideoList.vue
+++ b/src/components/SalesModule/PublishvideoList.vue
@@ -262,7 +262,6 @@ export default {
},
getEmployee() {
this.apipost('app_get_company_employee', this.employeeMsg, res => {
- console.log("fsasd",res)
if(res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
diff --git a/src/components/ScenicStrategyview.vue b/src/components/ScenicStrategyview.vue
index d8dd0065b..34f73a6fc 100644
--- a/src/components/ScenicStrategyview.vue
+++ b/src/components/ScenicStrategyview.vue
@@ -60,7 +60,6 @@ export default {
"ScenicRecomment_Get_GetScenicRecommentService", this.msg,
res => {
if (res.data.resultCode == 1) {
- console.log(res,'ressss')
this.dataList=res.data.data;
}
},
diff --git a/src/components/TravelManager/TravelList/OpTripList.vue b/src/components/TravelManager/TravelList/OpTripList.vue
index 994ff3b75..0b256780c 100644
--- a/src/components/TravelManager/TravelList/OpTripList.vue
+++ b/src/components/TravelManager/TravelList/OpTripList.vue
@@ -125,7 +125,7 @@
</div>
<div class="el-col">
<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>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
diff --git a/src/components/TravelManager/TravelList/RegistrationList.vue b/src/components/TravelManager/TravelList/RegistrationList.vue
index 5426e8a2c..6323c6c1a 100644
--- a/src/components/TravelManager/TravelList/RegistrationList.vue
+++ b/src/components/TravelManager/TravelList/RegistrationList.vue
@@ -5111,7 +5111,6 @@
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
- console.log(this.OrderDataList,'this.OrderDataList');
}
},
err => {}
@@ -5150,7 +5149,6 @@
this.ConfigData.Config = res.data.data.config;
this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
this.ConfigData.Leader = res.data.data.leader;
- console.log(" this.ConfigData.Config", this.ConfigData.Config);
}
}
);
diff --git a/src/components/TravelManager/TravelList/SaleTripList.vue b/src/components/TravelManager/TravelList/SaleTripList.vue
index ee9c96162..6b4f29a43 100644
--- a/src/components/TravelManager/TravelList/SaleTripList.vue
+++ b/src/components/TravelManager/TravelList/SaleTripList.vue
@@ -99,7 +99,8 @@
</div>
<div class="el-col">
<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 @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>
@@ -331,7 +332,6 @@
},
//跳转至下载
goUrlR(path,item){
- console.log(item,'itemm');
let routeData = this.$router.resolve({
name: path,
query: {
diff --git a/src/components/TravelManager/TravelList/TravelControlListSale.vue b/src/components/TravelManager/TravelList/TravelControlListSale.vue
index ff906a8bb..26eb754b7 100644
--- a/src/components/TravelManager/TravelList/TravelControlListSale.vue
+++ b/src/components/TravelManager/TravelList/TravelControlListSale.vue
@@ -945,8 +945,6 @@
});
}
});
-
- console.log(res,'resssss');
}
},
err => {}
diff --git a/src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue b/src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
index f21d11063..c2e64d29b 100644
--- a/src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
+++ b/src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
@@ -1443,7 +1443,6 @@
).toFixed(0);
//房é¤è½¦æ™¯ç‚¹ä»·æ ¼
var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
- console.log("trip",trip);
//å…¶ä»–ä»·æ ¼
var otherPrice = Number(that.getCostTotalMoney());
diff --git a/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue b/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
index d12de397c..fccf53b3e 100644
--- a/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+++ b/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
@@ -1007,8 +1007,6 @@
this.getSubtotalMoney();
},
created() {
- console.log("CostCurrencyList", this.CostCurrencyList);
- console.log("Post", this.postConfig)
},
watch: {
CostNumberList: {
diff --git a/src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue b/src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
index 7e37555ac..c526a462c 100644
--- a/src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+++ b/src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
@@ -144,7 +144,6 @@
});
}
this.postData.TravelState=type;
- console.log("this.postData",this.postData);
var nObj = {
config: this.postData,
dayCostPriceList: this.dayCostPriceList,
diff --git a/src/components/administrative/WorkOvertime.vue b/src/components/administrative/WorkOvertime.vue
index c0aed91e9..a514c4616 100644
--- a/src/components/administrative/WorkOvertime.vue
+++ b/src/components/administrative/WorkOvertime.vue
@@ -126,7 +126,6 @@ import moment from 'moment'
methods:{
getEmployee(val) { //员工
- console.log("val",val)
let str='-1';
if(val){
str=val;
diff --git a/src/components/index.vue b/src/components/index.vue
index fc1ca4cf1..e8682fe84 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1971,7 +1971,6 @@ export default {
}
let path=url+s.Link;
- console.log("path",path)
let routeData = this.$router.resolve({
name: path
})
diff --git a/src/components/systemManagement/CostType.vue b/src/components/systemManagement/CostType.vue
index cba5c9b2d..a2f5e311e 100644
--- a/src/components/systemManagement/CostType.vue
+++ b/src/components/systemManagement/CostType.vue
@@ -933,7 +933,6 @@
if(res.data.resultCode == 1) {
this.addShow=true;
var dataList = res.data.data;
- console.log("dataList",dataList)
this.getPostList();
this.getDepartmentList();
this.getEmployeeList('all');
diff --git a/src/components/work/mywork.vue b/src/components/work/mywork.vue
index c303fd288..df6f1690b 100644
--- a/src/components/work/mywork.vue
+++ b/src/components/work/mywork.vue
@@ -461,7 +461,6 @@ export default {
});
},
addData() {
- console.log(this.addMsg);
this.addMsg.BeginTime = this.addMsg.TimeRanges[0];
this.addMsg.EndTime = this.addMsg.TimeRanges[1];
this.addMsg.Tags =
diff --git a/src/components/work/workDetails.vue b/src/components/work/workDetails.vue
index 16e99ee71..38a4993d4 100644
--- a/src/components/work/workDetails.vue
+++ b/src/components/work/workDetails.vue
@@ -565,7 +565,6 @@ export default {
if (this.d.w.ZongExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ZongExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime();
- console.log(dateDiff)
if(dateDiff/1000/60<5){
this.canCancel3=true;
}
@@ -573,7 +572,6 @@ export default {
if (this.d.w.ZongFinishExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ZongFinishExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime();
- console.log(dateDiff)
if(dateDiff/1000/60<5){
this.canCancel4=true;
}
@@ -627,8 +625,6 @@ export default {
this.$message.error("请填写审批æ„è§");
return;
}
- // console.log(this.radio);
- // return;
this.apipost(
"user_post_SetWorkExamine",
{
diff --git a/src/components/work/workManager.vue b/src/components/work/workManager.vue
index c4355a3c9..11fb5907a 100644
--- a/src/components/work/workManager.vue
+++ b/src/components/work/workManager.vue
@@ -327,7 +327,6 @@ export default {
getList() {
//获å–æ•°æ®
this.loading = true;
- console.log(this.msg.timeRange)
if(this.msg.timeRange && this.msg.timeRange.length==2){
this.msg.bt=this.msg.timeRange[0];
this.msg.et=this.msg.timeRange[1];
@@ -406,7 +405,6 @@ export default {
if(res.data.data && res.data.data.length>0){
this.findMyDepartment(res.data.data[0]);
}
- console.log(this.departmentList);
} else {
this.Error(res.data.message);
}
@@ -415,9 +413,7 @@ export default {
);
},
findMyDepartment(data){
- console.log(data)
if(data.DepartmentId==this.userInfo.RB_Department_Id){
- console.log('yes',data)
this.changeDeparent(data)
}else{
if (data.ChildList && data.ChildList.length>0) {
diff --git a/src/components/work/workManager2.vue b/src/components/work/workManager2.vue
index f9c58c630..e8d0d6593 100644
--- a/src/components/work/workManager2.vue
+++ b/src/components/work/workManager2.vue
@@ -297,7 +297,6 @@ export default {
getList() {
//获å–æ•°æ®
this.loading = true;
- console.log(this.msg.timeRange)
if(this.msg.timeRange && this.msg.timeRange.length==2){
this.msg.bt=this.msg.timeRange[0];
this.msg.et=this.msg.timeRange[1];
@@ -362,7 +361,6 @@ export default {
if(res.data.data && res.data.data.length>0){
this.findMyDepartment(res.data.data[0]);
}
- console.log(this.departmentList);
} else {
this.Error(res.data.message);
}
@@ -371,9 +369,7 @@ export default {
);
},
findMyDepartment(data){
- console.log(data)
if(data.DepartmentId==this.userInfo.RB_Department_Id){
- console.log('yes',data)
this.changeDeparent(data)
}else{
if (data.ChildList && data.ChildList.length>0) {
--
2.18.1