Merge branch 'dev_hxz' into test

src/views/system/retreat/edit.vue

@@ -81,7 +81,7 @@
           </el-row>
           <el-row class="row-title">
             <el-col :span="3" class="text-r">商品金额</el-col>
-            <el-col :span="6" class="text-l">{{ goodsOrderDetail.price }}</el-col>
+            <el-col :span="6" class="text-l">{{ goodsOrderDetail.refund_money }}</el-col>
             <el-col :span="3" class="text-r">商品数量</el-col>
             <el-col :span="6" class="text-l">{{ goodsOrderDetail.total }}</el-col>
           </el-row>
@@ -91,9 +91,9 @@
       <div>
         <p>历史售后申请</p>
         <el-table :data="asApplyList">
-          <el-table-column label="申请时间" align="center" prop="tabapply_time">
+          <el-table-column label="申请时间" align="center" prop="created_time">
             <template slot-scope="scope">
-              {{formatter(scope.row.tabapply_time)}}
+              {{formatter(scope.row.created_time)}}
             </template>
           </el-table-column>
 
@@ -121,7 +121,7 @@
           </el-table-column>
           <el-table-column label="申请图片" align="center">
             <template slot-scope="scope">
-              {{scope.row.apply_price/100 }}
+              {{scope.row.images }}
             </template>
           </el-table-column>
 
@@ -234,16 +234,14 @@
         goodsOrderDetail: {
           goods_status: 0, // 订单状态
           goods_order_sn: '', // 订单编号
-          price: '', // 商品金额
+          refund_money: '', // 商品金额/售后金额
           title: '',// 商品名称
           goods_option_title: '', // 商品规格
           total: '', // 商品数量
         },
         // 售后申请 图片 list
         asSrcList: [],
-        asApplyList: [
-          { data1:1256332213,data2: 1,data3: 3,data4: 4,data5:5, data6: 6,data7: 7 }
-        ],
+        asApplyList: [],
         // 0-全部隐藏-默认状态; 1-显示 仅退款 按钮；2-显示 退货退款中（同意/拒绝 退货退款）按钮; 3-显示 退货退款中 （拒收包裹 / 确定退款） 按钮
         onlyOrRefundBtnType: 0,
         // 1-仅退款 同意退款; 2-仅退款 拒绝退款; 3-退货退款 同意退款退款; 4-; 5-
@@ -357,7 +355,7 @@
             this.refundStep3 = '买家超时未退货'
             this.refundStep4 = '买家未退货，售后关闭'
             this.refundStep5 = ''
-            this.step = 5
+            this.step = 4
           }else if (close_status === 6) {
             this.has45 = 3
             this.refundStep2 = '买家取消售后申请'

src/views/system/retreat/retreat/index.vue

@@ -18,18 +18,17 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            @change="applyTimeChange"
             :picker-options="pickerOptions">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="商品ID" prop="goods_id">
-          <el-input
-            v-model="queryParams.goods_id"
-            placeholder="请输入商品id"
-            clearable
-            @keyup.enter.native="handleQuery"
-          /></el-form-item>
+<!--        <el-form-item label="商品ID" prop="goods_id">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.goods_id"-->
+<!--            placeholder="请输入商品id"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--          /></el-form-item>-->
 
         <el-form-item label="商品名称" prop="goods_title">
           <el-input
@@ -40,13 +39,13 @@
           /></el-form-item>
 
         <el-form-item label="退换货类型" prop="refund_type">
-          <el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable >
+          <el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable width="120px">
             <el-option v-for="item in userNeedOptions" :key="item.value" :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="售后订单号" prop="refund_sn">
+        <el-form-item label="售后订单号" prop="refund_sn" width="220px">
           <el-input
             v-model="queryParams.refund_sn"
             placeholder="请输入订单号"
@@ -68,7 +67,7 @@
       </el-form>
       <!-- 列表 -->
       <el-table class="after-sale-table" :data="afterSaleList" :height="afterSaleHeight">
-        <el-table-column label="商品ID" align="center" width="150" prop="goodsId"></el-table-column>
+<!--        <el-table-column label="商品ID" align="center" width="150" prop="goodsId"></el-table-column>-->
         <el-table-column label="商品名称" align="center" width="180" prop="title"></el-table-column>
         <el-table-column label="售后订单号" align="center" width="240" prop="refund_sn"></el-table-column>
         <el-table-column label="退换货类型" align="center" width="180">
@@ -127,8 +126,9 @@
         goodsStatus: 1,
         activeName: 'first',
         queryParams: {
+          status: 0,
           applyTime: [],
-          goods_id: '',
+          // goods_id: '',
           goods_title: '',
           refund_type: '',
           refund_sn: '',
@@ -163,9 +163,9 @@
         },
         // 退换货类型
         userNeedOptions: [
-          {value: -1,label: '全部类型'},
-          {value: 1,label: '仅退款'},
-          {value: 2,label: '退货退款'},
+          {value: -1, label: '全部类型'},
+          {value: 1, label: '仅退款'},
+          {value: 2, label: '退货退款'},
         ],
         // 退换货原因
         needMsgOptions: [
@@ -178,7 +178,7 @@
         fullHeight: 0,
         afterSaleHeight: 200,
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 20,
         total: 0,
         // 售后列表
         afterSaleList: [],
@@ -198,14 +198,15 @@
         this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
       })
     },
