页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -474,7 +474,7 @@
                     <span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
                     <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
                     <span class="TC_xiajia daiwanshan"
-                    v-if="item.Config_OfferId>0&&item.Config_OfferStatus&&item.TCState==1">
+                      v-if="item.Config_OfferId>0&&item.Config_OfferStatus&&item.TCState==1">
                       {{item.Config_OfferStatus}}
                     </span>
                   </div>
@@ -598,30 +598,7 @@
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
                     <span class="go_date">{{item.StartDate}}</span>
                   </p>
-                  <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
-                    <span>报价单</span>
-                    <span class="go_date">
-                      <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
-                        <a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
-                          v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
-                        <template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
-                          <br :key="subIndex+1000" />
-                        </template>
-                      </template>
-                    </span>
-                  </p>
-                  <p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
-                    <span>报价单</span>
-                    <span class="go_date">
-                      <a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
-                        v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
-                    </span>
-                  </p>
-
-                  <p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
-                    <span style="cursor:pointer;text-decoration:underline;color:blue;"
-                      @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
-                  </p>
+                  
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
                     <span>手配费</span>
                     <span class="go_date">
@@ -695,7 +672,6 @@
                     v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168)  && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
-
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -807,6 +783,35 @@
                   <p style="color:red;font-size:12px;">
                     {{$t('op.TotalClicks')}}：{{item.TotalClickCount}}
                   </p>
+                  <p class="color:red;margin:20px 0 10px 0;font-size:12px;" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
+                        <a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
+                          v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
+                        <template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
+                          <br :key="subIndex+1000" />
+                        </template>
+                      </template>
+                    </span>
+                  </p>
+                  <p class="color:red;margin:20px 0 10px 0;font-size:12px;" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
+                        v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
+                    </span>
+                  </p>
+                  <p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;"
+                      @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                  </p>
+                  <p v-if="item.Config_OfferId==0">
+                    <span style="cursor:pointer;text-decoration:underline;color:red;"
+                      @click="NewCopyPriceSheet(item,0)">新增报价单</span>
+                    <span style="cursor:pointer;text-decoration:underline;color:red;"
+                      @click="NewCopyPriceSheet(item,1)">复制报价单</span>
+                  </p>
                 </div>
               </div>
               <div class="el-col" style="width:150px;">
@@ -1137,14 +1142,7 @@
                       <el-dropdown-item>
                         <div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
                       </el-dropdown-item>
-                      <template v-if="item.Config_OfferId==0&&item.TCState==1">
-                        <el-dropdown-item>
-                          <div @click="NewCopyPriceSheet(item,0)">新增报价单 </div>
-                        </el-dropdown-item>
-                        <el-dropdown-item>
-                          <div @click="NewCopyPriceSheet(item,1)">复制报价单 </div>
-                        </el-dropdown-item>
-                      </template>
+
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -1397,7 +1395,7 @@
           ApplyMaxNum: "",
           DayNum: "",
           OnlyShowOverTeam: false,
-          TCState: [1,3], //去掉默认显示
+          TCState: [1, 3], //去掉默认显示
           GroupState: [],
           SalePlat: [],
           UnionCityId: 0,
@@ -1539,22 +1537,22 @@
       },
     },
     methods: {
-      NewCopyPriceSheet(item,type){
-        if(type){
+      NewCopyPriceSheet(item, type) {
+        if (type) {
           this.CopyConfigOffer(item)
-        }else{
-          this.gotoOffer(item,1)
+        } else {
+          this.gotoOffer(item, 1)
         }
       },
       //跳转到报价单
-      gotoOffer(item,type) {
+      gotoOffer(item, type) {
         let name = 'QuotationNewPrice'
         let query = {
           offerid: item.Config_OfferId,
           blank: 'y',
           tab: '报价单'
         }
-        if(type){//新增报价单
+        if (type) { //新增报价单
           query.TeamType = item.TeamType;
           query.TCID = item.TCID;
           query.LineID = item.LineID;
@@ -1563,12 +1561,12 @@
           query.OutDateTime = item.StartCityTime;
           query.OutBranchId = item.OutBranchId;
           query.ForbidChange = true;
-          query.Title=item.Title;
+          query.Title = item.Title;
           this.$router.push({
             path: name,
             query
           });
-        }else{
+        } else {
           this.$router.push({
             path: name,
             query
@@ -1576,7 +1574,7 @@
         }
       },
       // 复制报价单
-      CopyConfigOffer(item){
+      CopyConfigOffer(item) {
         let msg = {
           ID: item.ID,
           TCID: item.TCID,
@@ -2244,7 +2242,7 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path, configId, tcid,item) {
+      goToOpenTravel(path, configId, tcid, item) {
         if (configId > 0) {
           this.$store.commit("pageConditionUpdate", this.queryMsg);
           this.$router.push({
@@ -2266,7 +2264,7 @@
       },
 
       //当团修改
-      goTonowTeam(path, configId, tcid, TCNUM,item) {
+      goTonowTeam(path, configId, tcid, TCNUM, item) {
         if (configId > 0) {
           this.$store.commit("pageConditionUpdate", this.queryMsg);
           this.$router.push({

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -398,13 +398,13 @@
             <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>
-                  <!--@click="clickedDay(dayobject)"-->
+                  class="other-month" >{{dayobject.day.getDate()}}</span>
+                  <!---->
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
-                  >{{dayobject.day.getDate()}}</span>
-                 <!--@click="clickedDay(dayobject)"-->
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                 <!---->
                 <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
-                  >{{dayobject.day.getDate()}}</span>
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>