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

# Conflicts:
#	src/components/FinancialModule/FinancialDocumentsDetail.vue

src/App.vue

@@ -49,8 +49,6 @@
         handler(newValue) {
           if(window.location.ancestorOrigins.length==0) localStorage.setItem('typeSystem', 0)
           else localStorage.setItem('typeSystem', 1)
-          // console.log(window.location.href)
-          // console.log(localStorage.typeSystem,'=-===')
         },
         deep: true,
         immediate: true

src/components/FinancialModule/BasicDocuments.vue

@@ -3771,7 +3771,6 @@ else if (Type==2) {
           OrderId: data.OrderID
         }, res => {
           if (res.data.resultCode == 1) {
-            console.log("this.DataOrderList",this.DataOrderList);
             let data = res.data.data;
             this.DataOrderList = data.FinanceList;
             this.DataOrderPreferPrice=data.PreferPrice

src/components/TravelContractNew.vue

@@ -1562,7 +1562,6 @@
           if (res.data.resultCode === 1) {
             var tempObj = res.data.data;
             this.CtObj = tempObj;
-            console.log("this.CtObj", this.CtObj);
             this.guestList = tempObj.allGuestList;
             this.CtObj.tcid = this.$route.query.TCID;
             this.CtObj.orderId = this.$route.query.orderID;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1035,30 +1035,32 @@
   .RegistrationList .el-upload-list {
     width: 200px;
   }
+
   .PQ_detail {
     width: 100%;
     border-collapse: collapse;
-}
+  }
 
-.PQ_detail tr th,
-.v-table-title-cell {
+  .PQ_detail tr th,
+  .v-table-title-cell {
     background: #e6e6e6;
     height: 40px;
     font-size: 14px;
     border-right: 1px solid #e6e6e6;
     color: #333;
-}
+  }
 
-.PQ_detail tr {
+  .PQ_detail tr {
     background: #fff;
     text-align: center;
     height: 40px;
-}
+  }
 
-.PQ_detail tr td {
+  .PQ_detail tr td {
     font-size: 12px;
     border: 1px solid #e5e5e5;
-}
+  }
+
 </style>
 
 <template>
@@ -1662,7 +1664,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" >
+          <el-col :span="4">
             <el-form-item label="行李数量" v-if="addMsg.IsOneDay==1" prop="LuggageNum">
               <el-input v-model="addMsg.LuggageNum"></el-input>
             </el-form-item>
@@ -2688,7 +2690,7 @@
                     <span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span
                         style="color:#f56c6c">{{subItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
                   </span>
-                </p >
+                </p>
                 <span style="display: block">
                   {{ $t("salesModule.RoomInfo")
                   }}<span v-if="childItem.OneSex > 0"
@@ -4069,8 +4071,8 @@
           RefuseVisaNum: 0, //拒签人数
           OneSex: "",
           QuotationUrl: "", //单团附件
-          LuggageNum:"",
-          IsOneDay:0,
+          LuggageNum: "",
+          IsOneDay: 0,
         },
         uploadLloading: false,
         fileFujianList: [],
@@ -4371,20 +4373,14 @@
         if (value == null) {
           return 0.0;
         }
-        console.log("value",value);
         let nStr = value.toFixed(2);
         let x = nStr.split(".");
         let x1 = x[0];
-        console.log("X1",x1);
         let x2 = x.length > 1 ? "." + x[1] : "";
-        console.log("X2",x2);
         var rgx = /(\d+)(\d{3})/;
         while (rgx.test(x1)) {
           x1 = x1.replace(rgx, "$1" + "," + "$2");
         }
-
-
-
         return x1 + x2;
       },
       priceFormat2(value) {

src/components/administrative/empBankAccount.vue

@@ -159,7 +159,8 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item :label="nameC" prop="CardNum">
-              <el-input type="text" v-model="addMsg.CardNum" onkeyup="value=value.replace(/[^0-9]/g, '')" placeholder="卡号只能输入数字，不能以0开头">
+              <el-input type="text" v-model="addMsg.CardNum" onkeyup="value=value.replace(/[^0-9]/g, '')"
+                placeholder="卡号只能输入数字，不能以0开头">
               </el-input>
             </el-form-item>
           </el-col>
@@ -192,8 +193,8 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="供应商：" prop="SupplierName">
-              <el-input type="text" v-model="addMsg.SupplierName"
-              :disabled="$route.query.FeatureType?true:false"></el-input>
+              <el-input type="text" v-model="addMsg.SupplierName" :disabled="$route.query.FeatureType?true:false">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -430,8 +431,8 @@
     },
     methods: {
       // 车系统 添加账户
-      getCarDatas(){
-        if(this.$route.query.FeatureType){
+      getCarDatas() {
+        if (this.$route.query.FeatureType) {
           this.addMsg.ObjID = this.$route.query.ObjID
           this.addMsg.ObjIdStr = this.$route.query.SupplierName
           this.addMsg.SupplierName = this.$route.query.SupplierName
@@ -696,7 +697,6 @@
           this.$message.error('请选择客户名称')
           return
         }
-        console.log("this.addMsg.Type", this.addMsg.Type);
         if (this.addMsg.Type != 7 && this.addMsg.Type != 9 && this.addMsg.Type != 10 && this.addMsg.Type != 12) {
           if (this.addMsg.DutyNo == '' || this.addMsg.DutyNo == undefined) {
             this.$message.error('请填写税号')
@@ -842,7 +842,6 @@
         this.currentPage = 1
       },
       submitForm(addMsg) { //提交创建、修改表单
-        console.log('卡号：'+this.addMsg.CardNum)
         this.$refs[addMsg].validate((valid) => {
           if (valid) {
             this.addData();

src/components/automaticLogin.vue

 <style>
   @import "../assets/css/login2019.css";
+
   .Autologin {
     position: fixed;
     left: 0;
@@ -9,6 +10,7 @@
     background: url('../assets/img/login/load.gif')no-repeat center;
     background-size: 350px auto;
   }
+
 </style>
 <template>
   <div>
@@ -42,13 +44,12 @@
       } else {
         var data = JSON.parse(localStorage.crmuserInfo)
         let query
-        console.log(data.parameter,'---parameter')
-        if(data.parameter.FeatureType){
+        console.log(data.parameter, '---parameter')
+        if (data.parameter.FeatureType) {
           query = {
             ...data.parameter,
-            // Type: data.parameter.Type
           }
-        }else{
+        } else {
           query = {
             crmOrderObj: JSON.stringify(data.parameter),
             Type: data.parameter.type
@@ -68,8 +69,8 @@
         if (param) {
           this.obj.parameter = param[0]
           localStorage.crmuserInfo = JSON.stringify(this.obj);
-          if(param[0].language){
-            localStorage.setItem('language',param[0].language)
+          if (param[0].language) {
+            localStorage.setItem('language', param[0].language)
           }
         }
       }
@@ -77,14 +78,15 @@
 
     },
     methods: {
-      getLogin(data){
-        if(localStorage.typeSystem&&localStorage.typeSystem==1) {
+      getLogin(data) {
+        if (localStorage.typeSystem && localStorage.typeSystem == 1) {
           let href = this.domainManager().CarUrl
           window.parent.postMessage({
             event_id: 'login',
             data: {
-            loginState: data?data:'',
-          }}, `${href}`)
+              loginState: data ? data : '',
+            }
+          }, `${href}`)
         }
       },
       autoLogin() {
@@ -116,12 +118,11 @@
               var data = JSON.parse(localStorage.crmuserInfo)
               let crmOrderObj = JSON.parse(JSON.stringify(data.parameter))
               let query = {}
-              console.log(data,'---data.parameter.tradeObj')
-              if(data.parameter.FeatureType){
+              if (data.parameter.FeatureType) {
                 query = {
                   ...data.parameter
                 }
-              }else{
+              } else {
                 query = {
                   crmOrderObj: JSON.stringify(crmOrderObj),
                   Type: data.parameter.type
@@ -148,4 +149,5 @@
       }
     },
   }
+
 </script>

src/components/index.vue

@@ -236,8 +236,7 @@
                     添加/编辑模版
                     <i class="iconfont icon-right1"></i>
                   </el-dropdown-item>
-                <el-dropdown-item class="clearfix _dropdown_other"
-                  @click.native="journeyTemplate(1)">
+                  <el-dropdown-item class="clearfix _dropdown_other" @click.native="journeyTemplate(1)">
                     <i class="iconfont icon-pdf" style="color:#f39c12"></i>
                     在线行程
                     <i class="iconfont icon-right1"></i>
@@ -261,7 +260,8 @@
                 @click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
             </li>
             <li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
-          <li v-if="!useRed"><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
+            <li v-if="!useRed"><i class="iconfont icon-gonggao"
+                @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
             </li>
             <li>
               <el-dropdown trigger="click">
@@ -1160,8 +1160,8 @@
       </div>
     </el-dialog>
     <a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
-    <el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center
-      :before-close="closeChangeMachie">
+    <el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow"
+      center :before-close="closeChangeMachie">
       <saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie" />
     </el-dialog>
 
@@ -1227,8 +1227,7 @@
       :ChangeThePriceObj="ChangeThePriceObj"
       @ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
     <!-- ppt 模版新增编辑窗口 -->
-    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl"
-    @close="closeIframe()"></pptIframe>
+    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe>
   </div>
 </template>
 
@@ -1289,7 +1288,7 @@
           pageSize: 5,
           total: 0,
           total2: 0,
-          ApplyType:0,
+          ApplyType: 0,
         },
         ExamineThePriceVisible: false, //审核改价提醒
         ChangeThePriceList: [],
@@ -1301,7 +1300,7 @@
         UnboundDate: {},
         UnTravelDate: {},
         unbundlingVisible: false, //未绑团提醒
-        unTravelVisible: false,//销售未完款提醒
+        unTravelVisible: false, //销售未完款提醒
         b2bDomain: "",
         useRed: false,
         //提成账单弹窗
@@ -1756,7 +1755,7 @@
       },
     },
     mounted() {
-      if(localStorage.typeSystem&&localStorage.typeSystem==1) this.typeSystem = localStorage.typeSystem
+      if (localStorage.typeSystem && localStorage.typeSystem == 1) this.typeSystem = localStorage.typeSystem
       let that = this;
       this.qjGroupId = this.QjGroupId();
       this.apipost('user_post_GetNowVote', {}, r => {
@@ -1941,7 +1940,7 @@
       this.ChangeThePriceList = DateList.filter(x => {
         return x == this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
       })
-      if (this.ChangeThePriceList.length > 0) {//1-10每2小时提醒
+      if (this.ChangeThePriceList.length > 0) { //1-10每2小时提醒
         if ((!localStorage.getItem("ChangeThePriceDataTime") ||
             (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
           )) {
@@ -1961,8 +1960,7 @@
             clearInterval()
           }
         }, 7200000)
-      }
-      else{//其余时间每天提醒
+      } else { //其余时间每天提醒
         if ((!localStorage.getItem("ChangeThePriceDataTime") ||
             (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
           )) {
@@ -1971,7 +1969,7 @@
         if ((!localStorage.getItem("ExamineThePriceDataTime") ||
             (localStorage.getItem("ExamineThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
           )) {
-            this.ExamineThePriceMsg.ApplyType=2;
+          this.ExamineThePriceMsg.ApplyType = 2;
           this.GetExaminePriceOrderPageList()
         }
 
@@ -1980,7 +1978,7 @@
     created() {
       let DateTime = new Date();
       let Year = DateTime.getFullYear()
-      let Month = DateTime.getMonth()+1
+      let Month = DateTime.getMonth() + 1
       let Months = Month > 9 ? Month : '0' + Month
       let day = new Date(Year, Month, 0).getDate()
       let DepartETime = Year + '-' + Months + '-' + day
@@ -2017,17 +2015,17 @@
       }
     },
     methods: {
-      closeIframe(){
+      closeIframe() {
         this.dialogPptistVisible = false
       },
       // 添加编辑模版
-      journeyTemplate(type){
+      journeyTemplate(type) {
         let href = this.domainManager().PptUrl
         // type 1销售暂存模版
-        if(type==1){
-          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=2&TempType=0`
-        }else{
-          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
+        if (type == 1) {
+          this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=2&TempType=0`
+        } else {
+          this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
         }
         this.dialogPptistVisible = true
       },
@@ -2036,21 +2034,17 @@
           "CarSingle_post_GetExaminePriceOrderPageList", this.ExamineThePriceMsg,
           res => {
             if (res.data.resultCode == 1) {
-              console.log("我进来啦结果...",res.data.data);
               if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
                 if (!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
-                // localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
                 localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format(
                   "yyyy-MM-dd")));
                 this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
-                console.log("我进来啦this.ChangeThePriceObj.ExamineThePriceData",this.ChangeThePriceObj.ExamineThePriceData);
                 this.ExamineThePriceVisible = true
               } else {
                 this.ExamineThePriceVisible = false
                 if (type == 1) {
                   // this.$message.info('暂无订单审核数据')
                 }
-                // localStorage.removeItem("ExamineThePriceData");
                 localStorage.removeItem("ExamineThePriceDataTime");
               }
             }
@@ -2062,12 +2056,12 @@
         let changedate = new Date();
         changedate.setDate(changedate.getDate() + 1);
         let Year = changedate.getFullYear()
-      let Month = changedate.getMonth()+1
+        let Month = changedate.getMonth() + 1
         let Months = Month > 9 ? Month : '0' + Month
         let day = changedate.getDate()
         let days = day > 9 ? day : '0' + Month
         let DepartETime = Year + '-' + Months + '-' + days
-        console.log("ddddddd",DepartETime);
+        console.log("ddddddd", DepartETime);
         let msg = {
           pageIndex: 1,
           pagesize: 5,
@@ -2160,11 +2154,9 @@
       testApi() {
         // var postMsg = {};
         // var cmd = "";
-        // cmd = "triptemplate_GetTripTemplatePage";
+        // cmd = "triptemplate_CreateTripFile";
         // postMsg = {
-        //   pageIndex:1,
-        //   pageSize:10,
-        //   TagJsonStr:"春"
+        //  FileId:1
         // }
         // this.apipost(
         //   cmd, postMsg,
@@ -4272,13 +4264,14 @@
         localStorage.removeItem("userInfo");
         localStorage.removeItem("previousPathInfo");
         location.href = '/'
-        if(localStorage.typeSystem&&localStorage.typeSystem==1) {
+        if (localStorage.typeSystem && localStorage.typeSystem == 1) {
           let href = this.domainManager().CarUrl
           window.parent.postMessage({
             event_id: 'out',
             data: {
               loginState: '退出登录',
-          }}, `${href}`)
+            }
+          }, `${href}`)
         }
       },
       togglebox(e) {

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -310,7 +310,6 @@
         if (event && event.data) {
           try {
             if (event.data == '行程数据保存成功' || event.data.indexOf('行程特色高') != -1) {
-              // this.$emit('ConfigInfo',this.myIframeUrl)
               this.PostMessageText = ''
               //行程特色高
               if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) {