修改退款订单详情

src/components/order/refundDetial.vue

@@ -241,8 +241,17 @@ export default {
           this.goodsList=[];
           this.form = response.data.order;
           this.form.refundAmount=response.data.refundAmount;
-          this.form.remark=this.form.remark;
-          this.form.refundState=this.form.state;
+          this.form.remark=response.data.remark;
+          this.form.refundState=response.data.state;
+          if(response.data.state!=""){
+            if(response.data.state=="1"){
+              this.form.refundState="退款中"
+            }else if(response.data.state=="2"){
+              this.form.refundState="退款成功"
+            }else if(response.data.state=="3"){
+              this.form.refundState="退款失败 "
+            }
+          }
           this.form.shopName=response.data.order.shop.name;
           this.form.state=this.formatterState(response.data.order.state);  
           this.form.city=this.getProvince(response.data.order.shop.city);        

src/views/order/refund/index.vue

@@ -43,18 +43,24 @@
         </template>
       </el-table-column>
       <el-table-column label="订单编号" align="center" prop="orderNo"/>
-      <el-table-column label="商品数量" align="center" prop="goodsNum" />
-      <el-table-column label="金额" align="center" prop="amount" />
-      <el-table-column label="店铺" align="center" prop="shop.name" />      
-      <el-table-column label="用户名称" align="center" prop="userName" />
-      <el-table-column label="付款时间" align="center" prop="payTime"/>  
-      <el-table-column label="订单状态" align="center" prop="state">
-        <template slot-scope="scope">{{formatterState(scope.row.state)}}</template>
+      <el-table-column label="商品数量" align="center" prop="order.goodsNum" />
+      <el-table-column label="金额" align="center" prop="refundAmount" />
+      <el-table-column label="店铺" align="center" prop="order.shop.name" />      
+      <el-table-column label="用户名称" align="center" prop="order.userName" />
+      <el-table-column label="付款时间" align="center" prop="order.payTime"/>  
+      <el-table-column label="订单状态" align="center" >
+        <template slot-scope="scope">{{formatterState(scope.row.order.state)}}</template>
       </el-table-column> 
-      <el-table-column label="申请退款时间" align="center" prop=""/>
-      <el-table-column label="到账时间" align="center" prop=""/>
-      <el-table-column label="退款状态" align="center" prop=""/>
-      <el-table-column label="发起人" align="center" prop=""/>   
+      <el-table-column label="申请退款时间" align="center" prop="createdAt"/>
+      <el-table-column label="到账时间" align="center" prop="updatedAt"/>
+      <el-table-column label="退款状态" align="center" prop="state">
+        <template scope="scope">
+          <span v-if="scope.row.state=='1'">退款中</span>
+          <span v-if="scope.row.state=='2'">退款成功</span>
+          <span v-if="scope.row.state=='3'">退款失败</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发起人" align="center" prop="createUserName"/>   
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
@@ -148,7 +154,37 @@ export default {
       }
     },    
     formatterState(state){
-      
+      if(state == 0){
+        return "创建未校验";
+      }else if(state == 1){
+        return "未支付";
+      }else if(state == 2){
+        return "已支付";
+      }else if(state == 3){
+        return "支付制作中";
+      }else if(state == 4){
+        return "制作完成未取";
+      }else if(state == 5){
+        return "取餐中";
+      }else if(state == 6){
+        return "正常完成";
+      }else if(state == 7){
+       return "未支付取消";
+      }else if(state == 8){
+       return "支付后制作前取消";
+      }else if(state == 9){
+        return "制作中取消";
+      }else if(state == 10){
+        return "制作完成取消";        
+      }else if(state == 11){
+        return "已退款";  
+      }else if(state == 12){
+        return "部分退款";  
+      }else if(state == 13){
+        return "待取超时";  
+      }else if(state == 50){
+        return "其他人工干预状态";  
+      }
     },    
     /** 查询订单列表 */
     getList() {