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

src/components/DomesticTravelcontract.vue

@@ -1135,7 +1135,7 @@
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
           TravelAgency_IDNum: "",
-          TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号",
+          TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号 ",
           TravelAgency_Tel: "",
           TravelAgency_Fax: "",
           TravelAgency_PostNum: "",

src/components/SingleContract.vue

@@ -1276,7 +1276,7 @@
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
           TravelAgency_IDNum: "",
-          TravelAgency_Address: "東京都北区滝野川5－41－3　TKビル9階",
+          TravelAgency_Address: "",
           TravelAgency_Tel: "",
           TravelAgency_Fax: "",
           TravelAgency_PostNum: "",
@@ -1441,10 +1441,10 @@
       changeSignType() {
         if (this.CtObj.SignType == 0) {
           this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
-          this.CtObj.TravelAgency_Address = "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号"
+          this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 "
         } else {
           this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル";
-          this.CtObj.TravelAgency_Address = "東京都北区滝野川5－41－3　TKビル9階";
+          this.CtObj.TravelAgency_Address = "";
         }
       },
       //跳转锚点

src/components/TravelContractConfirm.vue

@@ -3609,7 +3609,7 @@
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
           TravelAgency_IDNum: "",
-          TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号",
+          TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号",
           TravelAgency_Tel: "",
           TravelAgency_Fax: "",
           TravelAgency_PostNum: "",

src/components/TravelContractDetail.vue

@@ -403,7 +403,7 @@
         </div>
         <div class="contract">
           <div class="title">
-            <h1>四川和平国际旅行社有限公司团队出境旅游合同</h1>
+            <h1>{{dataList.company}} 团队出境旅游合同</h1>
             <p class="contractNo">合同编号：<span>{{dataList.contractNum}}</span></p>
           </div>
           <div class="menu">
@@ -741,7 +741,9 @@
                   </td>
                   <td>
                     <span>{{dataList.company}}</span>
-                    <img class="esealDiv" :src="CurrentUserInfo.ZhangImg" alt="" />
+                    <template v-if="dataList.zhangUrl">
+                      <img class="esealDiv" :src="dataList.zhangUrl" alt="" />
+                    </template>
                   </td>
                 </tr>
                 <tr>
@@ -1155,4 +1157,5 @@
       this.getShow(TID);
     }
   };
-</script>
+
\ No newline at end of file
+</script>

src/components/TravelContractNew.vue

@@ -373,12 +373,23 @@
                   </el-form-item>
                 </td>
               </tr>
-
             </tbody>
           </table>
           <div class="createTableTitle">出境社信息</div>
           <table class="createTable">
             <tbody>
+              <tr>
+                <td>
+                  <el-form-item label="合同章">
+                    <el-select v-model="CtObj.signType" placeholder="请选择" @change="changeSignType">
+                      <el-option key="0" label="和平章" :value="0">
+                      </el-option>
+                      <el-option key="1" label="日本公司章" :value="1">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+              </tr>
               <tr>
                 <td>
                   <el-form-item label="公司名称">
@@ -1313,7 +1324,8 @@
           tCNum: '',
           payProtocol: '',
           shopProtocol: '',
-          dmcName: ''
+          dmcName: '',
+          signType: 0, //合同章类型(0-和平，1-日本)
         },
         //旅客名单
         guestList: [],
