diff --git a/.env.development b/.env.development index e29fc9f..2554ec7 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台 # 开发环境配置 ENV = 'development' -VUE_APP_BASE_API = 'http://127.0.0.1:9993' +VUE_APP_BASE_API = 'http://192.168.0.166:9993' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/.env.production b/.env.production index e15a9f8..05d414c 100644 --- a/.env.production +++ b/.env.production @@ -32,7 +32,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/' # 长泰医院 -VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/' @@ -51,6 +51,9 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' # 南靖 # VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/' +# 东山 +VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/' + # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 32e461f..23ae698 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -87,7 +87,7 @@ + @sort-change="handleSortChange"> @@ -153,7 +153,7 @@ - + diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue index f3707eb..50e4691 100644 --- a/src/views/supplier/company/basicCompanyProductsImport.vue +++ b/src/views/supplier/company/basicCompanyProductsImport.vue @@ -420,6 +420,18 @@ > + +
+
+ 是否可集采:  +
+ + + + + +
+
@@ -549,7 +561,8 @@ - +
{{ productRemarkSet.remarkTitle8 }}:  diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue index 695f9a2..1678796 100644 --- a/src/views/supplier/products/supAddDiProductSelectUdi.vue +++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue @@ -197,6 +197,18 @@ v-model="editQuery.price"> + + + + + + + +