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

src/components/SalesModule/enrollTotal.vue

@@ -431,7 +431,10 @@
           <td style="color: #ff9c00">{{ item.tC_Price }}</td>
           <td style="color: #ff9c00">￥{{ item.unit_Price }}</td>
           <td>
-            <p style="color: #ff9c00">￥{{ item.preferPrice }}</p>
+            <p style="color: #ff9c00;cursor: pointer;">
+              <!-- ￥{{ item.preferPrice }} -->
+              <PriceDetail :OrderId="item.orderId" :PreferPrice="item.preferPrice"></PriceDetail>
+            </p>
           </td>
 
           <td>
@@ -739,10 +742,12 @@
   import Treeselect from "@riophae/vue-treeselect";
   import updateSalesMan from "../commonPage/updateSalesMan.vue";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import PriceDetail from '../orderCommon/PriceDetail.vue';
   export default {
     components: {
       Treeselect,
       updateSalesMan,
+      PriceDetail,
     },
     data() {
       return {

src/components/SalesModule/groupTourOrder.vue

@@ -1793,7 +1793,10 @@
             <td style="color: #ff9c00">{{ item.unit_Price }}</td>
 
             <td>
-              <p style="color: #ff9c00">{{ item.preferPrice }}</p>
+              <p style="color: #ff9c00">
+                <!-- {{ item.preferPrice }} -->
+                <PriceDetail :OrderId="item.orderId" :PreferPrice="item.preferPrice"></PriceDetail>
+              </p>
             </td>
             <td>
               <el-popover style="padding: 0" width="370" trigger="click">
@@ -2162,7 +2165,7 @@
                 }}<span v-if="item.oneSex > 0"
                   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 != ''"
@@ -2177,9 +2180,9 @@
                     " v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span>
                 </span>
               </div>
-              
+
               <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1"  @click="showMore(item,index)" >
-                     <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}  
+                     <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
                 </span>
                 </div>
               <div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
@@ -2476,6 +2479,7 @@
   import updateSalesMan from "../commonPage/updateSalesMan.vue";
   import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
   import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
+  import PriceDetail from '../orderCommon/PriceDetail.vue';
   export default {
     data() {
       return {
@@ -2799,6 +2803,7 @@
       updateSalesMan: updateSalesMan,
       commissionDialog,
       orderRemark: orderRemark,
+      PriceDetail,
     },
     filters: {
       priceFormat(value) {

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1939,12 +1939,18 @@
               </td>
               <td>
                 <p style="color: #ff9c00">
-                  <span v-if="
+                  <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>
+                    ">{{ item.preferPrice }}</span> -->
                   <span v-else>*****</span>
                 </p>
               </td>
@@ -2379,7 +2385,7 @@
                   </el-popover>
                 </span>
                 <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1"  @click="showMore(item,index)" >
-                     <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}  
+                     <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
                 </span>
                 </div>
                 <div>
@@ -3229,6 +3235,7 @@
   import updateSalesMan from "../commonPage/updateSalesMan.vue";
   import EditTip from "./Common/EditTip.vue";
   import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
+  import PriceDetail from '../orderCommon/PriceDetail.vue';
   export default {
     data() {
       return {
@@ -3622,6 +3629,7 @@
       tripDownLoadCommon: tripDownLoadCommon,
       updateSalesMan: updateSalesMan,
       orderRemark: orderRemark,
+      PriceDetail,
     },
     watch: {
       fullHeight(val) {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1035,7 +1035,30 @@
   .RegistrationList .el-upload-list {
     width: 200px;
   }
-
+  .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>
@@ -1793,7 +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 width="110" class="nowrap">{{ $t("fnc.danjia") }}</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>
@@ -1809,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>
@@ -1866,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>
@@ -2370,10 +2393,15 @@
                   }}{{ $t("sm.person") }})
                 </span>
               </td>
-              <td class="nowrap">{{ childItem.TC_Price }}</td>
+              <!-- <td>{{childItem.Unit_Price}}单价</td> -->
               <td>{{ childItem.Unit_Price }}</td>
               <td class="nowrap">
-                <p>{{ childItem.PreferPrice }}</p>
+                <p style="text-decoration: underline;cursor: pointer;">
+                  <PriceDetail :OrderId="childItem.OrderId" :PreferPrice="childItem.PreferPrice"></PriceDetail>
+                  <!-- <el-popover width="630" trigger="click"> -->
+
+                  <!-- {{ childItem.PreferPrice }} -->
+                </p>
               </td>
               <td class="nowrap">
                 <el-popover style="padding: 0" width="400" trigger="click">
@@ -3059,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>
@@ -3859,6 +3887,7 @@
   import commonShouSun from "../../commonPage/commonShouSun.vue";
   import EditTip from "../../SalesModule/Common/EditTip.vue";
   import orderTicketUnion from '../../commonPage/orderTicketUnion.vue';
+  import PriceDetail from '../../orderCommon/PriceDetail.vue';
   export default {
     data() {
       return {
@@ -4313,22 +4342,49 @@
       updateSalesMan: updateSalesMan,
       commonShouSun: commonShouSun,
       orderTicketUnion: orderTicketUnion,
+      PriceDetail,
     },
     filters: {
       priceFormat(value) {
         if (value == null) {
           return 0.0;
         }
-        let nStr = ""; //value.toFixed(2);
+        console.log("value",value);
+        let nStr = value.toFixed(2);
         let x = nStr.split(".");
         let x1 = x[0];
+        console.log("X1",x1);
         let x2 = x.length > 1 ? "." + x[1] : "";
+        console.log("X2",x2);
         var rgx = /(\d+)(\d{3})/;
         while (rgx.test(x1)) {
           x1 = x1.replace(rgx, "$1" + "," + "$2");
         }
+
+
+
         return x1 + x2;
       },
+      priceFormat2(value) {
+      if (value == null) {
+        return "已包含";
+      }
+      let nStr = value.toFixed(2);
+      nStr += "";
+      let x = nStr.split(".");
+      let x1 = x[0];
+      let x2 = x.length > 1 ? "." + x[1] : "";
+      var rgx = /(\d+)(\d{3})/;
+      while (rgx.test(x1)) {
+        x1 = x1.replace(rgx, "$1" + "," + "$2");
+      }
+      let result = x1 + x2;
+      if (result === "0.00") {
+        result = "已包含";
+      }
+      return result;
+    },
+
     },
     methods: {
       //显示订单联运信息