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

src/components/myOrdersAllType/components/OrderList.vue

@@ -581,10 +581,10 @@
       </div>
       <div style="padding:0 0 10px 0;" v-if="changePriceObj.ApplyForState==4">
         <span v-if="changePriceObj.ManagerRefuseReason" style="margin-right: 20px;">
-          {{item.ApplyType=="2"?"OP":"主管"}}审核意见：<span style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
+          {{changePriceObj.ApplyType=="2"?"OP":"主管"}}审核意见：<span style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
         </span>
         <span v-if="changePriceObj.RefuseReason">
-          {{item.ApplyType=="2"?"会计":"总经理"}}审核意见：<span style="color: red;">{{changePriceObj.RefuseReason}}</span>
+          {{changePriceObj.ApplyType=="2"?"会计":"总经理"}}审核意见：<span style="color: red;">{{changePriceObj.RefuseReason}}</span>
         </span>
       </div>
       <div slot="footer" class="dialog-footer"
@@ -1039,6 +1039,8 @@ export default {
       this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
       this.changePriceMsg.OrderId = item.OrderId;
       this.changePriceMsg.OrderType = item.OrderType;
+      console.log("item",item);
+      console.log("item.ApplyType",item.ApplyType);
       if(this.changePriceMsg.ID>0){
         this.changePriceMsg.ApplyType= String(item.ApplyType);
       }else{