合并代码

src/App.vue

@@ -117,6 +117,11 @@ export default {
         path: '/login'
       })
     }else{
+      if(document.URL.indexOf("clientConfirm")!=-1){
+          localStorage.openMode=0
+      }else{
+        
+      }
       this.timekeeper()
       this.listeneruser()
     }

src/components/Contract/TravelContract.vue

@@ -10,7 +10,7 @@
         float:left;
         width: 150px;
         height: 100%;
-        margin-left: 30px;
+        /* margin-left: 30px; */
         position: fixed;
         margin-top:100px;
     }
@@ -1010,6 +1010,7 @@
         },
         //旅客名单
         guestList:[],
+        tripList: [],
         rules: {
             clientName: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
             clientCall: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
@@ -1075,7 +1076,7 @@
                   if(this.CtObj.regulatorProvinceid>0){
                       this.GetJianAreaList(this.CtObj.regulatorProvinceid,2,1);
                   }
-
+                  console.log(this.CtObj,'CTOBJ');
             } else {
                 this.Error(res.data.message);
             }
@@ -1189,7 +1190,6 @@
         this.CtObj.status = 1;
         this.CtObj.contractStatus=2;
         this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-                console.log(res,'ressss');
                 if (res.data.resultCode === 1) {
                     this.Success(res.data.message);
                     this.getList();
@@ -1218,7 +1218,6 @@
             }).then(() => {
                 this.CtObj.status=0;
                 this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-                    console.log(res,'ressss');
                     if (res.data.resultCode === 1) {
                         this.Success(res.data.message);
                         this.getList();
@@ -1240,6 +1239,7 @@
                 if (valid) {
                     this.SaveMsg();
                 } else {
+                    this.Error('请完成必填项');
                     return false;
                 }
             });
@@ -1247,13 +1247,400 @@
      sendAudit(){
         this.CtObj.auditContract=1;
         this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-            console.log(res,'ressss');
             if (res.data.resultCode === 1) {
                 this.Success(res.data.message);
             } else {
                 this.Error(res.data.message);
             }
         },null);
