diff --git a/.env.production b/.env.production index 05d414c..acb070c 100644 --- a/.env.production +++ b/.env.production @@ -37,15 +37,15 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/' -# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/' #诏安医院 # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/' # 大田 # VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/' -# 云霄妇幼 -# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/ +# 云霄妇幼' # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/' # 南靖 @@ -58,10 +58,10 @@ VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ # 域名 -VUE_APP_CONTEXT_PATH = '/' +# VUE_APP_CONTEXT_PATH = '/' # 其他 -# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' +VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' # 监控地址 VUE_APP_MONITRO_ADMIN = '/admin/login' diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 47d9e42..cc077d7 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -360,7 +360,7 @@ @@ -380,7 +380,7 @@ @@ -400,7 +400,7 @@ @@ -416,7 +416,7 @@ - 允许科室多次使用出库 + 物资使用出库模式 @@ -424,8 +424,9 @@ :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.corpType != 1" placeholder="是否启用" > - - + + + @@ -1300,7 +1301,7 @@ export default { if (this.inputQuery.corpType !== 1) { this.inputQuery.genUnit = false - this.inputQuery.useDyCount = false + this.inputQuery.useDyCount = 0 } else { this.inputQuery.genUnit = this.oldData.genUnit this.inputQuery.useDyCount = this.oldData.useDyCount diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index cc5e9a5..46e8d5f 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -2157,6 +2157,7 @@ export default { }, handleModifyClick(_this,row) { + debugger _this.uuid = row.uuid; _this.relId = row.id; _this.isImport = false; diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index bac1f44..d43bf29 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -331,20 +331,39 @@ + + + + + + + + + + + + + + + + + + - 是否寄售 + 采购类型 - - - + + + + - 是否寄售 + 采购类型 diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 46f9796..e891e67 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -1,88 +1,90 @@