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

src/components/SalesModule/groupTourOrder.vue

@@ -2330,6 +2330,7 @@
               <div >
                 <div>{{ $t("fnc.fkdanju") }}：</div>
                 <div>
+                  
                   <span v-for="(item2, index2) in item.refundFinanceList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                     <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
                     <span v-else-if="item2.colorState === 2"

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -874,6 +874,7 @@
   .groupts .el-upload-list {
     width: 200px;
   }
+
 </style>
 
 <template>
@@ -2578,8 +2579,9 @@
               <td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
                 <div>
                   <div>收款单据：</div>
-                  <div v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">
-                    <span v-for="(item2, index2) in item.financeList" :key="index2+210000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
+                  <div >
+                    <span v-for="(item2, index2) in item.financeList" :key="index2+210000"
+                      @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                       <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
                       <span v-else-if="item2.colorState === 2"
                         class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
@@ -2595,8 +2597,9 @@
                 <!--@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''"-->
                 <div>
                   <div>付款单据：</div>
-                  <div v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">
-                    <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
+                  <div  >
+                    <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000"
+                      @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                       <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
                       <span v-else-if="item2.colorState === 2"
                         class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
@@ -3028,8 +3031,9 @@
             <td colspan="7" class="groupTourOrder_tickets" style="height: 40px">
               <div>
                 <div>收款单据：</div>
-                <div v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">
-                  <span v-for="(item2, index2) in item.financeList" :key="index2+280000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
+                <div>
+                  <span v-for="(item2, index2) in item.financeList" :key="index2+280000"
+                    @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                     <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
                     <span v-else-if="item2.colorState === 2"
                       class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
@@ -3041,10 +3045,11 @@
                     style="cursor: default">{{$t('system.content_noData')}}</span>
                 </div>
               </div>
-              <div >
+              <div>
                 <div>付款单据：</div>
-                <div v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">
-                  <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
+                <div>
+                  <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000"
+                    @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                     <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
                     <span v-else-if="item2.colorState === 2"
                       class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
@@ -6091,4 +6096,5 @@
       this.canEditUnitPrice();
     },
   };
+
 </script>

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -819,6 +819,7 @@
     border-top: 1px solid #cccccc;
     border-left: 1px solid #cccccc;
   }
+
 </style>
 
 <template>
@@ -1825,7 +1826,7 @@
               <td colspan="6" class="groupTourOrder_tickets" style="height: 40px;">
                 <div>
                   <div>收款单据：</div>
-                  <div v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
+                  <div>
                     <span v-for="(item2,index2) in item.financeList" :key="index2"
                       @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                       <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
@@ -1839,7 +1840,7 @@
                 </div>
                 <div>
                   <div>付款单据：</div>
-                  <div v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
+                  <div>
                     <span v-for="(item2,index2) in item.refundFinanceList" :key="index2"
                       @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                       <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
@@ -4776,4 +4777,5 @@
       this.getCountry() //国籍
     }
   };
+
 </script>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -881,7 +881,7 @@
                       <el-select class="w180" v-model="priceData.PriceTeamType">
                         <template v-for="item in TeamListArr">
                           <!--去掉小包团2023-04-19-->
-                          <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4" :key="item.Id"
+                          <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==8||item.Id==9" :key="item.Id"
                             :label="item.Name" :value="item.Id">
                           </el-option>
                         </template>

src/components/orderCommon/productOrderList.vue

@@ -373,7 +373,7 @@
     font-size: 12px;
   }
 
-  .product_union1 {
+  .product_nei {
     position: absolute;
     top: 0px;
     left: 0px;
@@ -385,7 +385,7 @@
     border-right: 15px solid transparent;
   }
 
-  .product_union1::after {
+  .product_nei::after {
     content: "内";
     position: absolute;
     top: -14px;
@@ -467,7 +467,7 @@
       <li v-for="(item, index) in list" :key="index">
         <div class="dline">
           <div class="d1">
-            <div v-if="item.IsB2B === 0" class="product_union1"></div>
+            <div v-if="item.IsB2B === 0" class="product_nei"></div>
             <div v-if="item.IsUnionTravel === 1" class="product_union"></div>
             <div v-if="item.IsWarning === 1" class="product_warning"></div>
             <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'200px':'auto'}">