+     },
+
+
+
+     GetTrip(id, TCID) {
+        this.tripList = [];
+        this.startDate = '';
+        var nTCID = 0;
+        if (TCID) {
+          nTCID = TCID;
+        }
+        var msg = {
+          configId: nTCID,
+          tcid: 0
+        };
+        if (id !== undefined) {
+          //根据ID 获取行程内容
+          this.apipost(
+            "b2b_get_GetB2BTravelInfoNoDes", msg,
+            res => {
+              if (res.data.resultCode == 1) {
+                if (res.data.data.priceList && res.data.data.priceList.length > 0) {
+                  this.startDate = res.data.data.priceList[0].startDate;
+                }
+                this.tripList = res.data.data.dayList;
+                this.init();
+              }
+            },
+            err => {}
+          );
+        } else {
+          var dayList = [];
+          this.subConfig.DayList.forEach((objItem, objIndex) => {
+            var dayItem = this.$tripUtils.daysArrayObj();
+            dayItem.dayNum = objItem.dayNum;
+            //每一天的数组
+            var dayArray = [];
+            //子项遍历
+            objItem.dayArray.forEach(subItem => {
+              switch (subItem.Type) {
+                //交通
+                case "1":
+                  var subTraffiArray = [];
+                  subItem.childItem.SubTraffic.forEach(subTrafficItem => {
+                    subTraffiArray.push({
+                      startCityName: subTrafficItem.StartCityName,
+                      arrivalType: subTrafficItem.ArrivalType,
+                      arrivalCityName: subTrafficItem.ArrivalCityName
+                    });
+                  });
+                  var trafficObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      description: subItem.childItem.Description,
+                      subTraffic: subTraffiArray
+                    }
+                  };
+                  dayArray.push(trafficObj);
+                  break;
+                  //景点
+                case "2":
+                  var imgArray = [];
+                  subItem.childItem.ImaArray.forEach(imgItem => {
+                    imgArray.push({
+                      url: imgItem.Url,
+                      name: imgItem.Name
+                    });
+                  });
+                  var scenicObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      couponsName: subItem.childItem.CouponsName,
+                      couponsTicketName: subItem.childItem.CouponsTicketName,
+                      playTimeHour: subItem.childItem.PlayTimeHour,
+                      playTimeMinutes: subItem.childItem.PlayTimeMinutes,
+                      description: subItem.childItem.Description,
+                      imaArray: imgArray
+                    }
+                  };
+                  dayArray.push(scenicObj);
+                  break;
+                  //酒店
+                case "3":
+                  var imgArray = [];
+                  subItem.childItem.ImaArray.forEach(imgItem => {
+                    imgArray.push({
+                      url: imgItem.Url,
+                      name: imgItem.Name
+                    });
+                  });
+                  var hotelObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      hotelName: subItem.childItem.HotelName,
+                      hotelProductName: subItem.childItem.HotelProductName,
+                      useDinnerType: subItem.childItem.UseDinnerType,
+                      description: subItem.childItem.Description,
+                      imaArray: imgArray
+                    }
+                  };
+                  dayArray.push(hotelObj);
+                  break;
+                  //餐厅
+                case "4":
+                  var imgArray = [];
+                  subItem.childItem.ImaArray.forEach(imgItem => {
+                    imgArray.push({
+                      url: imgItem.Url,
+                      name: imgItem.Name
+                    });
+                  });
+                  var dinnerObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      dinnerName: subItem.childItem.DinnerName,
+                      mealName: subItem.childItem.MinnerName,
+                      useDinnerType: subItem.childItem.UseDinnerType,
+                      useTimeHour: subItem.childItem.UseTimeHour,
+                      useTimeMinutes: subItem.childItem.UseTimeMinutes,
+                      description: subItem.childItem.Description,
+                      descriptionText: subItem.childItem.Description,
+                      imaArray: imgArray
+                    }
+                  };
+                  dayArray.push(dinnerObj);
+                  break;
+                  //自由活动
+                case "5":
+                  var freedomObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      description: subItem.Description,
+                      descriptionText: subItem.Description
+                    }
+                  };
+                  dayArray.push(freedomObj);
+                  break;
+                  //温馨提示
+                case "6":
+                  var warmObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      description: subItem.Description,
+                      descriptionText: subItem.Description
+                    }
+                  };
+                  dayArray.push(warmObj);
+                  break;
+                  //行程大点
+                case "7":
+                  var titleObj = {
+                    type: subItem.Type,
+                    childItem: {
+                      title: subItem.childItem.Title,
+                      description: subItem.childItem.Description
+                    }
+                  };
+                  dayArray.push(titleObj);
+                  break;
+              }
+            });
+            dayItem.dayArray = dayArray;
+            dayList.push(dayItem);
+          });
+          this.tripList = dayList;
+          this.init();
+        }
+      },
+      init() {
+        this.tripList.forEach((x, j) => {
+          let useDinnerTypeBy = "";
+          let jin = [],
+            jiu = [],
+            jiu2 = [],
+            jiao = [],
+            dadian = [],
+            tips = [],
+            activy = [],
+            can = {
+              breakfirst: "敬请自理",
+              lanuch: "敬请自理",
+              dinner: "敬请自理"
+            };
+          x.dayArray.forEach((y, index) => {
+            if (y.type == 7 && y.childItem.title != "") {
+              let obj = {
+                title: y.childItem.title,
+                content: y.childItem.description,
+                img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ?
+                  y.childItem.imaArray[0].url : "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              dadian.push(obj);
+            } else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
+              let title = "";
+              y.childItem.subTraffic.forEach((z, i) => {
+                title += z.startCityName;
+                if (z.arrivalType == 1) {
+                  title += '<i class="iconfont icon-feiji"></i>';
+                } else if (z.arrivalType == 2) {
+                  title += '<i class="iconfont icon-bus"></i>';
+                } else if (z.arrivalType == 3) {
+                  title += '<i class="iconfont icon-icon31"></i>';
+                } else {
+                  title += '<i class="iconfont icon-gaotiedongche"></i>';
+                }
+                if (i + 1 == y.childItem.subTraffic.length) {
+                  title += z.arrivalCityName;
+                }
+              });
+              let obj = {
+                title: title,
+                content: y.childItem.description,
+                img: "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              jiao.push(obj);
+            } else if (
+              y.type == 2 &&
+              y.childItem.couponsName != "" &&
+              y.childItem.imaArray.length > 0
+            ) {
+              let obj = {
+                title: y.childItem.couponsName,
+                content: y.childItem.description,
+                img: y.childItem.imaArray[0].url,
+                ticketName: y.childItem.couponsTicketName,
+                playTimeHour: y.childItem.playTimeHour,
+                playTimeMinutes: y.childItem.playTimeHour
+              };
+              jin.push(obj);
+            } else if (
+              y.type == 3 &&
+              y.childItem.hotelName != "" &&
+              y.childItem.imaArray.length > 0
+            ) {
+              let obj = {
+                title: y.childItem.hotelName,
+                content: y.childItem.description,
+                img: y.childItem.imaArray[0].url,
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              jiu.push(obj);
+            } else if (y.type == 4) {
+              if (y.childItem.useDinnerType == "1") {
+                can.breakfirst = y.childItem.dinnerName;
+              } else if (y.childItem.useDinnerType == "2") {
+                can.lanuch = y.childItem.dinnerName;
+              } else if (y.childItem.useDinnerType == "3") {
+                can.dinner = y.childItem.dinnerName;
+              }
+            } else if (y.type == 5) {
+              let obj = {
+                title: "自由活动",
+                content: y.childItem.description,
+                img: "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              activy.push(obj);
+            } else if (y.type == 6) {
+              let obj = {
+                title: y.childItem.title,
+                content: y.childItem.description,
+                img: "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              tips.push(obj);
+            }
+            if (y.type == 3) {
+              jiu2.push(y.childItem.hotelName);
+              useDinnerTypeBy = y.childItem.useDinnerType;
+            }
+          });
+          if (
+            can.breakfirst == "敬请自理" &&
+            useDinnerTypeBy.indexOf("1") != -1
+          ) {
+            can.breakfirst = "酒店内享用早餐";
+          }
+          if (can.lanuch == "敬请自理" && useDinnerTypeBy.indexOf("2") != -1) {
+            can.lanuch = "酒店自助";
+          }
+          if (can.dinner == "敬请自理" && useDinnerTypeBy.indexOf("3") != -1) {
+            can.dinner = "酒店自助";
+          }
+          x.can = can;
+          let details = [];
+          x.tips = tips;
+          x.jiu2 = jiu2;
+          if (jin.length > 0) {
+            details = jin;
+          } else if (jiu.length > 0) {
+            details = jiu;
+          } else if (dadian.length > 0) {
+            details = dadian;
+          } else if (jiao.length > 0) {
+            if (j == this.tripList.length - 1) {
+              let obj = {
+                title: "温暖的家",
+                content: "感谢您参加本次行程，期待下次与您相遇",
+                img: ""
+              };
+              details.push(obj);
+            } else {
+              details = jiao;
+            }
+          } else if (activy.length > 0) {
+            details = activy;
+          }
+          x.title =
+            dadian.length > 0 ?
+            dadian[0].title :
+            jiao.length > 0 ?
+            jiao[0].title :
+            "集合出发";
+          x.details = details;
+
+          if (x.details.length == 0) {
+            if (j == 0) {
+              let obj = {
+                title: "集合出发",
+                content: "向着远方的目标出发起飞",
+                img: "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              details.push(obj);
+            } else if (j == this.tripList.length - 1) {
+              let obj = {
+                title: "温暖的家",
+                content: "感谢您参加本次行程，期待下次与您相遇",
+                img: "",
+                ticketName: "",
+                playTimeHour: null,
+                playTimeMinutes: null
+              };
+              details.push(obj);
+            }
+          } else {
+            if (x.title == "集合出发") {
+              x.details.forEach(xc => {
+                if (xc.title !== undefined) x.title = xc.title + "~";
+              });
+              if (x.title == "集合出发") {
+                if (j > 0 && j < tripList.length - 1) x.title = "自由活动";
+              } else {
+                x.title = x.title.substring(0, x.title.length - 1);
+              }
+            }
+          }
+          x.islast = j + 1 == this.tripList.length;
+          this.$set(this.tripList, j, x);
+        });
+        for (let i = this.tripList.length - 1; i >= 0; i--) {
+          if (i == 0) this.tripList[i].can.breakfirst = "敬请自理";
+          else {
+            this.tripList[i].can.breakfirst = this.tripList[i - 1].can.breakfirst;
+            if (
+              this.tripList[i].lineId != 5 &&
+              this.tripList[i].can.breakfirst == "敬请自理"
+            )
+              this.tripList[i].can.breakfirst = "酒店内享用早餐";
+          }
+        }
+        let str = '';
+        this.tripList.forEach((x,index)=>{
+            str +=`第${x.dayNum}天  ${x.title}\n`
+            x.details.forEach(y=>{
+                if(index==this.tripList.length-1){
+                    str+=`温暖的家\n`
+                }else{
+                    str +=`${y.title}\n`
+                }
+            })
+            str +=`早餐：${x.can.breakfirst}\n午餐：${x.can.lanuch}\n晚餐：${x.can.dinner}\n \r`
+        })
+        this.CtObj.travelContent = str;
       }
     },
     mounted() {
@@ -1261,6 +1648,7 @@
         this.msg.TCID = this.$route.query.TCID;
         this.msg.orderID = this.$route.query.orderID;
         this.getList();
+        this.GetTrip(0,this.msg.TCID);
     }
   };
 </script>

src/components/SalesModule/groupTourOrder.vue

@@ -1820,8 +1820,8 @@
                     </span>
 
               </div>
-              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</span>
+              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -3827,6 +3827,7 @@
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
+              console.log(this.list,'list');
             } else {
               this.$message.error(res.data.message)
             }

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2142,8 +2142,8 @@
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
 
                     </span>
-                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</div>
-                    <div v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</div>
+                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</div>
+                    <div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}</div>
               </div>
 
               </td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1777,8 +1777,8 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.ContractNum}}</span>
