冲突

.env

@@ -6,12 +6,16 @@ VUE_APP_TENANT=default
 # 登录验证微服务名称
 VUE_APP_AdminPath  = dashoo.opms.admin-0.0.1
 VUE_APP_ParentPath = dashoo.opms.parent-0.0.1
+
+VUE_APP_MicroSrvProxy_API=http://127.0.0.1:9981/
+
 VUE_APP_MicroSrvProxy_API=http://192.168.0.81:9981/
 
 VUE_APP_PROTOCOL='http://'
 # 文件上传
 VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign'
 
+
 SSO_LOGIN=''
 SSO_HREF=''
 

.env.development

@@ -3,11 +3,25 @@
 VUE_APP_TENANT=default
 
 # GateWay地址
+
+
+#VUE_APP_MicroSrvProxy_API=http://192.168.0.252:8100/
+
+# 登录验证微服务名称
+#VUE_APP_AdminPath=dashoo.labsop.lims_latest_opms_admin
+
+# 业务接口微服务名称
+#VUE_APP_ParentPath=dashoo.labsop.lims_latest_opms_parent
+VUE_APP_AdminPath  = dashoo.opms.admin-0.0.1
+VUE_APP_ParentPath = dashoo.opms.parent-0.0.1
+VUE_APP_MicroSrvProxy_API=http://127.0.0.1:9981/
+
 VUE_APP_MicroSrvProxy_API=http://127.0.0.1:9981/
 # 登录验证微服务名称
 VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
 # 业务接口微服务名称
 VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
 
+
 # 文件上传
 VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign'

src/views/customer/list.vue

@@ -133,6 +133,7 @@
   import ToOpen from './components/ToOpen'
   import Merge from './components/Merge'
   import TableTool from '@/components/table/TableTool'
+  import downloadFileByByte from '@/utils/base64ToFile'
   export default {
     components: {
       Edit,
@@ -260,6 +261,23 @@
         this.total = res.data.total
         this.listLoading = false
       },
+
+      exportData() {
+        this.isPublic = false
+        let exportFrom = JSON.parse(JSON.stringify(this.queryForm))
+        exportFrom.columns = this.finallyColumns.map((item) => item.label)
+        api
+          .deriveList(exportFrom)
+          .then((res) => {
+            if (res.data.list.content) {
+              downloadFileByByte(res.data.list.content, '客户数据.xlsx')
+            }
+          })
+          .catch((err) => {
+            console.error(err)
+          })
+      },
+
       reset() {
         this.queryForm = {
           pageNum: 1,

src/views/customer/openSea.vue

@@ -289,6 +289,7 @@
         this.listLoading = false
       },
       exportData() {
+        this.queryForm.isPublic = true
         let exportFrom = JSON.parse(JSON.stringify(this.queryForm))
         exportFrom.columns = this.finallyColumns.map((item) => item.label)
         api