1

src/components/UserMan/distributionOrder.vue

@@ -91,7 +91,7 @@
                                     <el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
 
                                 </div>
-                                <div style="position: absolute;right: 15px;top: 19px;" v-if="item.IsOrderCommission==2 && currentUserInfo && currentUserInfo.TenantId == 1 &&  currentUserInfo.MallBaseId ==1  && currentUserInfo.EmpId == 5">
+                                <div style="position: absolute;right: 15px;top: 19px;" v-if="item.IsOrderCommission==2 && currentUserInfo && currentUserInfo.TenantId == 1 &&  currentUserInfo.MallBaseId ==1  && currentUserInfo.EmpId == 5 && item.showReset == true">
                                     <el-button @click="resetrakeback(item)"  style="width: 100px;height: 30px;" size="small" type="primary">重置订单返佣</el-button>
 
                                 </div>
@@ -474,6 +474,14 @@ export default {
                     if(this.tableData){
                         this.tableData.forEach(x=>{
                             x.isShow=true;
+                            x.showReset = true
+                            for(var i=0;i<x.DetailList.length;i++){
+                                let y = x.DetailList[i]
+                                if(y.OriginalCostMoney>0 && y.FXCommission >0 && (y.CostMoney > y.OriginalCostMoney )){
+                                    x.showReset = false
+                                    break
+                                }
+                            }
                         })
                     }
                 }

src/components/orderMan/orderList.vue

@@ -1478,6 +1478,7 @@
             min="0"
             onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''"
           ></el-input>
+          <div style="color: red;margin-top: 5px;" v-if="cosType == 1&& currentUserInfo && currentUserInfo.TenantId == 1 &&  currentUserInfo.MallBaseId ==1">*注：商品成本调高会触发重置订单商品返佣</div>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -1711,9 +1712,12 @@ export default {
       SupplierId: 0, //公用供应商id 给弹窗用
       CommonId: 0, //公用id 给弹窗用
       TenantId: 0,
+      currentUserInfo:{},
     };
   },
   created() {
+    this.currentUserInfo = JSON.parse(localStorage.mall_userInfo);
+
     let currentUser = this.getLocalStorage();
     this.TenantId = currentUser.TenantId;
     if (this.$route.query.TypeId) {