Procházet zdrojové kódy

Merge branch '售后列表,销售退货表整改' into 测试

lxf před 1 rokem
rodič
revize
35979d69d5

+ 3 - 1
src/views/group/finance/check-bill/printSKU.vue

@@ -75,6 +75,8 @@ watch(
 );
 const labelList = ref({
   2: "quantity",
+  4: "checkFee",
+  5: "subtotal",
   6: "total",
 });
 const textList = ref({
@@ -103,7 +105,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3, 4, 5].includes(index)
+        [1, 3].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",

+ 3 - 1
src/views/group/finance/summary/printSKU.vue

@@ -75,6 +75,8 @@ watch(
 );
 const labelList = ref({
   2: "quantity",
+  4: "checkFee",
+  5: "subtotal",
   6: "total",
 });
 const textList = ref({
@@ -103,7 +105,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3, 4, 5].includes(index)
+        [1, 3].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",

+ 22 - 1
src/views/group/order/after-sale/index.vue

@@ -7,6 +7,13 @@
       :loading="loading"
       :searchConfig="searchConfig"
       highlight-current-row
+      :action-list="[
+        {
+          text: '同步万里牛售后单',
+          action: () => clickSynchronousOrder(),
+          loading: btnLoading,
+        },
+      ]"
       @get-list="getList"
       @clickReset="clickReset"
       :spanMethod="spanMethod"
@@ -47,7 +54,6 @@
 <script setup>
 import byTable from "/src/components/byTable/index";
 import { ElMessage } from "element-plus";
-import { get } from "@vueuse/core";
 
 const { proxy } = getCurrentInstance();
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
@@ -352,6 +358,21 @@ const clickSubmit = () => {
     }
   });
 };
+const btnLoading = ref(false);
+const clickSynchronousOrder = () => {
+  btnLoading.value = true;
+  proxy.post("/orderHandle/resynchronizationReturnOrder", {}).then(
+    () => {
+      ElMessage.success("同步完成成功");
+      btnLoading.value = false;
+      getList();
+    },
+    (err) => {
+      ElMessage.error(`同步失败: ${err} !`);
+      btnLoading.value = false;
+    }
+  );
+};
 </script>
 
 <style lang="scss" scoped>