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

src/components/SalesModule/enrollTotal.vue

@@ -431,7 +431,7 @@
           <td style="color: #ff9c00">{{ item.tC_Price }}</td>
           <td style="color: #ff9c00">￥{{ item.unit_Price }}</td>
           <td>
-            <p style="color: #ff9c00">
+            <p style="color: #ff9c00;cursor: pointer;">
               <!-- ￥{{ item.preferPrice }} -->
               <PriceDetail :OrderId="item.orderId" :PreferPrice="item.preferPrice"></PriceDetail>
             </p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1939,14 +1939,19 @@
               </td>
               <td>
                 <p style="color: #ff9c00">
-                  <PriceDetail :OrderId="item.OrderId" :PreferPrice="item.preferPrice"></PriceDetail>
+                  <PriceDetail v-if="
+                  item.isOwn == 1 ||
+                  IsSupperOrderEdit ||
+                  IsLookOrder ||
+                  isUpdateOrder
+                " :OrderId="item.OrderId" :PreferPrice="item.preferPrice"></PriceDetail>
                   <!-- <span v-if="
                       item.isOwn == 1 ||
                       IsSupperOrderEdit ||
                       IsLookOrder ||
                       isUpdateOrder
-                    ">{{ item.preferPrice }}</span>
-                  <span v-else>*****</span> -->
+                    ">{{ item.preferPrice }}</span> -->
+                  <span v-else>*****</span>
                 </p>
               </td>
               <td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1816,6 +1816,7 @@
           <th width="260">{{ $t("fnc.danhao") }}</th>
           <th width="150">{{ $t("fnc.khxinxi") }}</th>
           <th width="70" class="nowrap"> {{ $t("admin.admin_personNumber") }}/{{ $t("salesModule.AirNum") }}</th>
+          <!-- <th>单价</th> -->
           <th width="110" class="nowrap">{{ $t("fnc.cjdanjia") }}</th>
           <th width="110" class="nowrap">{{ $t("fnc.yszonge") }}</th>
           <th width="110" class="nowrap">{{ $t("fnc.shishou") }}</th>
@@ -1831,12 +1832,12 @@
           <th width="150" class="nowrap">{{ $t("system.table_operation") }}</th>
         </tr>
         <tr>
-          <td v-show="OrderDataList.length == 0" colspan="17" align="center">
+          <td v-show="OrderDataList.length == 0" colspan="16" align="center">
             {{ $t("system.content_noData") }}
           </td>
         </tr>
         <tr v-if=" OrderDataList.leadetList != null &&OrderDataList.leadetList.length > 0  ">
-          <td colspan="17">
+          <td colspan="16">
             {{ $t("active.cl_orderType") }}：<span class="RL-redType">{{ $t("leader.leader_Leader") }}</span>
           </td>
         </tr>
@@ -1888,7 +1889,7 @@
                 }}{{ $t("ground.lduikongwei") }}{{ $t("salesModule.PeoPle") }})
               </span>
             </td>
-            <td>{{ item.TC_Price }}</td>
+            <!-- <td>{{ item.TC_Price }}</td> -->
             <td>{{ item.Unit_Price }}</td>
             <td>
               <p>{{ item.PreferPrice }}</p>
@@ -2392,6 +2393,7 @@
                   }}{{ $t("sm.person") }})
                 </span>
               </td>
+              <!-- <td>{{childItem.Unit_Price}}单价</td> -->
               <td>{{ childItem.Unit_Price }}</td>
               <td class="nowrap">
                 <p style="text-decoration: underline;cursor: pointer;">
@@ -3085,7 +3087,7 @@
                 }}{{ $t("sm.person") }})
               </span>
             </td>
-            <td>{{ item.TC_Price }}</td>
+            <!-- <td>{{ item.TC_Price }}</td> -->
             <td>{{ item.Unit_Price }}</td>
             <td>
               <p>{{ item.PreferPrice }}</p>

src/components/orderCommon/PriceDetail.vue

 <style scoped>
+  .PQ_detail {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.PQ_detail tr th,
+.v-table-title-cell {
+  background: #e6e6e6;
+  height: 40px;
+  font-size: 14px;
+  border-right: 1px solid #e6e6e6;
+  color: #333;
+}
 
+.PQ_detail tr {
+  background: #fff;
+  text-align: center;
+  height: 40px;
+}
+
+.PQ_detail tr td {
+  font-size: 12px;
+  border: 1px solid #e5e5e5;
+}
 </style>
 
 <template>