fix:修改售后旧版本权限路由

src/lang/en.js

@@ -233,6 +233,7 @@ export default {
     warningResults: "Warning Results",
     warningConfiguration: "Warning Configuration",
     afterSales: "After-Sales",
+    afterSalesNew: "AfterSales-New",
     invoicing: "Invoicing",
     refundManagement: "Refund Management",
     financialAudit: "Financial Audit",

src/lang/ja.js

@@ -160,6 +160,7 @@ export default {
     warningResults: "警告結果",
     warningConfiguration: "警告設定",
     afterSales: "アフターセールス",
+    afterSalesNew: "アフターセールス-新しい",
     invoicing: "仕入れ預金",
     refundManagement: "返金管理",
     financialAudit: "財務審査",

src/lang/zh.js

@@ -298,6 +298,7 @@ export default {
     childInventoryList: "子仓库存",
     childWarehouseList: "子仓管理",
     afterSales: "售后",
+    afterSalesNew: "售后-新",
     invoicing: "仓储",
     refundManagement: "退款管理",
     financialAudit: "财务审核",

src/router/modules/refund-old.js

@@ -7,7 +7,7 @@ const refundRouter = {
   component: Layout,
   redirect: "/refund-old/refundList",
   name: "afterSales-Old",
-  meta: { title: "afterSales-Old", icon: "refund" },
+  meta: { title: "afterSales", icon: "refund" },
   children: [
     {
       path: "refundList",

src/router/modules/refund.js

@@ -7,7 +7,7 @@ const refundRouter = {
   component: Layout,
   redirect: "/refund/refundList",
   name: "afterSales",
-  meta: { title: "afterSales", icon: "refund" },
+  meta: { title: "afterSalesNew", icon: "refund" },
   children: [
     {
       path: "refundList",

src/views/oms/refund-old/abnormalRefundList.vue

@@ -423,9 +423,14 @@
             >{{ $t("view.modifyRemarks") }}
           </el-button>
 
-           <el-button v-has="'ordersRefund:checkKf'" v-if="scope.row.abnormalFlag=='1' "  size="mini"-->
-                      type="success" @click="releaseEx(scope.row)">解除异常
-           </el-button>
+          <el-button
+            v-has="'ordersRefund:checkKf'"
+            v-if="scope.row.abnormalFlag == '1'"
+            size="mini"
+            --
+          >
+            type="success" @click="releaseEx(scope.row)">解除异常
+          </el-button>
           <el-button
             v-if="
               scope.row.status == '0' ||
@@ -587,9 +592,7 @@
       v-if="orderRefundVisible"
       :visible.sync="orderRefundVisible"
     >
-      <orderRefundDialog
-        :refundId="currentRefundId"
-      ></orderRefundDialog>
+      <orderRefundDialog :refundId="currentRefundId"></orderRefundDialog>
       <el-button type="danger" style="float:right" @click="backTable">{{
         $t("back")
       }}</el-button>
@@ -601,9 +604,7 @@
       v-if="orderRefundNewVisible"
       :visible.sync="orderRefundNewVisible"
     >
-      <orderRefundNewDialog
-        :refundId="currentRefundId"
-      ></orderRefundNewDialog>
+      <orderRefundNewDialog :refundId="currentRefundId"></orderRefundNewDialog>
       <el-button type="danger" style="float:right" @click="backTable">{{
         $t("back")
       }}</el-button>
@@ -725,9 +726,9 @@ import {
 } from "@/api/oms/refund/refund";
 import { dcmAdd } from "@/utils/toolUtil";
 import { fetchList as orderFetchList } from "@/api/oms/order/order";
-import orderRefundDialog from "@/views/oms/refund/components/orderRefundDialog";
-import orderRefundNewDialog from "@/views/oms/refund/components/orderRefundNewDialog";
-import createRefundDialog from "@/views/oms/refund/components/createRefundDialog";
+import orderRefundDialog from "@/views/oms/refund-old/components/orderRefundDialog";
+import orderRefundNewDialog from "@/views/oms/refund-old/components/orderRefundNewDialog";
+import createRefundDialog from "@/views/oms/refund-old/components/createRefundDialog";
 import log from "@/router/modules/log";
 import { queryChannelStore, queryChannel } from "@/api/oms/inventory/inventory";
 const refundMethodOptions = [
@@ -828,7 +829,7 @@ export default {
         refundNo: "",
         timeplacedLaggerThanEqual: null,
         timeplacedLessThanEqual: null,
-        abnormalFlag:'1'
+        abnormalFlag: "1"
       },
       dialogFormUploadVisible: false,
       formLabelWidth: "120px",

src/views/oms/refund-old/refundCwList.vue

@@ -204,9 +204,9 @@
         align="center"
         prop="channelStatus"
       >
-          <template slot-scope="scope">
-            {{ scope.row.channelStatus | channelStatusFilter(that) }}
-          </template>
+        <template slot-scope="scope">
+          {{ scope.row.channelStatus | channelStatusFilter(that) }}
+        </template>
       </el-table-column>
       <el-table-column
         :label="$t('label.afterSalesType')"
@@ -306,7 +306,7 @@
       >
       </el-table-column>
 
-     <el-table-column
+      <el-table-column
         label="自动退款失败原因"
         width="150"
         align="center"
@@ -546,7 +546,7 @@ import {
   manualRefundSuccess
 } from "@/api/oms/refund/refund";
 import { dcmAdd } from "@/utils/toolUtil";
-import orderRefundDialog from "@/views/oms/refund/components/orderRefundDialog";
+import orderRefundDialog from "@/views/oms/refund-old/components/orderRefundDialog";
 import { queryChannelStore, queryChannel } from "@/api/oms/inventory/inventory";
 export default {
   name: "refundList",

src/views/oms/refund-old/refundDetail.vue

@@ -21,12 +21,12 @@
       <div>
         AddressInfo: {{ returnWarehouseAddress
         }}<i
-          style="color:blue;"
-          class="el-icon-document-copy"
-          :title="$t('title.copy')"
-          :copy-value="returnWarehouseAddress"
-          v-on:click="copy"
-        ></i>
+        style="color:blue;"
+        class="el-icon-document-copy"
+        :title="$t('title.copy')"
+        :copy-value="returnWarehouseAddress"
+        v-on:click="copy"
+      ></i>
       </div>
     </el-card>
     <el-card
@@ -34,7 +34,7 @@
       v-if="refundInfo.status == 0"
       v-loading="btnLoading"
     >
-    <!-- TODO 暂时关闭SL -->
+      <!-- TODO 暂时关闭SL -->
       <el-form
         v-if="refundInfo.refundType == '3' &&
             this.isShopifyLabel == true && addressInfo.receiverCountryName == 'US'"
@@ -48,7 +48,7 @@
           <el-tag
             type="danger"
             v-if="this.slUseAble === '1' && this.shippingLabelMessage"
-            >{{ this.shippingLabelMessage }}</el-tag
+          >{{ this.shippingLabelMessage }}</el-tag
           >
         </el-form-item>
       </el-form>
@@ -83,11 +83,11 @@
         v-if="action == 'cus_check'"
       >
         <el-button type="primary" size="mini" @click="handleKfCheck(1)">{{
-          $t("view.approved")
-        }}</el-button>
+            $t("view.approved")
+          }}</el-button>
         <el-button type="primary" size="mini" @click="handleKfCheck(2)">{{
-          $t("view.rejected")
-        }}</el-button>
+            $t("view.rejected")
+          }}</el-button>
       </div>
     </el-card>
     <el-card
@@ -194,7 +194,7 @@
           "
           @click="handleCalculatesCheck"
           style="margin-right:20px;"
-          >{{ $t("view.verification") }}</el-button
+        >{{ $t("view.verification") }}</el-button
         >
         <el-button
           type="primary"
@@ -205,11 +205,11 @@
               refundInfo.refundMethod == 'system'
           "
           @click="handleCheck(6)"
-          >{{ $t("view.approved") }}</el-button
+        >{{ $t("view.approved") }}</el-button
         >
         <el-button type="primary" size="mini" @click="handleCheck(0)">{{
-          $t("view.rejected")
-        }}</el-button>
+            $t("view.rejected")
+          }}</el-button>
       </div>
     </el-card>
     <el-card class="box-card">
@@ -220,7 +220,7 @@
         border
       >
         <el-descriptions-item :label="$t('label.refundOrderNumber')"
-          >{{ refundInfo.refundNo }}
+        >{{ refundInfo.refundNo }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -228,15 +228,15 @@
             :copy-value="refundInfo.refundNo"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('label.totalRefundAmount')">{{
-          refundInfo.refundAmount
-        }}</el-descriptions-item>
+            refundInfo.refundAmount
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.SLFee')" span="1">
           {{ refundInfo.slFee || '0.00'}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('label.onlineShopOrder')"
-          >{{ refundInfo.ormorder }}
+        >{{ refundInfo.ormorder }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -244,13 +244,13 @@
             :copy-value="refundInfo.ormorder"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <!--        添加shopify单号-->
         <el-descriptions-item label="实际退款金额">{{
-          refundInfo.actualRefundAmount
-        }}</el-descriptions-item>
+            refundInfo.actualRefundAmount
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.shopifyNumber')" span="2"
-          >{{ refundInfo.cutUser }}
+        >{{ refundInfo.cutUser }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -258,10 +258,10 @@
             :copy-value="refundInfo.cutUser"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('label.afterSalesType')">{{
-          refundInfo.refundType | refundTypeFilter(that)
-        }}</el-descriptions-item>
+            refundInfo.refundType | refundTypeFilter(that)
+          }}</el-descriptions-item>
 
         <!-- <el-descriptions-item label="退款原因(中文)" span="2">{{
           refundInfo.reasonContentChinese
@@ -294,12 +294,12 @@
         <el-descriptions-item
           :label="$t('label.returnLogisticsCompany')"
           v-if="refundInfo.shipmodeId"
-          >{{ refundInfo.shipmodeId }}</el-descriptions-item
+        >{{ refundInfo.shipmodeId }}</el-descriptions-item
         >
         <el-descriptions-item
           :label="$t('label.returnExpressNumber')"
           v-if="refundInfo.shippingNo"
-          >{{ refundInfo.shippingNo
+        >{{ refundInfo.shippingNo
           }}<i
             style="color:blue;"
             v-if="refundInfo.shippingNo"
@@ -308,19 +308,19 @@
             :copy-value="refundInfo.shippingNo"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item
           :label="$t('label.customerServiceNote')"
           span="3"
-          >{{ refundInfo.notes }}</el-descriptions-item
+        >{{ refundInfo.notes }}</el-descriptions-item
         >
         <el-descriptions-item :label="$t('label.buyersNote')" span="1">{{
-          refundInfo.buyNotes
-        }}</el-descriptions-item>
+            refundInfo.buyNotes
+          }}</el-descriptions-item>
         <el-descriptions-item
           :label="$t('label.customerReturnCountry')"
           span="2"
-          >{{ addressInfo.receiverCountryName }}</el-descriptions-item
+        >{{ addressInfo.receiverCountryName }}</el-descriptions-item
         >
 
         <el-descriptions-item :label="$t('label.refundMethod')" span="1">
@@ -337,8 +337,8 @@
           <span v-else>{{ $t("yes") }}</span>
         </el-descriptions-item>
         <!-- TODO 暂时关闭SL -->
-         <el-descriptions-item :label="$t('label.openShippingLabel')" span="1">
-            {{ refundInfo.slUseable | SlstatusFilter }}
+        <el-descriptions-item :label="$t('label.openShippingLabel')" span="1">
+          {{ refundInfo.slUseable | SlstatusFilter }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('label.useShippingLabel')" span="2">
           {{ refundInfo.slFlag | SlstatusFilter }}
@@ -385,7 +385,7 @@
             item.uniqueCode
           }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.skuCode')"
-          >{{ item.skuCode }}
+        >{{ item.skuCode }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -393,9 +393,9 @@
             :copy-value="item.skuCode"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('label.shopifyNumber')" span="2"
-          >{{ item.orderOnId }}
+        >{{ item.orderOnId }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -403,12 +403,12 @@
             :copy-value="item.orderOnId"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('label.orderStatus')"
-          >{{ item.orderStatus | statusFilterStatus }}
+        >{{ item.orderStatus | statusFilterStatus }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('label.orderItemStatus')" span="2"
-          >{{ item.itemStatus | statusFilterStatus }}
+        >{{ item.itemStatus | statusFilterStatus }}
         </el-descriptions-item>
 
         <el-descriptions-item :label="$t('label.exchangeGoods')" span="1">
@@ -419,34 +419,34 @@
         </el-descriptions-item>
 
         <el-descriptions-item :label="$t('label.productName')" span="2">{{
-          item.productName
-        }}</el-descriptions-item>
+            item.productName
+          }}</el-descriptions-item>
         <el-descriptions-item
           :label="$t('label.quantity')"
           labelStyle="color: red;"
           contentStyle="color: red;"
           v-if="item.quantity > 1"
-          >{{ item.quantity }}
+        >{{ item.quantity }}
         </el-descriptions-item>
 
         <el-descriptions-item
           :label="$t('label.quantity')"
           v-if="item.quantity <= 1"
-          >{{ item.quantity }}
+        >{{ item.quantity }}
         </el-descriptions-item>
 
         <el-descriptions-item :label="$t('label.refundSubtotal')">{{
-          item.refundAmount
-        }}</el-descriptions-item>
+            item.refundAmount
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.salePrice')">{{
-          item.price
-        }}</el-descriptions-item>
+            item.price
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.paymentAmount')"
-          >{{ item.totalFee }}
+        >{{ item.totalFee }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('label.discountAmount')">{{
-          item.discountFee
-        }}</el-descriptions-item>
+            item.discountFee
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.sellerDiscount')">{{
             item.sellerDiscount
           }}</el-descriptions-item>
@@ -457,23 +457,23 @@
             item.loanAmount
           }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.status')"
