feat: 订单列表和详情增加折扣信息

src/lang/en.js

@@ -179,12 +179,13 @@ export default {
   update: "update time",
   appAmount: "applied amount",
   recAmount: "received amount",
-  enterAmount: "enter amount",
-  receives: "Receive",
+  orderPayType: "Payment Methods",
+  enterAmount: "enter amount", receives: "Receive",
   // recipient: "Receiver",
   contNumberp: "contact number",
   courCompanines: "Express company",
   courCode: "Shippment number",
+  discountInfo: "Multiple pieces and multiple discount information",
   // onlyCode: "barcode",
   // orderDetails: "derails",
   // goodsCode: "skcs",
@@ -497,5 +498,12 @@ export default {
     logStatus: "Status",
     executionTime: "Execution Time",
     operator: "Operator"
+  },
+  multipleDiscountInfo: {
+    OriginalDiscount: "Original order meets discount",
+    OriginalMoneny: "Original order payment amount",
+    afterReturnDiscount: "Refund after satisfying discount",
+    returnMoney: "Amount to be refunded",
+    needPayMoney: "Additional amount paid by the customer",
   }
 };

src/lang/es.js

@@ -1,4 +1,5 @@
 export default {
+  discountInfo: "Múltiples piezas y múltiples información de descuento.",
   route: {
     dashboard: "Panel de control",
     documentation: "Documentación",
@@ -198,5 +199,12 @@ export default {
     logStatus: "Estado",
     executionTime: "Tiempo de ejecución",
     operator: "Operador"
+  },
+  multipleDiscountInfo: {
+    OriginalDiscount: "El pedido original cumple con el descuento",
+    OriginalMoneny: "Importe del pago del pedido original",
+    afterReturnDiscount: "Reembolso tras satisfacción del descuento",
+    returnMoney: "Importe a reembolsar",
+    needPayMoney: "Importe adicional pagado por el cliente",
   }
 };

src/lang/ja.js

@@ -137,6 +137,7 @@ export default {
   view: view,
   sysTitle: "グロリア海外注文センター",
   post: "メール",
+  discountInfo: "複数個および複数の割引情報",
   route: {
     slFreightRules: "SL送料規則",
 
@@ -414,5 +415,12 @@ export default {
     logStatus: "状態",
     executionTime: "実行時間",
     operator: "オペレーター"
+  },
+  multipleDiscountInfo: {
+    OriginalDiscount: "元の注文に割引が適用されます",
+    OriginalMoneny: "元の注文の支払い金額",
+    afterReturnDiscount: "満足のいく割引後の払い戻し",
+    returnMoney: "返金金額",
+    needPayMoney: "顧客が支払う追加金額",
   }
 };

src/lang/zh.js

@@ -79,6 +79,7 @@ export default {
   exchangeFlag: "是否换货",
   giftCardFlag: "是否礼品卡支付",
   giftCardOrderFlag: "是否礼品卡订单",
+  discountInfo: "多件多折信息",
   giftFlag: "是否存在赠品",
   pushOmsStatus: "已推送国内OMS",
   takeOrderTime: "下单时间",
@@ -515,5 +516,12 @@ export default {
     logStatus: "状态",
     executionTime: "执行时间",
     operator: "操作人"
+  },
+  multipleDiscountInfo: {
+    OriginalDiscount: "原单满足折扣",
+    OriginalMoneny: "原单支付金额",
+    afterReturnDiscount: "退款后满足折扣",
+    returnMoney: "应退款金额",
+    needPayMoney: "顾客额外支付金额",
   }
 };

src/router/modules/promotion.js

@@ -35,7 +35,7 @@ const promotionRouter = {
     // },
     {
       path: "bagProduct",
-      component: () => import("@/views/oms/promotion/shopifyPromotion/promotionLogList"),
+      component: () => import("@/views/oms/promotion/promotionLogList/promotionLogList.vue"),
       name: "bagProduct",
       meta: { title: "促销设置日志" }
     },

src/views/oms/inventory/inventory/virtualInventory.vue

@@ -135,36 +135,35 @@
       >
         <template slot-scope="scope">
           <el-tooltip
-          class="item"
-          effect="dark"
-          :content="$t('label.pushedInventory')" >
-<!--          placement="top-start"-->
-          <el-button
-            type="success"
-            size="mini"
-            icon="el-icon-s-promotion"
-            @click="pushToShopify(scope.row.id)"
-            circle
-          ></el-button>
-
-        </el-tooltip>
+            class="item"
+            effect="dark"
+            :content="$t('label.pushedInventory')"
+          >
+            <!--          placement="top-start"-->
+            <el-button
+              type="success"
+              size="mini"
+              icon="el-icon-s-promotion"
+              @click="pushToShopify(scope.row.id)"
+              circle
+            ></el-button>
+          </el-tooltip>
           <el-tooltip
             class="item"
             effect="dark"
             :content="$t('logDetails')"
-            placement="top-start">
+            placement="top-start"
+          >
             <el-button
               type="primary"
               size="mini"
               icon="el-icon-info"
               @click="querySendLog(scope.row)"
-            >{{ $t("logDetails") }}</el-button>
-
+              >{{ $t("logDetails") }}</el-button
+            >
           </el-tooltip>
-
         </template>
       </el-table-column>
-
     </el-table>
 
     <!-- 分页 -->
@@ -177,11 +176,20 @@
       @retPage="retPage"
     />
 
-    <el-dialog :fullscreen="true" :title="$t('logDetails')" :visible.sync="isSendLog" v-if="isSendLog" @close="inventorySendLogClose">
-      <virtual-inventory-send-log  @close="inventorySendLogClose" :sku = sku :storeId = this.listQuery.storeId></virtual-inventory-send-log>
+    <el-dialog
+      custom-class="orderDetailDialog"
+      :fullscreen="true"
+      :title="$t('logDetails')"
+      :visible.sync="isSendLog"
+      v-if="isSendLog"
+      @close="inventorySendLogClose"
+    >
+      <virtual-inventory-send-log
+        @close="inventorySendLogClose"
+        :sku="sku"
+        :storeId="this.listQuery.storeId"
+      ></virtual-inventory-send-log>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -277,14 +285,14 @@ export default {
         this.listLoading = false;
       });
     },
-    inventorySendLogClose(){
+    inventorySendLogClose() {
       this.isSendLog = false;
       this.sku = "";
       this.listQuery.storeId = "";
     },
-    querySendLog(row){
+    querySendLog(row) {
       this.sku = row.skuCode;
-      this.listQuery.storeId  = row.storeId;
+      this.listQuery.storeId = row.storeId;
       this.isSendLog = true;
     },
     getChannelStore() {

src/views/oms/order/abnormalList.vue

@@ -396,7 +396,9 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
 
@@ -408,10 +410,20 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardOrderFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
 
+      <!-- 多件多件信息 -->
+      <el-table-column
+        :label="$t('discountInfo')"
+        min-width="200"
+        align="center"
+        prop="discountInfo"
+      ></el-table-column>
+
       <el-table-column
         :label="$t('sellerDiscount')"
         min-width="200"
@@ -629,6 +641,7 @@
       :fullscreen="true"
       v-if="orderInfoVisible"
       :visible.sync="orderInfoVisible"
+      custom-class="orderDetailDialog"
     >
       <orderInfoDialog :ordersId="currentOrdersId"></orderInfoDialog>
     </el-dialog>
@@ -1018,7 +1031,7 @@ export default {
         warehouseCode: "",
         blocked: "",
         abnormalFlag: true,
-        tags:""
+        tags: ""
       },
       addNoteForm: {
         id: null,

src/views/oms/order/components/baseInfoTab.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="baseinfo">
     <el-descriptions
       class="margin-top"
       title=""
@@ -64,14 +64,14 @@
       direction="horizontal"
     >
       <el-descriptions-item :label="$t('sellerDiscount')">{{
-          orderInfo.sellerDiscount
-        }}</el-descriptions-item>
+        orderInfo.sellerDiscount
+      }}</el-descriptions-item>
       <el-descriptions-item :label="$t('platformDiscount')">
         {{ orderInfo.platformDiscount }}</el-descriptions-item
       >
       <el-descriptions-item :label="$t('loanAmount')">{{
-          orderInfo.loanAmount
-        }}</el-descriptions-item>
+        orderInfo.loanAmount
+      }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions
       class="margin-top"

src/views/oms/order/components/discountInfoTab.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-table
+      style="width: 100%;"
+      ref="multipleTable"
+      v-loading="listLoading"
+      key="0"
+      :data="orderGiftCards"
+      row-key="id"
+      stripe
+      border
+      fit
+    >
+      <el-table-column align="center" type="index"> </el-table-column>
+
+      <el-table-column
+        :label="$t('multipleDiscountInfo.OriginalDiscount')"
+        width="300"
+        align="center"
+        prop="payId"
+      >
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('multipleDiscountInfo.OriginalMoneny')"
+        width="300"
+        align="center"
+        prop="authorization"
+      >
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('multipleDiscountInfo.afterReturnDiscount')"
+        width="300"
+        align="center"
+        prop="giftCardAmount"
+      >
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('multipleDiscountInfo.returnMoney')"
+        width="300"
+        align="center"
+        prop="currency"
+      >
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('multipleDiscountInfo.needPayMoney')"
+        width="300"
+        align="center"
+        prop="payMethod"
+      >
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import row from "element-ui/packages/row";
+import swPage from "@/views/common/swPage.vue";
+
+export default {
+  name: "orderGiftCardsTab",
+  components: { swPage },
+  data() {
+    return {
+      listLoading: false
+    };
+  },
+  computed: {
+    row() {
+      return row;
+    }
+  },
+  props: ["orderGiftCards"],
+  methods: {
+    retPage() {
+      //分页
+    },
+    setCurrent(row) {
+      this.$refs.tableDemand.setCurrentRow(row);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-table__body tr.current-row > td {
+  background: rgb(238, 227, 173) !important;
+}
+</style>

src/views/oms/order/components/orderInfoDialog.vue

@@ -1,31 +1,55 @@
 <template>
   <div v-loading.fullscreen.lock="detailLoading">
-    <div class="head">
-      <!--		<span>销售单详情</span>
- 			<span>返回</span>
- -->
-    </div>
+    <!-- <div class="head"></div> -->
     <div class="main">
       <div class="box" style="margin-top: 15px;">
         <div class="item_title">
           <span>{{ $t("baseMessage") }}</span>
         </div>
-        <div class="ptitle">
+        <div class="ptitle baseinfotab">
           <baseInfoTab :orderInfo="orderInfo"></baseInfoTab>
         </div>
       </div>
 
       <div class="box" style="margin-top: 15px;">
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.promotionActive"
+          accordion
+        >
+          <el-collapse-item
+            :title="$t('shopifyPromotion.promotionMessage')"
+            name="2"
+          >
+            <div class="ptitle">
+              <promotionInfoTab :orderInfo="orderInfo"></promotionInfoTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("shopifyPromotion.promotionMessage") }}</span>
         </div>
         <div class="ptitle">
           <promotionInfoTab :orderInfo="orderInfo"></promotionInfoTab>
-        </div>
+        </div> -->
       </div>
 
       <div class="box" style="margin-top: 15px;">
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.receivingInfoActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('receInfor')" name="2">
+            <div class="ptitle">
+              <receivingInfoTab
+                :addressInfo="addressInfo"
+                :orderInfo="orderInfo"
+              ></receivingInfoTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("receInfor") }}</span>
         </div>
         <div class="ptitle">
@@ -33,19 +57,30 @@
             :addressInfo="addressInfo"
             :orderInfo="orderInfo"
           ></receivingInfoTab>
-        </div>
+        </div> -->
       </div>
       <div
         class="box"
         style="margin-top: 15px;"
         v-if="this.pickUpInfo != null && this.pickUpInfo.orderType == 'pickUp'"
       >
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.pickUpInfoActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('pickUpInfor')" name="2">
+            <div class="ptitle">
+              <pickUpInfoDiaTab :pickUpInfo="pickUpInfo"></pickUpInfoDiaTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("pickUpInfor") }}</span>
         </div>
         <div class="ptitle">
           <pickUpInfoDiaTab :pickUpInfo="pickUpInfo"></pickUpInfoDiaTab>
