新增售后申请退货物业务流程-不含有部分支付

components/dialogOrderAfterSale.vue

@@ -25,7 +25,8 @@
               <span>没收到货,或与卖家写上同意无需要退货只退款</span>
             </div>
           </li>
-          <li>
+          <!--只有order.order_status[已发货,已收货]时展示"已发货已收货"-->
+          <li v-if="[3,4].includes(orderData.order_status)">
             <input type="radio" name="refundType" v-model="formData.refund_type" value="2">
             <div class="left">
               <strong>退货退款</strong>
@@ -224,7 +225,15 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.orderData = res.data
-            this.orderGoodsList = res.data.order_goods//需要售后的商品列表
+
+            let _refund_goods_data = [];//允许退款的商品
+            res.data.order_goods.forEach((v)=>{
+              if(v.refund_status == 0){
+                _refund_goods_data.push(v)
+              }
+            })
+            this.orderGoodsList = _refund_goods_data//需要售后的商品列表
+
             console.log('1111',this.orderGoodsList)
           }else{
             this.$message.error(res.message);

pages/order/index.vue

@@ -183,7 +183,7 @@
           <template slot-scope="scope">
             <!-- 在这里添加自定义内容和判断逻辑 -->
             <span v-if="scope.row.order_status_name == `待审核` && scope.row.order_status == 1">待发货</span>
-            <span v-else>11{{scope.row.order_status_name}}</span>
+            <span v-else>{{scope.row.order_status_name}}</span>
           </template>
         </el-table-column>
         <!--待审核是展示-->

pages/order/processRefunds.vue

@@ -46,7 +46,8 @@
         <p class="t1">退款成功</p>
         <p class="t4">
           退款总金额：
-          <span>¥{{refundData.real_goods_money}}</span>
+<!--          <span>¥{{refundData.real_goods_money}}</span>-->
+          <span>¥{{orderGoodsData.refund_status == 3 ? orderGoodsData.refund_real_money : orderGoodsData.refund_apply_money}}</span>
         </p>
       </div>
       <!-- 商品信息 -->
@@ -74,13 +75,22 @@
           <div>申请时间</div>
           <div>{{ $dayjs(refundData.refund_action_time*1000).format('YYYY-MM-DD HH:mm:ss') }}</div>
         </div>
-        <div class="refoundOrder_item" v-if="refundData.refund_fee">
+
+        <!--退款状态=3维权结束 && refund_real_money实际退款金额 >0 时展示-->
+        <div class="refoundOrder_item" v-if="refundData.refund_status == 3 && refundData.refund_real_money>0">
           <div>退款金额</div>
-          <div>¥{{refundData.refund_fee}}</div>
+          <div>¥{{refundData.refund_real_money}}</div>
         </div>
+
+        <!--退款申请金额>0时展示-->
+        <div class="refoundOrder_item" v-else-if="refundData.refund_apply_money > 0">
+          <div>退款金额</div>
+          <div>¥{{refundData.refund_apply_money}}</div>
+        </div>
+
         <div class="refoundOrder_item">
           <div>退款原因</div>
-          <div>{{refundData.refund_reason}}</div>
+          <div>{{orderGoodsData.refund_remark}}</div>
         </div>
         <!-- <div class="refoundOrder_item_img" >
           <div>上传图片</div>
@@ -120,7 +130,7 @@
 <script>
 import Setting from "~/setting";
 export default {
-  props: ["stepActive", "iSfailed", "iSrefund", "orderData"],
+  props: ["stepActive", "iSfailed", "iSrefund", "orderData",'orderGoodsData'],
   data() {
     return {
       imgUrl: Setting.uplodBaseURL,
@@ -136,6 +146,7 @@ export default {
       return item.order_goods_id;
     });
     this.getRefundData();
+    //console.log('qq5',this.orderGoodsData)
     console.log(this.stepActive, this.iSfailed, this.iSrefund);
   },
   methods: {
@@ -143,7 +154,8 @@ export default {
       // 多个退款数据查询
       // if (this.orderData.order_goods.length > 1) {
       let obj = {
-        order_goods_id: this.order_goods_ids.toString()
+        //order_goods_id: this.order_goods_ids.toString()
+        order_goods_id: this.orderGoodsData.order_goods_id.toString()
       };
       this.$axios
         .post(`/orderrefund/detail`, obj)
@@ -346,4 +358,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages/order/refund.vue

@@ -15,6 +15,7 @@
           :key="stepIndex"
         ></el-step>
       </el-steps>
+
       <ApplyRefund v-if="stepActive == 0" :orderData.sync="orderData" ref="applyRefund" />
       <ProcessRefunds
         v-if="!stepActive == 0"
@@ -23,6 +24,7 @@
         :iSfailed.sync="iSfailed"
         :iSrefund.sync="iSrefund"
         :orderData.sync="orderData"
+        :orderGoodsData.sync="order_goods_data"
       />
 
       <el-button class="refundBtn" type="primary" @click="next(0)" v-show="stepActive == 0">提交</el-button>
@@ -31,13 +33,19 @@
         class="refundBtn"
         type="primary"
         @click="next(2)"
-        v-show="stepActive == 2 && iSfailed == false"
+        v-show="stepActive == 2 && iSfailed == false && ![5,6].includes(order_goods_data.refund_status)"
       >撤销申请</el-button>
+<!--      <el-button-->
+<!--        class="refundBtn"-->
+<!--        type="primary"-->
+<!--        @click="showWaybill()"-->
+<!--        v-if="isWaybill"-->
+<!--        v-show="stepActive == 2 && iSfailed == true"-->
+<!--      >填写快递运单号</el-button>-->
       <el-button
         class="refundBtn"
         type="primary"
         @click="showWaybill()"
-        v-if="isWaybill"
         v-show="stepActive == 2 && iSfailed == true"
       >填写快递运单号</el-button>
     </div>
@@ -50,19 +58,16 @@
     >
       <template v-slot:contentSlot>
         <el-form ref="waybillForm" :model="waybillForm" label-width="80px">
-          <el-form-item label="快递公司">
+          <el-form-item label="物流公司">
-            <el-select
+            <el-input v-model="waybillForm.refund_delivery_name" size="small"></el-input>
-              v-model="waybillForm.region"
-              placeholder="请选择"
-              style="width: 100%"
-              size="small"
-            >
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
           </el-form-item>
-          <el-form-item label="快递单号">
+
-            <el-input v-model="waybillForm.name" size="small"></el-input>
+          <el-form-item label="物流单号">
+            <el-input v-model="waybillForm.refund_delivery_no" size="small"></el-input>
+          </el-form-item>
+
+          <el-form-item label="物流说明">
+            <el-input v-model="waybillForm.refund_delivery_remark" size="small"></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -117,9 +122,15 @@ export default {
       // 运单号弹出框
       isWaybill: false,
       waybillDialog: false,
+
+      order_goods_ids:[],
+      order_goods_data:'',//需要售后的商品订单表信息
+      refundData: {},//要退款的商品数据
+      //卖家退货运单需要填写的表单
       waybillForm: {
-        region: "",
+        refund_delivery_name: "",//物流公司
-        name: ""
+        refund_delivery_no: "",//物流单号
+        refund_delivery_remark: "",//物流说明
       },
 
       orderData: {},
@@ -137,18 +148,20 @@ export default {
     this.iSrefund = undefined;
     this.iSfailed = undefined;
     this.stepActive = 0;
+
+    this.order_goods_data = this.$route.query.row;//需要售后的商品订单表信息
     if (this.$route.query.row.refund_status == 0) {
       this.orderData = this.$route.query.row;
     } else {
       let status = this.$route.query.row.refund_status;
       this.getRefundOrder(this.$route.query.row.order_id, status);
-      console.log(
+      // console.log(
-        this.stepActive,
+      //   this.stepActive,
-        this.iSfailed,
+      //   this.iSfailed,
-        this.iSrefund,
+      //   this.iSrefund,
-        status,
+      //   status,
-        111111
+      //   111111
-      );
+      // );
     }
   },
   mounted() {
@@ -166,6 +179,12 @@ export default {
           console.log(status, `status`);
           console.log(this.orderData, `this.orderData`);
 
+          this.order_goods_ids = this.orderData.order_goods.map(item => {
+            return item.order_goods_id;
+          });
+
+          this.getRefundData()
+
           // refund_status  1申请退款   2已确认  3已完成  4等待买家发货  5等待卖家发货   6卖家确认收货  -1卖家拒绝退款  -2卖家关闭退款
           switch (status) {
             case -1:
@@ -186,9 +205,18 @@ export default {
               this.stepActive = 3;
               this.iSrefund = true;
               break;
-            //   case 4:
+              case 4://4等待买家发货
-            //     this.stepActive = 2;
+                this.stepActive = 2;
-            //     break;
+                this.iSfailed = true;
+                break;
+            case 5://5等待卖家发货
+              this.stepActive = 2;
+              this.iSfailed = false;
+              break;
+            case 6://6卖家确认收货
+              this.stepActive = 2;
+              this.iSfailed = false;
+              break;
 
             //   default:
             //     this.stepActive = 0;
@@ -251,22 +279,67 @@ export default {
     showWaybill() {
       this.waybillDialog = true;
     },
-    // 运单号弹出框确认按钮
+
+    //获取要退货的商品信息
+    getRefundData() {
+      // 多个退款数据查询
+      // if (this.orderData.order_goods.length > 1) {
+      let obj = {
+        order_goods_id: this.order_goods_ids.toString()
+      };
+      this.$axios
+        .post(`/orderrefund/detail`, obj)
+        .then(res => {
+          this.refundData = res.data;
+          //console.log('qq3',res.data);
+        })
+        .catch(err => {
+          this.$message.error(err);
+        });
+    },
+
+    // 运单号弹出框确认按钮点击事件
     clickConfirm() {
       let obj = {
-        order_goods_id: "",
+        order_goods_id: this.$route.query.row.order_goods_id,
-        refund_delivery_name: "",
+        refund_delivery_name: this.waybillForm.refund_delivery_name,
-        refund_delivery_no: ""
+        refund_delivery_no: this.waybillForm.refund_delivery_no,
-        // refund_delivery_remark
+        refund_delivery_remark:this.waybillForm.refund_delivery_remark,
       };
 
+      //验证必填参数
+      if (!obj.refund_delivery_name){
+        this.$message.error("请填写物流公司名称");
+        return;
+      }
+      if (!obj.refund_delivery_no){
+        this.$message.error("请填写物流单号");
+        return;
+      }
+      //发送请求
+      this.$axios
+        .post(`/orderrefund/delivery`, obj)
+        .then(res => {
+          console.log('qq2',res)
+          if(res.code == 0){
+            this.$message.success(res.message);
+          }else{
+            this.$message.error(res.message);
+          }
+        })
+        .catch(err => {
+          this.$message.error(err);
+        });
+
+
       this.waybillDialog = false;
-      // if (this.stepActive++ > 2) this.stepActive = 0;
+
     },
+    //撤销退款申请
     cancelRefund() {
       console.log();
       let obj = {
-        order_goods_id: this.$refs.processRefunds.order_goods_ids.toString()
+        order_goods_id: this.$route.query.row.order_goods_id.toString()
       };
       this.$axios
         .post(`/orderrefund/cancel`, obj)
@@ -362,4 +435,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages/shopping_cart/submit_order.vue

@@ -548,9 +548,24 @@ export default {
         is_invoice: this.paymentForm.is_invoice ? 1 : 0, //是否需要开发票
         store_id: JSON.parse(localStorage.getItem("drugstoreObj")).id,
       };
-      this.$axios.post(`/ordercreate/create`, obj).then((res) => {
+      // this.$axios.post(`/ordercreate/create`, obj).then((res) => {
-        this.orderNum = res.data;
+      //   this.orderNum = res.data;
-      });
+      // });
+
+      this.$axios
+        .post(`/ordercreate/create`, obj)
+        .then(res => {
+          if(res.code != 0){
+            this.$message.error(res.message);
+          }
+          this.orderNum = res.data;
+        })
+        .catch(err => {
+          this.$message.error(err);
+        });
+
+
+
       this.paymentDialog = true;
     },
     // 提交订单弹出框取消按钮