-          >{{ item.returnStatus | statusFiltr2 }}
+        >{{ item.returnStatus | statusFiltr2 }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('inboundStatus')">
           {{ item.inboundStatus | inboundStatusFilter }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('label.receivedGoodsType')">{{
-          item.receiveType | receiveTypeFilter
-        }}</el-descriptions-item>
+            item.receiveType | receiveTypeFilter
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.currencyInformation')">{{
-          refundInfo.currency
-        }}</el-descriptions-item>
+            refundInfo.currency
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.refundReason')">{{
-          item.refundReason | reasonFilter(item.refundReasonList)
-        }}</el-descriptions-item>
+            item.refundReason | reasonFilter(item.refundReasonList)
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.otherReasons')">{{
-          item.otherReason
-        }}</el-descriptions-item>
+            item.otherReason
+          }}</el-descriptions-item>
       </el-descriptions>
     </el-card>
     <!--
@@ -486,31 +486,31 @@
         border
       >
         <el-descriptions-item :label="$t('country')" span="3">{{
-          addressInfo.receiverCountryName
-        }}</el-descriptions-item>
+            addressInfo.receiverCountryName
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('state')">{{
-          addressInfo.receiverState
-        }}</el-descriptions-item>
+            addressInfo.receiverState
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('city')">{{
-          addressInfo.receiverCity
-        }}</el-descriptions-item>
+            addressInfo.receiverCity
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('suburb')">{{
-          addressInfo.receiverDistrict
-        }}</el-descriptions-item>
+            addressInfo.receiverDistrict
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('street')" span="3">{{
-          addressInfo.receiverStreet
-        }}</el-descriptions-item>
+            addressInfo.receiverStreet
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('address')" span="3">{{
-          addressInfo.receiverAddress
-        }}</el-descriptions-item>
+            addressInfo.receiverAddress
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('dooeNo')" span="2">{{
-          addressInfo.receiverAddress2
-        }}</el-descriptions-item>
+            addressInfo.receiverAddress2
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('recipient')">{{
-          addressInfo.receiverName
-        }}</el-descriptions-item>
+            addressInfo.receiverName
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('telephone')" span="3"
-          >{{ addressInfo.receiverPhone
+        >{{ addressInfo.receiverPhone
           }}<i
             style="color:blue;"
             v-if="addressInfo.receiverPhone"
@@ -519,9 +519,9 @@
             :copy-value="addressInfo.receiverPhone"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('moPhone')" span="3"
-          >{{ addressInfo.receiverMobile
+        >{{ addressInfo.receiverMobile
           }}<i
             style="color:blue;"
             v-if="addressInfo.receiverMobile"
@@ -530,7 +530,7 @@
             :copy-value="addressInfo.receiverMobile"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('post')" span="3"
         >{{ addressInfo.email
           }}<i
@@ -755,11 +755,11 @@ export default {
     //选择物流公司编码，带出地址
     handelChangeReturnWarehouse() {
       if (this.selectedWarehouseCode !== "PSJ-H0000024"
-      && this.selectedWarehouseCode !== "PSJ-H0000019"
-      && this.selectedWarehouseCode !== "PSJ-H0000011"
-      && this.selectedWarehouseCode !== "PSJ-G001001"
-      && this.selectedWarehouseCode !== "PSJ-G001003"
-      && this.selectedWarehouseCode !== "PSJ-G001004") {
+        && this.selectedWarehouseCode !== "PSJ-H0000019"
+        && this.selectedWarehouseCode !== "PSJ-H0000011"
+        && this.selectedWarehouseCode !== "PSJ-G001001"
+        && this.selectedWarehouseCode !== "PSJ-G001003"
+        && this.selectedWarehouseCode !== "PSJ-G001004") {
         this.slUseAble = "0";
         this.showSlChooseLabel = 0; //展示sl的选择标签
         // 触发预估运费查询，目前只有一个仓库使用，可暂时不添加查询逻辑，后续若多仓库支持，则需要增加实时查询预估运费逻辑
@@ -773,7 +773,7 @@ export default {
 
       this.returnWarehouseAddress = this.returnWcodeAndAddress[
         this.selectedWarehouseCode
-      ];
+        ];
       this.checkPSJWarehouse(this.returnWarehouseAddress,  this.selectedWarehouseCode);
     },
     //获取退货仓库列表
@@ -810,13 +810,13 @@ export default {
 
               this.returnWcodeAndAddress[
                 item1.returnWarehouseCode
-              ] = addressInfo;
+                ] = addressInfo;
 
               if (item1.returnWarehouseCode == this.refundInfo.warehouseCode) {
                 this.selectedWarehouseCode = this.refundInfo.warehouseCode;
                 this.returnWarehouseAddress = this.returnWcodeAndAddress[
                   this.selectedWarehouseCode
-                ];
+                  ];
               }
             });
           }
@@ -873,6 +873,17 @@ export default {
               this.refundInfo.warehouseCode = 'HKW002';
               this.selectedWarehouseCode = 'HKW002';
             }
+
+            var esCountries = ['ES','AT','BE','BG','HR',
+              'CZ','DK','EE','FI','FR',
+              'DE','GR','HU','IE','IT',
+              'LV','LT','LU','NL','PL',
+              'PT','RO','SK','SI','SE'];
+
+            if (esCountries.includes(this.addressInfo.receiverCountryCode)) {
+              this.refundInfo.warehouseCode = 'ESPW03';
+              this.selectedWarehouseCode = 'ESPW03';
+            }
           }
         });
     },
