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

src/assets/css/tripIndexNew.css

@@ -17,7 +17,7 @@ html, body{
 .LeaveGroupDownload-form p, .LeaveGroupDownload-form blockquote,
 .LeaveGroupDownload-form table, .LeaveGroupDownload-form th,
 .LeaveGroupDownload-form td, .LeaveGroupDownload-form iframe {
-    font-family: Microsoft JhengHei, sans-serif !important;
+    /* font-family: Microsoft JhengHei, sans-serif !important; */
 }
 
 .LeaveGroupDownload-form .expense .right .expense-table {

src/components/SalesModule/MyCustomer.vue

@@ -689,28 +689,14 @@
               </div>
               <div style="display: flex; justify-content: end;">
                 <el-upload class="upload-demo"
-                  style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadImg"
+                ref="my-upload"
+                  style="display:inline-block;position:relative;top:-1px;left:3px;"
+                  :http-request="uploadImg"
                   :show-file-list="false" action="">
                   <el-button size="small" type="primary">上传合同</el-button>
               </el-upload>
               </div>
             </div>
-              <!--
-              <div style="display: flex;flex-wrap: wrap;">
-                <div v-if="addMsg.BusinessCardPhotos&&addMsg.BusinessCardPhotos.length>0"
-                  style="display: flex;flex-wrap: wrap;">
-                  <div style="position: relative;margin-right: 10px;margin-bottom: 15px;"
-                  v-for="(i,fIndex) in addMsg.BusinessCardPhotos">
-                    <img :src="i" class="avatar">
-                    <span class="iconfont icon-guanbi1"
-                    @click="deleteUploadFile(fIndex,1)"></span>
-                  </div>
-                </div>
-                <el-upload class="avatar-uploader" action="" :http-request="uploadImg"
-                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-              </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -856,7 +842,7 @@
       </el-upload>
     </el-dialog>
     <div class="MyCustomerDetailbottomLayer ownScrollbarStyle"
-    style="height:500px;" v-show="addLayer1">
+    style="height:500px;" v-if="addLayer1">
       <p>修改客户信息</p>
       <el-row :gutter="20">
         <el-col :span="18">
@@ -993,28 +979,14 @@
                 </div>
                 <div style="display: flex; justify-content: end;">
                   <el-upload class="upload-demo"
-                    style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadImgNew"
+                  ref="my-upload"
+                    style="display:inline-block;position:relative;top:-1px;left:3px;"
+                    :http-request="uploadImg"
                     :show-file-list="false" action="">
                     <el-button size="small" type="primary">上传合同</el-button>
                 </el-upload>
                 </div>
               </div>
-
-              <!--
-              <div style="display: flex;flex-wrap: wrap;">
-                <div v-if="updateMsg.BusinessCardPhotos&&updateMsg.BusinessCardPhotos.length>0"
-                  style="display: flex;flex-wrap: wrap;">
-                  <div style="position: relative;margin-right: 10px;margin-bottom: 15px;" v-for="(i,fIndex) in updateMsg.BusinessCardPhotos">
-                    <img :src="i" class="avatar">
-                    <span class="iconfont icon-guanbi1"
-                    @click="deleteUploadFile(fIndex)"></span>
-                  </div>
-                </div>
-                <el-upload class="avatar-uploader" action="" :http-request="uploadImgNew"
-                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-              </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -1463,7 +1435,7 @@
         }
 
         if (!this.updateMsg.Address) {
-          this.$message.error('请输入输入详情地址')
+          this.$message.error('请输入详情地址')
           return
         }
         this.apipost('app_customer_UpdateCustomerAddress', this.updateMsg, res => {
@@ -1541,7 +1513,7 @@
             this.updateMsg.District = x.district
 
             this.BusinessCardPhotos = x.businessCardPhotos && x.businessCardPhotos.length > 0?x.businessCardPhotos[0]:''
-            this.updateMsg.BusinessCardPhotos = x.businessCardPhotos
+            this.updateMsg.BusinessCardPhotos = x.businessCardPhotos?x.businessCardPhotos:[]
             this.updateMsg.PlatformUserNameList = x.platformUserNameList?x.platformUserNameList:[]
             this.Images = x.images && x.images.length > 0?x.images[0]:''
             this.HousePhotos = x.housePhotos && x.housePhotos.length > 0?x.housePhotos[0]:''
@@ -1642,8 +1614,13 @@
         newArr.push(file.file);
         let path = "/Upload/Temporary/";
         this.UploadSelfFileT(path, newArr, x => {
-          this.BusinessCardPhotos = this.domainManager().ViittoFileUrl + x.data.FilePath
-          this.addMsg.BusinessCardPhotos.push(this.BusinessCardPhotos)
+          that.BusinessCardPhotos = this.domainManager().ViittoFileUrl + x.data.FilePath
+          if(that.addShow==true){
+            that.addMsg.BusinessCardPhotos.push(that.BusinessCardPhotos)
+          }
+          if(that.addLayer1==true){
+            that.updateMsg.BusinessCardPhotos.push(that.BusinessCardPhotos)
+          }
           that.$message.success('上传成功');
         });
       },
@@ -1927,7 +1904,7 @@
           this.addMsg.address = AreaName + ',' + this.addMsg.address
         }
         if (!this.addMsg.address) {
-          this.$message.error('请输入输入详情地址')
+          this.$message.error('请输入详情地址')
           return
         }
         this.addMsgS.customerInfo = {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -398,11 +398,11 @@
             <ul class="days">
               <li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
-                  class="other-month" >{{dayobject.day.getDate()}}</span>
-                  <!---->
+                  class="other-month">{{dayobject.day.getDate()}}</span>
+                <!---->
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
                   @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
-                 <!---->
+                <!---->
                 <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
                   @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
@@ -664,14 +664,6 @@
                     'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
                     'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
                   </el-form-item>
-                  <!-- <el-form-item prop="OutGroupType" style="margin-top:1px;">
-                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">组团类型</span>
-                    <el-select class="w180" v-model="priceData.OutGroupType">
-                      <el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item> -->
-
                   <el-form-item style="margin-top:1px;">
                     <span class="TP_Sendprepend" style="margin:3px -1px 0 0">供应商</span>
                     <el-select class="w180" v-model="priceData.SupplierId">
@@ -884,7 +876,8 @@
                       <el-select class="w180" v-model="priceData.PriceTeamType">
                         <template v-for="item in TeamListArr">
                           <!--去掉小包团2023-04-19-->
-                          <el-option v-if="item.Id!=4" :key="item.Id" :label="item.Name" :value="item.Id">
+                          <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4" :key="item.Id"
+                            :label="item.Name" :value="item.Id">
                           </el-option>
                         </template>
                       </el-select>
@@ -1111,9 +1104,7 @@
   import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
   import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
   export default {
-    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo",
-      "IsDirect"
-    ],
+    props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
     data() {
       return {
         outerVisible: false,
@@ -1993,8 +1984,7 @@
         this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
             if (res.data.resultCode == 1) {
               this.TeamListArr = res.data.data;
-              // 屏蔽单项服务
-              this.TeamListArr.splice(-1)
+
             } else {
               this.Error(res.data.message);
             }
@@ -2090,14 +2080,6 @@
         },
         deep: true
       },
-      //监听报价单日期
-      OfferList: {
-        //深度监听，可监听到对象、数组的变化
-        handler: function (val, oldVal) {
-          this.initCalendar();
-        },
-        deep: true
-      }
     },
     components: {
       TravelPriceFlightList: TravelPriceFlightList,
@@ -2105,5 +2087,4 @@
       TravelPriceFlightListSelf: TravelPriceFlightList_Self,
     }
   };
