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

src/components/Ticketing/individualTicket.vue

@@ -553,7 +553,6 @@ import moment from 'moment'
     },
     methods: {
       goUrl(path, item) {
-        // console.log(item);
         this.$router.push({
           path: path,
           query: {

src/components/TravelManager/TravelList/AmoebaDetail.vue

@@ -83,7 +83,6 @@ export default {
         res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-              console.log(res,'resssss');
              this.dataList = res.data.data.List;
           } else {
             this.loading = false;

src/components/TravelManager/TravelList/PassengerFeedback.vue

@@ -152,7 +152,6 @@ export default {
     created(){
       this.dateList[0]=moment().subtract(6, "month").format("YYYY-MM-DD");
       this.dateList[1]=moment().format("YYYY-MM-DD");
-      // console.log("this.dateList",this.dateList)
       this.getTitle();
     },
     mounted(){
@@ -234,14 +233,10 @@ export default {
                 this.loading = false;
                 if (res.data.resultCode === 1) {
                 let arrays=[];
-                // console.log("res.data.data.pageData",res.data.data)
                 res.data.data.pageData.forEach(x => {
                     let isHave=false
                   if(x.tCID!=0 || x.tCID || x.tCID!=''){
-                    // if(this.fields.indexOf(x.title)==-1&&x.title!=''){
-                    //     this.fields.push(x.title)
-                    //     console.log("fields",this.fields)
-                    // }
+
                     if(arrays.length>0){
                         arrays.forEach(y=>{
                             if(y.tcid==x.tCID){
@@ -272,7 +267,6 @@ export default {
                     
                 });
                 this.dataList=arrays;
-                // console.log("this.dataList",this.dataList)
                 this.total=res.data.data.count;
                 } else {
                   this.Error(res.data.message)

src/components/TravelManager/TravelList/freeTravelOrderStatiDetails.vue

@@ -239,7 +239,6 @@ export default {
         
         this.dialogFormVisible=true;
         this.exitMsg.orderId=this.oldModel.OrderID;
-        // console.log(item);
         this.exitMsg.CancelBy = userInfo.customerId;
       },
     ExitOrder(){
@@ -252,7 +251,6 @@ export default {
         "dmc_post_Get_KKDayOrderCancel",
         this.exitMsg,
         res => {
-            // console.log("res",res);
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.$emit('queryDays')
@@ -274,7 +272,6 @@ export default {
         "dmc_post_Get_KKDayOrderQueryOrderDtl",
         this.msg,
         res => {
-            // console.log("sfafg",res);
           if (res.data.resultCode == 1) {
               this.oldModel=res.data.data.oldModel;
               this.jo=res.data.data.jo;
@@ -304,10 +301,7 @@ export default {
             if (res.data.data.result === "00") {
                 this.DomainUrl=res.data.data.KkdayDomain;
                 let data = res.data.data.prod
-                console.log("data",data)
                 this.dataDetail = data;
-
-
             } else {
                 this.Error(res.data.data.result_msg)
             }

src/components/VisaPersonalForm.vue

@@ -350,8 +350,6 @@ export default {
                     let path = this.QRpath
                     var canvas = document.getElementById('canvas')
                     QRCode.toCanvas(canvas, path, function (error) {
-                    if (error) console.error(error)
-                        console.log('success!');
                     })
                 },1000); 
             }else{
@@ -424,7 +422,6 @@ export default {
             this.apipost('dmc_get_GetPeopleForeignInfo',{VisaPeopleId:this.ID},res=>{
                 if(res.data.resultCode==1){
                     this.QRpath = res.data.data
-                    console.log(this.QRpath)
                 }else{
                     this.$message.error(res.data.message)
                 }
@@ -433,7 +430,6 @@ export default {
         getInfo(){ // 获取信息
             this.apipost('dmc_get_GetVisaApplyForGrouSignInfo',{VisaPeopleId:this.ID},res=>{
                 if(res.data.resultCode==1){
-                	console.log(res.data.data)
                     this.infoData = res.data.data
                     this.infoData.PeopleModel.OpenQRCode = this.infoData.PeopleModel.OpenQRCode.toString()
                     if(this.infoData.PeopleModel.OpenQRCode=='1'){

src/components/VisaPersonalFormSell.vue

@@ -353,8 +353,6 @@ export default {
                     let path = this.QRpath
                     var canvas = document.getElementById('canvas')
                     QRCode.toCanvas(canvas, path, function (error) {
-                    if (error) console.error(error)
-                        console.log('success!');
                     })
                 },1000); 
             }else{
@@ -427,7 +425,6 @@ export default {
             this.apipost('dmc_get_GetPeopleForeignInfo',{VisaPeopleId:this.ID},res=>{
                 if(res.data.resultCode==1){
                     this.QRpath = res.data.data
-                    console.log(this.QRpath)
                 }else{
                     this.$message.error(res.data.message)
                 }
@@ -436,7 +433,6 @@ export default {
         getInfo(){ // 获取信息
             this.apipost('dmc_get_GetVisaApplyForGrouSignInfoForSell',{VisaPeopleId:this.ID},res=>{
                 if(res.data.resultCode==1){
-                	console.log(res.data.data)
                     this.infoData = res.data.data
                     this.infoData.PeopleModel.OpenQRCode = this.infoData.PeopleModel.OpenQRCode.toString()
                     if(this.infoData.PeopleModel.OpenQRCode=='1'){

src/components/activity/ItineraryCustomizer.vue

@@ -120,7 +120,6 @@
 		
 		methods: {
 			Edit(item){
-				console.log(item)
 				this.pwdMsg=Object.assign({},item);
 			},
 			ResetPwdForm(){
@@ -136,7 +135,6 @@
                 this.$refs[formName].validate((valid) => {
                 if (valid) {
                     this.apiJavaPost("/api/user/employee/setTripCustom",this.pwdMsg, res => {
-                    console.log(res);
                     if (res.data.resultCode === 1) {
 						this.Success(res.data.message)
 						this.Visible=false;
@@ -174,7 +172,6 @@
                 this.loading=true,
                 this.apiJavaPost("/api/user/employee/getTripCustomList",this.msg, res => {
                     this.loading = false;
-                    console.log(res);
                     if (res.data.resultCode === 1) {
                     this.DataList = res.data.data.pageData;
                     this.total= res.data.data.count;
@@ -186,7 +183,6 @@
 			},
 			getEmployee(){
 				this.apiJavaPost("/api/user/employee/getAllSalesList",{}, res => {
-                    console.log(res);
                     if (res.data.resultCode === 1) {
 						this.employee=res.data.data;
                     } else {

src/components/administrative/AirticketCommission.vue

@@ -11,7 +11,7 @@
     <div class="query-box">
       <ul>
         <li>
-          <input type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable" />
+          <input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
         </li>
       </ul>
     </div>
@@ -60,9 +60,11 @@
         total: 0,
         currentPage: 1,
         isDisable:false,
+        IsAuth:0,//生成票务提成权限
       }
     },
     mounted() {
+      this.GetAuth();
       this.getList();
     },
     methods: {
@@ -117,6 +119,15 @@
           },
           null
         );
+      },
+       GetAuth() {
+        this.apipost('AirTicketRules_post_CreateAirticketCommissionAuthService', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.IsAuth = res.data.data;
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
       },
       //生成票务提成报表
       CreateAirticketCommission() {

src/components/administrative/NewSurvey.vue

@@ -86,7 +86,6 @@ export default {
     this.getList(TCID, OrderID);
   },methods: {
     openPage: function (obj){
-      console.log(obj)
       let dom = document.querySelector("#blankLink");
       dom.href = "http://activity.oytour.com/html/invesDetails2.html" + '?ID=' + obj.ID + '&name=' + encodeURI(obj.GuestName) + '&MobilePhone=' + obj.CustomerPhone
       dom.click();

src/components/administrative/myApprovalList.vue

@@ -390,7 +390,6 @@
 				this.templateType=templateType;	
 				this.apipost('WorkFlow_get_GetDepartMentEmployee', {}, res => {
 					if(res.data.resultCode == 1) {
-						//console.log(res.data.data)
 						this.memberList = res.data.data
 					}
 				}, err => {})				
@@ -419,7 +418,6 @@
 							this.transferMsg.CareOfEmId=this.arr[this.arr.length-1]
 						}
 					}
-				console.log(this.transferMsg.CareOfEmId)
 			},
 		
 			transferApproval(){
@@ -508,16 +506,6 @@
 						this.IsAudit=res.data.data.IsAudit
 						this.IsCancel=res.data.data.IsCancel
 						this.IsUpdate=res.data.data.IsUpdate	
-//						console.log(this.detailList.arList)
-//                      let newArr=this.detailList.arList;
-//                      this.detailList.arList.forEach((item,index)=>{
-//                      	if(item.AuditRecordList.length!=0){
-//                      		console.log(item.AuditRecordList)
-//                      		newArr.splice(index,0,{'BeFrom':item.AuditRecordList[0].CareOfList[0].BeFrom,'Target':item.AuditRecordList[0].CareOfList[0].Target,
-//                      		'Remarks':item.AuditRecordList[0].CareOfList[0].Remarks})
-//                      	}
-//                      })
-						console.log(res.data.data.Details)
 					}
 				},err=>{})
 			},
@@ -525,7 +513,6 @@
 				this.loading=true;
 				this.apipost('app_user_workflow_my_initiateaudit',this.msg,res=>{
 					if(res.data.resultCode == 1) {
-						//console.log(res.data.data)
 						this.list=res.data.data.pageData;
 						this.total=res.data.data.count;
 						this.loading=false
@@ -535,7 +522,6 @@
 			getApplyType(){  //模板类型
 				this.apipost('app_user_workflow_get_templatetype',{},res=>{
 					if(res.data.resultCode == 1) {
-						//console.log(res.data.data)
 						res.data.data.forEach(item=>{
 							for(let key in item){
 								 if (item.hasOwnProperty(key)){
@@ -549,7 +535,6 @@
 			getAppAuditStatus(){
 				this.apipost('app_user_workflow_get_myinitiate_auditstatus',{},res=>{
 					if(res.data.resultCode == 1) {
-						//console.log(res.data.data)
 						res.data.data.forEach(item=>{
 							for(let key in item){
 								 if (item.hasOwnProperty(key)){

src/components/administrative/statisticsCheckTime.vue

@@ -184,7 +184,6 @@
 						this.$nextTick(() => {
 							this.dataList = res.data.data.pageData;
 						 });
-						 console.log("res",res);
 						this.datesArr = res.data.data.columnData;
 						this.newArr.length = 0;
 						for(let i = 0; i < this.datesArr.length; i++) {
@@ -193,7 +192,6 @@
 								"title": this.datesArr[i].substring(this.datesArr[i].length - 2, this.datesArr[i].length) + '（' + this.getWeekByDay(this.datesArr[i]) + ')'
 							})
 						}
-						console.log("this.newArr",this.newArr)
 						this.total = res.data.data.count;
 					}
 
@@ -203,7 +201,6 @@
 				this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
 					if(res.data.resultCode == 1) {
 						this.companyList = res.data.data;
-						//console.log(this.companyList)
 					}
 				}, err => {})
 			},
@@ -219,7 +216,6 @@
 				this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
 					if(res.data.resultCode == 1) {
 						this.departmentList = res.data.data;
-					//	console.log(this.departmentList)
 					}
 				}, err => {})				
 			},
@@ -232,7 +228,6 @@
 				this.apipost('app_get_company_employee', this.employeeMsg, res => {
 					if(res.data.resultCode == 1) {
 						this.employeeList = res.data.data;
-						//console.log(this.employeeList)
 					}
 				}, err => {})	
 			},			

src/components/commonPage/TicketFinace.vue

@@ -89,8 +89,6 @@ export default {
         r => {
           if (r.data.resultCode == 1) {
             this.DataList = r.data.data;
-            console.log("DataList",this.DataList);
-            // this.$forceUpdate()
           }
         },
         null
@@ -98,9 +96,6 @@ export default {
     }
   },
   mounted() {
-    // this.SourceID = this.$route.query.SourceID;
-    // var obj = JSON.parse(this.$route.query.Callback);
-    // this.Type = obj.Type;
     let obj = JSON.parse(this.Callback);
     this.Type =  obj.Type;  
     this.getList();

src/components/commonPage/payURL1.vue

@@ -58,7 +58,6 @@
 					OrderSource: 8
 				}, res => {
 					if(res.data.resultCode == 1) {
-						console.log(res.data.data)
 						if(Object.keys(res.data.data).length == 0) {
 							if(Type == 2) {
 								this.getCodeUrl(obj)

src/components/confirmationOrderDownLoad.vue

@@ -753,8 +753,6 @@
             }
           })
         }
-        // console.log("title",title)
-        // return;
         this.pdfLoading = true
         let pageData = document.getElementById('pdfNode').innerHTML
         let urlObj = this.domainManager()

src/components/systemManagement/Manfunds.vue

@@ -435,7 +435,6 @@
                     if(res.data.resultCode == 1) {
                         this.DataList = res.data.data.pageData;
                         this.total=res.data.data.count;
-                        console.log(res,'res');
                     } else {
                         this.Error(res.data.message);
                     }