地接图片查询修改

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -965,6 +965,14 @@ export default {
           columnAlign: "left",
           isResize: true
         },
+        {
+          field: "TransportOZ",
+          title: "印象欧洲",
+          width: 50,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },
         {
           field: "TransportCost",
           formatter: this.moneyFormat,

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1998,6 +1998,14 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "TransportOZ",
+          title: "印象欧洲",
+          width: 50,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "TransportCost",
           formatter: this.moneyFormat,

src/components/SalesModule/groupTourOrder.vue

@@ -2160,7 +2160,9 @@
               </p>
               <span style="display: block">{{ $t("salesModule.RoomInfo")
                 }}<span v-if="item.oneSex > 0"
-                  style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span>：{{ item.orderGuestHouseStr }}</span>
+                  style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0"
+                  style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：{{ item.orderGuestHouseStr }}</span>
+                 
 
               <div>
                 <span v-if="item.opTipMoney == '' && item.tipMoney != ''"

src/components/SalesModule/productQuery.vue

@@ -3311,7 +3311,7 @@ export default {
       //   this.addMsg.Remarks = this.addMsg.Remarks + text + ':' + (count-this.addMsg[key]) + ';'
       // }
     },
-    // 获取微信二维码
+    // 获取微信二维码（旅小友）
     getWxCode: function (key) {
       this.wxLoading = false;
       if (this.list[key].wxImage === "") {
@@ -3335,6 +3335,30 @@ export default {
         );
       }
     },
+    // 获取微信（和平商旅）二维码
+    getWxHPSLCode: function (key) {
+      this.wxLoading = false;
+      if (this.list[key].wxImage === "") {
+        this.wxLoading = true;
+        this.apipost(
+          "TaskManagemnet_get_GetWeiXinShareHPSL",
+          {
+            ConfigId: this.list[key].ConfigID,
+            TCID: this.list[key].TCID,
+          },
+          (res) => {
+            if (res.data.resultCode == 1) {
+              let url = res.data.data;
+              this.list[key].wxImage = url;
+              this.wxLoading = false;
+            } else {
+              this.$message.error("二维码获取失败");
+            }
+          },
+          (err) => {}
+        );
+      }
+    },
     toTrip: function (obj) {
       this.tripObj.tcid = obj.TCID;
       this.tripObj.configId = obj.ConfigID;

src/components/commonPage/DMCchooseImg.vue

@@ -178,9 +178,9 @@
     </div>
     <div v-if="activeName == 'first'">
       <span style="margin-left:24px;">
-        <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="queryMsg.pageIndex=1,getList()"
+        <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"
           placeholder="请输入关键字" />
-        <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="queryMsg.pageIndex=1,getList()"></i></span>
+        <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"></i></span>
       </span>
       <div class="addimgContent test-1" v-loading="loading">
         <div class="addimgDiv" v-for="(item, index) in imglistArry" :key="item.subCode"

src/components/myOrdersAllType/components/OrderList.vue

@@ -756,7 +756,7 @@ export default {
         OrderId: 0,
         OrderType: 0,
         PreferPrice: 0,
-        Money: 0,
+        Money: '',
         ApplyForReason: "",
         RefuseReason: "",
         ApplyForState: 1,
@@ -931,8 +931,9 @@ export default {
       if(this.titlePrice == "申请改价"||this.titlePrice == "修改改价"){
         this.changePriceMsg.ApplyForState=1
         let text = ''
+
         if(this.changePriceMsg.Money!=this.getChangePriceObj()){
-          text = `此单应收总金额应改为 ${this.getChangePriceObj()} 方可帐平，目前申请 ${this.changePriceMsg.Money} 确认提交吗？`
+          text = `此单应收总金额应改为 ${this.getChangePriceObj()} 方可帐平，目前申请改价金额 ${this.changePriceMsg.Money} 确认提交吗？`
           this.$confirm(`${text}`, '提示', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
@@ -1016,7 +1017,7 @@ export default {
       if(item.OrderChangePriceId){
         this.getGetOrderChangePriceDetai(item);
       }else{
-        this.changePriceMsg.Money = item.Money;
+        this.changePriceMsg.Money = '';//item.Money;
         this.changePriceMsg.ApplyForState = 1;
         this.changePriceMsg.ApplyForReason = '';
         this.changePriceMsg.PreferPrice = item.Money;

src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue

@@ -247,7 +247,6 @@
                                 <img
                                   v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
                                   class="absolute"
-                                  style="height: 100%;"
                                   :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                               </div>
                             </div>
@@ -287,8 +286,7 @@
                                     <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
                                       <img
                                         v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                        class="absolute"
-                                        style="height: 100%;" :src="ScenicArrayList[1].NewImaArray[0].Url"
+                                        class="absolute" :src="ScenicArrayList[1].NewImaArray[0].Url"
                                         :id="'viewSpotImg_'+(item*4)+'_1'+index">
                                     </template>
                                     <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
@@ -339,8 +337,7 @@
                                     <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
                                       <img
                                         v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                        class="absolute"
-                                        style="height: 100%;" :src="ScenicArrayList[2].NewImaArray[0].Url"
+                                        class="absolute" :src="ScenicArrayList[2].NewImaArray[0].Url"
                                         :id="'viewSpotImg_'+(item*4)+'_2'+index">
                                     </template>
                                     <img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100"