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

src/views/club/editForm.vue

@@ -172,13 +172,20 @@ export default {
             this.loadingbut = false
             this.loadingbuttext = '保存'
             this.$message({ message: response.msg, type: 'success', center: true })
-            setTimeout(() => {
-              this.$router.push({ path: '/club/list' })
-            }, 2000)
+            this.backToList()
           })
         }
       })
     },
+    backToList() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/club/list'
+          })
+        })
+      })
+    },
     // 从子组件获取省市区
     handleCity(data) {
       this.addList.provinceID = data.provinceid

src/views/club/form.vue

@@ -168,11 +168,20 @@ export default {
               this.loadingbut = false
               this.loadingbuttext = '保存'
               this.$message({ message: '上线会所成功', type: 'success', center: true })
-              this.$router.push({ path: '/club/list' })
+              this.backToList()
             }
           })
         }
       })
+    },
+    backToList() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/club/list'
+          })
+        })
+      })
     }
   }
 }

src/views/goods/list-select.vue

@@ -146,6 +146,7 @@ export default {
         })
       } else {
         this.$refs.multipleTable.clearSelection()
+        this.backToParentPath()
       }
     },
     handleSelectionChange(val) {
@@ -157,35 +158,38 @@ export default {
       this.multipleSelection.map(item => {
         itemsList.push(item.id)
       })
-      saveAddList({ itemsList: itemsList, organizeID: this.$store.getters.organizeID, modules: this.moduleId }).then(response => {
+      saveAddList({ itemsList: JSON.stringify(itemsList), organizeID: this.$store.getters.organizeID, modules: this.moduleId }).then(response => {
         this.$notify({
           title: response.code * 1 === 1 ? 'Success' : 'Error',
           message: response.code * 1 === 1 ? '添加成功' : response.msg,
           type: response.code * 1 === 1 ? 'success' : 'error',
           duration: 2000
         })
-        this.$store.dispatch('tagsView/delView', this.$route).then(() => {
-          let parentPath = ''
-          switch (this.moduleId) {
-            case 1:
-              parentPath = '/goods/list/preferred'
-              break
-            case 2:
-              parentPath = '/goods/list/preferential'
-              break
-            case 3:
-              parentPath = '/goods/list/commonly'
-              break
-          }
-          if (parentPath) {
-            this.$nextTick(() => {
-              this.$router.replace({ path: parentPath })
-            })
-          }
-        })
+        this.backToParentPath()
       }).catch(() => {
         this.fetchData()
       })
+    },
+    backToParentPath() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        let parentPath = ''
+        switch (this.moduleId) {
+          case 1:
+            parentPath = '/goods/list/preferred'
+            break
+          case 2:
+            parentPath = '/goods/list/preferential'
+            break
+          case 3:
+            parentPath = '/goods/list/commonly'
+            break
+        }
+        if (parentPath) {
+          this.$nextTick(() => {
+            this.$router.replace({ path: parentPath })
+          })
+        }
+      })
     }
   }
 }

src/views/order/detail.vue

@@ -153,15 +153,15 @@ export default {
         '5': '订单完成',
         '6': '已关闭',
         '7': '交易全退',
-        '11': '待收待发',
-        '12': '待收部发',
-        '13': '待收全发',
-        '21': '部收待发',
-        '22': '部收部发',
-        '23': '部收全发',
-        '31': '已收待发',
-        '32': '已收部发',
-        '33': '已收全发'
+        '11': '待收款、待发货',
+        '12': '待收款、部分发货',
+        '13': '待收款、全部发货',
+        '21': '部分收款、待发货',
+        '22': '部分收款、部分发货',
+        '23': '部分收款、全部发货',
+        '31': '全部收款、待发货',
+        '32': '全部收款、部分发货',
+        '33': '全部收款、全部发货'
       }
     }
   },

src/views/order/list.vue

@@ -203,15 +203,15 @@ export default {
         '5': '订单完成',
         '6': '已关闭',
         '7': '交易全退',
-        '11': '待收待发',
-        '12': '待收部发',
-        '13': '待收全发',
-        '21': '部收待发',
-        '22': '部收部发',
-        '23': '部收全发',
-        '31': '已收待发',
-        '32': '已收部发',
-        '33': '已收全发'
+        '11': '待收款、待发货',
+        '12': '待收款、部分发货',
+        '13': '待收款、全部发货',
+        '21': '部分收款、待发货',
+        '22': '部分收款、部分发货',
+        '23': '部分收款、全部发货',
+        '31': '全部收款、待发货',
+        '32': '全部收款、部分发货',
+        '33': '全部收款、全部发货'
       }
     }
   },