-        </div>
+        </div> -->
       </div>
 
       <div
@@ -53,16 +88,31 @@
         style="margin-top: 15px;padding-bottom: 10px;"
         v-if="invoiceInfo != null"
       >
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.invoiceInfoActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('view.invoiceDetails')" name="2">
+            <div class="ptitle">
+              <invoiceInfoTab :invoiceInfo="invoiceInfo"></invoiceInfoTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("view.invoiceDetails") }}</span>
         </div>
         <div class="ptitle">
           <invoiceInfoTab :invoiceInfo="invoiceInfo"></invoiceInfoTab>
-        </div>
+        </div> -->
       </div>
 
       <div class="box" style="margin-top: 15px;" v-if="this.logData != ''">
-        <el-collapse v-model="active" accordion>
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.operationLogActive"
+          accordion
+        >
           <el-collapse-item :title="$t('title.operationLog')" name="2">
             <div class="ptitle">
               <operationLog :logData="this.logData"></operationLog>
@@ -76,18 +126,74 @@
         style="margin-top: 15px;"
         v-if="this.orderGiftCards != null"
       >
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.orderGiftCardsActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('orderPayType')" name="2">
+            <div class="ptitle">
+              <orderGiftCardsTab
+                :orderGiftCards="orderGiftCards"
+              ></orderGiftCardsTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("orderPayType") }}</span>
         </div>
         <div class="ptitle">
           <orderGiftCardsTab
             :orderGiftCards="orderGiftCards"
           ></orderGiftCardsTab>
+        </div> -->
+      </div>
+      <!-- 多件多折信息 -->
+      <div
+        class="box"
+        style="margin-top: 15px;"
+        v-if="this.orderGiftCards != null"
+      >
+        <el-collapse
+          class="collapseContainer"
+          v-model="collapse.orderGiftCardsActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('discountInfo')" name="2">
+            <div class="ptitle">
+              <discountInfoTab
+                :orderGiftCards="orderGiftCards"
+              ></discountInfoTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
+          <span>{{ $t("orderPayType") }}</span>
         </div>
+        <div class="ptitle">
+          <orderGiftCardsTab
+            :orderGiftCards="orderGiftCards"
+          ></orderGiftCardsTab>
+        </div> -->
       </div>
-
       <div class="box" style="margin-top: 15px;">
-        <div class="item_title">
+        <el-collapse
+          class="collapseContainer detailTab"
+          v-model="collapse.orderItemListActive"
+          accordion
+        >
+          <el-collapse-item :title="$t('orderDetails')" name="2">
+            <div class="ptitle orderitemlist">
+              <orderItemListTab
+                :orderDeatils="orderDeatils"
+                :orderInfo="orderInfo"
+                :exchangeFlag="exchangeFlag"
+                :getOrderInfo="getOrderInfo"
+              ></orderItemListTab>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+        <!-- <div class="item_title">
           <span>{{ $t("orderDetails") }}</span>
         </div>
         <div class="ptitle">
@@ -97,7 +203,7 @@
             :exchangeFlag="exchangeFlag"
             :getOrderInfo="getOrderInfo"
           ></orderItemListTab>
-        </div>
+        </div> -->
       </div>
 
       <!-- 		<div class="box" style="margin: 15px 0;padding-bottom: 10px;">
@@ -129,6 +235,7 @@ import optLogTab from "./optLogTab";
 import orderItemListTab from "./orderItemListTab";
 import orderGiftCardsTab from "./orderGiftCardsTab";
 import receivingInfoTab from "./receivingInfoTab";
+import discountInfoTab from "./discountInfoTab";
 import operationLog from "@/views/oms/order/components/operationLog.vue";
 import PickUpInfoDiaTab from "@/views/oms/order/components/pickUpInfoDiaTab.vue";
 
@@ -144,14 +251,23 @@ export default {
     orderItemListTab,
     orderGiftCardsTab,
     receivingInfoTab,
-    promotionInfoTab
+    promotionInfoTab,
+    discountInfoTab
   },
   data() {
     return {
       activeName: "orderItemList",
       logData: [],
       orderInfo: {},
-      active: 1,
+      collapse: {
+        promotionActive: "2",
+        receivingInfoActive: "2",
+        pickUpInfoActive: "2",
+        operationLogActive: "1",
+        orderGiftCardsActive: "2",
+        orderItemListActive: "2",
+        invoiceInfoActive: "2"
+      },
       addressInfo: {},
       pickUpInfo: {},
       orderDeatils: [],
@@ -359,3 +475,107 @@ export default {
   color: #606266;
 }
 </style>
+<style lang="scss">
+.orderDetailDialog {
+  .el-dialog__header {
+    padding: 36px 21px 0px 28px;
+    .el-dialog__title {
+      font-size: 19px;
+      font-weight: bold;
+      color: #ae8877;
+      line-height: 22px;
+    }
+  }
+  .el-dialog__headerbtn {
+    top: 14px;
+    right: 14px;
+    font-weight: bold;
+    .el-icon-close {
+      font-weight: bold;
+    }
+  }
+  .el-dialog__body {
+    padding: 0px 8px 28px 8px;
+  }
+  .item_title,
+  .el-collapse-item__header {
+    color: #606266;
+    font-size: 16px !important;
+    line-height: 16px;
+    position: relative;
+    padding-left: 28px !important;
+    &:before {
+      position: absolute;
+      left: 18px;
+      top: 13px;
+      content: "";
+      display: inline-block;
+      width: 3px;
+      height: 13px;
+      background: #ae8877;
+      border-radius: 0px 0px 0px 0px;
+    }
+  }
+
+  .el-collapse {
+    border: none;
+    .el-collapse-item__wrap {
+      // margin: 18px;
+    }
+    .el-collapse-item__header {
+      height: 40px;
+      padding-left: 9px !important;
+      &:before {
+        left: 0px;
+      }
+    }
+    .el-collapse-item__wrap,
+    .el-collapse-item__header {
+      border: none;
+    }
+    .el-collapse-item {
+      margin: 18px;
+      border-bottom: 1px solid#d8d8d8 !important;
+      padding-bottom: 18px;
+    }
+    .el-collapse-item__content {
+      padding-bottom: 0px;
+    }
+  }
+  .collapseContainer {
+    .ptitle {
+      border-bottom: none;
+    }
+  }
+  .el-descriptions-item__cell {
+    line-height: 22px !important;
+  }
+  .ptitle {
+    margin: 2px 20px;
+    border-bottom: 1px solid#d8d8d8;
+    &.baseinfotab {
+      border-bottom: none;
+      background: #f5f0ee;
+      padding: 0px 18px;
+    }
+    &.orderitemlist {
+      width: 100%;
+      overflow-x: scroll;
+    }
+    .el-table {
+      margin-bottom: 13px;
+    }
+  }
+  .baseinfo {
+    padding: 18px;
+    .el-descriptions__table {
+      background: #f5f0ee;
+    }
+  }
+  .detailTab {
+    .el-collapse-item {
+      border-bottom: none !important;
+    }
+  }
+}
+</style>

src/views/oms/order/components/orderItemListTab.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <el-table
-      style="width: 100%;"
       ref="multipleTable"
       v-loading="listLoading"
       key="0"
@@ -9,10 +8,11 @@
       row-key="id"
       stripe
       border
+      resizable="0"
       fit
     >
       <el-table-column align="center" type="index"> </el-table-column>
-     <el-table-column
+      <el-table-column
         :label="$t('label.product')"
         min-width="80"
         align="center"
@@ -139,12 +139,7 @@
       >
       </el-table-column>
 
-      <el-table-column
-        label="税金"
-        width="80"
-        align="center"
-        prop="taxAmount"
-      >
+      <el-table-column label="税金" width="80" align="center" prop="taxAmount">
       </el-table-column>
 
       <el-table-column
@@ -182,16 +177,27 @@
           <el-checkbox v-model="scope.row.bagFlag == 1"></el-checkbox>
         </template>
       </el-table-column>
-      <el-table-column width="55" :label="$t('label.flashPurchase')" align="center">
+      <el-table-column
+        width="55"
+        :label="$t('label.flashPurchase')"
+        align="center"
+      >
         <template slot-scope="scope">
           <el-checkbox v-model="scope.row.flashPurchaseFlag == 1"></el-checkbox>
         </template>
       </el-table-column>
-      <el-table-column width="55" :label="$t('label.exchangePurchase')" align="center">
+      <el-table-column
+        width="55"
+        :label="$t('label.exchangePurchase')"
+        align="center"
+      >
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.exchangePurchaseFlag == 1"></el-checkbox>
+          <el-checkbox
+            v-model="scope.row.exchangePurchaseFlag == 1"
+          ></el-checkbox>
         </template>
       </el-table-column>
+      <!-- 多件多折 -->
       <el-table-column width="55" label="多件多折" align="center">
         <template slot-scope="scope">
           <el-checkbox v-model="scope.row.manyfoldFlag == 1"></el-checkbox>
@@ -240,10 +246,11 @@
     >
       <el-input
         v-model="listQuery.sku"
-        clearable style="width: 200px"
+        clearable
+        style="width: 200px"
         autocomplete="off"
         :placeholder="$t('place.skuCode')"
-        @input ="querySkuFilter()"
+        @input="querySkuFilter()"
       ></el-input>
 
       <el-table
@@ -320,9 +327,7 @@
               {{ $t("label.inventory") }}
             </el-button>
           </template>
-
         </el-table-column>
-
       </el-table>
 
       <swPage
@@ -343,22 +348,26 @@
     </el-dialog>
 
     <el-dialog
-       v-highlight
-       :title="$t('title.inventoryList')"
-       :visible.sync="skuInventory"
-       :modal-append-to-body="false"
-       :append-to-body="true">
+      v-highlight
+      :title="$t('title.inventoryList')"
+      :visible.sync="skuInventory"
+      :modal-append-to-body="false"
+      :append-to-body="true"
+    >
       <el-input
         v-model="inventoryQuery.skuCodeIn"
-        clearable style="width: 200px"
+        clearable
+        style="width: 200px"
         autocomplete="off"
         :placeholder="$t('place.skuCode')"
-        @input ="inventoryFilter()"
+        @input="inventoryFilter()"
       ></el-input>
-      <el-table :data="skuInventoryList"
-                v-loading="skuInventoryLoading"
-                style="width: 100%;"
-                highlight-current-row>
+      <el-table
+        :data="skuInventoryList"
+        v-loading="skuInventoryLoading"
+        style="width: 100%;"
+        highlight-current-row
+      >
         <el-table-column align="center" type="index"> </el-table-column>
 
         <el-table-column
@@ -416,8 +425,8 @@
           prop="warehouseType"
         >
           <template slot-scope="scope">{{
-              scope.row.warehouseType | warehouseTypeFilter
-            }}</template>
+            scope.row.warehouseType | warehouseTypeFilter
+          }}</template>
           <!-- <template slot-scope="scope">
             <span v-if="scope.row.warehouseType == '1'">{{
               $t("view.exportExcel")
@@ -446,7 +455,6 @@
         <!--        </el-button>-->
       </span>
     </el-dialog>
-
   </div>
 </template>
 
@@ -461,7 +469,7 @@ import i18n from "@/lang";
 import row from "element-ui/packages/row";
 import { getList } from "@/api/table";
 import swPage from "@/views/common/swPage.vue";
-import {fetchList, warehouseTypeValue} from "@/api/oms/inventory/inventory"; // 国际化
+import { fetchList, warehouseTypeValue } from "@/api/oms/inventory/inventory"; // 国际化
 
 export default {
   name: "orderItemListTab",
@@ -497,7 +505,7 @@ export default {
         productId: "",
         partnumber: "",
         skuCodeIn: "",
-        isquantityGtZero: 1,
+        isquantityGtZero: 1
       },
       listQuery: {
         page: 1,
@@ -505,7 +513,7 @@ export default {
         skuCode: "",
         isGift: "",
         sku: "",
-        storeId: '',
+        storeId: ""
       },
       params: {
         oldSku: "",
@@ -518,20 +526,20 @@ export default {
   },
   methods: {
     // 查看库存信息
-    querySkuInventory(row){
+    querySkuInventory(row) {
       this.skuInventory = true;
       this.inventoryQuery.productId = row.productId;
       this.queryInventory();
     },
-    queryInventory(){
+    queryInventory() {
       this.skuInventoryLoading = true;
       fetchList(this.inventoryQuery).then(res => {
         this.skuInventoryList = res.data.list;
         this.inventoryTotal = res.data.total;
         this.skuInventoryLoading = false;
-      })
+      });
     },
-    inventoryFilter(){
+    inventoryFilter() {
       this.inventoryQuery.page = 1;
       this.queryInventory();
     },
@@ -553,7 +561,7 @@ export default {
         this.selectSku = false;
       });
     },
-    querySkuFilter(){
+    querySkuFilter() {
       this.listQuery.page = 1;
       this.querySkuList();
     },

src/views/oms/order/orderList.vue

@@ -419,7 +419,9 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
 
@@ -431,9 +433,18 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardOrderFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
+      <!-- 多件多件信息 -->
+      <el-table-column
+        :label="$t('discountInfo')"
+        min-width="200"
+        align="center"
+        prop="discountInfo"
+      ></el-table-column>
 
       <el-table-column
         :label="$t('sellerDiscount')"
@@ -490,6 +501,7 @@
     <el-dialog
       :title="$t('orderDetail')"
       :fullscreen="true"
+      custom-class="orderDetailDialog"
       v-if="orderInfoVisible"
       :visible.sync="orderInfoVisible"
     >
@@ -574,12 +586,12 @@ export default {
         receiverCountryCode: "",
         receiverPhone: "",
         receiverMobile: "",
-        email:"",
+        email: "",
         receiverName: "",
         warehouseCode: "",
         blocked: "",
-        tags:"",
-        orderType:""
+        tags: "",
+        orderType: ""
       },
       addNoteForm: {
         id: null,
@@ -621,7 +633,7 @@ export default {
         { value: "cancel", label: "cancel" },
         { value: "partdelivery", label: "partdelivery" }
       ],
-      orderTypes:[
+      orderTypes: [
         { value: "fixed", label: "正常订单" },
         { value: "pre", label: "预售订单" },
         { value: "manual", label: "手工订单" },
@@ -835,3 +847,11 @@ export default {
   justify-content: center;
 }
 </style>
+<style>
+.orderDetailDialog .el-dialog__title {
+  font-size: 14px;
+  font-weight:bold;
+  color: #ae8877;
+  line-height: 22px;
+}
+</style>

src/views/oms/order/orderProcess.vue

@@ -427,7 +427,9 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
 
@@ -439,9 +441,18 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.giftCardOrderFlag == '00'">{{ $t("no") }}</span>
-          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{ $t("yes") }}</span>
+          <span v-else-if="scope.row.giftCardOrderFlag == '01'">{{
+            $t("yes")
+          }}</span>
         </template>
       </el-table-column>
+      <!-- 多件多件信息 -->
+      <el-table-column
+        :label="$t('discountInfo')"
+        min-width="200"
+        align="center"
+        prop="discountInfo"
+      ></el-table-column>
 
       <el-table-column
         :label="$t('sellerDiscount')"
@@ -703,6 +714,7 @@
       :fullscreen="true"
       v-if="orderInfoVisible"
       :visible.sync="orderInfoVisible"
+      custom-class="orderDetailDialog"
     >
       <orderInfoDialog
         :ordersId="currentOrdersId"
@@ -1261,7 +1273,7 @@ export default {
         refundFlag: "0",
         outStockFlag: "0",
         isGift: "",
-        tags:"",
+        tags: ""
       },
       addNoteForm: {
         id: null,

src/views/oms/promotion/promotionLogList/promotionLogList.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input
+        :placeholder="$t('label.promotionName')"
+        style="width: 200px;"
+        clearable
+        class="filter-item"
+        v-model="listQuery.keywords"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        v-waves
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >{{ $t("search") }}</el-button
+      >
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :key="tableKey"
+      :data="list"
+      stripe
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;"
+    >
+      <el-table-column type="index" width="40"></el-table-column>
+
+      <el-table-column
+        :label="$t('shopifyPromotion.logType')"
+        align="center"
+        width="220"
+        visible-overflow-tooltip
+      >
+        <template v-slot="{ row }">
+          <span>{{ row.userName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('shopifyPromotion.executionInfo')"
+        align="center"
+        width="220"
+      >
+        <template v-slot="{ row }">
+          <el-popover
+            placement="bottom-start"
+            width="400"
+            trigger="hover"
+            :content="row.remark"
+          >
+            <span slot="reference" class="tooltip">{{ row.remark }}</span>
+          </el-popover>
+        </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('shopifyPromotion.resultInfo')">
+        <template v-slot="{ row }">
+          <el-popover
+            placement="bottom-start"
+            width="400"
+            trigger="hover"
+            :content="row.remark"
+          >
+            <span slot="reference" class="tooltip">{{ row.remark }}</span>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('shopifyPromotion.logStatus')"
+        visible-overflow-tooltip
+      >
+        <template v-slot="{ row }">
+          <span>{{ row.remark }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('shopifyPromotion.executionTime')"
+        visible-overflow-tooltip
+      >
+        <template v-slot="{ row }">
+          <span>{{ row.remark }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('shopifyPromotion.operator')"
+        visible-overflow-tooltip
+      >
+        <template v-slot="{ row }">
+          <span>{{ row.remark }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('label.operation')"
+        align="center"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <a
+            class="active"
+            href="javascript:void(0)"
+            @click="visibleDetailDialog(scope.row)"
+            >{{ $t("details") }}</a
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <swPage
+      v-if="total > 0"
+      key="2"
+      :listQuery="listQuery"
+      :total="total"
+      pos="btmRight"
+      @retPage="getList"
+    />
+    <DetailDialog :visible.sync="dialog.visible" :params="dialog.params" />
+  </div>
+</template>
+
+<script>
+import waves from "@/directive/waves"; // 水波纹指令
+import SwPage from "@/views/common/swPage.vue";
+import { promotionLogs } from "@/api/oms/order/promotion";
+import DetailDialog from "./components/promotionLogDetail.vue";
+
+export default {
+  inject: ["reload"], //刷新
+  components: {
+    SwPage,
+    DetailDialog
+  },
+  name: "shopifyPromotionLogList",
+  directives: {
+    waves
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: [],
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        upAndDown: null,
+        keywords: null,
+        page: 1,
+        limit: 10
+      },
+      dialog: {
+        visible: false,
+        params: {}
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleOpen(id) {
+      this.listQuery.promotionId = id;
+      this.dialogFormVisible = true;
+      this.retPage();
+    },
+    getList() {
+      this.listLoading = true;
+      promotionLogs(this.listQuery)
+        .then(response => {
+          if (response.code === 200) {
+            this.list = response.data.list || arr;
+            this.total = response.data.total;
+            setTimeout(() => {
+              this.listLoading = false;
+            }, 0.5 * 1000);
+          }
+        })
+        .catch(() => {
+          setTimeout(() => {
+            this.listLoading = false;
+          }, 0.5 * 1000);
+        });
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    visibleDetailDialog(row) {
+      this.dialog.visible = !this.dialog.visible;
+      this.dialog.params = row;
+    },
+    handleCloseDialog(params) {
+      this.dialog.visible = params;
+    },
+    retPage() {
+      this.listQuery.page = 1;
+      this.getList();
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.tooltip {
+  white-space: nowrap;
+  min-width: 50px;
+}
+.active {
+  color: #ae8877;
+}
+</style>

src/views/oms/promotion/shopifyPromotion/index.vue

@@ -137,10 +137,9 @@
             class="filter-item"
             type="primary"
             icon="el-icon-circle-plus-outline"
-            @click="showDialog('',true)"
+            @click="showDialog('', true)"
             >{{ $t("view.create") }}
           </el-button>
-
         </div>
         <el-table
           v-loading="listLoading"
@@ -387,7 +386,7 @@
                   size="mini"
                   icon="el-icon-edit"
                   circle
-                  @click="showDialog(row.id,true)"
+                  @click="showDialog(row.id, true)"
                 >
                 </el-button>
               </el-tooltip>
@@ -404,7 +403,7 @@
                   size="mini"
                   icon="el-icon-more"
                   circle
-                  @click="showDialog(row.id,false)"
+                  @click="showDialog(row.id, false)"
                 >
                 </el-button>
               </el-tooltip>
@@ -554,13 +553,13 @@ export default {
     ElContainer,
     PromotionForm,
     PromotionGiftList: Vue.component("PromotionGiftList", () =>
-      import("@/views/oms/promotion/promotion/promotionGiftList.vue")
+      import("@/views/oms/promotion/shopifyPromotion/promotionGiftList.vue")
     ),
     PromotionGoodsList: Vue.component("PromotionGoodsList", () =>
-      import("@/views/oms/promotion/promotion/promotionGoodsList.vue")
+      import("@/views/oms/promotion/shopifyPromotion/promotionGoodsList.vue")
     ),
     PromotionLogList: Vue.component("PromotionLogList", () =>
-      import("@/views/oms/promotion/promotion/promotionLogList.vue")
+      import("@/views/oms/promotion/shopifyPromotion/promotionLogList.vue")
     )
   },
   name: "shopifyPromotion",
@@ -647,8 +646,8 @@ export default {
         });
       });
     },
-    showDialog(id,edit) {
-      this.$refs.promotionFormRef.showDialog(id,edit);
+    showDialog(id, edit) {
+      this.$refs.promotionFormRef.showDialog(id, edit);
     },
     handleCheck(id) {
       this.$confirm("是否审核通过?", "提示", {

src/views/oms/promotion/shopifyPromotion/promotionLogList.vue

@@ -1,144 +1,95 @@
 <template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-input
-        :placeholder="$t('label.promotionName')"
-        style="width: 200px;"
-        clearable
-        class="filter-item"
-        v-model="listQuery.keywords"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        v-waves
-        class="filter-item"
-        type="primary"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >{{ $t("search") }}</el-button
-      >
-    </div>
-    <el-table
-      v-loading="listLoading"
-      :key="tableKey"
-      :data="list"
-      stripe
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;"
+  <div>
+    <el-dialog
+      :title="$t('title.operationLog')"
+      append-to-body
+      top="5vh"
+      width="60%"
+      :visible.sync="dialogFormVisible"
     >
-      <el-table-column type="index" width="40"></el-table-column>
+      <div style="height: 72vh; overflow: auto">
+        <el-table
+          v-loading="listLoading"
+          :key="tableKey"
+          :data="list"
+          stripe
+          border
+          fit
+          highlight-current-row
+          style="width: 100%;"
+        >
+          <el-table-column type="index" width="40"></el-table-column>
 
-      <el-table-column
-        :label="$t('shopifyPromotion.logType')"
-        align="center"
-        width="220"
-        visible-overflow-tooltip
-      >
-        <template v-slot="{ row }">
-          <span>{{ row.userName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('shopifyPromotion.executionInfo')"
-        align="center"
-        width="220"
-      >
-        <template v-slot="{ row }">
-          <el-popover
-            placement="bottom-start"
-            width="400"
-            trigger="hover"
-            :content="row.remark"
+          <el-table-column
+            :label="$t('label.operator')"
+            align="center"
+            width="220"
+            show-overflow-tooltip
           >
-            <span slot="reference" class="tooltip">{{ row.remark }}</span>
-          </el-popover>
-        </template>
-      </el-table-column>
-
-      <el-table-column :label="$t('shopifyPromotion.resultInfo')">
-        <template v-slot="{ row }">
-          <el-popover
-            placement="bottom-start"
-            width="400"
-            trigger="hover"
-            :content="row.remark"
+            <template v-slot="{ row }">
+              <span>{{ row.userName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('label.operationTime')"
+            align="center"
+            width="220"
+            show-overflow-tooltip
           >
-            <span slot="reference" class="tooltip">{{ row.remark }}</span>
-          </el-popover>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('shopifyPromotion.logStatus')"
-        visible-overflow-tooltip
-      >
-        <template v-slot="{ row }">
-          <span>{{ row.remark }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('shopifyPromotion.executionTime')"
-        visible-overflow-tooltip
-      >
-        <template v-slot="{ row }">
-          <span>{{ row.remark }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('shopifyPromotion.operator')"
-        visible-overflow-tooltip
-      >
-        <template v-slot="{ row }">
-          <span>{{ row.remark }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('label.operation')"
-        align="center"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <a
-            class="active"
-            href="javascript:void(0)"
-            @click="visibleDetailDialog(scope.row)"
-            >{{ $t("details") }}</a
+            <template v-slot="{ row }">
+              <span>{{ row.createTime }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            :label="$t('label.operationMethod')"
+            align="center"
+            show-overflow-tooltip
           >
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <swPage
-      v-if="total > 0"
-      key="2"
-      :listQuery="listQuery"
-      :total="total"
-      pos="btmRight"
-      @retPage="getList"
-    />
-    <DetailDialog :visible.sync="dialog.visible" :params="dialog.params" />
+            <template v-slot="{ row }">
+              <span>{{ row.remark }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <swPage
+          v-if="total > 0"
+          key="2"
+          :listQuery="listQuery"
+          :total="total"
+          pos="btmRight"
+          @retPage="getList"
+        />
+      </div>
+
+      <template slot="footer">
+        <el-button @click="dialogFormVisible = false"
+          >{{ $t("tagsView.close") }}
+        </el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import waves from "@/directive/waves"; // 水波纹指令
 import SwPage from "@/views/common/swPage.vue";
+import ElContainer from "element-ui/packages/container/src/main";
 import { promotionLogs } from "@/api/oms/order/promotion";
-import DetailDialog from "./component/promotionLogDetail.vue";
 
 export default {
   inject: ["reload"], //刷新
   components: {
     SwPage,
-    DetailDialog
+    ElContainer
   },
-  name: "shopifyPromotionPromotionLogList",
+  name: "promotionLogList",
   directives: {
     waves
   },
   data() {
     return {
+      dialogFormVisible: false,
       tableKey: 0,
       list: [],
       total: 0,
@@ -148,23 +99,23 @@ export default {
         keywords: null,
         page: 1,
         limit: 10
-      },
-      dialog: {
-        visible: false,
-        params: {}
       }
     };
   },
-  created() {
-    this.getList();
-  },
+  created() {},
+  computed: {},
   methods: {
+    handleOpen(id) {
+      this.listQuery.promotionId = id;
+      this.dialogFormVisible = true;
+      this.retPage();
+    },
     getList() {
       this.listLoading = true;
       promotionLogs(this.listQuery)
         .then(response => {
           if (response.code === 200) {
-            this.list = response.data.list || arr;
+            this.list = response.data.list;
             this.total = response.data.total;
             setTimeout(() => {
               this.listLoading = false;
@@ -177,17 +128,6 @@ export default {
           }, 0.5 * 1000);
         });
     },
-    handleFilter() {
-      this.listQuery.page = 1;
-      this.getList();
-    },
-    visibleDetailDialog(row) {
-      this.dialog.visible = !this.dialog.visible;
-      this.dialog.params = row;
-    },
-    handleCloseDialog(params) {
-      this.dialog.visible = params;
-    },
     retPage() {
       this.listQuery.page = 1;
       this.getList();
@@ -196,12 +136,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-.tooltip {
-  white-space: nowrap;
-  min-width: 50px;
-}
-.active {
-  color: #ae8877;
-}
-</style>
+<style scoped lang="scss"></style>

src/views/oms/refund/autoRefund.vue

@@ -25,7 +25,7 @@
         type="primary"
         icon="el-icon-search"
         @click="handleFilter"
-      >{{ $t("view.search") }}</el-button
+        >{{ $t("view.search") }}</el-button
       >
       <el-button
         class="filter-item"
@@ -33,7 +33,7 @@
         type="primary"
         icon="el-icon-circle-plus"
         @click="handleCreate"
-      >{{ $t("view.create") }}</el-button
+        >{{ $t("view.create") }}</el-button
       >
     </div>
 
@@ -58,24 +58,24 @@
       >
       </el-table-column>
 
-<!--      <el-table-column-->
-<!--        :label="$t('label.code')"-->
-<!--        width="200"-->
-<!--        align="center"-->
-<!--        prop="giftSkuCode"-->
-<!--      >-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column-->
-<!--        :label="$t('label.applicableShops')"-->
-<!--        width="150"-->
-<!--        align="center"-->
-<!--        prop="storeId"-->
-<!--      >-->
-<!--        <template slot-scope="scope">-->
-<!--          {{ scope.row.storeId | storeIdFilter }}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        :label="$t('label.code')"-->
+      <!--        width="200"-->
+      <!--        align="center"-->
+      <!--        prop="giftSkuCode"-->
+      <!--      >-->
+      <!--      </el-table-column>-->
+
+      <!--      <el-table-column-->
+      <!--        :label="$t('label.applicableShops')"-->
+      <!--        width="150"-->
+      <!--        align="center"-->
+      <!--        prop="storeId"-->
+      <!--      >-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{ scope.row.storeId | storeIdFilter }}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
 
       <el-table-column
         :label="$t('label.effectivePeriodStart')"
@@ -119,7 +119,7 @@
             size="mini"
             v-waves
             @click="refresh(scope.row)"
-          >{{ "明细" }}</el-button
+            >{{ "明细" }}</el-button
           >
           <el-button
             v-if="scope.row.isEnable === '1'"
@@ -128,7 +128,7 @@
             size="mini"
             v-waves
             @click="enableInfo(scope.row)"
-          >{{ "禁用" }}</el-button
+            >{{ "禁用" }}</el-button
           >
 
           <el-button
@@ -138,7 +138,7 @@
             size="mini"
             v-waves
             @click="enableInfo(scope.row)"
-          >{{ "启用" }}</el-button
+            >{{ "启用" }}</el-button
           >
 
           <el-button
@@ -147,7 +147,7 @@
             size="mini"
             v-waves
             @click="modifyConfig(scope.row)"
-          >{{ "修改" }}</el-button
+            >{{ "修改" }}</el-button
           >
 
           <el-button
@@ -183,7 +183,11 @@
     >
       <el-form label-width="auto" :rules="rules">
         <el-form-item label="自动退款配置名称">
-          <el-input v-model="autoConfig.name" placeholder="请输入" style="width: 400px;" />
+          <el-input
+            v-model="autoConfig.name"
+            placeholder="请输入"
+            style="width: 400px;"
+          />
         </el-form-item>
         <el-form-item :label="$t('label.validTime')" prop="dateTime">
           <el-date-picker
@@ -215,11 +219,11 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="addConfig = false">{{
-            $t("view.cancel")
-          }}</el-button>
+          $t("view.cancel")
+        }}</el-button>
         <el-button type="primary" @click="handleSave">{{
-            $t("view.confirm")
-          }}</el-button>
+          $t("view.confirm")
+        }}</el-button>
       </div>
     </el-dialog>
 
@@ -297,7 +301,6 @@
           </template>
         </el-table-column>
 
-
         <el-table-column
           fixed="right"
           :label="$t('label.operation')"
@@ -368,7 +371,10 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="配置内容" v-if="autoRefundConfigDetail.configType === 'store'">
+        <el-form-item
+          label="配置内容"
+          v-if="autoRefundConfigDetail.configType === 'store'"
+        >
           <el-select
             filterable
             v-model="autoRefundConfigDetail.configContent"
@@ -386,7 +392,10 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="配置内容" v-if="autoRefundConfigDetail.configType === 'warehouse'">
+        <el-form-item
+          label="配置内容"
+          v-if="autoRefundConfigDetail.configType === 'warehouse'"
+        >
           <el-select
             filterable
             v-model="autoRefundConfigDetail.configContent"
@@ -404,7 +413,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="是否支持次品" >
+        <el-form-item label="是否支持次品">
           <el-select
             clearable
             v-model="autoRefundConfigDetail.supportDefective"
@@ -420,7 +429,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否支持赠品" >
+        <el-form-item label="是否支持赠品">
           <el-select
             clearable
             v-model="autoRefundConfigDetail.supportGift"
@@ -436,15 +445,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="addDetailDialog = false">{{
-            $t("view.cancel")
-          }}</el-button>
+          $t("view.cancel")
+        }}</el-button>
         <el-button type="primary" @click="addDetailSave">{{
-            $t("view.confirm")
-          }}</el-button>
+          $t("view.confirm")
+        }}</el-button>
       </div>
     </el-dialog>
 
@@ -481,11 +489,11 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="modifyEditVisible = false">{{
-            $t("view.cancel")
-          }}</el-button>
+          $t("view.cancel")
+        }}</el-button>
         <el-button type="primary" @click="handleModify()">{{
-            $t("view.confirm")
-          }}</el-button>
+          $t("view.confirm")
+        }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -493,20 +501,22 @@
 
 <script>
 import swPage from "@/views/common/swPage.vue";
+import { queryChannelStore } from "@/api/oms/inventory/inventory";
 import {
-  queryChannelStore,
-} from "@/api/oms/inventory/inventory";
-import {fetchList as warehouseList, returnWarehouseList} from "@/api/oms/inventory/warehouse";
-import {
-  deleteDetail,
-} from "@/api/oms/order/virtualGoods";
+  fetchList as warehouseList,
+  returnWarehouseList
+} from "@/api/oms/inventory/warehouse";
+import { deleteDetail } from "@/api/oms/order/virtualGoods";
 import orderInfoDialog from "@/views/oms/order/components/orderInfoDialog.vue";
 import {
-  deleteConfig, deleteConfigDetail,
+  deleteConfig,
+  deleteConfigDetail,
   getConfigDetailList,
   getConfigList,
-  saveConfig, saveConfigDetail,
-  updateConfig, updateConfigDetail,
+  saveConfig,
+  saveConfigDetail,
+  updateConfig,
+  updateConfigDetail,
   updateConfigList
 } from "@/api/oms/refund/autoRefund";
 
@@ -537,7 +547,7 @@ export default {
       } else if (key === "warehouse") {
         return "仓库";
       }
-    },
+    }
   },
 
   data() {
@@ -558,16 +568,14 @@ export default {
       relationshipList: [],
       params: {},
       rules: {
-        name: [
-          { required: true, message: "请填写配置名称", trigger: "blur" }
-        ]
+        name: [{ required: true, message: "请填写配置名称", trigger: "blur" }]
       },
       listQuery: {
         page: 1,
         limit: 10,
         name: "",
         effectiveStartTime: "",
-        effectiveEndTime: "",
+        effectiveEndTime: ""
       },
       store: [],
       activitySkuList: [],
@@ -587,18 +595,18 @@ export default {
       autoRefundConfig: {
         id: "",
         name: "",
-        isEnable:"",
+        isEnable: "",
         beginTime: "",
         endTime: "",
         dateTime: []
       },
       autoRefundConfigDetail: {
-        id:"",
-        configId:"",
-        configType:"",
-        configContent:"",
-        supportDefective:"0",
-        supportGift:"0"
+        id: "",
+        configId: "",
+        configType: "",
+        configContent: "",
+        supportDefective: "0",
+        supportGift: "0"
       },
       warehouses: []
     };
@@ -615,8 +623,8 @@ export default {
   methods: {
     getList() {
       this.listLoading = true;
-      this.listQuery.effectiveStartTime=this.createTimePicker[0];
-      this.listQuery.effectiveEndTime=this.createTimePicker[1];
+      this.listQuery.effectiveStartTime = this.createTimePicker[0];
+      this.listQuery.effectiveEndTime = this.createTimePicker[1];
       getConfigList(this.listQuery).then(res => {
         if (200 === res.code) {
           this.total = res.data.total;
@@ -767,7 +775,7 @@ export default {
     getWarehouse() {
       returnWarehouseList({
         page: 1,
-        limit: 1000,
+        limit: 1000
       }).then(res => {
         if (200 === res.code) {
           this.warehouses = res.data.list;
@@ -775,8 +783,10 @@ export default {
       });
     },
     async addDetailSave() {
-
-      if(this.autoRefundConfigDetail.id!=null&&this.autoRefundConfigDetail.id!==""){
+      if (
+        this.autoRefundConfigDetail.id != null &&
+        this.autoRefundConfigDetail.id !== ""
+      ) {
         await updateConfigDetail(this.autoRefundConfigDetail).then(res => {
           if (200 === res.code) {
             this.$message({
@@ -785,7 +795,7 @@ export default {
             });
           }
         });
-      }else {
+      } else {
         for (let item in this.relationshipList) {
           if (
             this.autoRefundConfigDetail.configContent ===
@@ -828,16 +838,16 @@ export default {
       this.autoRefundConfigDetail.supportDefective = "0";
       this.autoRefundConfigDetail.supportGift = "0";
     },
-    changeType(){
-      this.autoRefundConfigDetail.configContent=null;
+    changeType() {
+      this.autoRefundConfigDetail.configContent = null;
     },
     exchangeGoods(row) {
       this.addDetailDialog = true;
       this.autoRefundConfigDetail.id = row.id;
       this.autoRefundConfigDetail.configType = row.configType;
-      if(row.configType === "store"){
+      if (row.configType === "store") {
         this.autoRefundConfigDetail.configContent = parseInt(row.configContent);
-      }else{
+      } else {
         this.autoRefundConfigDetail.configContent = row.configContent;
       }
       this.autoRefundConfigDetail.configId = row.configId;