页面修改

src/components/SalesconfirmationOrder.vue

@@ -1178,12 +1178,6 @@
             for (let i = 0; i < imgs.length; i++) {
               document.getElementsByTagName('img')[i].removeAttribute('crossOrigin')
             }
-            // let imgList = document.getElementById("gernalCanvas").getElementsByTagName("img")
-            // for (let i = 0; i < imgList.length; i++) {
-            //   if (imgList[i].src.indexOf('http') !== -1 && imgList[i].src.indexOf('icon') === -1 && imgList[i].src.indexOf('_bg_') === -1 && imgList[i].src.indexOf('_top_') === -1 && imgList[i].src.indexOf('_title') === -1) {
-            //     imgList[i].src = this.compressImg(imgList[i].src, "filt", imgList[i].clientWidth, '')
-            //   }
-            // }
           })
         }, err => {})
       },

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -58,9 +58,11 @@
     text-align: right;
     padding-right: 10px;
   }
-  .CostNewPrice .el-form-item{
-    margin-bottom:0!important;
+
+  .CostNewPrice .el-form-item {
+    margin-bottom: 0 !important;
   }
+
 </style>
 
 <template>
@@ -115,6 +117,24 @@
                 </el-input>
               </td>
             </tr>
+            <tr>
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr>
+              <td width="80" class="txtRightCost">出团公司</td>
+              <td>
+                <el-select class="  multiple_input" v-model="postConfig.OutBranchId">
+                  <el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
+                  </el-option>
+                </el-select>
+              </td>
+              <td width="80" class="txtRightCost">出发时间</td>
+              <td colspan="3">
+                <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder>
+                </el-date-picker>
+              </td>
+            </tr>
           </table>
           <div class="seat-box" style="display:none;">
             <div class="left" style="float:left;margin:6px 0 0 64px;">座位</div>
@@ -773,7 +793,7 @@
             </td>
           </tr>
           <tr>
-            <td   class="CP_ComTitle2">作业处提成</td>
+            <td class="CP_ComTitle2">作业处提成</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"
@@ -883,26 +903,32 @@
           <tr>
             <td colspan="12"></td>
           </tr>
-                    <tr>
+          <tr>
             <td colspan="12" class="CP_ComTitle2">成本回扣
-               <span style="color:red;padding-left:5px;">
+              <span style="color:red;padding-left:5px;">
                 成本回扣，请直接输入人民币
               </span>
             </td>
           </tr>
           <tr>
-          <td>导游回补</td>
-<td colspan="11"> <el-form-item>
-                <el-input type='text' class="w70" v-model="OtherPrice.GuideComplement" @keyup.native="checkPrice(OtherPrice,'GuideComplement'),getchange()">></el-input>
-              </el-form-item></td>
+            <td>导游回补</td>
+            <td colspan="11">
+              <el-form-item>
+                <el-input type='text' class="w70" v-model="OtherPrice.GuideComplement"
+                  @keyup.native="checkPrice(OtherPrice,'GuideComplement'),getchange()">></el-input>
+              </el-form-item>
+            </td>
           </tr>
-           <tr>
-          <td>小费回补</td>
-<td colspan="11"> <el-form-item>
-                <el-input type='text' class="w70" v-model="OtherPrice.TipComplement"  @keyup.native="checkPrice(OtherPrice,'TipComplement'),getchange()"></el-input>
-              </el-form-item></td>
+          <tr>
+            <td>小费回补</td>
+            <td colspan="11">
+              <el-form-item>
+                <el-input type='text' class="w70" v-model="OtherPrice.TipComplement"
+                  @keyup.native="checkPrice(OtherPrice,'TipComplement'),getchange()"></el-input>
+              </el-form-item>
+            </td>
           </tr>
-           <tr>
+          <tr>
             <td colspan="12"></td>
           </tr>
           <tr>
@@ -1004,6 +1030,17 @@
               <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
           </tr>
+          <tr>
+            <td class="CP_ComTitle2">附件</td>
+            <td colspan="11">
+              <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
+                :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
+                <el-button size="small" type="primary">报价单附件</el-button>
+              </el-upload>
+              <a style="margin-left:20px;color:blue;" :href="teamPrice.ContractArray[0].Url"
+                v-if="teamPrice.ContractArray" target="_blank">预览</a>
+            </td>
+          </tr>
         </table>
         <div class="Cost_Line"></div>
       </el-form>
@@ -1030,9 +1067,38 @@
         checkedPei: [],
         currencyTypeArr: [], //币种下拉列表
         LineTeamList: [], //系列下拉列表
+        companyList: [], //出团公司
       }
     },
     methods: {
+      uploadFileBtn(file) { //上传
+        let newArr = [];
+        newArr.push(file.file)
+        let path = "/Upload/Temporary/"
+        this.$message.info(this.$t('tips.shangchuanzhong'))
+        this.UploadSelfFileT(path, newArr, x => {
+          var newUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
+          this.teamPrice.ContractArray = [];
+          this.teamPrice.ContractArray.push({
+            Name: "",
+            Url: newUrl
+          });
+          this.teamPrice.ContractUrl = newUrl;
+          this.Success(this.$t('tips.scchenggong'))
+        });
+      },
+      getCompanyList() {
+        //出团公司
+        this.apipost(
+          "sellorder_post_GetBranchList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.companyList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
       //含餐类型切换
       DinnerTypeChange(subItem) {
         switch (subItem.ContainDinnerType) {
@@ -1251,7 +1317,8 @@
           this.getConvertMoney(this.OtherPrice.KBMoney) +
           this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
             this.OtherPrice.VisaMoneyCurrencyId
-          )- this.getConvertMoney(this.OtherPrice.TipComplement) - this.getConvertMoney(this.OtherPrice.GuideComplement) ;
+          ) - this.getConvertMoney(this.OtherPrice.TipComplement) - this.getConvertMoney(this.OtherPrice
+            .GuideComplement);
         //KBMoney[团负费用减法]
         // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
         return totalMoney;
@@ -1523,6 +1590,7 @@
     mounted() {
       this.getSubtotalMoney();
       this.getAllCurrency();
+      this.getCompanyList();
     },
     created() {},
     watch: {

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -98,6 +98,20 @@
                 {{postConfig.DayNum}}
               </td>
             </tr>
+            <tr>
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr>
+              <td width="80" class="txtRightCost">出团公司</td>
+              <td colspan="3">
+                {{postConfig.OutBranchName}}
+              </td>
+              <td width="80" class="txtRightCost">出发日期</td>
+              <td>
+                {{postConfig.OutDateTime}}
+              </td>
+            </tr>
           </table>
         </div>
         <br />
@@ -166,7 +180,7 @@
                     {{getCurrencyName(subItem.CurrencyId)}}
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
-                    {{subItem.HotelName}}<br/>
+                    {{subItem.HotelName}}<br />
                     <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
                     <template v-if="subItem.ContainDinnerType==1">含早餐</template>
                     <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
@@ -285,7 +299,7 @@
                 {{getCurrencyName(subItem.CurrencyId)}}
               </td>
               <td>
-                 {{subItem.HotelName}}<br/>
+                {{subItem.HotelName}}<br />
                 <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
                 <template v-if="subItem.ContainDinnerType==1">含早餐</template>
                 <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
@@ -460,10 +474,10 @@
             <td class="CP_ComTitle2 CostcomCenter">4</td>
             <td class="CP_ComTitle2">国际段机票(每人)</td>
             <td colspan="2">
-                {{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
+              {{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
             </td>
             <td colspan="2">
-               {{OtherPrice.InternationalAirTicket}}
+              {{OtherPrice.InternationalAirTicket}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
             <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
@@ -642,24 +656,19 @@
             <td colspan="13"></td>
           </tr>
             <tr>
-            <td colspan="13" class="CP_ComTitle2">成本回扣
-               
-            </td>
-          </tr>
-          <tr>
-          <td>导游回补</td>
-<td colspan="12">
-  {{OtherPrice.GuideComplement}} 
-                </td>
-          </tr>
-           <tr>
-          <td>小费回补</td>
-<td colspan="12"> {{OtherPrice.TipComplement}}</td>
-          </tr>
-           <tr>
-            <td colspan="13"></td>
-          </tr>
-
+              <td colspan="13" class="CP_ComTitle2">成本回扣  </td>
+          </tr>
+            <tr> 
+            <td>导游回补</td>
+            <td colspan="12"> {{OtherPrice.GuideComplement}} </td>         
+          </tr>          
+           <tr>   
+            <td>小费回补</td>
+            <td colspan="12"> {{OtherPrice.TipComplement}}</td>
+          </tr>           
+          <tr>      
+              <td colspan="13"></td>
+          </tr>
           <tr>
             <td colspan="13" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
               计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
@@ -736,7 +745,6 @@
             <td colspan="2">
               {{teamPrice.SingleRoomPrice}}
             </td>
-
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
@@ -745,7 +753,14 @@
             </td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2">备注</td>
+            <td class="CP_ComTitle2">附件</td>
+            <td colspan="11">
+              <a style="margin-left:20px;color:blue;" :href="teamPrice.ContractArray[0].Url"
+                v-if="teamPrice.ContractArray" target="_blank">预览</a>
+            </td>
+          </tr>
+          <tr>
+            <td class="CP_ComTitle2">审核备注</td>
             <td colspan="12">
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
@@ -765,7 +780,7 @@
 <script>
   export default {
     props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
-      "CostCurrencyList", "teamPrice","IsEdit"
+      "CostCurrencyList", "teamPrice", "IsEdit"
     ],
     data() {
       return {
@@ -803,7 +818,7 @@
             trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney) * this.getCurrencyMoney(this.OtherPrice
               .InlandTrainTicketCurrency);
           }
-           if (this.OtherPrice.InternationalAirTicketCurrency == 1) {
+          if (this.OtherPrice.InternationalAirTicketCurrency == 1) {
             trafficTotal += Number(this.OtherPrice.InternationalAirTicket);
           } else {
             trafficTotal += Number(this.OtherPrice.InternationalAirTicket) * this.getCurrencyMoney(this.OtherPrice
@@ -956,7 +971,7 @@
           this.getConvertMoney(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(
             this.OtherPrice.DriverGuideMoneyCurrencyId
           ) +
-           this.getConvertMoney(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(
+          this.getConvertMoney(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(
             this.OtherPrice.GuideMoneyCurrencyId
           ) +
           this.getConvertMoney(this.OtherPrice.LeaderTripMoney) * this.getCurrencyMoney(
@@ -972,7 +987,8 @@
           this.getConvertMoney(this.OtherPrice.KBMoney) +
           this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
             this.OtherPrice.VisaMoneyCurrencyId
-          )- this.getConvertMoney(this.OtherPrice.GuideComplement)- this.getConvertMoney(this.OtherPrice.TipComplement);
+          ) - this.getConvertMoney(this.OtherPrice.GuideComplement) - this.getConvertMoney(this.OtherPrice
+            .TipComplement);
         //KBMoney[团负费用减法]
         return totalMoney;
       },
@@ -1043,8 +1059,7 @@
     mounted() {
       this.getSubtotalMoney();
     },
-    created() {
-    },
+    created() {},
     watch: {
       CostNumberList: {
         handler: function (val, oldVal) {

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

 <style>
-.singlePrice {
+  .singlePrice {
     width: 100%;
     position: relative;
     margin-bottom: 15px;
     background-color: #fff;
     padding: 0 20px 20px 20px;
     border-radius: 4px;
-}
+  }
+
 </style>
 <template>
   <div class="DirectQuotation clearfix" v-loading="loading">
     <div class="singlePrice clearfix">
-        <CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
-        :dayCostPrice="dayCostPriceList"  :CostCurrencyList="CostCurrencyList"
-        :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
-        :teamPrice="teamPrice" :IsEdit="IsEdit"
-        ></CostNewPriceAudit>
+      <CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
+        :dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList"
+        :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice" :IsEdit="IsEdit"></CostNewPriceAudit>
     </div>
   </div>
 </template>
@@ -26,7 +25,7 @@
     data() {
       return {
         ConfigID: 0,
-        IsShow:false,
+        IsShow: false,
         //基本配置
         postData: {
           ID: 0,
@@ -57,8 +56,11 @@
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
           TeamType: 0, //团队类型,
-          LineName:"",//线路名称
-          LtName:"",//系列名称
+          LineName: "", //线路名称
+          LtName: "", //系列名称
+          OutBranchId: -1, //出团公司
+          OutBranchName: "", //出团公司名称
+          OutDateTime: "", //出发时间
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -92,10 +94,10 @@
           SafeMoneyCurrencyId: 0, //保险费币种
           LeaderTripMoneyCurrencyId: 0, //领队小费币种
           DriverGuideMoneyCurrencyId: 0, //司机小费币种
-          GuideMoneyCurrencyId:0,//导游小费币种
-          GuideMoney:0,//导游小费
-          InternationalAirTicket:0,//国际段机票
-          InternationalAirTicketCurrency:0,//国际段机票币种
+          GuideMoneyCurrencyId: 0, //导游小费币种
+          GuideMoney: 0, //导游小费
+          InternationalAirTicket: 0, //国际段机票
+          InternationalAirTicketCurrency: 0, //国际段机票币种
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -129,23 +131,23 @@
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
-          LeaderGuideDriveZhuSu:0,//领队导游住宿费
-          AuditContent:"",//审核备注
-          TravelState:0,//3审核通过，4拒绝
+          LeaderGuideDriveZhuSu: 0, //领队导游住宿费
+          AuditContent: "", //审核备注
+          TravelState: 0, //3审核通过，4拒绝
         },
         LineList: [], //线路列表
         loading: false,
-        IsEdit:0,
+        IsEdit: 0,
       };
     },
     methods: {
-     
+
       //保存数据
       SaveData(Type) {
         var nObj = {
           ID: this.$route.query.configId,
-          AuditContent:this.postData.AuditContent,
-          TravelState:Type
+          AuditContent: this.postData.AuditContent,
+          TravelState: Type
         };
         this.loading = true;
         this.apipost(
@@ -180,7 +182,7 @@
           ID: configId,
           offerId: offerId
         };
-        
+
         this.apipost(
           "travel_get_GetMyTravelInfo_V2",
           msg,
@@ -218,8 +220,11 @@
                 this.postData.NightNum = tempData.NightNum;
               }
               this.postData.CustomerName = tempData.CustomerName;
-              this.postData.LineName=tempData.LineName;
-              this.postData.LtName=tempData.LtName;
+              this.postData.LineName = tempData.LineName;
+              this.postData.LtName = tempData.LtName;
+              this.postData.OutBranchId = tempData.OutBranchId;
+              this.postData.OutDateTime = tempData.OutDateTime;
+              this.postData.OutBranchName = tempData.OutBranchName;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {
@@ -242,7 +247,7 @@
                 .CurrencyNumberListExt.length > 0) {
                 this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
               }
-              this.IsShow=true;
+              this.IsShow = true;
             } else {
               this.Error(res.data.message);
             }

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -53,7 +53,9 @@
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
           TeamType: 0, //团队类型
-          TravelState:1,//团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
+          TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
+          OutBranchId: -1, //出团公司
+          OutDateTime: "", //出发时间
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -87,11 +89,13 @@
           SafeMoneyCurrencyId: 0, //保险费币种
           LeaderTripMoneyCurrencyId: 0, //领队小费币种
           DriverGuideMoneyCurrencyId: 0, //司机小费币种
-          LeaderGuideDriveZhuSu:0,//领队导游住宿费
-          GuideMoneyCurrencyId:0,//导游小费币种
-          GuideMoney:0,//导游小费
-          InternationalAirTicket:0,//国际段机票
-          InternationalAirTicketCurrency:0,//国际段机票币种
+          LeaderGuideDriveZhuSu: 0, //领队导游住宿费
+          GuideMoneyCurrencyId: 0, //导游小费币种
+          GuideMoney: 0, //导游小费
+          InternationalAirTicket: 0, //国际段机票
+          InternationalAirTicketCurrency: 0, //国际段机票币种
+          GuideComplement:0,//导游回补
+          TipComplement:0,//小费回补
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -125,7 +129,6 @@
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
-        
         },
         LineList: [], //线路列表
         loading: false
@@ -146,7 +149,7 @@
             });
           });
         }
-        this.postData.TravelState=type;
+        this.postData.TravelState = type;
         var nObj = {
           config: this.postData,
           dayCostPriceList: this.dayCostPriceList,
@@ -230,12 +233,14 @@
                 this.postData.NightNum = tempData.NightNum;
               }
               this.postData.CustomerName = tempData.CustomerName;
+              this.postData.OutBranchId = tempData.OutBranchId;
+              this.postData.OutDateTime = tempData.OutDateTime;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {
                 this.dayCostPriceList = tempData.dayCostPriceList;
               }
-            
+
               if (tempData.otherPrice) {
                 this.otherPrice = tempData.otherPrice;
               }

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -607,7 +607,6 @@
               openState: 1,
               isOffer: 1,
               offerId: item.OfferId,
-
               blank: 'y'
             }
           });

src/components/busManagement/CharteringManagement/CharteringProductList.vue

@@ -260,7 +260,6 @@
         <div class="resourceList" v-for="item in tableData" :key="item.subCode">
           <div class="reTopInfo" :class="{'comCursorUrl':item.ImageList}" @click="OpenNewUrl(item.ImageList[0])">
             <img v-if="!item.ImageList" src="../../../assets/img/bg_c3@3x.png">
-            <!-- compressImg(item.ImageList[0], "filt", 213, "") 压缩图片-->
             <img v-else :src='item.ImageList[0]' :onerror="defaultImg">
             <div class="resTypeList">
               <!-- B2B 内部 APP 小程序 -->