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

src/components/myOrdersAllType/components/OrderList.vue

@@ -162,7 +162,7 @@
                 {{item.ApplyType=="2"?"OP":"主管"}}审核意见：<span style="color: red;">{{item.ManagerRefuseReason}}</span>
               </span>
               <span v-if="item.RefuseReason">
-                {{item.ApplyType=="2"?"会计":"总经理"}}审核意见：<span style="color: red;">{{item.RefuseReason}}</span>
+                总经理审核意见：<span style="color: red;">{{item.RefuseReason}}</span>
               </span>
             </div>
             <div style="margin-top: 10px;" v-if="item.ApplyForState
@@ -186,11 +186,11 @@
                 </el-tag>
               </span>
               <span style="margin-left: 20px;" v-if="item.ApplyForState==2&&pagesTitle=='查看'&&item.ExamineByName">
-                <el-tag type="warning" effect="dark">待{{item.ApplyType=="2"?"会计":"总经理"}}{{item.ExamineByName}} 审核
+                <el-tag type="warning" effect="dark">待{{item.ApplyType=="2"&&item.ExamineByName!="徐总"?"会计":"总经理"}}{{item.ExamineByName}} 审核
                 </el-tag>
               </span>
               <span style="margin-left: 20px;" v-if="pagesTitle=='申请'&&item.ApplyForState==2">
-                <el-tag type="warning" effect="dark">待{{item.ApplyType=="2"?"会计":"总经理"}}{{item.ExamineByName}}审核
+                <el-tag type="warning" effect="dark">待{{item.ApplyType=="2"&&item.ExamineByName!="徐总"?"会计":"总经理"}}{{item.ExamineByName}}审核
                 </el-tag>
                 <span v-if="item.ManagerExamineBy>0"
                   style="color:#13879b;">{{item.ApplyType=="2"?"OP":"主管"}}（{{item.ManagerExamineName}} /{{item.ManagerExamineTimeStr
@@ -438,7 +438,7 @@
             style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
         </span>
         <span v-if="changePriceObj.RefuseReason">
-          {{changePriceObj.ApplyType=="2"?"会计":"总经理"}}审核意见：<span
+          {{changePriceObj.ApplyType=="2"&&changePriceObj.ExamineByName!="徐总"?"会计":"总经理"}}审核意见：<span
             style="color: red;">{{changePriceObj.RefuseReason}}</span>
         </span>
       </div>
@@ -461,13 +461,14 @@
             <el-form-item label="改价原因" prop="">
               <el-input type="textarea" placeholder="填写改价原因，不是价格哟" v-model="changePriceMsg.ApplyForReason" autosize>
               </el-input>
+              <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="isHaveJapanMoney==1">
+          <el-col :span="8" v-if="changePriceMsg.ApplyType==2">
             <el-form-item label="改价类型" prop="">
-              <el-radio-group v-model="changePriceMsg.ApplyType">
-                <el-radio label="1">正常改价</el-radio>
-                <el-radio label="2">汇差改价<span style="color:red;">（由于汇率造成的帐未平，实际已全额收款）</span></el-radio>
+              <el-radio-group v-model="changePriceMsg.ApplyType" >
+                <el-radio label="1" :disabled="changePriceObj.TeamType==2">正常改价</el-radio>
+                <el-radio label="2" :disabled="changePriceObj.TeamType==2">汇差改价<span style="color:red;">（由于汇率造成的帐未平，实际已全额收款）</span></el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -546,6 +547,12 @@
                 v-model="changePriceMsg.RefuseReason" autosize></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" v-if="changePriceMsg.ApplyType==2&&changePriceMsg.ApplyForState==1">
+            <el-form-item label="OP备注" prop="">
+              <el-input :readonly="changePriceMsg.DialogType == 1 ? true : false" type="textarea"
+                v-model="changePriceMsg.OP_Remarks" autosize></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -594,6 +601,7 @@
           outerVisible2: false,
           ApplyForMoney: 0,
           ApplyType: '',
+          OP_Remarks: '',
         },
         msg: {
           OrderId: "",
@@ -838,6 +846,8 @@
         this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
         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 {
@@ -854,12 +864,16 @@
               this.isHaveJapanMoney = res.data.data.IsHaveJapanMoney;
             }
             if (this.isHaveJapanMoney == 1) {
-
-              if (this.changePriceMsg.ID > 0) {
+              if(item.TeamType==2){
+                this.changePriceMsg.ApplyType = "2"
+              }
+              else{
+                if (this.changePriceMsg.ID > 0) {
                 this.changePriceMsg.ApplyType = String(item.ApplyType);
               } else {
                 this.changePriceMsg.ApplyType = ""
               }
+              }
             } else {
               this.changePriceMsg.ApplyType = "1"
             }
@@ -893,7 +907,7 @@
               this.changePriceMsg.PreferPrice = item.Money; //data.ApplyForMoney
 
               this.changePriceMsg.ApplyForMoney = data.ApplyForMoney //申请总金额
-
+             // this.changePriceMsg.OP_Remarks = data.OP_Remarks;
               this.changePriceMsg.RefuseReason = data.RefuseReason;
             }
           }

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!='查看'">