页面修改

src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue

@@ -410,7 +410,7 @@ export default {
           }, err => {})
         },
         addCheckbox(item){
-          console.log('11111:'+item.check)
+          
         },
         GenerateDocuments() {
           if(this.DataList.filter(citem => citem.check).length == 0) {

src/components/Hotel/roomReservationsDetails.vue

@@ -159,10 +159,7 @@
             <th width="80">{{$t('ground.jinexiaoji')}}</th>
             <th width="80">{{$t('ground.fanyongleixing')}}</th>
             <th width="80">{{$t('hotel.hotel_commission')}}</th>
-            <th width="80">{{$t('ground.fanyongyjin')}}</th>
-            <th width="80">{{$t('ground.rutangshui')}}</th>
-            <th width="80">{{$t('ground.chengshishui')}}</th>
-            <th width="80">{{$t('ground.tingchefei')}}</th>
+            <th width="80">{{$t('ground.fanyongyjin')}}</th>      
             <th width="100">{{$t('ground.jinezongji')}}</th>
             <th width="250">{{$t('ground.fukuanbzdth')}}</th>
             <th width="80">{{$t('system.table_operation')}}</th>
@@ -420,19 +417,7 @@
                       {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
                     </template>
                   </template>
-                </td>
-                <!-- 入汤税 -->
-                <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
-                  {{subItem.InTangTax}}
-                </td>
-                <!-- 城市税 -->
-                <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
-                  {{subItem.CityTax}}
-                </td>
-                <!-- 停车费 -->
-                <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
-                  {{subItem.ParkFee}}
-                </td>
+                </td>              
                 <!-- 金额总计 -->
                 <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
                   {{subItem.TotalPrice}}
@@ -511,7 +496,7 @@
                           <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
                           <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
                           <el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option>
-                           <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
+                          <el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
                         </el-select>
                       </td>
                     </tr>
@@ -581,7 +566,6 @@
                       <td>
                         <el-select class='w135 sel' v-model='subItem.IsPay' :placeholder="$t('pub.pleaseSel')"
                           :disabled="IsEditHotel==0?true:false">
-                          <!-- <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option> -->
                           <el-option :label="$t('pub.no')" :value='0'></el-option>
                           <el-option :label="$t('pub.yes')" :value='1'></el-option>
                         </el-select>
@@ -649,7 +633,6 @@
         <p>{{$t('active.ld_noData')}}</p>
       </div>
     </div>
-
   </div>
 </template>
 <script>
@@ -811,7 +794,6 @@
         var useTime = oldData.CheckInDateStr;
         var hotelId = ckedObj.ID;
         var TCID = oldData.TCID;
-        console.log("checkHotel", ckedObj);
         this.apipost('travel_get_GetHotelUsePriceListService_V2', {
           HotelId: hotelId,
           UseTime: useTime,
@@ -1103,7 +1085,6 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
@@ -1255,10 +1236,6 @@
             }
           });
         })
-        let mag = {
-          TotalList: this.list,
-          SingleItem: item
-        };
         this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);

src/components/SalesModule/customerTransfer.vue

