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

src/App.vue

@@ -72,7 +72,6 @@
         showCareer: false,
         careerId: 0,
         isRed: false
-        // sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
       };
     },
     methods: {
@@ -91,10 +90,14 @@
         window.onblur = function () {
           that.plaus();
           if (that.useTime) {
+            var cObj = that.getLocalStorage();
             let params = {
-              CreateBy: that.getLocalStorage().EmployeeId,
+              CreateBy: 0,
               UsedTime: that.useTime
             };
+            if (cObj && cObj.EmployeeId) {
+              params.CreateBy = cObj.EmployeeId;
+            }
             if (params.CreateBy && params.CreateBy > 0) {
               // that.apipost("user_set_user_usederplog", params, r => {
               //   if (r.data.resultCode == 1) {
@@ -187,6 +190,7 @@
       });
     }
   };
+
 </script>
 <style>
   @import "//at.alicdn.com/t/font_635492_wcd7pw1105.css";
@@ -243,9 +247,11 @@
       Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
       Microsoft JhengHei;
   }
+
   .groupTourOrderByTuan_ico {
     margin: 0 10px 0 0;
   }
+
   .groupTourOrderByTuan_ico i {
     display: inline-block;
     margin: 0 2px 0 0;
@@ -254,9 +260,11 @@
     border-radius: 2px;
     vertical-align: middle;
   }
+
   .groupTourOrderByTuan_ico>span {
     vertical-align: middle;
   }
+
   .groupTourOrder_count {
     margin: 0 0 20px 0;
     width: 100%;
@@ -301,6 +309,7 @@
     margin: 0 5px 0 0;
     white-space: nowrap;
   }
+
   .groupTourOrder_count_green {
     color: #1BC594;
   }
@@ -316,22 +325,30 @@
   .groupTourOrder_count_gray {
     color: #999999;
   }
