Tang 3 жил өмнө
parent
commit
97d0ee0c7b

+ 23 - 1
src/components/tableList.vue

@@ -1286,10 +1286,29 @@
                 :key="indext"
                 v-if="itemt.value === scope.row[item.prop]"
                 :style="itemt.style ? itemt.style : ''"
-                >{{ itemt.label }}</span
+                >{{ itemt.label }}
+                <el-button
+                  type="text"
+                  v-if="itemt.click"
+                  @click="backFunc(scope.row)"
+                  >查看</el-button
+                ></span
               >
             </template>
           </div>
+          <div v-else-if="item.scope === 'orderGoodsStatus'">
+            {{
+              scope.row[item.prop] === -1
+                ? "关闭"
+                : scope.row[item.prop] === 0
+                ? "待支付"
+                : scope.row[item.prop] === 1
+                ? `已支付(${scope.row["goodsReceived"]})`
+                : scope.row[item.prop] === 2
+                ? `已退款(${scope.row["goodsReceived"]})`
+                : ""
+            }}
+          </div>
           <div v-else-if="item.scope === 'isOptionsDZYQ'">
             <template v-for="(itemt, indext) in item.options">
               <span
@@ -1703,6 +1722,9 @@ export default {
   },
   mounted() {},
   methods: {
+    backFunc(row) {
+      this.$emit("backFunc", row);
+    },
     /**
      * 清除多选框
      */

+ 5 - 3
src/views/Marketing/order/offlineOrder/orderChargeInfo/bodyBox.vue

@@ -108,7 +108,6 @@ export default {
         .then((res) => {
           this.list = res.rows;
           if (res.rows.length) {
-            console.log(this.$route.query.status);
             if (this.$route.query.status == 1) {
               this.openActive(res.rows[0].userId);
             }
@@ -122,14 +121,17 @@ export default {
      * 选中
      */
     activeUser(item) {
-      console.log(item);
       this.active = `${item.userId}-${item.goodsId}`;
       this.goodsId = item.goodsId;
       this.orderSn = item.orderSn;
       this.orderGoodsId = item.orderGoodsId;
       this.userId = item.userId;
       this.orderFrom = item.orderFrom;
-      this.activeName = "first";
+      if (this.$route.query.pageName) {
+        this.activeName = this.$route.query.pageName;
+      } else {
+        this.activeName = "first";
+      }
     },
     /**
      * 展开学员商品信息

+ 56 - 10
src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -15,6 +15,7 @@
       :navText="navText"
       :loading="loading"
       ref="tableList"
+      @backFunc="jumpRefund"
     >
       <template slot="customize">
         <el-button size="medium" type="warning" @click="setGoodsOptions(1)"
@@ -265,41 +266,56 @@ export default {
         },
         {
           label: "订单状态",
-          prop: "status",
+          prop: "orderGoodsStatus",
+          hidden: true,
+          scope: "orderGoodsStatus",
+        },
+        {
+          label: "退款状态",
+          prop: "refundStatus",
           hidden: true,
           scope: "isOptions",
           options: [
             {
-              label: "无效",
+              label: "无",
               value: 0,
             },
             {
-              label: "有效",
+              label: "退款中",
               value: 1,
+              click: true,
+            },
+            {
+              label: "已退款",
+              value: 2,
+            },
+            {
+              label: "拒绝退款",
+              value: 3,
             },
           ],
         },
         {
-          label: "退款状态",
-          prop: "refundStatus",
+          label: "发票状态",
+          prop: "invoiceStatus",
           hidden: true,
           scope: "isOptions",
           options: [
             {
               label: "无",
-              value: 0,
+              value: null,
             },
             {
-              label: "退款中",
+              label: "未开票",
               value: 1,
             },
             {
-              label: "已退款",
+              label: "已开票",
               value: 2,
             },
             {
-              label: "拒绝退款",
-              value: 3,
+              label: "已退票",
+              value: -1,
             },
           ],
         },
@@ -322,6 +338,36 @@ export default {
     this.search();
   },
   methods: {
+    jumpRefund(row) {
+      const jump = () => {
+        this.$router.push({
+          path: "orderChargeInfo",
+          query: {
+            inputOrderSn: this.$route.query.inputOrderSn,
+            status: 2,
+            pageName: "fourd",
+            orderGoodsId: row.orderGoodsId,
+            userId: row.userId,
+          },
+        });
+      };
+      const statusPage = this.$store.state.tagsView.visitedViews.some(
+        (item) => {
+          return item.name == "OrderChargeInfo";
+        }
+      );
+      if (statusPage) {
+        this.$store
+          .dispatch("tagsView/delCachedView", {
+            name: "OrderChargeInfo",
+          })
+          .then((res) => {
+            jump();
+          });
+      } else {
+        jump();
+      }
+    },
     /**
      * 1计费单收费2退费申请3补录
      */

+ 0 - 1
src/views/Marketing/order/offlineOrder/orderDetailsT/refundDocument/index.vue

@@ -315,7 +315,6 @@ export default {
       this.$api
         .inquireOrderList({ orderGoodsIds: this.$route.query.orderGoodsIds })
         .then((res) => {
-          console.log(res, "ggg");
           res.rows.forEach((item) => {
             item.applyImgs = [];
           });

+ 3 - 1
src/views/Marketing/order/pendingRefundOrder/refundDia.vue

@@ -137,7 +137,7 @@ export default {
         }
         if (int === 1) {
           item.copyperiodStatus = item.periodStatus;
-          item.periodStatusLine = ""
+          item.periodStatusLine = "";
         }
         return item;
       });
@@ -180,6 +180,8 @@ export default {
       data.forEach((item) => {
         if (item.applyImgs.length) {
           item.applyImgs = item.applyImgs.toString();
+        } else {
+          item.applyImgs = ""
         }
       });
       if (this.int === 0) {