@@ -659,8 +659,6 @@
     watch: {
       '$route': {
         handler(val, oldVal) {
-          // console.log(this.$route.query, '-------')
-
           // this.getList();
         },
         deep: true,
@@ -1260,7 +1258,6 @@
         );
       },
       changeDepart(node, id) {
-        console.log(node, "changeDepart")
         this.msg.CreateBy = "";
         this.msg.DepartmentId = node.DepartmentID;
         this.employeeMsg.departmentId = node.DepartmentID;

src/components/SalesModule/enrollTotal.vue

@@ -1178,7 +1178,6 @@
           this.getCompanyMsg,
           (res) => {
             if (res.data.resultCode == 1) {
-              console.log("admin_get_BranchGetList",res.data);
               this.companyList = res.data.data;
             } else {}
           },

src/components/SalesModule/groupTourOrder.vue

@@ -4895,11 +4895,9 @@
       },
       //点击修改单男单女
       getOrderGender(item) {
-        console.log("我进来了",item);
         this.subGenderInfo.TipMoney = item.oneSex;
         this.subGenderInfo.OrderId = item.orderId;
         this.showChangeGender = true;
-        console.log("我进来了",this.subGenderInfo);
       },
       //关闭修改单男单女
       closeGenderDiv() {

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -1221,23 +1221,6 @@ getCompanyList() {
     updateTFimg(index) {
       this.updateChoseIndex = index;
     },
-
-    //图片左移右移
-    // ExchangeImg(index, IsMove) {
-    //   var imgItem = this.addMsg.CoverImageList[index];
-    //   //左移
-    //   if (IsMove == 0) {
-    //     var upItem = this.addMsg.CoverImageList[index - 1];
-    //     this.$set(this.addMsg.CoverImageList, index - 1, imgItem);
-    //     this.$set(this.addMsg.CoverImageList, index, upItem);
-    //   } else {
-    //     //右移动
-    //     var downItem = this.addMsg.CoverImageList[index + 1];
-    //     this.$set(this.addMsg.CoverImageList, index + 1, imgItem);
-    //     this.$set(this.addMsg.CoverImageList, index, downItem);
-    //   }
-    // },
-
     //   签证国家Id改变
     VisaCountry(val) {
       this.GetProductLabel(val);
@@ -1247,27 +1230,7 @@ getCompanyList() {
       this.productlabel.TagType = num
       this.productlabel.Id = tag.Id;
       this.CountryTagList = this.CountryTagList.filter(x=>x.Id!=tag.Id);
-      console.log(list,tag.Id)
       return
-      this.$confirm(this.$t('objFill.shifouscbkhf'), this.$t('tips.tips'), {
-            confirmButtonText: this.$t('pub.sureBtn'),
-            cancelButtonText: this.$t('pub.cancelBtn'),
-            type: "warning"
-          })
-          .then(() => {
-            this.apipost('', {
-              Id: this.productlabel.Id
-            }, res => {
-              if (res.data.resultCode == 1) {
-                this.Success(res.data.message)
-               
-              } else {
-                this.Error(res.data.message)
-
-              }
-            })
-          })
-          .catch(() => {});
     },
     // 双击编辑标签
     EditTag(tag, num) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2442,7 +2442,6 @@
       //获取TCID
       clickAirticket(item) {
         this.updateAirticketObj.TCID = item.TCID;
-        console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
       },
       //开启散客机票
       openAirticket() {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1541,7 +1541,6 @@
       //获取TCID
       clickAirticket(item) {
         this.updateAirticketObj.TCID = item.TCID;
-        console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
       },
       //开启散客机票
       openAirticket() {

src/components/activity/CouponList.vue

@@ -834,7 +834,6 @@
           }
         }
         this.addMsg = Object.assign({}, item);
-        console.log("item",item.customerType);
         if (item.couponPriceLists || item.lineId || item.lineteamId || item.effectDate || item.expirationDate) {
         if(item.lineId>0){
           this.getLineTeamList(item.lineId);

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -1072,6 +1072,7 @@
                 this.AirPickUp = tempData.AirPickUp;
                 this.AirSend = tempData.AirSend;
                 this.PostConfig.PDFAlias = tempData.PDFAlias;
+                this.ScrollMethod();
               } else {
                 this.Error(res.data.message);
               }

src/components/public/StartDateLimit.vue

 <template>
-  <el-date-picker
-    class="h34"
-    @change="timeAdd(1)"
-    v-model="productionDate"
-    type="daterange"
-    value-format="yyyy-MM-dd"
-    :picker-options="pickerOptions"
-    :range-separator="$t('OrderList.zhi')"
-    :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
-  ></el-date-picker>
+  <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" value-format="yyyy-MM-dd"
+    :picker-options="pickerOptions" :range-separator="$t('OrderList.zhi')"
+    :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"></el-date-picker>
 </template>
 <script>
   export default {
-    props:['dateTime','clearable'],
+    props: ['dateTime', 'clearable'],
     data() {
       return {
         productionDate: [],
         pickerOptions: {
-          onPick: ({ maxDate, minDate }) => {
+          onPick: ({
+            maxDate,
+            minDate
+          }) => {
             this.choiceDate = minDate.getTime();
             if (maxDate) {
               this.choiceDate = "";
@@ -50,18 +46,20 @@
       this.GetSupperOrderEditAuth()
     },
     watch: {
-      dateTime:{
-        handler(n,o){
+      dateTime: {
+        handler(n, o) {
           this.productionDate = this.dateTime
         },
-        deep:false,
+        deep: false,
         immediate: true,
       },
-      clearable:{
-        handler(n,o){
-          if(n)console.log(n,'--------')
+      clearable: {
+        handler(n, o) {
+          if (n) {
+            //console.log(n,'--------')
+          }
         },
-        deep:false,
+        deep: false,
         immediate: true,
       }
     },
@@ -72,13 +70,12 @@
           if (!this.productionDate) {
             this.startDate = "";
             this.endDate = "";
-            this.$emit('change',this.startDate,this.endDate)
+            this.$emit('change', this.startDate, this.endDate)
             return;
           }
-
           this.startDate = this.productionDate[0];
           this.endDate = this.productionDate[1];
-          this.$emit('change',this.startDate,this.endDate)
+          this.$emit('change', this.startDate, this.endDate)
         }
       },
       GetSupperOrderEditAuth() {
@@ -91,4 +88,5 @@
       },
     }
   }
+
 </script>

src/components/rank/components/citiescount.vue

@@ -29,7 +29,6 @@ export default {
     watch: {
       chartData: function (old, val) {
         if (this.chartData) {
-            console.log(this.chartData);
             this.pieData = this.chartData.pieData;
             this.name = this.chartData.name;
         }

src/components/rank/components/customer.vue

@@ -191,7 +191,6 @@
       setOpacity(seriesName) {
         const option = this.chart.getOption();
         option.series.forEach((series) => {
-          console.log(series.name, seriesName + '----')
           if (seriesName == '') {
             if (series.itemStyle) series.itemStyle.opacity = 1;
             if (series.lineStyle) series.lineStyle.opacity = 1;

src/components/sale/YNExpectedCommission.vue

@@ -496,8 +496,6 @@
               // 年终奖
               this.AnnualBonus.AvgLureNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
               this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
-
-              console.log(this.JapaneseProfit);
             }else {
               this.Error(res.data.message);
             }

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -22,12 +22,13 @@
             {{$t('salesModule.CompanyNum')}}
           </th>
           <th colspan="15" style="text-align:left; padding-left:8px;">
-            <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
+            <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')"
+              style="text-decoration:underline;cursor:pointer;">{{TCNUM}}</p>
           </th>
         </tr>
         <tr>
           <th width="115">{{$t('ground.youlanshijian')}}</th>
-          <th width="200">{{$t('visaT.jdname')}}</th>
+          <th width="250">{{$t('visaT.jdname')}}</th>
           <th width="70">{{$t('objFill.zongrenshu')}}</th>
           <th width="70">{{$t('objFill.youke')}}<br />{{$t('advmanager.v_type')}}</th>
           <th width="70">{{$t('objFill.youke')}}<br />{{$t('admin.admin_personNumber')}}</th>
@@ -35,7 +36,7 @@
           <th width="70">{{$t('ground.mianrenshu')}}</th>
           <th width="120">{{$t('fnc.danjia')}}</th>
           <th width="90">{{$t('objFill.jingexj')}}</th>
-          <th width="120">{{$t('hotel.hotel_commission')}})</th>
+          <th width="120">{{$t('hotel.hotel_commission')}}</th>
           <th width="100">{{$t('fnc.a_zongjine')}}</th>
           <th width="210">{{$t('ground.fkfsdth')}}</th>
           <th width="200">{{$t('pub.pubRemark')}}</th>
@@ -102,17 +103,17 @@
                 {{childItem.PeopleNum}}
               </td>
               <td>
-                <el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
-                  @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
+                <el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number" @input='calculationPrice()'
+                  @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
               </td>
               <td>
                 <el-input class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number"
-                  @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
+                  @input='calculationPrice()' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
                   <el-input class='w100' v-model='childItem.PeoplePrice'
-                    @keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice(subItem)' type="text">
+                    @keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice()' type="text">
                   </el-input>
                 </template>
                 <template v-else>
@@ -128,9 +129,9 @@
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
-                  <el-input class='w100' v-model='childItem.DiscountPrice'
-                    @keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice(subItem)'
-                    type="text"></el-input>
+                  <el-input class='w50 tcenter' v-model='childItem.DiscountPrice'
+                    @keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice()' type="text">
+                  </el-input>
                 </template>
                 <template v-else>
                   <span class="spanlink" v-if='childItem.DiscountPrice==0'
@@ -160,13 +161,13 @@
                     </td>
                     <td style="text-align:left;">
                       <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
-                        <el-option :label="$t('objFill.qingxuanzhe')" value='0'></el-option>
-                        <el-option :label="$t('objFill.xianfu')" value='1'></el-option>
-                        <el-option :label="$t('objFill.qiandan')" value='2'></el-option>
-                        <el-option :label="$t('objFill.shiweidikou')" value='5'></el-option>
-                        <el-option :label="$t('objFill.yufu')" value='4'></el-option>
-                        <el-option :label="$t('objFill.wangding')" value='12'></el-option>
-                         <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
+                        <el-option :label="$t('objFill.qingxuanzhe')" :value='0'></el-option>
+                        <el-option :label="$t('objFill.xianfu')" :value='1'></el-option>
+                        <el-option :label="$t('objFill.qiandan')" :value='2'></el-option>
+                        <el-option :label="$t('objFill.shiweidikou')" :value='5'></el-option>
+                        <el-option :label="$t('objFill.yufu')" :value='4'></el-option>
+                        <el-option :label="$t('objFill.wangding')" :value='12'></el-option>
+                        <el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
                       </el-select>
                     </td>
                   </tr>
@@ -186,6 +187,38 @@
             </tr>
           </template>
         </template>
+        <tfoot>
+          <tr>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td colspan="2">
+              合计
+            </td>
+            <td>
+              <font style="color:red;font-weight:bold;">
+                {{sTotalPrice}}
+              </font>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+          </tr>
+        </tfoot>
       </table>
     </div>
   </div>
@@ -206,7 +239,8 @@
         IsOperation: '',
         saveLoading: false,
         LineId: 0, //线路编号
-        currentUserInfo: {}
+        currentUserInfo: {},
+        sTotalPrice: 0, //合计
       }
     },
     methods: {
@@ -218,6 +252,17 @@
         if (str == 3)
           return this.$t('objFill.xiaoren')
       },
+      //页面跳转[小写]
+      goUrlT(path, obj, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: obj,
+            blank: 'y',
+            tab: title
+          }
+        });
+      },
       goUrl(path, obj, name) {
         this.$router.push({
           path: path,
@@ -228,12 +273,26 @@
           }
         });
       },
-      calculationPrice(obj) {
-        let totalPrice = 0;
-        obj.TicketPriceList.forEach(item => {
-          totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
-        })
-        obj.TotalPrice = totalPrice.toFixed(2);
+      calculationPrice() {
+        var tempPrice = 0;
+        if (this.DataList && this.DataList.length > 0) {
+          this.DataList.forEach(rItem => {
+            if (rItem.ScenicStatisticsList && rItem.ScenicStatisticsList.length > 0) {
+              rItem.ScenicStatisticsList.forEach(sItem => {
+                var totalPrice = 0;
+                if (sItem.TicketPriceList && sItem.TicketPriceList.length > 0) {
+                  sItem.TicketPriceList.forEach(tItem => {
+                    totalPrice += tItem.PeoplePrice * (tItem.UsePeopleNum - tItem.Discount) * (1 - tItem
+                      .DiscountPrice / 100);
+                  });
+                }
+                sItem.TotalPrice = totalPrice.toFixed(2);
+                tempPrice += Number(totalPrice);
+              });
+            }
+          });
+        }
+        this.sTotalPrice = tempPrice;
       },
       getCurrencyList: function () {
         this.apipost("financeinfo_post_GetList", {
@@ -254,15 +313,7 @@
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data.ScenicList;
             this.IsOperation = res.data.data.IsOperation;
-            this.DataList.forEach(item => {
-              item.ScenicStatisticsList.forEach(x => {
-                x.PayStyle = x.PayStyle.toString();
-                this.calculationPrice(x);
-                if (x.CombinationNum == '' || x.CombinationNum == null) {
-                  x.CombinationNum = this.$route.query.NewCombinationNum;
-                }
-              })
-            })
+            this.calculationPrice();
           } else {
             this.$message.error(res.data.message);
           }
@@ -332,6 +383,7 @@
       this.getCurrencyList();
     },
   }
+
 </script>
 <style>
   .admissionStatisticsDetailsTalbe {
@@ -378,4 +430,5 @@
   .admissionStatisticsDetailsTalbe .scenicTable tr td {
     border: none;
   }
-</style>
+
\ No newline at end of file
+</style>