no message

src/components/index.vue

@@ -222,7 +222,7 @@
                   机票未绑团查看
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="GetChangeThePrice()">
+                <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="GetChangeThePrice(1)">
                   <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
                   订单改价查看
                   <i class="iconfont icon-right1"></i>
@@ -1936,7 +1936,7 @@
     },
     methods: {
       // 获取改价提醒的数据
-      GetChangeThePrice(){
+      GetChangeThePrice(type){
         let DateTime = new Date();
         let Year = DateTime.getFullYear()
         let Month = DateTime.getMonth()
@@ -1979,6 +1979,9 @@
                   this.ChangeThePriceData = res.data.data.pageData
                   this.ChangeThePriceVisible = true
                 }else{
+                  if(type==1){
+                    this.$message.info('暂无订单改价数据')
+                  }
                   localStorage.removeItem("ChangeThePriceData");
                   localStorage.removeItem("ChangeThePriceDataTime");
                 }

src/components/myOrdersAllType/components/OrderList.vue

@@ -126,8 +126,8 @@
       <el-table-column
         sortable
         prop="PlatformMoney"
-        label="在途金额"
-        min-width="110"
+        label="平台在途金额"
+        min-width="130"
       >
       </el-table-column>
       <el-table-column
@@ -271,7 +271,16 @@
     </el-table>
     <!-- 申请弹窗 -->
     <div class="combottomDiv OPremarkDiv" v-if="changePriceMsg.outerVisible">
-      <div class="combottomTitle">{{ titlePrice }}</div>
+      <div class="combottomTitle">{{ titlePrice }}
+
+        <span style="margin-left: 20px;">
+          提示：
+          <span style="color: red;">
+            此单应申请改价为
+            {{getChangePriceObj()}}
+            方可帐平</span>
+        </span>
+      </div>
       <el-form label-width="100px">
         <el-col :span="8">
           <el-form-item label="应收总金额" prop="">
@@ -420,7 +429,7 @@ export default {
   components: {
     offset
   },
-  props: ["OrderList", "pagesTitle","msgObj"],
+  props: ["OrderList", "pagesTitle","changePriceOuterVisible"],
   data() {
     return {
       titlePrice: "",
@@ -564,18 +573,23 @@ export default {
       ],
       items: null,
       typeState: "",
-      Title: ""
+      Title: "",
+      changePriceObj:{}
     };
   },
   watch: {
     pagesTitle(val, oldval) {
       this.Title = val;
     },
-    msgObj: {
+    changePriceOuterVisible: {
       handler(val, oldVal) {
-        this.changePriceMsg.outerVisible = true;
-        this.changePriceMsg.outerVisible2 = true;
-      }
+        if(!val){
+          this.changePriceMsg.outerVisible = false;
+          this.changePriceMsg.outerVisible2 = false;
+        }
+      },
+      deep: true,
+      immediate: true
     },
     OrderList: {
       handler(val, oldVal) {
@@ -590,6 +604,12 @@ export default {
     }
   },
   methods: {
+    getChangePriceObj(){
+      //此单应申请改价为 9999 方可帐平，公式: 应收 = 实收 + 手续费  退款
+      let Price = (this.changePriceObj.Money*100) - (this.changePriceObj.DueInMoney*100)
+      let Money = this.RoundItUp(parseFloat(Price/100).toFixed(2))
+      return Money
+    },
     setChangePrice() {
       if(this.titlePrice == "申请改价"){
         this.changePriceMsg.ApplyForState=1
@@ -616,6 +636,7 @@ export default {
       if (type == 1) this.titlePrice = "修改改价";
       if (type == 2) this.titlePrice = "应收总金额改价审核";
       if (type == 3) this.titlePrice = "改价详情";
+      this.changePriceObj = item
       this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
       this.changePriceMsg.OrderId = item.OrderId;
       this.changePriceMsg.OrderType = item.OrderType;

src/components/myOrdersAllType/components/allList.vue

@@ -346,7 +346,7 @@
 
 
     </div>
-              <OrderList :pagesTitle="Title" :OrderList="OrderList" :msgObj="msg" v-loading="loading" @success="msg.pageIndex=1,msg2.pageIndex=1,GetList()"> </OrderList>
+              <OrderList :pagesTitle="Title" :OrderList="OrderList" :changePriceOuterVisible="changePriceOuterVisible" v-loading="loading" @success="msg.pageIndex=1,msg2.pageIndex=1,GetList()"> </OrderList>
               <!-- <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div> -->
               <el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle!='审核'" background
                  @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -487,7 +487,8 @@
                 { Name: "不限", Id: "0" },
                 { Name: "待申请", Id: "1" },
                 { Name: "已申请", Id: "2" },
-              ]
+              ],
+              changePriceOuterVisible: true
           };
         },
         watch: {
@@ -510,6 +511,7 @@
         },
         methods: {
           search(){
+            this.changePriceOuterVisible = false
             if(this.dataObj&&this.dataObj.OrderId){
               this.msg.OrderId=0
             }
@@ -666,6 +668,7 @@
             this.apipost(url, msgObj,
               res => {
                 if (res.data.resultCode == 1) {
+                  this.changePriceOuterVisible = true
                   if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){
                     this.getSummaryData()
                   }