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

src/api/supply/implement.js

@@ -38,6 +38,25 @@ export function retailExecPolicyListV2Export(data, name) {
   })
 }
 
+// 销售执行明细列表-政策零售订单-V2
+export function retailExecEnginListV2(data) {
+  return request({
+    url: `/retail/exec/engin/list/v2?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//销售执行明细列表-政策零售订单-V2-导出
+export function retailExecEnginListV2Export(data, name) {
+  return postBlob({
+    url: '/retail/exec/engin/export/v2',
+    method: 'post',
+    data,
+    name
+  })
+}
+
 // 获取列表
 export function getList(params) {
   return request({

src/views/supply/implement/implement_list.vue

@@ -32,7 +32,9 @@ import {
   retailExecRetailV2,
   retailExecRetailV2Export,
   retailExecPolicyListV2,
-  retailExecPolicyListV2Export
+  retailExecPolicyListV2Export,
+  retailExecEnginListV2,
+  retailExecEnginListV2Export
 } from '@/api/supply/implement'
 import { getCategoryList } from '@/api/common'
 import DisplaceDetail from '@/views/supply/implement/components/displace_detail'
@@ -160,16 +162,44 @@ export default {
       if (this.radioType === '零售订单') {
         return retailExecRetailV2(...p)
       }
+      if (this.radioType === '家用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'HOME'
+        }
+        return retailExecEnginListV2(params)
+      }
+      if (this.radioType === '商用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'TRADE'
+        }
+        return retailExecEnginListV2(params)
+      }
     },
 
     // 列表导出函数
-    exportList() {
+    exportList(...p) {
       if (this.radioType === '政策零售订单') {
         return retailExecPolicyListV2Export()
       }
       if (this.radioType === '零售订单') {
         return retailExecRetailV2Export()
       }
+      if (this.radioType === '家用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'HOME'
+        }
+        return retailExecEnginListV2Export(params)
+      }
+      if (this.radioType === '商用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'TRADE'
+        }
+        return retailExecEnginListV2Export(params)
+      }
     },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {