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

src/components/FinancialModule/BasicDocuments.vue

@@ -2355,6 +2355,7 @@ class="w135 _border_b_1">
         isClientBankAccount:false,
         clientBankAccountData:{},
         helpBranchData:{},
+        isSeeOrderLog:0,
       }
     },
     components: {
@@ -3182,6 +3183,16 @@ else if (Type==2) {
             }
           })
         } else if (type == 7) {
+          if (this.isSeeOrderLog==1){
+          this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: 'y'
+            }
+          })
+        }
+        else{
           this.$router.push({
             name: path,
             query: {
@@ -3190,6 +3201,7 @@ else if (Type==2) {
               blank: 'y'
             }
           })
+        }
         } else if (type == 8) {
           this.$router.push({
             name: path,
@@ -4166,6 +4178,9 @@ else if (Type==2) {
       if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
         this.isOrderOP = true
       }
+      if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1678,6 +1678,7 @@
         ClientBankAccountTop:0,
         ActionMenuCode: '',
         typeSystem: 0,
+        isSeeOrderLog:0,
       }
     },
     components: {
@@ -1728,6 +1729,9 @@
       if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
         this.isOrderOP = true
       }
+      if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     methods: {
 
@@ -2506,7 +2510,18 @@
             }
           })
         } else if (type == 7) {
-          this.$router.push({
+
+          if (this.isSeeOrderLog==1){
+            this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: 'y'
+            }
+          })
+          }
+          else{
+            this.$router.push({
             name: path,
             query: {
               id: id,
@@ -2514,6 +2529,8 @@
               blank: 'y'
             }
           })
+          }
+          
         } else if (type == 8) {
           if (OrderID) {
             this.$router.push({
@@ -2890,6 +2907,7 @@
       // document.oncontextmenu = function(){return false;}
       this.GetAuth();
       this.userInfo = this.getLocalStorage();
+      this.ActionMenuCode = this.userInfo.ActionMenuCode;
       this.qjGroupId = this.QjGroupId();
       this.Financial_post_GetDetail(this.ID)
       this.queryMsg.FinanceId = this.$route.query.id;

src/components/FinancialModule/FinancialSubmodule/OrderFinancialPage.vue

@@ -51,7 +51,7 @@ export default {
     props:["dataOrderList", 'dataOrderPreferPrice'],
     data(){
         return{
-            tableOrderShow:false,
+            tableOrderShow:true,
         }
     },watch:{
         

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -386,6 +386,7 @@ export default {
             choiceDate: '',
             EmployeeId:0,
             noData:false,
+            isSeeOrderLog:0,
         }
     },
     created(){
@@ -419,8 +420,11 @@ export default {
         }else{
             this.defaultMonth[0] = t2;
         }
-
-
+        let userinfo = this.getLocalStorage();
+        let ActionMenuCode =  userinfo.ActionMenuCode;
+        if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     components: {
         "my-Bill": myBill,
@@ -478,10 +482,25 @@ export default {
                 })
             }
             if(type==2){
-                this.$router.push({
-                    name: path,
-                    query: { id:tcid,orderID: id,blank:'y',isShow:false}
-                })
+                if (this.isSeeOrderLog==1){
+            this.$router.push({
+            name: path,
+            query: {
+              id: tcid,
+              blank: 'y'
+            }
+          })
+          }
+          else{
+            this.$router.push({
+            name: path,
+            query: {
+              id: tcid,
+              isShow: false,
+              blank: 'y'
+            }
+          })
+          }
             }
         },
         getStartList1() {// 获取出发城市

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -1763,7 +1763,7 @@
                   <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
                 </span>
                 <span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
-                <p>行李数量：{{item.luggageNum}}</p>
+                <p v-if="item.luggageNum">行李数量：{{item.luggageNum}}</p>
                 <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
               </td>
             </tr>

src/components/SalesModule/groupTourOrderOne.vue

@@ -1691,7 +1691,7 @@
               </span>
 
               <span style="display: block">{{$t('salesModule.RoomInfo')}}：{{item.orderGuestHouseStr}}</span>
-              <p >行李数量：{{item.luggageNum}}</p>
+              <p v-if="item.luggageNum">行李数量：{{item.luggageNum}}</p>
               <span v-if="item.tipMoney" style="color:red">（{{$t('fnc.xiaofei')}}：{{item.tipMoney}}）</span>
               <div v-if="item.otherContractList">
                 <span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goSingleContract(item)">

src/components/TravelContractNew.vue

@@ -969,7 +969,27 @@
                     <div>备注：1、在主要景点的游览时间不小于此数的时间，以小时填; 2、交通工具不含景区观光车、索道等; 3、“交通工具”栏中的“标准”按各类别的标准填写。</div>
                     <div>飞机：头等舱/商务舱/经济舱；&nbsp;&nbsp;&nbsp;汽车：空调大巴/空调卧铺/普通客车</div>
                     <div>火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；</div>
-                    <div>轮船：普通客船/星级游船 &nbsp;&nbsp;&nbsp;人/间</div>
+                    <template v-if="CtObj.TeamType==2">
+                      <div>
+                        备注：<br/>
+                        注：《1》本行程交通、住宿、用餐、观光点尽量忠于原行程，若遇特殊状况:如天气、交通阻塞、路况等、观光点休假、住宿饭店调整及其它不可抗拒之现象，行程会有所变动，相应调整，本公司保有变更行程之权利。尽量忠于原行程，敬请谅解！<br/>
+                        注：《2》根据人数调配车型，不可以指定车型车牌！<br/>
+                        注：《3》由于停车问题，司机兼向导大多数情况下为沿途讲解，不入景区，司机兼向导最重要的是保证贵宾的行车安全，敬请谅解！如果对讲解有特别高的要求，建议加配专职导游！ <br/>
+                        注：《4》あいおいニッセイ同和損害保険株式会社的保险保障只针对日本以外的外国人有效，不适用于：持在留卡者及日本本国人。敬请注意！<br/>
+                        【行程中的观光时间仅限参考，实际旅行过程中有时间浮动敬请贵宾谅解为谢！！！】<br/>
+
+                        ※因本行程为精品拼团游，雨雪天行驶较为困难，故建议于出发前 10 分钟⾄集合地点等候，请贵宾注意集合时间。<br/>
+                        ※⾏程时间由司导根据⻋程远近等情况来进⾏安排，请互相理解配合，统⼀听从司导安排！精品散拼团 请贵宾时间严守！<br/>
+                        ※再次提醒短途旅行，请贵宾携带小包出行，【不要带大件礼箱！】<br/>
+
+                        【退改规则】<br/>
+                        出发前 11-8 天(不含)，收取损失30%。<br/>
+                        出发前 3～7(不含)，收取损失50%。<br/>
+                        出发前 2～3 天(含)，收取损失 80%。<br/>
+                        出发前 1 天(含)，将不退还任何费⽤，收取损失100%<br/>
+                      </div>
+                    </template>
+
                   </td>
                 </tr>
               </tbody>
@@ -1531,6 +1551,7 @@
           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

@@ -2712,7 +2712,7 @@
                       style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span>
                   </el-popover>
                 </span>
-                <p v-if="childItem.IsOneDay==1">行李数量：{{childItem.LuggageNum}}</p>
+                <p v-if="childItem.IsOneDay==1&&childItem.LuggageNum">行李数量：{{childItem.LuggageNum}}</p>
 
                 <div>
                   <span v-if="

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -445,8 +445,11 @@
                 </template>
                 {{postConfig.AuditContent}}
               </template>
-              <template> <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="importOfferLoading" @click="downLoadOffer(postConfig)">下载报价单
-              </el-button></template>
+              <template>
+                <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
+                  :loading="importOfferLoading" @click="downLoadOffer(postConfig)">下载系统报价单
+                </el-button>
+              </template>
             </td>
             <td colspan="3">
               当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">
@@ -457,10 +460,10 @@
               </template>
             </td>
           </tr>
-         
+
         </table>
 
-      
+
         <div class="Cost_Line"></div>
       </el-form>
     </div>
@@ -469,7 +472,7 @@
 <script>
   export default {
     props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
-      "CostCurrencyList", "teamPrice", "IsEdit", "loading"
+      "CostCurrencyList", "teamPrice", "IsEdit", "loading","OfferId"
     ],
     data() {
       return {
@@ -501,30 +504,27 @@
         document.body.appendChild(link);
         link.click();
       },
-
-
       downLoadOffer(item) {
- 
- var downMsg = {
-   OfferId: item.ID,
- };
- var fileName = "【" + item.OutDateTime + "】";
- if (item.TCNUMS && item.TCNUMS.length < 20) {
-   fileName += item.TCNUMS;
- }
- if (item.Title) {
-   if (item.Title.length > 20) {
-     fileName += item.Title.substring(0, 20);
-   } else {
-     fileName += item.Title;
-   }
- }
- fileName += ".xls"
- this.loading = true;
- this.GetLocalFile("quotation_get_DownLoadQuotation", downMsg, fileName, res => {
-   this.loading = false;
- });
-},
+        var downMsg = {
+          OfferId: this.OfferId,
+        };
+        var fileName = "【" + item.OutDateTime + "】";
+        if (item.TCNUMS && item.TCNUMS.length < 20) {
+          fileName += item.TCNUMS;
+        }
+        if (item.Title) {
+          if (item.Title.length > 20) {
+            fileName += item.Title.substring(0, 20);
+          } else {
+            fileName += item.Title;
+          }
+        }
+        fileName += ".xls"
+        this.loading = true;
+        this.GetLocalFile("quotation_get_DownLoadQuotation", downMsg, fileName, res => {
+          this.loading = false;
+        });
+      },
       //调用父组件方法
       SubSaveType(type) {
         this.$parent.SaveData(type);

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -810,7 +810,6 @@
         this.downloadBill = true;
       },
       downLoadOffer(item) {
- 
         var downMsg = {
           OfferId: item.ID,
         };

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -119,7 +119,7 @@
             <CostNewPriceCC ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
               :dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
               :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice"
-              :loading="loading">
+              :loading="loading" :OfferId="OfferId">
             </CostNewPriceCC>
           </div>
         </div>

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -66,7 +66,11 @@
         <div class="TravelPrice clearfix" style="padding: 25px;">
           <div class="mapImg-buttom">
             <span class="TMTitle"><i></i>地图</span>
-            <span class="foldList" @click="ShowMap=!ShowMap">编辑地图</span>
+            <div style="padding-bottom: 15px;">
+              <input type="file" style="display:none" id="uploadMap" @change="uploadpic">
+              <span class="foldList" style="margin-left: 10px;" @click="ShowMap=!ShowMap">编辑地图</span>
+              <span class="foldList" @click="UploadImg">上传地图图片</span>
+            </div>
           </div>
           <div class="mapImg-Img marginT20">
             <div v-if="PostConfig&&PostConfig.MapUrl">
@@ -74,11 +78,11 @@
                 :preview-src-list="[PostConfig.MapUrl]">
               </el-image>
             </div>
-            <p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">地图暂未生成图</p>
+            <p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">地图暂未生成/上传图</p>
           </div>
         </div>
         <Tripmap v-if="ShowMap" :PostConfig="PostConfig" :ConfigId="ConfigId" @Cancel="ShowMap=false"
-          @saveMsg="ShowMap=false,SaveData(1)"></Tripmap>
+          @saveMsg="SaveData"></Tripmap>
       </div>
       <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
         :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
@@ -308,6 +312,34 @@
       };
     },
     methods: {
+      UploadImg() {
+        document.querySelector(`#uploadMap`).click();
+      },
+      uploadpic(e) {
+        let that = this;
+        var postJson = {
+          // ConfigId: 8757,
+          // MapLevel: 11,
+        };
+        that.$message.info('上传中...')
+        if (e.target.files.length > 0 && e.target.files[0].size > 0) {
+          // 压缩图片需要的一些元素和对象
+          var reader = new FileReader();
+          reader.onload = function (event) {
+            let blob = that.base64ToBlob(event.target.result);
+            let newArr = [];
+            newArr.push(blob);
+            var path = `/newFeature`;
+            that.uploadSelfBlob(path, newArr, postJson, x => {
+              let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
+              that.PostConfig.MapUrl = allPath
+              that.$forceUpdate()
+              that.$message.success('上传成功');
+            });
+          };
+          reader.readAsDataURL(e.target.files[0]);
+        }
+      },
       getPptJourney(status){
         this.isPptJourney = status
       },
@@ -408,7 +440,8 @@
         }
       },
       /*保存数据*/
-      SaveData(SaveType) {
+      SaveData(SaveType,MapUrl) {
+        this.ShowMap = false
         this.saveLoading = true;
         this.MsgBus.$emit('saveTravel', true);
         this.FeatureData.IsSave = true;
@@ -521,6 +554,7 @@
         }
 
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
+        basicData.MapUrl = this.PostConfig.MapUrl
         console.log("travel_post_SetTravelConfigInfo", basicData);
         this.isSubmit = false;
         this.apipost(

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -718,11 +718,11 @@
             if (x.data.StatusCode == 1) {
               that.saveLoading = false;
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
-              that.PostConfig.Mapurl = allPath;
+              that.PostConfig.MapUrl = allPath;
               //调用父页面保存方法
               that.PostConfig.TripCountryList = JSON.parse(JSON.stringify(that.countriesData));
               that.PostConfig.TripCityList = JSON.parse(JSON.stringify(that.citiesData));
-              that.$emit('saveMsg');
+              that.$emit('saveMsg',1);
             } else {
               that.saveLoading = false;
             }