diff --git a/.env.production b/.env.production index d615dd75..b9e5fb43 100644 --- a/.env.production +++ b/.env.production @@ -17,6 +17,7 @@ ENV = 'production' # 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://dm.xmglxp.com:8082/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/' # 诏安总医院 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/' @@ -48,6 +49,10 @@ VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/' +# 林纪裕centos +# VUE_APP_BASE_API = 'http://192.168.0.86:9150/UDI_WMS_MC/' + + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/inout/statData.js b/src/api/inout/statData.js index 45788d0a..42cbdb19 100644 --- a/src/api/inout/statData.js +++ b/src/api/inout/statData.js @@ -49,3 +49,21 @@ export function excelImport(params) { }); } + +export function createCustom(query) { + return axios({ + url: "/udiwms/inout/detail/custom/create", + method: "post", + data: query + }); +} + +export function filterCusDetailList(params) { + return axios({ + url: "/udiwms/inout/detail/custom/filter", + method: "get", + params: params + }); +} + + diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index b09c8095..e0bf8751 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -123,10 +123,11 @@ export function filterDynamicRoutes(routes) { export const loadView = (view) => { if (process.env.NODE_ENV === 'development') { - return (resolve) => require([`@/views/${view}`], resolve) + return (resolve) => require([`@/views/${view}.vue`], resolve) } else { // 使用 import 实现生产环境的路由懒加载 - return () => import(`@/views/${view}`) +// return () => import(`@/views/${view}`) + return (resolve) => require([`@/views/${view}.vue`], resolve) } } diff --git a/src/views/basic/sicker/skPersonDownload.vue b/src/views/basic/sicker/skPersonDownload.vue index 5cc2d57b..35703e7f 100644 --- a/src/views/basic/sicker/skPersonDownload.vue +++ b/src/views/basic/sicker/skPersonDownload.vue @@ -142,7 +142,20 @@ export default { selectData.forEach((obj) => { this.filterQuery.selectSickers.push(obj); }); - this.downloadAllErp(); + + downloadSick(this.filterQuery).then(res => { + this.dlSickLoading = false + if (res.code != 20000) { + this.$message.error(res.message) + return + } else { + this.$emit("cancelDialog", true); + this.$message.success("后台正在下载更新，请稍后刷新重试！"); + } + }).catch(() => { + this.dlSickLoading = false + this.$message.error("数据加载失败") + }) }, downloadAllErp() { diff --git a/src/views/inout/stat/DialogCreateCustom.vue b/src/views/inout/stat/DialogCreateCustom.vue new file mode 100644 index 00000000..41a75a89 --- /dev/null +++ b/src/views/inout/stat/DialogCreateCustom.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/src/views/inout/stat/IoStatCustomSearch.vue b/src/views/inout/stat/IoStatCustomSearch.vue new file mode 100644 index 00000000..236af639 --- /dev/null +++ b/src/views/inout/stat/IoStatCustomSearch.vue @@ -0,0 +1,434 @@ + + + + +