src/views/order/refund-detail.vue

@@ -7,8 +7,8 @@
     </el-menu>
 
     <h1>退款单</h1>
-    <template v-for="refund in refundList">
-      <el-card :key="refund.orderID" class="box-card">
+    <el-card v-for="refund in refundList" :key="refund.orderID" class="box-card">
+      <div class="refund-item">
         <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>
@@ -51,84 +51,85 @@
             </el-col>
           </el-row>
         </template>
-      </el-card>
+      </div>
 
-      <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="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 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>
+      <div class="refund-item">
+        <template v-if="order">
+          <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.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-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">
+          <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>
+        </template>
+      </div>
+      <!-- <div class="refund-item"><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>
@@ -154,8 +155,9 @@
             <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">
+      </el-card></div>-->
+
+      <div class="refund-item">
         <h3>审核信息</h3>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
@@ -172,8 +174,8 @@
             <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">
+      </div>
+      <div class="refund-item">
         <h3>申请信息</h3>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
@@ -190,15 +192,16 @@
             <img v-if="refund.image5" :src="refund.image5" width="65" alt="">
           </el-col>
         </el-row>
-      </el-card>
-      <el-card :key="'end'+refund.orderID" class="box-card">
+      </div>
+      <div class="refund-item">
         <el-row :gutter="24" class="box-row">
           <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>
+    </el-card>
+
     <template>
       <el-backtop style="right: 40px; bottom: 40px;">
         <i class="el-icon-upload2" />
@@ -222,15 +225,15 @@ export default {
         '5': '订单完成',
         '6': '已关闭',
         '7': '交易全退',
-        '11': '待收待发',
-        '12': '待收部发',
-        '13': '待收全发',
-        '21': '部收待发',
-        '22': '部收部发',
-        '23': '部收全发',
-        '31': '已收待发',
-        '32': '已收部发',
-        '33': '已收全发'
+        '11': '待收款、待发货',
+        '12': '待收款、部分发货',
+        '13': '待收款、全部发货',
+        '21': '部分收款、待发货',
+        '22': '部分收款、部分发货',
+        '23': '部分收款、全部发货',
+        '31': '全部收款、待发货',
+        '32': '全部收款、部分发货',
+        '33': '全部收款、全部发货'
       }
     }
   },
@@ -288,6 +291,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-record.vue

@@ -144,15 +144,15 @@ export default {
         '5': '订单完成',
         '6': '已关闭',
         '7': '交易全退',
-        '11': '待收待发',
-        '12': '待收部发',
-        '13': '待收全发',
-        '21': '部收待发',
-        '22': '部收部发',
-        '23': '部收全发',
-        '31': '已收待发',
-        '32': '已收部发',
-        '33': '已收全发'
+        '11': '待收款、待发货',
+        '12': '待收款、部分发货',
+        '13': '待收款、全部发货',
+        '21': '部分收款、待发货',
+        '22': '部分收款、部分发货',
+        '23': '部分收款、全部发货',
+        '31': '全部收款、待发货',
+        '32': '全部收款、部分发货',
+        '33': '全部收款、全部发货'
       }
     }
   },
@@ -209,5 +209,9 @@ export default {
   .box-row{
     padding: 10px 0;
   }
+  .refund-item{
+    border-bottom:1px dashed #E4E7ED;
+    margin-bottom: 20px;
+  }
 </style>
 

src/views/order/refund-return.vue

@@ -190,15 +190,15 @@ export default {
         '5': '订单完成',
         '6': '已关闭',
         '7': '交易全退',
-        '11': '待收待发',
-        '12': '待收部发',
-        '13': '待收全发',
-        '21': '部收待发',
-        '22': '部收部发',
-        '23': '部收全发',
-        '31': '已收待发',
-        '32': '已收部发',
-        '33': '已收全发'
+        '11': '待收款、待发货',
+        '12': '待收款、部分发货',
+        '13': '待收款、全部发货',
+        '21': '部分收款、待发货',
+        '22': '部分收款、部分发货',
+        '23': '部分收款、全部发货',
+        '31': '全部收款、待发货',
+        '32': '全部收款、部分发货',
+        '33': '全部收款、全部发货'
       }
     }
   },