Merge branch 'master' of https://gogs.zfire.top/zfire-front/supply-front

src/api/deliver_list_v2.js

@@ -1,5 +1,13 @@
 import request, { postBlob } from '@/utils/request'
 
+export function invoiceListRetailV3(data) {
+  return request({
+    url: `/invoice/listRetailV3?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
 export function invoiceListRetailV2(data) {
   return request({
     url: `/invoice/listRetailV2?moduleId=${data.moduleId}`,

src/views/supply/deliver/deliver_list.vue

@@ -61,7 +61,7 @@
 <script>
 import { getDeliverList, getPassword, getPasswordRecord } from '@/api/supply/deliver'
 import { getCategoryList, getSalesmanList } from '@/api/common'
-import { invoiceListRetailV2, invoiceListRetailV2Export } from '@/api/deliver_list_v2'
+import { invoiceListRetailV3, invoiceListRetailV2Export } from '@/api/deliver_list_v2'
 import DeliverDetail from '@/views/supply/deliver/components/deliver_detail'
 import TemplatePage from '@/components/template/template-page-1.vue'
 export default {
@@ -142,7 +142,7 @@ export default {
 
   methods: {
     // 列表请求函数
-    getList: invoiceListRetailV2,
+    getList: invoiceListRetailV3,
     // 列表导出函数
     exportList: invoiceListRetailV2Export,
     // 表格列解析渲染数据更改