-  .cursor-p{
+
+  .cursor-p {
     cursor: pointer;
   }
-  .cursor-p.active,.cursor-p:hover{
+
+  .cursor-p.active,
+  .cursor-p:hover {
     color: #409EFF;
   }
-  .float-l{
+
+  .float-l {
     float: left;
   }
-  .width100-float-l{
+
+  .width100-float-l {
     float: left;
   }
-  .width100-float-l+.width100-float-l{
+
+  .width100-float-l+.width100-float-l {
     margin-left: 10px;
   }
+
   .c059FF6 {
-      color: #059ff6;
-    }
+    color: #059ff6;
+  }
+
 </style>

src/components/TravelContractDetailRB.vue

@@ -665,27 +665,28 @@
               <template v-else-if="dataList.serviceNum=='5'">
                 <span style="font-weight:bold:color:red;">伍</span>
               </template>（大写）项服务。 </p>
-            <p>费用总额（小写）人民币 {{dataList.orderPrice}} 元, （大写）人民币 {{dataList.bigOrderPrice}} </p>
-            <p>
+            <h3>人数：{{dataList.clientNumber}} 人</h3>
+            <h3>费用总额（小写）人民币 {{dataList.orderPrice}} 元, （大写）人民币 {{dataList.bigOrderPrice}} </h3>
+            <h3>
               {{dataList.clientNumber?dataList.clientNumber:''}}人合计 {{dataList.totalMoneyInfo}}
-            </p>
+            </h3>
           </div>
           <!-- 签章信息 -->
           <div class="eseal" :class="{'checkedNav':cked==3}">
             <table class="SignTable">
               <tbody>
                 <tr>
-                  <td>旅游者代表签字（盖章）：</td>
+                  <td>委托方(旅游者)签字：</td>
                   <td>
                     <span>{{dataList.clientName}}</span>
                     <img class="signDiv" :src="dataList.companySignature" v-if="dataList.companySignature" alt="">
                   </td>
                   <td>
-                    出境社盖章：
+                    受托方(旅行社)签章：
                   </td>
                   <td>
                     <span>{{dataList.company}}</span>
-                    <img class="esealDiv" :src="dataList.zhangUrl" alt="" />
+                    <img v-if="isShowZhang==1" class="esealDiv" :src="dataList.zhangUrl" alt="" />
                   </td>
                 </tr>
                 <tr>
@@ -771,7 +772,7 @@
           TCID: 0,
           orderID: 0,
           guestId: 0,
-          Id: 0,//合同主键编号
+          Id: 0, //合同主键编号
         },
         //数据源
         dataList: [],
@@ -795,7 +796,7 @@
           orderID: this.$route.query.orderID,
           guestId: guestId,
           Id: this.$route.query.ID,
-          pUrl: "clientConfirm",
+          pUrl: "clientConfirmRB",
         };
         this.$http({
           headers: {
@@ -867,7 +868,7 @@
       getDayAddOne(day, num) {
         return moment(day).add(num, 'days').format('YYYY-MM-DD')
       },
- 
+
       //获取大写
       getTotalNum(num) {
         switch (num) {
@@ -911,7 +912,6 @@
           type: 'warning'
         }).then(() => {
           this.dataList.status = 0;
-          //  this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
           this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
             if (res.data.resultCode === 1) {
               this.Success(res.data.message);

src/components/TravelContractNewRB.vue

@@ -741,11 +741,13 @@
             （大写）项服务。
           </el-form-item>
           <el-form-item label="人数">
-            <el-input type="text" v-model="CtObj.clientNumber" maxlength="100" class="w300"></el-input>
+            <el-input type="text" v-model="CtObj.clientNumber" maxlength="100" class="w300"
+              @keyup.native="checkInteger(CtObj,'clientNumber')"></el-input>
           </el-form-item>
           <el-form-item label="费用总额（小写）人民币">
-            <el-input type="text" v-model="CtObj.orderPrice" maxlength="100" class="w300"></el-input>
-            元 （大写）人民币.
+            <el-input type="text" v-model="CtObj.orderPrice" maxlength="100" class="w300"
+              @keyup.native="checkPrice(CtObj,'orderPrice')"></el-input>
+            元.
           </el-form-item>
           <el-form-item :label="(CtObj.clientNumber?CtObj.clientNumber:'')+'人合计'">
             <el-input type="text" v-model="CtObj.totalMoneyInfo" maxlength="500" class="w300"></el-input>
@@ -1039,8 +1041,7 @@
         VoluntaryArr: [],
         //自愿付费项目补充协议
         WillingPayArr: [],
-        //菜单列表 ['合同基本信息', '其他约定事项', '投诉联系', '行程信息', '游客信息', '自愿购物活动补充协议', '自愿付费项目补充协议'],
-        menuArr: ['合同基本信息', '合同协议条款', '其他约定事项', '投诉联系', '行程信息', '游客信息'],
+        menuArr: ['合同基本信息'],
         ckedIndex: 0,
         LineName: '',
         //交通
@@ -1101,11 +1102,13 @@
       changeSignType() {
         if (this.CtObj.SignType == 0) {
           this.CtObj.company = '四川和平国际旅行社有限公司'
-          this.CtObj.companyAddress = "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号"
+          this.CtObj.companyAddress = "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号";
+          this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
         }
         if (this.CtObj.SignType == 1) {
-          this.CtObj.company = '日本和平国际旅行社有限公司'
+          this.CtObj.company = '（株）ピースインターナショナル'
           this.CtObj.companyAddress = "東京都北区滝野川5－41－3　TKビル9階";
+          this.CtObj.TravelAgency_LicenseNum = "";
         }
       },
       goContract() {
@@ -1212,16 +1215,16 @@
         }
         this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
         this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id,
-        this.CtObj.templateType = 1,
-        this.apipost("travelcontract_post_SetContractService", this.CtObj, res => {
-          if (res.data.resultCode === 1) {
-            this.Success(res.data.message);
-            this.dialogVisible = false;
-            this.getList();
-          } else {
-            this.Error(res.data.message);
-          }
-        }, null);
+          this.CtObj.templateType = 1,
+          this.apipost("travelcontract_post_SetContractService", this.CtObj, res => {
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+              this.dialogVisible = false;
+              this.getList();
+            } else {
+              this.Error(res.data.message);
+            }
+          }, null);
       },
       //跳转至预览
       goUrl() {
@@ -1288,51 +1291,7 @@
       },
       //滚动条滚动选中tab
       menu() {
-        var _self = this;
-        _self.scroll = (document.documentElement.scrollTop || document.body.scrollTop) + 70;
-        //滑动到指定位置相应菜单高亮
-        var a_0 = 0;
-        if (_self.$refs.anchor0 && _self.$refs.anchor0.offsetTop) {
-          a_0 = _self.$refs.anchor0.offsetTop;
-        }
-        var a_1 = 0;
-        if (_self.$refs.anchor1 && _self.$refs.anchor1.offsetTop) {
-          a_1 = _self.$refs.anchor1.offsetTop;
-        }
-
-        var a_2 = 0;
-        if (_self.$refs.anchor2 && _self.$refs.anchor2.offsetTop) {
-          a_2 = _self.$refs.anchor2.offsetTop;
-        }
-
-        var a_3 = 0;
-        if (_self.$refs.anchor3 && _self.$refs.anchor3.offsetTop) {
-          a_3 = _self.$refs.anchor3.offsetTop;
-        }
-
-        var a_4 = 0;
-        if (_self.$refs.anchor4 && _self.$refs.anchor4.offsetTop) {
-          a_4 = _self.$refs.anchor4.offsetTop;
-        }
 
-        var a_5 = 0;
-        if (_self.$refs.anchor5 && _self.$refs.anchor5.offsetTop) {
-          a_5 = _self.$refs.anchor5.offsetTop;
-        }
-
-        if (_self.scroll < a_0) {
-          this.ckedIndex = 0
-        } else if (_self.scroll > a_0 && _self.scroll < a_1) {
-          this.ckedIndex = 1
-        } else if (_self.scroll > a_2 && _self.scroll < a_3) {
-          this.ckedIndex = 2
-        } else if (_self.scroll > a_3 && _self.scroll < a_4) {
-          this.ckedIndex = 3
-        } else if (_self.scroll > a_4 && _self.scroll < a_5) {
-          this.ckedIndex = 4
-        } else if (_self.scroll > a_5 && _self.scroll) {
-          this.ckedIndex = 5
-        }
       },
       //点击合同获取旅客信息
       getGuestList() {

src/plug/index.js

@@ -119,7 +119,7 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        domainUrl = "http://192.168.10.9:8083"; // 刘东电脑
+        domainUrl = "http://192.168.10.128"; // 刘东电脑
 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -286,7 +286,21 @@ export default {
               guestId: guestId,
             }
           })
-        } else if (this.$route.path == "/TravelContractConfirm") {
+        } 
+        else if (this.$route.path == "/clientConfirmRB") {
+          let TCID = this.$route.query.TCID;
+          let orderID = this.$route.query.orderID;
+          let guestId = this.$route.query.guestId;
+          this.$router.push({
+            name: "clientConfirmRB",
+            query: {
+              TCID: TCID,
+              orderID: orderID,
+              guestId: guestId,
+            }
+          })
+        } 
+        else if (this.$route.path == "/TravelContractConfirm") {
           let ContractId = this.$route.query.ContractId;
           this.$router.push({
             name: "TravelContractConfirm",