-    mounted() {
-
-    },
+    mounted() {},
     methods: {
       /** 顶部 状态页签切换
        * 1-未处理；2-处理中；3-已完成
        * */
       handleClick() {
+        // 搜索条件初始化
+        this.resetSearchParams();
+
         switch (this.activeName) {
           case 'first':
             this.goodsStatus = 1
@@ -219,50 +220,47 @@
           default:
             break
         }
-        // 搜索条件初始化
-        this.resetSearchParams();
         // 列表 查询
         this.getList();
       },
       /** 时间格式处理 */
-      applyTimeChange() {
-        if( !Array.isArray(this.queryParams.applyTime) ) {
-          this.queryParams.applyTime = [];
-        }
-      },
+      // applyTimeChange() {
+      //   if( !Array.isArray(this.queryParams.applyTime) ) {
+      //     this.queryParams.applyTime = [];
+      //   }
+      // },
       /** 列表查询 */
       getList() {
         let params = {
           page: this.currentPage,
           limit: this.pageSize,
           status: this.goodsStatus,
-          apply_start_time: '',
-          apply_end_time: '',
-          goods_id: this.queryParams.goods_id,
-          goods_title: this.queryParams.goods_title,
-          refund_type: '',
-          refund_sn: '',
-          reason: ''
+          //goods_id: this.queryParams.goods_id,
+          // goods_title: this.queryParams.goods_title,
+          // refund_type: '',
+          // refund_sn: '',
+          // reason: ''
+        }
+
+        if( this.queryParams.applyTime && this.queryParams.applyTime.length === 2) {
+          params['apply_start_time'] = new Date(this.queryParams.applyTime[0]).getTime() / 1000
+          params['apply_end_time'] = new Date(this.queryParams.applyTime[1]).getTime() / 1000
+        }
+
+        if (this.queryParams.goods_title != '') {
+          params['goods_title'] = this.queryParams.goods_title;
         }
 
-        if( this.queryParams.applyTime.length === 2) {
-          params.apply_start_time = new Date(this.queryParams.applyTime[0]).getTime() / 1000
-          params.apply_end_time = new Date(this.queryParams.applyTime[1]).getTime() / 1000
-        }else {
-          params.apply_start_time = ''
-          params.apply_end_time = ''
+        if (this.queryParams.refund_type != -1 && this.queryParams.refund_type != '') {
+          params['refund_type'] = this.queryParams.refund_type;
         }
 
-        if (this.queryParams.refund_type === -1) {
-          params.refund_type = ''
-        }else {
-          params.refund_type = this.queryParams.refund_type;
+        if (this.queryParams.refund_sn != '') {
+          params['refund_sn'] = this.queryParams.refund_sn;
         }
 
-        if (this.queryParams.reason === -1) {
-          params.reason = ''
-        }else {
-          params.reason = this.queryParams.reason;
+        if (this.queryParams.reason != -1 && this.queryParams.reason != '') {
+          params['reason'] = this.queryParams.reason;
         }
 
         getRetreatList(params).then(res=> {
@@ -298,12 +296,12 @@
       },
       /** 搜索条件初始化 */
       resetSearchParams() {
-        this.pageSize = 10;
+        this.pageSize = 20;
         this.currentPage = 1;
-        // this.goodsStatus = 1;
         this.queryParams = {
+          status: 0,
           applyTime: [],
-          goods_id: '',
+          //goods_id: '',
           goods_title: '',
           refund_type: '',
           refund_sn: '',