Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/views/order/refund-return.vue

@@ -93,7 +93,7 @@
           <h3>订单信息</h3>
           <template v-if="order">
             <el-row :gutter="24" class="box-row">
-              <el-col :span="6"><b>订单编号:</b> {{ order.orderID }}</el-col>
+              <el-col :span="6"><b>订单编号(ID):</b> {{ order.orderNo + '(' + order.orderID + ')' }}</el-col>
               <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
               <el-col :span="6"><b>订单状态:</b>
                 <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
@@ -103,7 +103,17 @@
                   <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
                 </template>
               </el-col>
-              <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
+            </el-row>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="6"><b>订单金额:</b>¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+              <el-col :span="6"><b>应收总额:</b>¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
+              <el-col :span="6"><b>经理折扣:</b>¥{{ order.discountFee | toThousandFloatFilter }}</el-col>
+              <el-col :span="6"><b>运费:</b>
+                <template v-if="order.freight*1===0">包邮</template>
+                <template v-else-if="order.freight*1===-1">到付</template>
+                <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
+                <template v-else>¥{{ order.freight | toThousandFloatFilter }}</template>
+              </el-col>
             </el-row>
             <el-row :gutter="24" class="box-row">
               <el-col :span="6"><b>收款状态:</b>
@@ -111,6 +121,11 @@
                 <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
                 <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
               </el-col>
+              <el-col :span="6"><b>付款状态:</b>
+                <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+                <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+                <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+              </el-col>
               <el-col :span="6"><b>退款状态:</b>
                 <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
                 <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
@@ -123,47 +138,59 @@
               </el-col>
             </el-row>
             <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
+              <el-col :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
               <el-col :span="6"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
               <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
-              <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+              <el-col :span="6"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
             </el-row>
           </template>
         </div>
-        <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
-          <el-row :gutter="22" class="box-row">
-            <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
-            <el-col :span="5"><b>付款状态:</b>
-              <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-              <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-              <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
-            </el-col>
-            <el-col :span="5"><b>发货状态:</b>
-              <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-              <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-              <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-            </el-col>
-          </el-row>
-          <el-row :gutter="22" class="box-row">
-            <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
-          </el-row>
-          <el-row v-for="op in shopOrder.cmReturnedPurchaseProductList" :key="op.orderProductID" :gutter="22" class="product-row">
-            <el-col :span="2">
-              <img :src="op.mainImage" width="60" alt="">
-            </el-col>
-            <el-col :span="7">{{ op.name }}</el-col>
-            <el-col :span="5">
-              <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
-              <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
-            </el-col>
-            <el-col v-if="op.productID*1!==999" :span="5">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
-            </el-col>
-            <el-col v-if="op.productID*1!==999" :span="5">
-              <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>
-            </el-col>
-          </el-row>
+        <div class="refund-item">
+          <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
+            <el-row :gutter="22" class="box-row">
+              <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
+              <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+              <el-col :span="5"><b>付款状态:</b>
+                <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+                <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+                <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
+              </el-col>
+              <el-col :span="5"><b>发货状态:</b>
+                <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+                <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+                <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+              </el-col>
+            </el-row>
+            <el-row :gutter="22" class="box-row">
+              <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
+            </el-row>
+            <el-row v-for="op in shopOrder.cmReturnedPurchaseProductList" :key="op.orderProductID" :gutter="22" class="product-row">
+              <el-col :span="2">
+                <img :src="op.mainImage" width="60" alt="">
+              </el-col>
+              <el-col :span="6">{{ op.name }}</el-col>
+              <el-col :span="4">
+                <div class="op-item"><b>折后单价:</b> ¥{{ op.discountPrice | toThousandFloatFilter }}</div>
+                <div class="op-item"><b>数量(赠品数):</b> x{{ op.num }}</div>
+                <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+              </el-col>
+              <el-col :span="4">
+                <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+                <div class="op-item"><b>折扣:</b> {{ op.discount }}</div>
+                <div class="op-item"><b>税费(税率):</b> ¥{{ op.totalAddedValueTax | toThousandFloatFilter }} ({{ op.taxRate }})</div>
+              </el-col>
+              <el-col :span="4">
+                <div class="op-item"><b>已发货:</b> {{ op.num - op.notOutStore }}</div>
+                <div class="op-item"><b>已退货:</b> {{ op.returnedPurchaseProductNum }}</div>
+                <div class="op-item"><b>本次退货:</b> {{ op.actualReturnedNum ? op.actualReturnedNum : 0 }}</div>
+              </el-col>
+              <el-col :span="4">
+                <div class="op-item"><b>待发货:</b> {{ op.notOutStore - op.cancelProductNum }}</div>
+                <div class="op-item"><b>已取消:</b> {{ op.cancelProductNum }}</div>
+                <div class="op-item"><b>本次取消:</b> {{ op.actualCancelNum ? op.actualCancelNum : 0 }}</div>
+              </el-col>
+            </el-row>
+          </div>
         </div>
       </el-card>
     </template>