@@ -938,7 +949,7 @@ export default {
     checkPSJWarehouse(house, code){
       let shu = house.split(" ");
       if (this.addressInfo.receiverCountryCode == 'US' && (code == "PSJ-G001003" || code == "PSJ-G001001" || code == "PSJ-H0000024"
-      || code == "PSJ-H0000019" || code == "PSJ-H0000011" || code == "PSJ-G001004")){
+        || code == "PSJ-H0000019" || code == "PSJ-H0000011" || code == "PSJ-G001004")){
         this.isShopifyLabel = true;
         this.refundInfo.warehouseCode = code;
         this.slUseAble = "1";

src/views/oms/refund-old/refundList.vue

@@ -355,9 +355,7 @@
         width="120"
       >
         <template slot-scope="scope">
-          {{
-            scope.row.autoRefund === "1" ? $t("label.yes") : $t("label.no")
-          }}
+          {{ scope.row.autoRefund === "1" ? $t("label.yes") : $t("label.no") }}
         </template>
       </el-table-column>
 
@@ -374,8 +372,6 @@
         </template>
       </el-table-column>
 
-
-
       <el-table-column
         :label="$t('label.applicationTime')"
         width="160"
@@ -764,9 +760,7 @@
       v-if="orderRefundVisible"
       :visible.sync="orderRefundVisible"
     >
-      <orderRefundDialog
-        :refundId="currentRefundId"
-      ></orderRefundDialog>
+      <orderRefundDialog :refundId="currentRefundId"></orderRefundDialog>
       <el-button type="danger" style="float:right" @click="backTable">{{
         $t("back")
       }}</el-button>
@@ -778,9 +772,7 @@
       v-if="orderRefundNewVisible"
       :visible.sync="orderRefundNewVisible"
     >
-      <orderRefundNewDialog
-        :refundId="currentRefundId"
-      ></orderRefundNewDialog>
+      <orderRefundNewDialog :refundId="currentRefundId"></orderRefundNewDialog>
       <el-button type="danger" style="float:right" @click="backTable">{{
         $t("back")
       }}</el-button>
@@ -885,8 +877,9 @@
       :destroy-on-close="true"
       :visible.sync="cargoTrackVisible"
       width="40%"
-      v-loading="listLoading">
-      <cargoTrackDialog :refundNo='selectedRefundNo'></cargoTrackDialog>
+      v-loading="listLoading"
+    >
+      <cargoTrackDialog :refundNo="selectedRefundNo"></cargoTrackDialog>
     </el-dialog>
   </div>
 </template>
@@ -912,10 +905,10 @@ import {
 } from "@/api/oms/refund/refund";
 import { dcmAdd } from "@/utils/toolUtil";
 import { fetchList as orderFetchList } from "@/api/oms/order/order";
-import orderRefundDialog from "@/views/oms/refund/components/orderRefundDialog";
-import orderRefundNewDialog from "@/views/oms/refund/components/orderRefundNewDialog";
-import createRefundDialog from "@/views/oms/refund/components/createRefundDialog";
-import cargoTrackDialog from "@/views/oms/refund/components/cargoTrackDialog";
+import orderRefundDialog from "@/views/oms/refund-old/components/orderRefundDialog";
+import orderRefundNewDialog from "@/views/oms/refund-old/components/orderRefundNewDialog";
+import createRefundDialog from "@/views/oms/refund-old/components/createRefundDialog";
+import cargoTrackDialog from "@/views/oms/refund-old/components/cargoTrackDialog";
 import log from "@/router/modules/log";
 import { queryChannelStore, queryChannel } from "@/api/oms/inventory/inventory";
 const refundMethodOptions = [
@@ -1017,8 +1010,8 @@ export default {
         refundNo: "",
         timeplacedLaggerThanEqual: null,
         timeplacedLessThanEqual: null,
-        sendEmailFlag:"",
-        signInStatus: null,
+        sendEmailFlag: "",
+        signInStatus: null
       },
       dialogFormUploadVisible: false,
       formLabelWidth: "120px",
@@ -1075,8 +1068,8 @@ export default {
         shipmodeId: "",
         shippingNo: ""
       },
-      cargoTrackVisible:false,
-      selectedRefundNo:'',
+      cargoTrackVisible: false,
+      selectedRefundNo: ""
     };
   },
   created() {
@@ -1099,7 +1092,7 @@ export default {
     }
   },
   methods: {
-    handleCargoTrack(e){
+    handleCargoTrack(e) {
       this.cargoTrackVisible = true;
       this.selectedRefundNo = e.refundNo;
     },
@@ -1533,8 +1526,8 @@ export default {
 .cell > span {
   white-space: nowrap !important;
 }
-.el-button+.el-button {
-    margin-left: 10px;
-    margin-top: 10px;
+.el-button + .el-button {
+  margin-left: 10px;
+  margin-top: 10px;
 }
 </style>

src/views/oms/refund-old/returnDetail.vue

@@ -8,7 +8,7 @@
         border
       >
         <el-descriptions-item :label="$t('label.shopName')"
-          >{{ returnInfo.storeName }}
+        >{{ returnInfo.storeName }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -16,24 +16,24 @@
             :copy-value="returnInfo.storeName"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('label.onlineShopOrder')">{{
-          returnInfo.ormorder
-        }}</el-descriptions-item>
+            returnInfo.ormorder
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.documentStatus')">{{
-          returnInfo.status | statusFilter
-        }}</el-descriptions-item>
+            returnInfo.status | statusFilter
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.creator')">{{
-          returnInfo.createBy
-        }}</el-descriptions-item>
+            returnInfo.createBy
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('label.createTime')" span="2">{{
-          returnInfo.createTime
-        }}</el-descriptions-item>
+            returnInfo.createTime
+          }}</el-descriptions-item>
         <el-descriptions-item label="退件目的仓">{{
-          returnInfo.warehouseName
-        }}</el-descriptions-item>
+            returnInfo.warehouseName
+          }}</el-descriptions-item>
         <el-descriptions-item label="退件目的仓编码"
