页面修改

src/assets/utils/tripUtils.js

@@ -286,7 +286,8 @@ var tripUtils = {
       InlandTrafficMoney: 0.00, //内陆段交通分摊费用
       OtherMoney: 0.00, //杂费分摊费用
       SubtotalMoney: 0.00, //小计
-      TotalMoney: 0.00 //总费用
+      TotalMoney: 0.00, //总费用
+      ShouPeiFee:0.00//手配费
     }
   },
   //团控列表下拉菜单

src/components/FinancialModule/FinancialDocuments.vue

@@ -2761,7 +2761,6 @@ export default {
     saveTransTaxMoney() {
       if (this.transTax.loading) return;
       this.transTax.loading = true;
-      console.log(this.transTax.Fee);
       if (this.transTax.Fee && this.transTax.Fee != "") {
         this.apipost(
           "Financial_post_UpdateFinanceFee",

src/components/FinancialModule/GroupRateQuery.vue

@@ -631,9 +631,6 @@ export default {
             })
         },
         handleSelectionChange(val) {
-            // this.ids = val.map(item => item.TCStatus);// 需要根据数据情况调整id名称
-            // this.single = val.length != 1;
-            console.log(val,'---')
             this.multipleSelection = val;
         },
         handleCurrentChanges(val){

src/components/FinancialModule/Kingdee/currency.vue

@@ -319,7 +319,6 @@
           this.addShow = false
           if(item){
             this.text = '编辑金蝶币种'
-            console.log(item)
             this.addMsg = JSON.parse(JSON.stringify(item))
           }else{
             this.text = '新增金蝶币种'

src/components/FinancialModule/addFinancialDocuments.vue

@@ -942,7 +942,6 @@ export default {
                let yballPrice = 0
                this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
                    yballPrice += Number(yballPrice)+Number(item.UnitPrice)
-                   console.log(item)
                })
                this.yballPriceTo = yballPrice
                if(this.orderObj.Money!=this.yballPriceTo){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1858,7 +1858,6 @@
                     if(this.msg.RB_Branch_Id==item.Id&&item.StandardCurrencyId>0){
                         this.StandardCurrencyId = item.StandardCurrencyId
                         this.StandardCurrencyName = item.StandardCurrencyName
-                        console.log(item,'----')
                     }
                 })
             }

src/components/Hotel/HotelInfo.vue

@@ -684,7 +684,6 @@
         return [... new Set(this.idsList)].join(',')
       },
       getSelcetedKeyIds(tree) {
-       console.log('getSelcetedKeyIds', tree, this.idsList)
               tree.forEach(item => {
                 if(item.SubList && item.SubList.length) {
                   this.getSelcetedKeyIds(item.SubList)

src/components/Hotel/singleProduct/components/TableOperation.vue

@@ -240,8 +240,6 @@
             let tips = ['', '本房型不同的酒店入住人数限制不同，系统默认该房型只能入住一人', '', '', '']
             let limitGuestNum = [2, 1, 1, 3, 1]
             let tempPrice = this.hotelInfor.PriceList[0]
-            // console.log(tempPrice,'---')
-            // console.log(this.hotelInfor,'----')
             let hotel = this.hotelInfor
             this.parameters.HotelId = this.HotelRow.HotelId
             this.parameters.HotelName = this.HotelRow.HotelName
@@ -255,7 +253,6 @@
 
             this.setDateRange()
             roomTyps.forEach((x, i) => {
-                // console.log(tempPrice[x],i+'-----')
                 if (tempPrice[x] > 0) {
                     let dataMsg = {
                     HotelId: this.HotelRow.HotelId,

src/components/TravelContractDetail.vue

@@ -1133,7 +1133,6 @@
       },
       //获取是否显示公司章
       getShow(ID) {
-        console.log(ID,'ID')
         if (ID != null && ID != undefined) {
           let msg = {
             ID: ID

src/components/TravelContractNew.vue

@@ -1493,7 +1493,6 @@
             orderID: this.$route.query.orderID,
           },
         });
-        console.log(routeData.href)
         location.href=routeData.href
       },
       GetQrCode: function () {

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -940,7 +940,8 @@
             <td class="CP_ComTitle2">人数统计</td>
             <td class="CP_ComTitle2">成本价</td>
             <td class="CP_ComTitle2" colspan="2">销售价格</td>
-            <td colspan="8" class="CP_ComTitle2">备注</td>
+            <td class="CP_ComTitle2" colspan="2">手配费</td>
+            <td colspan="6" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
@@ -949,6 +950,10 @@
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
+            <td colspan="2">
+              <el-input type='text' class="w70" v-model="item.ShouPeiFee"
+                @keyup.native="checkPrice(item,'ShouPeiFee',true)" maxlength="8"></el-input>
+            </td>
             <td colspan="8">
               <el-input type="textarea" v-model="item.CostRemark"></el-input>
             </td>

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -679,7 +679,8 @@
             </td>
             <td class="CP_ComTitle2">成本价</td>
             <td class="CP_ComTitle2" colspan="2">销售价格</td>
-            <td colspan="8" class="CP_ComTitle2">备注</td>
+                 <td class="CP_ComTitle2" colspan="2">手配费</td>
+            <td colspan="6" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
@@ -687,7 +688,10 @@
             <td colspan="2">
               {{item.SalePrice}}
             </td>
-            <td colspan="8">
+                  <td colspan="2">
+              {{item.ShouPeiFee}}
+            </td>
+            <td colspan="6">
               {{item.CostRemark}}
             </td>
           </tr>
@@ -766,7 +770,7 @@
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
           </tr>
-          <tr v-if="IsEdit==2">
+          <tr >
             <td colspan="13" style="text-align:center;">
               <input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
               <input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />

src/components/WebSet/WebSiteArea.vue

@@ -306,7 +306,6 @@ import uploadImg from '../../pubComponents/uploadImg'
     methods: {
       lngLatChange() {
         let lngLat = this.addMsg.LngLat.split(',')
-        console.log('addMsg.LngLat watcher', this.addMsg.LngLat, lngLat)
         if(!lngLat[0] || !lngLat[1]) {
           this.$message.error('坐标格式不对,请重新输入');
           return
@@ -442,7 +441,6 @@ import uploadImg from '../../pubComponents/uploadImg'
               tempData.IsHot = tempData.IsHot === 1
               this.addMsg = tempData;
               this.$set(this.addMsg, "LngLat", res.data.data.Lng  ? `${res.data.data.Lng},${res.data.data.Lat}` : '')
-              console.log('this.addMsg.LngLat', this.addMsg.LngLat)
               if(!this.addMsg.BestTravelTimeList || !this.addMsg.BestTravelTimeList.length) {
                 this.addMsg.BestTravelTimeList = [{
                   Month: '',
@@ -505,7 +503,6 @@ import uploadImg from '../../pubComponents/uploadImg'
         this.$refs[formName].validate((valid) => {
           if (valid) {
             const imageList = this.$refs.uploadImg.ImageList
-        console.log('submitForm', this.addMsg, imageList)
         if(!imageList.length) {
           this.$message.error('请上传图片!');
           return
@@ -574,7 +571,6 @@ import uploadImg from '../../pubComponents/uploadImg'
         }
       },
       addArea() {
-        console.log(this.areaInfo)
         if(this.areaInfo) {
           this.addMsg.DestinationList = this.addMsg.DestinationList?this.addMsg.DestinationList:[]
           this.addMsg.DestinationList.push(this.areaInfo)
@@ -583,7 +579,6 @@ import uploadImg from '../../pubComponents/uploadImg'
         this.areaInfo = null
       },
       changeSelectArea(area) {
-        console.log('changeSelectArea', area)
         this.areaInfo = area
       }
     }

src/components/busManagement/BookAcar/components/orderList.vue

@@ -1060,7 +1060,6 @@
               }
             });
           }else{//变更预定
-            console.log()
             this.$router.push({
               name: 'CharterPreview',
               query: {

src/components/busManagement/CharteringManagement/CharteringInfoManage.vue

@@ -1696,11 +1696,6 @@ export default {
       this.selectAddress = false;
     },
     headCall(msg, type, index, address_detail) {
-      // this.addMsg.QCountry = msg.country;
-      // this.addMsg.QProvince = msg.province;
-      // this.addMsg.QCity = msg.city;
-      // this.addMsg.Address = msg.address;
-      // console.log(msg,type,index,address_detail,'-----')
       if (type == 1) {
         this.addMsg.AirportList.forEach((x, i) => {
           if (i == index) {
@@ -1716,13 +1711,8 @@ export default {
             x.Lat = msg.lat;
             x.Address = address_detail
           }
-          // console.log('地址1', i)
-          // console.log('地址2', index)
         })
-
       }
-
-
     },
     //获取国家
     GetCounrty() {
@@ -1762,16 +1752,8 @@ export default {
     getDMCimg(imgArr) {
       let obj = this.$DMCUtils.DMCImageObj();
       imgArr.forEach(imgItem => {
-        // obj.ID = 0;
-        // obj.Path = "/" + this.$commonUtils.removeDomain(imgItem.Path);
-        // obj.Path = imgItem.Path;
-        // obj.PicID = imgItem.ID;
-        // obj.ShowPath = imgItem.Path + "?x-oss-process=image/resize,l_140";
-        // this.addMsg.ImageList.push(obj);
         this.addMsg.ImageList.push(imgItem.Path);
       });
-      // console.log('拿到的值', imgItem.Path)
-      // console.log('拿到的值2', this.addMsg.ImageList)
     },
     //图片左移右移
     ExchangeImg(index, IsMove) {

src/components/busManagement/CharteringManagement/CharteringQuotation.vue

@@ -253,7 +253,6 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      // CarSingle_post_GetCarSingleTypePageList
       this.apipost(
         "CarSingle_post_GetCarSingleTypePageList",
         this.msg,
@@ -263,7 +262,6 @@ export default {
             this.total = res.data.data.count;
             this.DataList = res.data.data.pageData;
             this.noData = !this.total > 0;
-            // console.log('fff', this.total)
           }
         },
         null

src/components/clientConfirm.vue

@@ -2131,7 +2131,6 @@
       },
       //获取数据
       getList() {
-        console.log(this.msg)
         this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data;

src/components/commonPage/DMCchooseImg.vue

@@ -370,7 +370,6 @@ export default {
         selImg.isShow = false;
       });
       this.selectImgArr = [];
-      // console.log('44', this.selectImgArr)
     },
     //无效路径整个div不显示
     imgError(item) {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -700,11 +700,9 @@
                     tempData.Feature.FeatureHtmlJsonDelete != "" && tempData.Feature.FeatureType > 3 ?
                     JSON.parse(tempData.Feature.FeatureHtmlJsonDelete) :
                     null;
-
-                  this.FeatureHtmlJson = this.FeatureData.FeatureHtmlJson,
-                    this.FeatureHtmlJsonDelete = this.FeatureData.FeatureHtmlJsonDelete,
-
-                    this.NoticeData.FeeInclude = tempData.Feature.FeeInclude;
+                  this.FeatureHtmlJson = this.FeatureData.FeatureHtmlJson;
+                  this.FeatureHtmlJsonDelete = this.FeatureData.FeatureHtmlJsonDelete;
+                  this.NoticeData.FeeInclude = tempData.Feature.FeeInclude;
                   this.NoticeData.FeeNonInclude = tempData.Feature.FeeNonInclude;
                   this.NoticeData.ImportantTip = tempData.Feature.ImportantTip;
                   this.NoticeData.WarmTip = tempData.Feature.WarmTip;
@@ -743,7 +741,6 @@
                     PriceTeamType: 2,
                     TCSaleState: 1,
                   };
-                  console.log(" tempData.travelQuotationPriceObj", tempData.travelQuotationPriceObj.ContractArray);
                   if (tempData.travelQuotationPriceObj && tempData.travelQuotationPriceObj.ContractArray && tempData
                     .travelQuotationPriceObj.ContractArray.length > 0) {
                     priceObj.PriceOfferUrl = tempData.travelQuotationPriceObj.ContractArray[0].Url;

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -1140,11 +1140,9 @@
             this.returnPriceList.push(obj);
           })
         } else {
-          // console.log("取消选中");
           // var that = this;
           // if (this.returnPriceList && this.returnPriceList.length > 0) {
           //   this.returnPriceList.forEach(item => {
-          //     console.log("item", item)
           //     if (item.TCID > 0) {
           //       that.apipost(
           //         "travel_post_RemoveTravelPrice", {

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -1449,7 +1449,6 @@ export default {
               let categoryTree = res.data.data.filter(item => item.CategoryName === '景点门票')
               this.addParentId(categoryTree, [])
               this.categoryTree = categoryTree
-              console.log('this.categoryTree', this.categoryTree)
               this.setSelectedKeys()
             } else {
               _self.Error(res.data.message);
@@ -1493,7 +1492,6 @@ export default {
         return [... new Set(this.idsList)].join(',')
       },
       getSelcetedKeyIds(tree) {
-       console.log('getSelcetedKeyIds', tree, this.idsList)
               tree.forEach(item => {
                 if(item.SubList && item.SubList.length) {
                   this.getSelcetedKeyIds(item.SubList)
@@ -1504,11 +1502,6 @@ export default {
               })
       },
       handleNodeClick(data, checked, node) {
-  //   if(checked === true) {
-  // console.log('data, checked, node', data, checked, node)
-  //       this.checkedId = data.ids;
-  //       this.$refs.treeForm.setCheckedKeys([data.Id]);
-  //   }
     },
     inited(viewer) {
       this.$viewer = viewer;

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -776,13 +776,10 @@ export default {
         this.addMsg,
         res => {
           if (res.data.resultCode == 1) {
-            console.log(res.data)
             this.initDataTable();
             this.Success("保存成功！");
             this.isShowDIv = false;
             this.resetForm("addMsg");
-            // this.goUrl('ticketManagement',this.CouponsId);
-            // location.reload()
           } else {
             this.Error(res.data.message);
           }