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

src/views/goods/category.vue

@@ -15,7 +15,7 @@
     >
       <el-table-column align="center" label="序号" width="50px">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="分类名称" align="center" prop="classifyName" />
@@ -112,7 +112,9 @@ export default {
     batchSaveSort() {
       const sorts = []
       this.list.map(item => {
-        sorts.push(item.id + '-' + item.sort)
+        if (item.sort) {
+          sorts.push(item.id + '-' + item.sort)
+        }
       })
       saveCategorySort({ newProducSorttList: sorts.join(',') }).then(() => {
         this.getList()

src/views/goods/list-commonly.vue

@@ -52,7 +52,7 @@
     >
       <el-table-column align="center" label="序号" width="50px">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="商品ID" align="center" prop="id" width="70px" />
@@ -147,7 +147,9 @@ export default {
     batchSaveSort() {
       const sorts = []
       this.list.map(item => {
-        sorts.push(item.id + '-' + item.commonlyProductSort)
+        if (item.commonlyProductSort) {
+          sorts.push(item.id + '-' + item.commonlyProductSort)
+        }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
         this.$notify({

src/views/goods/list-preferential.vue

@@ -52,7 +52,7 @@
     >
       <el-table-column align="center" label="序号" width="50px">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="商品ID" align="center" prop="id" width="70px" />
@@ -147,7 +147,9 @@ export default {
     batchSaveSort() {
       const sorts = []
       this.list.map(item => {
-        sorts.push(item.id + '-' + item.preferentialProductSort)
+        if (item.preferentialProductSort) {
+          sorts.push(item.id + '-' + item.preferentialProductSort)
+        }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
         this.$notify({

src/views/goods/list-preferred.vue

@@ -52,7 +52,7 @@
     >
       <el-table-column align="center" label="序号" width="50px">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="商品ID" align="center" prop="id" width="70px" />
@@ -147,7 +147,9 @@ export default {
     batchSaveSort() {
       const sorts = []
       this.list.map(item => {
-        sorts.push(item.id + '-' + item.preferredProductSort)
+        if (item.preferredProductSort) {
+          sorts.push(item.id + '-' + item.preferredProductSort)
+        }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
         this.$notify({

src/views/order/list.vue

@@ -74,7 +74,7 @@
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="订单ID" align="center" prop="orderID" />
@@ -140,7 +140,7 @@
         <template slot-scope="{row}">
           <router-link :to="'/order/detail/' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
           <el-dropdown>
-            <el-button type="primary" size="small" style="margin-top:5px;">
+            <el-button type="success" size="small" style="margin-top:5px;">
               功能<i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown">

src/views/order/refund-detail.vue

@@ -7,158 +7,160 @@
     </el-menu>
 
     <h1>退款单</h1>
-
-    <el-card v-for="refund in refundList" :key="refund.orderID" class="box-card">
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-        <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-        <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>退款状态:</b>
-          <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
-          <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
-          <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="20"><b>退款方式:</b>
-          <template v-if="refund.returnedWay*1===4">未支付无退款</template>
-          <template v-else-if="refund.returnedWay*1===1">
-            <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-            <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-            <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
-          </template>
-          <template v-else>----</template>
-        </el-col>
-      </el-row>
-      <template v-if="refund.returnedWay*1===1 && refund.refundOfflineFee*1!==0">
+    <template v-for="refund in refundList">
+      <el-card :key="refund.orderID" class="box-card">
         <el-row :gutter="24" class="box-row">
-          <el-col v-if="refund.refundFee" :span="12"><b>退款银行:</b>
-            <template v-if="refund.payType*1===1">建设银行7297</template>
-            <template v-else-if="refund.payType*1===2">中信银行0897</template>
-            <template v-else-if="refund.payType*1===3">中信银行7172</template>
-            <template v-else-if="refund.payType*1===4">广发银行0115</template>
-            <template v-else-if="refund.payType*1===5">广发银行5461</template>
+          <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
+          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>退款状态:</b>
+            <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
+            <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
+            <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
           </el-col>
-          <el-col v-else :span="12">暂无支付方式</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>开户名:</b> {{ refund.bankAccountName ? refund.bankAccountName : '' }}</el-col>
-          <el-col :span="6"><b>账号:</b> {{ refund.bankAccountNo ? refund.bankAccountNo : '' }}</el-col>
-          <el-col :span="6"><b>开户行:</b> {{ refund.openBank ? refund.openBank : '' }}</el-col>
-          <el-col :span="6"><b>账户类型:</b>
-            <el-tag v-if="refund.bankAccountType*1===1" type="warning" size="small">公账</el-tag>
-            <el-tag v-if="refund.bankAccountType*1===2" type="danger" size="small">私账</el-tag>
+          <el-col :span="20"><b>退款方式:</b>
+            <template v-if="refund.returnedWay*1===4">未支付无退款</template>
+            <template v-else-if="refund.returnedWay*1===1">
+              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
+              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
+              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+            </template>
+            <template v-else>----</template>
           </el-col>
         </el-row>
-      </template>
-    </el-card>
-
-    <el-card v-if="order" class="box-card">
-      <el-row :gutter="24" class="box-row">
-        <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}') }}</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">
-            <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
-          </template>
-          <template v-else>
-            <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>
-          <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-          <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.refundType*1===1" type="warning" size="small">部分退</el-tag>
-          <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
-          <el-tag v-else type="info" size="small">无退款</el-tag>
-        </el-col>
-        <el-col :span="6"><b>发货状态:</b>
-          <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-          <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-          <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-        </el-col>
-      </el-row>
-      <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-        <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-row>
+        <template v-if="refund.returnedWay*1===1 && refund.refundOfflineFee*1!==0">
+          <el-row :gutter="24" class="box-row">
+            <el-col v-if="refund.refundFee" :span="12"><b>退款银行:</b>
+              <template v-if="refund.payType*1===1">建设银行7297</template>
+              <template v-else-if="refund.payType*1===2">中信银行0897</template>
+              <template v-else-if="refund.payType*1===3">中信银行7172</template>
+              <template v-else-if="refund.payType*1===4">广发银行0115</template>
+              <template v-else-if="refund.payType*1===5">广发银行5461</template>
+            </el-col>
+            <el-col v-else :span="12">暂无支付方式</el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>开户名:</b> {{ refund.bankAccountName ? refund.bankAccountName : '' }}</el-col>
+            <el-col :span="6"><b>账号:</b> {{ refund.bankAccountNo ? refund.bankAccountNo : '' }}</el-col>
+            <el-col :span="6"><b>开户行:</b> {{ refund.openBank ? refund.openBank : '' }}</el-col>
+            <el-col :span="6"><b>账户类型:</b>
+              <el-tag v-if="refund.bankAccountType*1===1" type="warning" size="small">公账</el-tag>
+              <el-tag v-if="refund.bankAccountType*1===2" type="danger" size="small">私账</el-tag>
+            </el-col>
+          </el-row>
+        </template>
+      </el-card>
 
-      <div v-for="shopOrder in order.newShopOrders" :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.orderTime }}</el-col>
-          <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</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-card v-if="order" :key="'order'+refund.orderID" class="box-card">
+        <el-row :gutter="24" class="box-row">
+          <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}') }}</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">
+              <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+            </template>
+            <template v-else>
+              <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="22" class="box-row">
-          <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
-        </el-row>
-        <el-row v-for="op in shopOrder.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
-          <el-col :span="2">
-            <img :src="op.productImage" 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-row :gutter="24" class="box-row">
+          <el-col :span="6"><b>收款状态:</b>
+            <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+            <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 v-if="op.productID*1!==999" :span="5">
-            <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-            <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+          <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>
+            <el-tag v-else type="info" size="small">无退款</el-tag>
           </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 :span="6"><b>发货状态:</b>
+            <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+            <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+            <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
           </el-col>
         </el-row>
-      </div>
-    </el-card>
+        <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
+          <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-row>
 
-    <!--<el-card v-if="order && order.orderInvoice" class="box-card">
-      <el-row :gutter="24" class="box-row">
-        <b>发票信息:</b>
-        <template v-if="order.orderInvoice.type*1===0">不需要发票</template>
-        <template v-else-if="order.orderInvoice.type*1===1">普通发票</template>
-        <template v-else-if="order.orderInvoice.type*1===2">增值税发票</template>
-      </el-row>
-      <el-row v-if="order.orderInvoice.invoiceTitleType*1===0" :gutter="24" class="box-row">
-        <el-col :span="7"><b>个人抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-      </el-row>
-      <el-row v-if="order.orderInvoice.invoiceTitleType*1===1" :gutter="24" class="box-row">
-        <el-col :span="7"><b>企业抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-        <el-col :span="7"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
-      </el-row>
-      <template v-if="order.orderInvoice.type*1===2">
+        <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 | toThousandFilter }}</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 | toThousandFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</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>
+      </el-card>
+
+      <!--<el-card v-if="order && order.orderInvoice" class="box-card">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>单位名称:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-          <el-col :span="7"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
-          <el-col :span="7"><b>注册地址:</b>{{ order.orderInvoice.registeredAddress }}</el-col>
+          <b>发票信息:</b>
+          <template v-if="order.orderInvoice.type*1===0">不需要发票</template>
+          <template v-else-if="order.orderInvoice.type*1===1">普通发票</template>
+          <template v-else-if="order.orderInvoice.type*1===2">增值税发票</template>
         </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>注册电话:</b>{{ order.orderInvoice.registeredPhone }}</el-col>
-          <el-col :span="7"><b>开户银行:</b>{{ order.orderInvoice.openBank }}</el-col>
-          <el-col :span="7"><b>银行账号:</b>{{ order.orderInvoice.bankAccountNo }}</el-col>
+        <el-row v-if="order.orderInvoice.invoiceTitleType*1===0" :gutter="24" class="box-row">
+          <el-col :span="6"><b>个人抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
         </el-row>
-      </template>
-    </el-card>-->
-
-    <template v-for="refund in refundList">
+        <el-row v-if="order.orderInvoice.invoiceTitleType*1===1" :gutter="24" class="box-row">
+          <el-col :span="6"><b>企业抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
+          <el-col :span="6"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
+        </el-row>
+        <template v-if="order.orderInvoice.type*1===2">
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>单位名称:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
+            <el-col :span="6"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
+            <el-col :span="6"><b>注册地址:</b>{{ order.orderInvoice.registeredAddress }}</el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>注册电话:</b>{{ order.orderInvoice.registeredPhone }}</el-col>
+            <el-col :span="6"><b>开户银行:</b>{{ order.orderInvoice.openBank }}</el-col>
+            <el-col :span="6"><b>银行账号:</b>{{ order.orderInvoice.bankAccountNo }}</el-col>
+          </el-row>
+        </template>
+      </el-card>-->
       <el-card :key="'review'+refund.orderID" class="box-card">
         <h3>审核信息</h3>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
-          <el-col :span="7"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
-          <el-col :span="7"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
+          <el-col :span="6"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
+          <el-col :span="6"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
+          <el-col :span="6"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
           <el-col :span="4"><b>审核凭证:</b></el-col>
@@ -174,9 +176,9 @@
       <el-card :key="'application'+refund.orderID" class="box-card">
         <h3>申请信息</h3>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-          <el-col :span="7"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-          <el-col :span="7"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
+          <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
+          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+          <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
           <el-col :span="4"><b>申请凭证:</b></el-col>
@@ -191,13 +193,12 @@
       </el-card>
       <el-card :key="'end'+refund.orderID" class="box-card">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
-          <el-col :span="7"><b>财务签名:</b></el-col>
-          <el-col :span="7"><b>总经理签名:</b></el-col>
+          <el-col :span="6"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>财务签名:</b></el-col>
+          <el-col :span="6"><b>总经理签名:</b></el-col>
         </el-row>
       </el-card>
     </template>
-
   </div>
 </template>
 
@@ -230,7 +231,10 @@ export default {
   },
   computed: {
     orderID: function() {
-      return window.location.href.split('/').reverse()[0] * 1
+      return this.$route.query.orderID
+    },
+    refundId: function() {
+      return this.$route.params.id
     }
   },
   created() {
@@ -239,7 +243,7 @@ export default {
   methods: {
     fetchData() {
       this.listLoading = true
-      getRefundDetail({ orderID: this.orderID }).then(response => {
+      getRefundDetail({ id: this.refundId, orderID: this.orderID }).then(response => {
         this.order = response.data.order
         this.bpClauses = response.data.bpClauses
         this.refundList = response.data.cmReturnedPurchaseList

src/views/order/refund-record.vue

@@ -66,7 +66,7 @@
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="收款ID" align="center" prop="receiptID" />
@@ -97,7 +97,7 @@
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="退款编号" align="center" prop="returnedNo" />

src/views/order/refund-return.vue

@@ -8,161 +8,165 @@
 
     <template v-for="refund in refundList">
       <el-card :key="'review'+refund.orderID" class="box-card">
-        <h3>审核信息</h3>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
-          <el-col :span="7"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
-          <el-col :span="7"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
-        </el-row>
-        <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
-          <el-col :span="4"><b>审核凭证:</b></el-col>
-          <el-col :span="20">
-            <img v-if="refund.reviewImage1" :src="refund.reviewImage1" width="65" alt="">
-            <img v-if="refund.reviewImage2" :src="refund.reviewImage2" width="65" alt="">
-            <img v-if="refund.reviewImage3" :src="refund.reviewImage3" width="65" alt="">
-            <img v-if="refund.reviewImage4" :src="refund.reviewImage4" width="65" alt="">
-            <img v-if="refund.reviewImage5" :src="refund.reviewImage5" width="65" alt="">
-          </el-col>
-        </el-row>
-      </el-card>
-
-      <el-card :key="'application'+refund.orderID" class="box-card">
-        <h3>申请信息</h3>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="7"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-          <el-col :span="7"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-          <el-col :span="7"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
-        </el-row>
-        <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
-          <el-col :span="4"><b>申请凭证:</b></el-col>
-          <el-col :span="20">
-            <img v-if="refund.image1" :src="refund.image1" width="65" alt="">
-            <img v-if="refund.image2" :src="refund.image2" width="65" alt="">
-            <img v-if="refund.image3" :src="refund.image3" width="65" alt="">
-            <img v-if="refund.image4" :src="refund.image4" width="65" alt="">
-            <img v-if="refund.image5" :src="refund.image5" width="65" alt="">
-          </el-col>
-        </el-row>
-      </el-card>
-
-      <el-card :key="'refund' + refund.orderID" class="box-card">
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
-          <el-col :span="6"><b>退款状态:</b>
-            <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
-            <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
-            <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="20"><b>退款方式:</b>
-            <template v-if="refund.returnedWay*1===4">未支付无退款</template>
-            <template v-else-if="refund.returnedWay*1===1">
-              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
-            </template>
-            <template v-else>----</template>
-          </el-col>
-        </el-row>
-        <template v-if="refund.returnedWay*1===1 && refund.refundOfflineFee*1!==0">
+        <div class="refund-item">
+          <h3>审核信息</h3>
           <el-row :gutter="24" class="box-row">
-            <el-col v-if="refund.refundFee" :span="12"><b>退款银行:</b>
-              <template v-if="refund.payType*1===1">建设银行7297</template>
-              <template v-else-if="refund.payType*1===2">中信银行0897</template>
-              <template v-else-if="refund.payType*1===3">中信银行7172</template>
-              <template v-else-if="refund.payType*1===4">广发银行0115</template>
-              <template v-else-if="refund.payType*1===5">广发银行5461</template>
+            <el-col :span="6"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
+            <el-col :span="6"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
+            <el-col :span="6"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
+          </el-row>
+          <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
+            <el-col :span="4"><b>审核凭证:</b></el-col>
+            <el-col :span="20">
+              <img v-if="refund.reviewImage1" :src="refund.reviewImage1" width="65" alt="">
+              <img v-if="refund.reviewImage2" :src="refund.reviewImage2" width="65" alt="">
+              <img v-if="refund.reviewImage3" :src="refund.reviewImage3" width="65" alt="">
+              <img v-if="refund.reviewImage4" :src="refund.reviewImage4" width="65" alt="">
+              <img v-if="refund.reviewImage5" :src="refund.reviewImage5" width="65" alt="">
             </el-col>
-            <el-col v-else :span="12">暂无支付方式</el-col>
           </el-row>
+        </div>
+        <div class="refund-item">
+          <h3>申请信息</h3>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>开户名:</b> {{ refund.bankAccountName ? refund.bankAccountName : '' }}</el-col>
-            <el-col :span="6"><b>账号:</b> {{ refund.bankAccountNo ? refund.bankAccountNo : '' }}</el-col>
-            <el-col :span="6"><b>开户行:</b> {{ refund.openBank ? refund.openBank : '' }}</el-col>
-            <el-col :span="6"><b>账户类型:</b>
-              <el-tag v-if="refund.bankAccountType*1===1" type="warning" size="small">公账</el-tag>
-              <el-tag v-if="refund.bankAccountType*1===2" type="danger" size="small">私账</el-tag>
+            <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
+            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+            <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
+          </el-row>
+          <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
+            <el-col :span="4"><b>申请凭证:</b></el-col>
+            <el-col :span="20">
+              <img v-if="refund.image1" :src="refund.image1" width="65" alt="">
+              <img v-if="refund.image2" :src="refund.image2" width="65" alt="">
+              <img v-if="refund.image3" :src="refund.image3" width="65" alt="">
+              <img v-if="refund.image4" :src="refund.image4" width="65" alt="">
+              <img v-if="refund.image5" :src="refund.image5" width="65" alt="">
             </el-col>
           </el-row>
-        </template>
-      </el-card>
-
-    </template>
-
-    <el-card v-if="order" class="box-card">
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>订单编号:</b> {{ order.orderID }}</el-col>
-        <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</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">
-            <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+        </div>
+        <div class="refund-item">
+          <h3>退款信息</h3>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
+            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+            <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+            <el-col :span="6"><b>退款状态:</b>
+              <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
+              <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
+              <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="20"><b>退款方式:</b>
+              <template v-if="refund.returnedWay*1===4">未支付无退款</template>
+              <template v-else-if="refund.returnedWay*1===1">
+                <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
+                <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
+                <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+              </template>
+              <template v-else>----</template>
+            </el-col>
+          </el-row>
+          <template v-if="refund.returnedWay*1===1 && refund.refundOfflineFee*1!==0">
+            <el-row :gutter="24" class="box-row">
+              <el-col v-if="refund.refundFee" :span="12"><b>退款银行:</b>
+                <template v-if="refund.payType*1===1">建设银行7297</template>
+                <template v-else-if="refund.payType*1===2">中信银行0897</template>
+                <template v-else-if="refund.payType*1===3">中信银行7172</template>
+                <template v-else-if="refund.payType*1===4">广发银行0115</template>
+                <template v-else-if="refund.payType*1===5">广发银行5461</template>
+              </el-col>
+              <el-col v-else :span="12">暂无支付方式</el-col>
+            </el-row>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="6"><b>开户名:</b> {{ refund.bankAccountName ? refund.bankAccountName : '' }}</el-col>
+              <el-col :span="6"><b>账号:</b> {{ refund.bankAccountNo ? refund.bankAccountNo : '' }}</el-col>
+              <el-col :span="6"><b>开户行:</b> {{ refund.openBank ? refund.openBank : '' }}</el-col>
+              <el-col :span="6"><b>账户类型:</b>
+                <el-tag v-if="refund.bankAccountType*1===1" type="warning" size="small">公账</el-tag>
+                <el-tag v-if="refund.bankAccountType*1===2" type="danger" size="small">私账</el-tag>
+              </el-col>
+            </el-row>
           </template>
-          <template v-else>
-            <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+        </div>
+        <div class="refund-item">
+          <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>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</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">
+                  <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+                </template>
+                <template v-else>
+                  <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>
+                <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+                <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.refundType*1===1" type="warning" size="small">部分退</el-tag>
+                <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
+                <el-tag v-else type="info" size="small">无退款</el-tag>
+              </el-col>
+              <el-col :span="6"><b>发货状态:</b>
+                <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+                <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+                <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+              </el-col>
+            </el-row>
+            <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
+              <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-row>
           </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>
-          <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-          <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.refundType*1===1" type="warning" size="small">部分退</el-tag>
-          <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
-          <el-tag v-else type="info" size="small">无退款</el-tag>
-        </el-col>
-        <el-col :span="6"><b>发货状态:</b>
-          <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-          <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-          <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-        </el-col>
-      </el-row>
-      <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-        <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-row>
-
-      <div v-for="shopOrder in order.newShopOrders" :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.orderTime }}</el-col>
-          <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</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.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
-          <el-col :span="2">
-            <img :src="op.productImage" 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 | toThousandFilter }}</div>
-            <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</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>
-    </el-card>
-
+        </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 | toThousandFilter }}</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 | toThousandFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</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>
+      </el-card>
+    </template>
   </div>
 </template>
 
@@ -244,6 +248,10 @@ export default {
   .box-row{
     padding: 10px 0;
   }
+  .refund-item{
+    border-bottom:1px dashed #E4E7ED;
+    margin-bottom: 20px;
+  }
   .order-item{
     border-bottom: 1px solid #DCDFE6;
     background:#F2F6FC;

src/views/order/refund.vue

@@ -47,7 +47,7 @@
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
-          {{ scope.$index }}
+          {{ scope.$index+1 }}
         </template>
       </el-table-column>
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
-          <router-link :to="'/order/refund/detail/' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
+          <router-link :to="'/order/refund/detail/' + row.id + '?orderID=' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
         </template>
       </el-table-column>
     </el-table>