-
-</script>
+</script>
\ No newline at end of file

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -883,7 +883,7 @@
                       <el-select class="w180" v-model="priceData.PriceTeamType">
                         <template v-for="item in TeamListArr">
                           <!--去掉小包团2023-04-19-->
-                          <el-option v-if="item.Id!=4" :key="item.Id" :label="item.Name" :value="item.Id">
+                          <el-option v-if="item.Id==2||item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
                           </el-option>
                         </template>
                       </el-select>
@@ -1994,8 +1994,7 @@
         this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
             if (res.data.resultCode == 1) {
               this.TeamListArr = res.data.data;
-              // 屏蔽单项服务
-              this.TeamListArr.splice(-1)
+     
             } else {
               this.Error(res.data.message);
             }
@@ -2043,6 +2042,7 @@
       priceList: {
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {
+          console.log("travel_price2");
           this.returnPriceList = JSON.parse(JSON.stringify(this.priceList));
           //当团期修改
           if (this.modifyTcid > 0) {

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -385,11 +385,11 @@
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
-                  class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span
-                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>
@@ -865,7 +865,7 @@
 <script>
   import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
   export default {
-    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
+    props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
     data() {
       return {
         outerVisible: false,
@@ -1178,25 +1178,6 @@
             this.returnPriceList.push(obj);
           })
         } else {
-          // var that = this;
-          // if (this.returnPriceList && this.returnPriceList.length > 0) {
-          //   this.returnPriceList.forEach(item => {
-          //     if (item.TCID > 0) {
-          //       that.apipost(
-          //         "travel_post_RemoveTravelPrice", {
-          //           TCID: item.TCID
-          //         },
-          //         res => {
-          //           if (res.data.resultCode == 1) {
-          //           } else {
-          //             that.Info(res.data.message);
-          //           }
-          //         },
-          //         null
-          //       );
-          //     }
-          //   })
-          // }
           //取消选中
           this.days.forEach(x => {
             x.checkState = '2';
@@ -1788,14 +1769,6 @@
         },
         deep: true
       },
-      //监听报价单日期
-      OfferList: {
-        //深度监听，可监听到对象、数组的变化
-        handler: function (val, oldVal) {
-          this.initCalendar();
-        },
-        deep: true
-      }
     },
     components: {
       TravelPriceFlightList: TravelPriceFlightList

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="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;"
+    :id="'LineOfTravel'+(item*4)+'_0'+index">
       <div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
         <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
         <div class="travelDaysTitlle row-aic">
@@ -140,7 +141,9 @@
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
         <span>底线</span>
       </div>
-      <div class="UpgradedVersion2Line absolute z-index3 row-ajc" style="top: 2878px;">
+      <!--  v-if="pageHeight>1839" -->
+      <!-- :style="{'top': pageHeight>2878?'2878px':pageHeight-10+'px'}" -->
+      <div class="UpgradedVersion2Line absolute z-index3 row-ajc" style="top: 2878px">
         <span>底线</span>
       </div>
     </div>
@@ -189,6 +192,7 @@
         },
         imgIndex: null,
         defaultScenicIndex: 0, //当前默认选中的景点
+        pageHeight: 0
       };
     },
     mounted() {},
@@ -361,7 +365,11 @@
               }
             });
           }
+
           this.RenderingOk = true;
+          setTimeout(()=>{
+            this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
+          },500)
         },
         deep: true,
         immediate: true