+              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -2094,8 +2094,8 @@
                     <span>单据：</span>
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
                     </span>
-                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" style="display:none">领取合同</span>
-                    <span v-else class="GO_Contract" @click="goContract(childItem)" style="display:none">{{childItem.ContractNum}}</span>
+                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
+                    <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
               </div>
               </td>
             </tr>

src/components/clientConfirm.vue

@@ -27,7 +27,7 @@
 .dic_content .item_content .title {width:100%;text-align:center;margin-top:20px;}
 .dic_content .item_content>label {width:100%;text-align:left;font-weight:bold;background-color:#F2F2F2;margin:30px 0;padding:8px 0;text-indent:20px;display:inline-block;font-size:16px;}
 .dic_content .item_content>span{font-size:13px;line-height:26px;margin-left:10px;}
-.dic_content .item_content .content_table {border:0;margin-top:10px;width:100%;}
+.dic_content .item_content .content_table {border:1px solid #d1d1d1;margin-top:10px;width:100%;}
 .dic_content .item_content .content_table th {background-color:#F2F2F2;}
 .dic_content .item_content .content_table th,.dic_content .item_content .content_table th td {border:1px solid #808080;text-align:center;padding:10px;}
 .dic_content .item_content font {color:blue;display:inline-block;padding:0 10px; font-size: 13px;}
@@ -58,7 +58,7 @@
 .dic_content .zhangOne{position:absolute;width:200px;top:-83px;left:160px;}
 .dic_content .zhangTwo{position:absolute;width:200px;top:-60px;left:80px;}
 .dic_content .comonTb td{padding:15px 0;}
-.dic_content .remindInfo{position:absolute;top:42%;left:25%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
+.dic_content .remindInfo{position:absolute;top:42%;left:35%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
 .dic_content .signName{position:relative;top:10px;width:140px;}
 .dic_content .LRTB td:nth-child(odd){text-align:right;padding-right:20px;}
 .dic_content .LRTB td:nth-child(even){text-align:left;padding-left:20px;}
@@ -69,7 +69,7 @@
 #canvas {
   width: 100%;
   height: 100%;
-  position: relative;
+  /* position: relative; */
 }
 #canvas canvas {
   display: block;
@@ -90,9 +90,9 @@
 }
 .CV_Btn{
     color: #fff;
-    padding: 0 15px;
-    height: 30px;
+    padding: 10px 30px;
     background: #E95252;
+    font-size:30px;
     border: 1px solid #E95252;
     cursor: pointer;
     border-radius: 15px;
@@ -106,7 +106,9 @@
 }
 .CliConfirmBtn{
     color: #fff;
-    height: 30px;
+    height: 60px;
+    width:150px;
+    font-size:27px;
     background: #E95252;
     border: 1px solid #E95252;
     border-radius: 15px;
@@ -747,7 +749,7 @@
                 </div>
             </div>
         </div>
-        <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''">
+        <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
             <div id="canvas">
             </div>
             <div style="text-align:center;margin-top:20px;">
@@ -783,7 +785,7 @@
     methods: {
      //获取数据
       getList(){
-        this.apiJavaPost("/api/contract/getContractInfoForCode",this.msg,res => {
+        this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
             console.log(res,'resss');
             if (res.data.resultCode === 1) {
                   this.dataList = res.data.data;
@@ -898,7 +900,7 @@
         this.msg.orderID = this.$route.query.orderID;
         var h = window.screen.height;
         var cHeight=document.getElementsByClassName("CliSignDiv")[0];
-        cHeight.style.height=600+'px';
+        cHeight.style.height=700+'px';
         this.getList();
         this.getCanvas();
     }

src/components/public/leftNav.vue

@@ -202,11 +202,28 @@
         })
       },
       goUrl(path) {
+        if(path=='/JapanHotel'){
+            let userInfo = this.getLocalStorage();
+            let msg = {
+              id:userInfo.EmployeeId
+            }
+            this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
+              if (res.data.resultCode == 1) {
+                  this.EnCodeWord=res.data.data;
+                  window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
+              } else {
+                  this.Error(res.data.message);
+              }
+              },
+              err => {}
+            );
+          }else{
             this.$router.push({
               path: path
             })
-      },
-    },
+          }
+        }
+      }
   }
 
 </script>

src/plug/index.js

@@ -118,9 +118,10 @@ export default {
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
                 let locationName = window.location.hostname;
-                domainUrl = "http://192.168.2.214:8082";
+                 //domainUrl = "http://192.168.2.214:8082";
                  domainUrl = "http://192.168.2.65:8025";
-                // domainUrl = "http://192.168.2.16:8083";
+                //domainUrl = "http://192.168.2.16:8083";
+                //domainUrl = "http://192.168.0.110";
 
                 if (locationName.indexOf('oytour') !== -1) {
                     domainUrl = "http://reborn.oytour.com";
@@ -354,7 +355,7 @@ export default {
             },
 
             Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
-                if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) {
+                if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
                     let previousPathInfo = {
                         path: this.$route.name,
                         query: this.$route.query