1

src/components/myOrdersAllType/components/OrderList.vue

@@ -427,7 +427,7 @@
             style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
         </span>
         <span v-if="changePriceObj.RefuseReason">
-          {{changePriceObj.ApplyType=="2"&&item.ExamineByName!="徐总"?"会计":"总经理"}}审核意见：<span
+          {{changePriceObj.ApplyType=="2"&&changePriceObj.ExamineByName!="徐总"?"会计":"总经理"}}审核意见：<span
             style="color: red;">{{changePriceObj.RefuseReason}}</span>
         </span>
       </div>
@@ -450,7 +450,7 @@
             <el-form-item label="改价原因" prop="">
               <el-input type="textarea" placeholder="填写改价原因，不是价格哟" v-model="changePriceMsg.ApplyForReason" autosize>
               </el-input>
-              <span v-if="isHaveJapanMoney==1" style="color:red;">请填写实收金额的计算公式:如 14万日元*0.05=7000人民币</span>
+              <span v-if="changePriceMsg.ApplyType==2" style="color:red;">请填写实收金额的计算公式:如 14万日元*0.05=7000人民币</span>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="changePriceMsg.ApplyType==2">
@@ -836,6 +836,7 @@
         this.changePriceMsg.OrderId = item.OrderId;
         this.changePriceMsg.OrderType = item.OrderType;
         this.changePriceMsg.OP_Remarks = item.OP_Remarks;
+        this.changePriceMsg.OP_Remarks = item.OP_Remarks;
         if (this.changePriceMsg.ID > 0) {
           this.changePriceMsg.ApplyType = String(item.ApplyType);
         } else {

src/components/myOrdersAllType/components/allList.vue

@@ -120,7 +120,7 @@
                   </li>
                   <li v-if="Title!='申请'&&Title!='查看'">
                     <span><em>{{$t('objFill.orderid')}}</em>
-                    <el-input clearable type="Number" @keyup.native="checkInteger(msg,'OrderId')" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
+                    <el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg2.OrderId" placeholder="请输入订单Id" class="w200"/>
                     </span>
                   </li>
                   <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">