-          >{{ returnInfo.warehouseCode }}
+        >{{ returnInfo.warehouseCode }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -41,9 +41,9 @@
             :copy-value="returnInfo.ormorder"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item label="退件物流单号"
-          >{{ returnInfo.shippingNo }}
+        >{{ returnInfo.shippingNo }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -51,7 +51,7 @@
             :copy-value="returnInfo.ordersNo"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('noheadFlag')" span="1"
         >
           <div style="color: red" v-if="
@@ -61,7 +61,7 @@
             {{ $t("yes") }}
           </div>
           <div style="color: red"
-            v-if="
+               v-if="
               returnInfo.noheadFlag == 0
             "
           >
@@ -83,29 +83,29 @@
       <!-- 基本信息-->
       <el-descriptions :title="$t('sender')" :colon="false" border>
         <el-descriptions-item :label="$t('country')" span="3">{{
-          returnInfo.orderReceiverCountry
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverCountry
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('state')">{{
-          returnInfo.orderReceiverState
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverState
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('city')">{{
-          returnInfo.orderReceiverCity
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverCity
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('suburb')">{{
-          returnInfo.orderReceiverDistrict
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverDistrict
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('street')" span="3">{{
-          returnInfo.orderReceiverStreet
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverStreet
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('address')" span="3">{{
-          returnInfo.orderReceiverAddress1
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverAddress1
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('dooeNo')" span="2">{{
-          returnInfo.orderReceiverAddress2
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverAddress2
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('senders')">{{
-          returnInfo.orderReceiverName
-        }}</el-descriptions-item>
+            returnInfo.orderReceiverName
+          }}</el-descriptions-item>
       </el-descriptions>
     </el-card>
 