@@ -1437,6 +1449,17 @@
       };
     },
     methods: {
+      changeSignType() {
+        if (this.CtObj.signType == 0) {
+          this.CtObj.company = "四川和平国际旅行社有限公司";
+          this.CtObj.companyAddress = "成都市锦江区青和里南段55号1栋2310、2311、2312号 "
+          this.CtObj.businessCertificate = 'L-SC-CJ00015';
+        } else {
+          this.CtObj.company = "（株）ピースインターナショナル";
+          this.CtObj.companyAddress = "";
+          this.CtObj.businessCertificate = '';
+        }
+      },
       goContract() {
         let routeData = this.$router.resolve({
           name: "TravelContractDetail",
@@ -1510,7 +1533,7 @@
             if (tempObj && tempObj.id <= 0) {
               this.CtObj.company = '四川和平国际旅行社有限公司';
               this.CtObj.businessCertificate = 'L-SC-CJ00015';
-              this.CtObj.companyAddress = '成都市锦江区一环路东五段87号2幢23层2310.2311.2312号';
+              this.CtObj.companyAddress = '成都市锦江区青和里南段55号1栋2310、2311、2312号 ';
               this.CtObj.regulatorName = '四川省成都市旅游质监执法机构';
               this.CtObj.regulatorComplainCall = '17708046437';
               this.CtObj.companyComplainCall = '028-96927';

src/components/TravelContractNewRB.vue

@@ -1155,12 +1155,12 @@
       changeSignType() {
         if (this.CtObj.SignType == 0) {
           this.CtObj.company = '四川和平国际旅行社有限公司'
-          this.CtObj.companyAddress = "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号";
+          this.CtObj.companyAddress = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
           this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
         }
         if (this.CtObj.SignType == 1) {
           this.CtObj.company = '（株）ピースインターナショナル'
-          this.CtObj.companyAddress = "東京都北区滝野川5－41－3　TKビル9階";
+          this.CtObj.companyAddress = "";
           this.CtObj.TravelAgency_LicenseNum = "";
         }
       },

src/components/TravelContractView.vue

@@ -2077,7 +2077,7 @@
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
           TravelAgency_IDNum: "",
-          TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号",
+          TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号 ",
           TravelAgency_Tel: "",
           TravelAgency_Fax: "",
           TravelAgency_PostNum: "",

src/components/clientConfirm.vue

@@ -994,7 +994,11 @@
               <li>
                 <el-row>
                   <el-col :span="12">出境社盖章：</el-col>
-                  <el-col :span="12"><img class="signImg" :src="ZhangImg" alt="" /></el-col>
+                  <el-col :span="12">
+                    <template v-if="dataList.zhangUrl">
+                      <img class="signImg" :src="dataList.zhangUrl" alt="" />
+                    </template>
+                  </el-col>
                 </el-row>
               </li>
               <li>
@@ -1222,7 +1226,6 @@
         //数据源
         dataList: [],
         dialogVisible: false,
-        ZhangImg: "",
       };
     },
     created() {
@@ -1305,7 +1308,6 @@
       },
     },
     mounted() {
-      this.ZhangImg = 'http://imgfile.oytour.com/New/Upload/CompanyImage/hepingzhang.png'
       this.msg.TCID = this.$route.query.TCID;
       this.msg.orderID = this.$route.query.orderID;
       this.msg.guestId = this.$route.query.guestId;

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -683,6 +683,13 @@
           this.journeyList.isFileUpload = true;
           this.journeyList.DayNum = configData.Days.length;
           this.journeyList.NightNum = this.journeyList.DayNum - 1;
+          let arrDayList = function(list){
+            list.forEach(x=>{
+              x.IsBlowUp = false
+              x.zoom = 0.44
+            })
+          }
+          arrDayList(dayList)
           this.journeyList.DayList = dayList;
 
           //产品特色
@@ -939,6 +946,13 @@
                 this.journeyList.NightNum = tempData.NightNum;
                 this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
                 this.journeyList.StartCityId = tempData.StartCityId;
+                let arrDayList = function(list){
+                  list.forEach(x=>{
+                    x.IsBlowUp = false
+                    x.zoom = 0.44
+                  })
+                }
+                arrDayList(tempData.DayList)
                 this.journeyList.DayList = tempData.DayList;
                 this.journeyList.DayList.forEach(x => {
                   x["HotelChooseArray"] = [];

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -77,6 +77,48 @@
   .TC-newTop {
     margin-top: 40px !important;
   }
+  .BlowUpTravelDays{
+    position: absolute;
+    right: 10px;
+    top: -19px;
+    border-bottom-right-radius: 1px;
+    border-top-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    padding: 2px 12px;
+    background: #7cb99f;
+    color: #444;
+    z-index: 999;
+    cursor: pointer;
+    font-size: 15px;
+  }
+  .BlowUpTravelDays:hover{
+    color: #fff;
+  }
+  .BlowUpTravelDaysBox{
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10000;
+    padding: 0 10px;
+    overflow-y: scroll;
+    background: rgba(23,23,23,0.5);
+    display: flex;
+    justify-content: center;
+  }
+  .BlowUpTravelDaysClose{
+    position: fixed;
+    width: 40px;
+    right: 50px;
+    top: 15px;
+    color: #fff;
+    font-size: 25px;
+    padding: 0 15px;
+    border-radius: 3px;
+    cursor: pointer;
+    z-index: 99999;
+  }
 
 </style>
 
@@ -146,8 +188,19 @@
                 <div class="dayCircle">D{{item.DayNum}}</div>
               </div>
               <div class="dayPage-box row">
-                <div class="dayPage-form" v-if="!item.isHide">
-                  <travelDays :index="index" :dataAll="dataAll" :item="item"></travelDays>
+                <div class="dayPage-form relative" v-if="!item.isHide">
+                  <el-tooltip class="item" effect="dark" content="放大行程" placement="top">
+                    <span class="el-icon-full-screen absolute BlowUpTravelDays"
+                    @click="clickBlowUpTravelDays(item)"></span>
+                  </el-tooltip>
+                  <travelDays :index="index" :dataAll="dataAll" :item="item">
+                  </travelDays>
+                  <div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
+                    <travelDays :index="index" :dataAll="dataAll" :item="item">
+                    </travelDays>
+                    <span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
+                      @click="clickBlowUpTravelDays(item)"></span>
+                  </div>
                 </div>
                 <div class="newDayContent"
                 :style="{'width':!item.isHide?'520px':'1020px'}">
@@ -198,6 +251,12 @@
       travelDays
     },
     methods: {
+      clickBlowUpTravelDays(item){
+        item.IsBlowUp=!item.IsBlowUp
+        if(item.IsBlowUp) item.zoom = 1
+        else item.zoom = 0.44
+        this.$forceUpdate()
+      },
       handlerChangeDateList(data) {
         this.$emit('change', data)
       },

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

 <template>
-  <div style="height: 100%;overflow: hidden;" v-if="RenderingOk">
-    <div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;">
-      <div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
+  <div :style="{'height':item.zoom==1?'auto':'100%',
+'overflow':item.zoom==1?'auto':'hidden'}"
+   v-if="RenderingOk">
+    <div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" :style="{'zoom': item.zoom}">
+      <div class="z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
         <div style="padding: 10px 0;"></div>
         <div :id="'LineOfTravel'+(item*4)+'_0'+index">
           <!-- <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header> -->
@@ -809,7 +811,7 @@
         </div>
 
         <!-- otherJourney-footer -->
-        <div class="footer">
+        <div v-if="item.zoom!=1" :class="[item.zoom==1?'':'footer']">
           <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
             <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
             <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.TripColor}">&nbsp;</div>

src/components/onedayTripContract.vue

@@ -1055,7 +1055,7 @@
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
           TravelAgency_IDNum: "",
-          TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号",
+          TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号 ",
           TravelAgency_Tel: "",
           TravelAgency_Fax: "",
           TravelAgency_PostNum: "",

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -1085,7 +1085,7 @@
           PlayTimeHour: "", //游玩小时
           PlayTimeMinutes: "", //游玩分钟
           IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
-          SelffetchAddress: '東京都北区滝野川5－41－3　TKビル9階', //邮寄地址
+          SelffetchAddress: '', //邮寄地址
         },
         rules: {
           //表单必填验证