Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw

# Conflicts:
#	src/views/basic/product/product.vue

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -8,13 +8,14 @@ ENV = 'production'
 
 
 #林纪裕cd
-# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
 
 # 平潭正式
 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'

src/api/thrsys/thrProductsExport.js

@@ -2,33 +2,35 @@ import axios from "@/utils/request";
 
 
 export function filterLog(query) {
-    return axios({
-        url: "/udiwms/thrProducts/exportLog/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/thrProducts/exportLog/filter",
+    method: "get",
+    params: query
+  });
 }
+
 export function deleteLog(query) {
-    return axios({
-        url: "/udiwms/thrProducts/exportLog/deleteLog",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/thrProducts/exportLog/deleteLog",
+    method: "post",
+    data: query
+  });
 }
 
 export function downloadLog(query) {
-    return axios({
-        url: "/udiwms/thrProducts/exportLog/download",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/thrProducts/exportLog/download",
+    method: "get",
+    params: query
+  });
 }
+
 export function exportExcel(query) {
-    return axios({
-        url: "/udiwms/thrProducts/importLog/export",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/thrProducts/importLog/export",
+    method: "post",
+    data: query
+  });
 }
 
 export function exportExcelAll(query) {
@@ -39,3 +41,15 @@ export function exportExcelAll(query) {
   });
 }
 
+
+export function postThirdProduct(query) {
+  return axios({
+    url: "/udiwms/thrsys/products/post",
+    method: "post",
+    data: query
+  });
+}
+
+
+
+