@@ -121,7 +121,7 @@
           :label="$t('onlyCode')"
           span="3"
           v-if="item.uniqueCode"
-          >{{ item.uniqueCode }}
+        >{{ item.uniqueCode }}
           <!--          <el-input-->
           <!--            style="width: 450px;"-->
           <!--            class="filter-item"-->
@@ -129,7 +129,7 @@
           <!--          />-->
         </el-descriptions-item>
         <el-descriptions-item :label="$t('sku')"
-          >{{ item.skuCode }}
+        >{{ item.skuCode }}
           <i
             style="color:blue;"
             class="el-icon-document-copy"
@@ -137,16 +137,16 @@
             :copy-value="item.skuCode"
             v-on:click="copy"
           ></i
-        ></el-descriptions-item>
+          ></el-descriptions-item>
         <el-descriptions-item :label="$t('goodsName')" span="2">{{
-          item.tittle
-        }}</el-descriptions-item>
+            item.tittle
+          }}</el-descriptions-item>
         <el-descriptions-item :label="$t('status')"
-          >{{ item.status | statusFiltr2 }}
+        >{{ item.status | statusFiltr2 }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('update')" span="2">{{
-          item.updateTime
-        }}</el-descriptions-item>
+            item.updateTime
+          }}</el-descriptions-item>
         <el-descriptions-item
           v-if="confirmSh == 2"
           :label="$t('returngoodsType')"
