Browse Source

Merge branch 'feature/bug分支'

chenqilong 2 years ago
parent
commit
cfba4aa42c

+ 8 - 1
src/views/supply/deliver/commerce_list.vue

@@ -194,7 +194,14 @@ export default {
       return invoiceListProjectV2(params)
     },
     // 列表导出函数
-    exportList: invoiceListProjectV2Export,
+    // exportList: invoiceListProjectV2Export,
+    exportList(...p) {
+      let params = {
+        ...p[0],
+        orderType: 3
+      }
+      return invoiceListProjectV2Export(params, p[1])
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData

+ 8 - 1
src/views/supply/deliver/home_list.vue

@@ -166,7 +166,14 @@ export default {
       return invoiceListProjectV2(params)
     },
     // 列表导出函数
-    exportList: invoiceListProjectV2Export,
+    // exportList: invoiceListProjectV2Export,
+    exportList(...p) {
+      let params = {
+        ...p[0],
+        orderType: 2
+      }
+      return invoiceListProjectV2Export(params, p[1])
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData