Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/CommodityMan/goodsListEdit.vue

@@ -243,6 +243,14 @@
                       <el-button slot="append">元</el-button>
                     </el-input>
                   </el-form-item>
+                  <el-form-item label="订金比例" v-if="currentUserInfo.MallBaseId==19" prop="DepositRatio">
+                    <el-tooltip class="item" effect="dark" content="=0的时候支付全款，>0的时候首次支付按订单总金额*订金比例支付" placement="top-start"
+                      style="position: absolute;left: -22px;top:12px">
+                      <i class="elzk el-tooltip el-icon-info"></i>
+                    </el-tooltip>
+                    <el-input v-model="addMsg.DepositRatio" type="number" min="1" size="small" placeholder="请输入内容"
+                      class="input-with-select"> <el-button slot="append">%</el-button></el-input>
+                  </el-form-item>
                   <el-form-item label="原价" prop="OriginalPrice">
                     <el-tooltip class="item" effect="dark" content="以划线形式显示" placement="top-start"
                       style="position: absolute;left: -22px;top:12px">
@@ -457,6 +465,7 @@
                                 size="small"></el-input>
                             </template>
                           </el-table-column>
+                          
                           <el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额">
                             <template slot-scope="scope">
                               <el-input v-model="scope.row.Commission"
@@ -1266,6 +1275,7 @@
           GoodsUrl: "", //简介
           goodsLogo: "", //商品Logo
           IsKorea: 0, //是否为韩国馆
+          DepositRatio:0,//订金比例
         },
         predefineColors: [
           '#000000',
@@ -1300,6 +1310,11 @@
             message: "请输入商品售价",
             trigger: "blur"
           }],
+          DepositRatio: [{
+            required: true,
+            message: "请输入商品订金",
+            trigger: "blur"
+          }],
           OriginalPrice: [{
             required: true,
             message: "请输入商品原价",

src/components/orderMan/afterSalesOrder.vue

@@ -516,6 +516,7 @@ export default {
             regionshow:false,
           regionlist:[],
           regiontotal:0,
+          IsHPSL:false,
         }
     },
     created(){
@@ -613,6 +614,7 @@ export default {
         },
        //审核同意 收货地址选择
         agree(item){
+         this.IsHPSL=false;
           let that=this;
           this.SetOrderMsg.ReOrderId=item.ReOrderId;
           this.SetOrderMsg.Type=1;
@@ -621,8 +623,15 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.regionshow=true;
+            if(item.TenantId==29){
+                this.IsHPSL=true;
+                this.regionsubmitForm();
+            }
+            else{
+                this.regionshow=true;
             this.getLogisticsDeliveryPage()
+            }
+          
           }).catch(() => {
 
           });
@@ -647,7 +656,8 @@ export default {
 
       regionsubmitForm(){
 
-        if(this.SetOrderMsg.DeliveryId==''){
+        console.log("this.IsHPSL",this.IsHPSL);
+        if(this.SetOrderMsg.DeliveryId==''&&this.IsHPSL==false){
           this.Error('请选择收货地址');
           return false
         }
@@ -656,7 +666,7 @@ export default {
           res => {
             if (res.data.resultCode === 1) {
               this.regionshow=false
-
+              this.regionMsg.pageIndex = 1;
               this.getList();
               this.Success(res.data.message)
             } else {

src/components/orderMan/orderDetails.vue

@@ -196,6 +196,12 @@
                 {{dataInfo.BuyerMessage}}
               </div>
             </div>
+            <div v-if="dataInfo.OrderStatus>=6&& dataInfo.CancelRemark && dataInfo.CancelRemark!=''" flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
+              <span class="label">取消原因:</span>
+              <div>
+                {{dataInfo.CancelRemark}}
+              </div>
+            </div>
           </div>
         </el-col>
         <el-col :span="8">

src/components/orderMan/orderList.vue

@@ -386,6 +386,7 @@
                       <img slot="reference" src="../../assets/img/userman/price.png" alt="" />
                     </el-popover>
                   </div>
+                 
                   <div class="express-price">
                     <span>
                       <span style="color: rgb(144, 147, 153)">(含运费￥{{ item.FreightMoney }})
@@ -394,6 +395,9 @@
                       </span>
                     </span>
                   </div>
+                  <div v-if="currentUserInfo.TenantId==29">
+                    <span style="font-size: 12px">已付金额：￥{{ item.PayIncome }}</span>
+                  </div>
                   <div>
                     <el-tag effect="dark" type="warning" size="mini">{{
                       item.PaymentWayName
@@ -475,11 +479,11 @@
                         src="../../assets/img/userman/sale.png" alt="" />
                     </el-tooltip>
                     <!--待处理-->
-                    <el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus == 6">
+                    <el-tooltip class="item" effect="dark" :content="'同意'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')" placement="top" v-if="item.OrderStatus == 6">
                       <img @click="pending(item, 1)" v-if="item.OrderStatus == 6" class="app-order-icon"
                         src="../../assets/img/userman/pass.png" alt="" />
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus == 6">
+                    <el-tooltip class="item" effect="dark" :content="'拒绝'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')" placement="top" v-if="item.OrderStatus == 6">
                       <img @click="pending(item, 2)" v-if="item.OrderStatus == 6" class="app-order-icon"
                         src="../../assets/img/userman/nopass.png" alt="" />
                     </el-tooltip>