@@ -162,10 +162,10 @@
           {{ item.inboundStatusShow | inboundStatusFilter }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('appAmount')"
-          >{{ item.applyQuantity }}
+        >{{ item.applyQuantity }}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('recAmount')" span="2"
-          >{{ item.receiveQuantity }}
+        >{{ item.receiveQuantity }}
         </el-descriptions-item>
 
         <el-descriptions-item
@@ -225,7 +225,7 @@
             @click="confirmShClick(item)"
             v-if="item.status != '01'"
             v-loading="btnLoading"
-            >{{ $t("receives") }}</el-button
+          >{{ $t("receives") }}</el-button
           >
           <!-- </template> -->
         </el-descriptions-item>
@@ -321,6 +321,11 @@ export default {
         if (200 == res.code) {
           this.returnInfo = res.data;
           this.returnOrderItemInfo = res.data.items;
+          for(var i=0;i<this.returnOrderItemInfo.length;i++){
+            if("00" == this.returnOrderItemInfo[i].status){
+              this.returnOrderItemInfo[i].inboundStatus = '';
+            }
+          }
           this.logs = res.data.logItems;
         }
       });

src/views/oms/refund-old/returnDetailList.vue

@@ -32,22 +32,22 @@
         </el-option>
       </el-select>
 
-<!--      <el-select-->
-<!--        v-model="listQuery.channelCode"-->
-<!--        :clearable="true"-->
-<!--        class="filter-item"-->
-<!--        style="width: 200px;"-->
-<!--        :placeholder="$t('place.channel')"-->
-<!--        @change="getStore"-->
-<!--      >-->
-<!--        <el-option-->
-<!--          v-for="item in channel"-->
-<!--          :key="item.code"-->
-<!--          :label="item.name"-->
-<!--          :value="item.code"-->
-<!--        >-->
-<!--        </el-option>-->
-<!--      </el-select>-->
+      <!--      <el-select-->
+      <!--        v-model="listQuery.channelCode"-->
+      <!--        :clearable="true"-->
+      <!--        class="filter-item"-->
+      <!--        style="width: 200px;"-->
+      <!--        :placeholder="$t('place.channel')"-->
+      <!--        @change="getStore"-->
+      <!--      >-->
+      <!--        <el-option-->
+      <!--          v-for="item in channel"-->
+      <!--          :key="item.code"-->
+      <!--          :label="item.name"-->
+      <!--          :value="item.code"-->
+      <!--        >-->
+      <!--        </el-option>-->
+      <!--      </el-select>-->
       <el-select
         v-model="listQuery.storeId"
         :clearable="true"
@@ -87,11 +87,11 @@
         v-model="listQuery.ormorder"
       />
       <el-input
