提交merge1.3

openhis-ui-vue3/src/api/public.js

@@ -1,21 +1,70 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 获取追溯码
 export function searchTraceNo(data) {
   return request({
-    url:'/app-common/search-trace-no', 
+    url: '/app-common/search-trace-no',
     method: 'get',
     params: data,
-  })
+  });
 }
 
 // 获取处方打印数据
 export function advicePrint(data) {
   return request({
-    url:'/app-common/advice-print', 
+    url: '/app-common/advice-print',
     method: 'get',
     params: data,
-  })
+  });
+}
+
+// 获取全部科室列表
+export function getOrgList(data) {
+  return request({
+    url: '/app-common/department-list',
+    method: 'get',
+    params: data,
+  });
+}
+
+// 获取全部病区列表
+export function getWardList(data) {
+  return request({
+    url: '/app-common/ward-list',
+    method: 'get',
+    params: data,
+  });
+}
+
+// 获取全部供应商列表
+export function getSupplierList(data) {
+  return request({
+    url: '/app-common/supplier',
+    method: 'get',
+    params: data,
+  });
+}
+
+/**
+ * 获取项目定价方式,批次售价/统一售价
+ */
+export function getAdjustPriceSwitchState(params) {
+  return request({
+    url: '/change/price/getAdjustPriceSwitchState',
+    method: 'get',
+    params: params,
+  });
+}
+
+/**
+ * 批次号匹配
+ */
+export function lotNumberMatch(params) {
+  return request({
+    url: '/app-common/lot-number-match',
+    method: 'get',
+    params: params,
+  });
 }
 
 // 获取全部科室列表
@@ -48,8 +97,9 @@ export function getSupplierList(data) {
 import axios from 'axios';
 
 const env = import.meta.env.MODE;
-export function invokeYbPlugin(data) {
+export function invokeYbPlugin5001(data) {
 
+<<<<<<< HEAD
 if(env == 'development'){
   return axios.create(
     {
@@ -59,15 +109,34 @@ if(env == 'development'){
       timeout: 60000
     }
   ).post('/api/data/', data);
+=======
+    return axios
+      .create({
+        // axios中请求配置有baseURL选项，表示请求URL公共部分
+        baseURL: '',
+        // 超时
+        timeout: 60000,
+      })
+      .post('http://localhost:5001/api/data/', data);
+  }
+// }
+>>>>>>> v1.3
 
-} else {
-  return axios.create(
-    {
+export function invokeYbPlugin5000(data) {
+  return axios
+    .create({
       // axios中请求配置有baseURL选项，表示请求URL公共部分
       baseURL: '',
       // 超时
+<<<<<<< HEAD
       timeout: 60000
     }
   ).post('http://localhost:5000/api/data/', data);
 }
 }
+=======
+      timeout: 60000,
+    })
+    .post('http://localhost:5000/api/data/', data);
+}
+>>>>>>> v1.3