-      :placeholder="$t('label.shopifyNumber')"
-      clearable
-      style="width: 200px;"
-      class="filter-item"
-      v-model="listQuery.shopify"
+        :placeholder="$t('label.shopifyNumber')"
+        clearable
+        style="width: 200px;"
+        class="filter-item"
+        v-model="listQuery.shopify"
       />
       <el-input
         :placeholder="$t('label.externalBillNo')"
@@ -198,18 +198,18 @@
         >
         </el-option>
       </el-select>
-<!--      <el-select-->
-<!--        :placeholder="$t('place.inboundStatus')"-->
-<!--        clearable-->
-<!--        style="width: 200px;"-->
-<!--        class="filter-item"-->
-<!--        v-model="listQuery.inboundStatus"-->
-<!--      >-->
-<!--        <el-option value="success" :label="$t('label.normalReturn')" />-->
-<!--        <el-option value="returning" :label="$t('label.inReturnTransit')" />-->
-<!--        <el-option value="shipLost" :label="$t('label.shipmentLost')" />-->
-<!--        <el-option value="returnLost" :label="$t('label.returnLost')" />-->
-<!--      </el-select>-->
+      <!--      <el-select-->
+      <!--        :placeholder="$t('place.inboundStatus')"-->
+      <!--        clearable-->
+      <!--        style="width: 200px;"-->
+      <!--        class="filter-item"-->
+      <!--        v-model="listQuery.inboundStatus"-->
+      <!--      >-->
+      <!--        <el-option value="success" :label="$t('label.normalReturn')" />-->
+      <!--        <el-option value="returning" :label="$t('label.inReturnTransit')" />-->
+      <!--        <el-option value="shipLost" :label="$t('label.shipmentLost')" />-->
+      <!--        <el-option value="returnLost" :label="$t('label.returnLost')" />-->
+      <!--      </el-select>-->
 
       <!--<el-input placeholder="收件人电话" style="width: 200px;"
         	class="filter-item"	v-model="listQuery.receiverMobile"/>-->
@@ -219,7 +219,7 @@
         type="primary"
         icon="el-icon-search"
         @click="handleFilter"
-      >{{ $t("table.search") }}</el-button
+        >{{ $t("table.search") }}</el-button
       >
 
       <el-button class="filter-item" @click="exportExcel" type="primary">
@@ -358,51 +358,23 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('noheadFlag')"
-        width="120"
-        align="center"
-      >
+      <el-table-column :label="$t('noheadFlag')" width="120" align="center">
         <template slot-scope="scope">
-          <el-tag
-            effect="warning"
-            v-if="
-              scope.row.noheadFlag == '1'
-            "
-          >
+          <el-tag effect="warning" v-if="scope.row.noheadFlag == '1'">
             是
           </el-tag>
-          <el-tag
-            effect="warning"
-            v-if="
-              scope.row.noheadFlag == '0'
-            "
-          >
+          <el-tag effect="warning" v-if="scope.row.noheadFlag == '0'">
             否
           </el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="是否手工签收"
-        width="120"
-        align="center"
-      >
+      <el-table-column label="是否手工签收" width="120" align="center">
         <template slot-scope="scope">
-          <el-tag
-            effect="warning"
-            v-if="
-              scope.row.isManual == '1'
-            "
-          >
+          <el-tag effect="warning" v-if="scope.row.isManual == '1'">
             是
           </el-tag>
-          <el-tag
-            effect="warning"
-            v-if="
-              scope.row.isManual == '0'
-            "
-          >
+          <el-tag effect="warning" v-if="scope.row.isManual == '0'">
             否
           </el-tag>
         </template>
@@ -430,7 +402,6 @@
       >
       </el-table-column>
 
-
       <el-table-column
         :label="$t('appAmount')"
         width="160"
@@ -471,44 +442,53 @@
             type="primary"
             size="mini"
             @click="handleInfo(scope.row.returnId, 2)"
-          >{{ $t("details") }}</el-button
+            >{{ $t("details") }}</el-button
           >
           <el-button
             type="danger"
             v-if="scope.row.exceptionFlag == 'Y'"
             size="mini"
             @click="handleException(scope.row.returnId)"
-          >{{ $t("view.processException") }}</el-button
+            >{{ $t("view.processException") }}</el-button
           >
 
           <el-button
             type="success"
-            v-if="(scope.row.status == '01' || scope.row.status == '02') && scope.row.detailStatus != '01'"
+            v-if="
+              (scope.row.status == '01' || scope.row.status == '02') &&
+                scope.row.detailStatus != '01'
+            "
             size="mini"
             @click="handleInfo(scope.row.returnId, 1)"
-          >{{ $t("receiveStock") }}</el-button
+            >{{ $t("receiveStock") }}</el-button
           >
           <el-button
             type="success"
-            v-if="scope.row.matchStatus === 'order_matched' && scope.row.status !== '05'"
+            v-if="
+              scope.row.matchStatus === 'order_matched' &&
+                scope.row.status !== '05'
+            "
             size="mini"
             @click="antiMatchingOrder(scope.row.id)"
-          >{{ $t("antiMatchingOrder") }}</el-button
+            >{{ $t("antiMatchingOrder") }}</el-button
           >
           <el-button
             type="danger"
             size="mini"
             @click="matchingOrder(scope.row.id)"
-            v-if="scope.row.matchStatus === 'unmatch' && scope.row.status !== '05'">
+            v-if="
+              scope.row.matchStatus === 'unmatch' && scope.row.status !== '05'
+            "
+          >
             {{ $t("matchingOrder") }}
           </el-button>
-<!--          <el-button-->
-<!--            type="danger"-->
-<!--            v-if="scope.row.exceptionFlag == 'Y'"-->
-<!--            size="mini"-->
-<!--            @click="handleException(scope.row.returnId)"-->
-<!--          >{{ $t("view.processException") }}</el-button-->
-<!--          >-->
+          <!--          <el-button-->
+          <!--            type="danger"-->
+          <!--            v-if="scope.row.exceptionFlag == 'Y'"-->
+          <!--            size="mini"-->
+          <!--            @click="handleException(scope.row.returnId)"-->
+          <!--          >{{ $t("view.processException") }}</el-button-->
+          <!--          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -591,8 +571,8 @@
         </div>
         <el-form-item>
           <el-button type="primary" @click="submit">{{
-              $t("determine")
-            }}</el-button>
+            $t("determine")
+          }}</el-button>
           <el-button type="danger" @click="cancel">{{ $t("back") }}</el-button>
         </el-form-item>
       </el-form>
@@ -611,10 +591,17 @@
       ></returnInfoDialog>
     </el-drawer>
 
-    <el-dialog :title="$t('queryOrder')" :visible.sync="showDialog" @close="returnOrderClose">
-      <return-order-list :details-id="detailsId" @close="returnOrderClose" ref="childComponent"/>
+    <el-dialog
+      :title="$t('queryOrder')"
+      :visible.sync="showDialog"
+      @close="returnOrderClose"
+    >
+      <return-order-list
+        :details-id="detailsId"
+        @close="returnOrderClose"
+        ref="childComponent"
+      />
     </el-dialog>
-
   </div>
 </template>
 
@@ -628,14 +615,15 @@ import {
   fetchList,
   getExceptionUniqueCode,
   dealReturnException,
-  verifyExport, antiMatchingOrders
+  verifyExport,
+  antiMatchingOrders
 } from "@/api/oms/return/return";
 import { dcmAdd } from "@/utils/toolUtil";
 import i18n from "@/lang";
 import { queryTWarehouseNameALL } from "@/api/oms/refund/refund";
 import { queryWarehouseNameALL } from "@/api/oms/order/order";
 import { queryChannelStore, queryChannel } from "@/api/oms/inventory/inventory";
-import ReturnOrderList from "@/views/oms/refund/components/returnOrderList.vue";
+import ReturnOrderList from "@/views/oms/refund-old/components/returnOrderList.vue";
 
 export default {
   name: "returnList",
@@ -646,16 +634,16 @@ export default {
     ReturnOrderList,
     swPage,
     returnInfoDialog,
-    global,
+    global
   },
   filters: {
-    matchStatusFilter(matchStatus){
+    matchStatusFilter(matchStatus) {
       let value = "";
-     global.matchStatusType.forEach(status => {
-       if (status.value == matchStatus) {
-         value = status.label;
-       }
-     })
+      global.matchStatusType.forEach(status => {
+        if (status.value == matchStatus) {
+          value = status.label;
+        }
+      });
       return value;
     },
     statusFilter(key) {
@@ -714,7 +702,7 @@ export default {
         noheadFlag: null,
         matchStatus: null,
         externalBillNo: "",
-        signInStatus: null,
+        signInStatus: null
       },
       createTimePicker: null,
       returnStatusList: global.returnStatus, //售后状态
@@ -821,10 +809,10 @@ export default {
         if (arr[i].returnQuantity != sum) {
           alert(
             "订单项Id:" +
-            arr[i].orderItemId +
-            ",所选唯一码数量与退货数量不匹配,请选择" +
-            arr[i].returnQuantity +
-            "个唯一码"
+              arr[i].orderItemId +
+              ",所选唯一码数量与退货数量不匹配,请选择" +
+              arr[i].returnQuantity +
+              "个唯一码"
           );
           flag = false;
         }
@@ -936,14 +924,14 @@ export default {
       });
     },
     // 客服匹配订单
-    matchingOrder(id){
+    matchingOrder(id) {
       this.detailsId = id;
       this.showDialog = true;
     },
     // 反匹配
-    antiMatchingOrder(id){
-      antiMatchingOrders(id).then(res=>{
-        if(res.code === 200){
+    antiMatchingOrder(id) {
+      antiMatchingOrders(id).then(res => {
+        if (res.code === 200) {
           this.$message({
             message: "反匹配成功",
             type: "success"
@@ -953,18 +941,18 @@ export default {
       });
     },
     // 关闭页面刷新列表
-    returnOrderClose(){
+    returnOrderClose() {
       this.showDialog = false;
       // 调用子组件的清除值方法
       this.$refs.childComponent.closeDialog();
       // 清空子组件中的搜索框的值
       this.getList();
     },
-    tableRowClassName({row}) {
-      if(row.matchStatus == 'unmatch'){
-        return 'highlighted-row';
+    tableRowClassName({ row }) {
+      if (row.matchStatus == "unmatch") {
+        return "highlighted-row";
       }
-      return '';
+      return "";
     }
   }
 };