diff --git a/.env.development b/.env.development index c36d00d3..eed92e7d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统 ENV = 'development' # 开发环境 -VUE_APP_BASE_API = 'http://192.168.0.166:9991' +VUE_APP_BASE_API = 'http://127.0.0.1:9991' VUE_APP_SYNC_API ="http://127.0.0.1:10001" diff --git a/.env.production b/.env.production index 1c85c14e..7c94c0ec 100644 --- a/.env.production +++ b/.env.production @@ -14,10 +14,12 @@ ENV = 'production' # 刘恩典 # 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.67:9150/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://dm.xmglxp.com:8001/UDI_WMS_MC/' # 诏安总医院 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/' @@ -36,7 +38,6 @@ ENV = 'production' # 平和县医院 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 长泰医院 @@ -65,8 +66,16 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/' # 东山 -# VUE_APP_BASE_API = 'http://https://mudi.dsxyy.org/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://151.122.122.146:9150/UDI_WMS_MC/' + + +# 南靖 +# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.73.128:9150/UDI_WMS_MC/' +# 测试NIGINX +# VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/' + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js index c49b2267..699814c5 100644 --- a/src/api/inout/receiveOrder.js +++ b/src/api/inout/receiveOrder.js @@ -19,6 +19,14 @@ export function addDetail(query) { }); } +export function repeatAdd(query) { + return axios({ + url: "/udiwms/thrsys/order/repeatAdd", + method: "post", + data: query + }); +} + export function getOrderDetail(query) { return axios({ diff --git a/src/utils/request.js b/src/utils/request.js index 2fe3f146..7c289efd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -34,8 +34,8 @@ service.interceptors.request.use(config => { config.headers = { - ADMIN_ID: getAdminId(), - ADMIN_TOKEN: getToken() + ADMINID: getAdminId(), + ADMINTOKEN: getToken() }; diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 072b3836..11969171 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -617,8 +617,8 @@ export default { init() { this.uploadFileUrl = process.env.VUE_APP_BASE_API + '/udiwms/bussinessType/file/upload' this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token } }, getSyncConfig() { diff --git a/src/views/dev/DeviceInspectTakeProjectSet.vue b/src/views/dev/DeviceInspectTakeProjectSet.vue index 7f3c5ecf..106c6ae0 100644 --- a/src/views/dev/DeviceInspectTakeProjectSet.vue +++ b/src/views/dev/DeviceInspectTakeProjectSet.vue @@ -206,8 +206,8 @@ export default { this.inputQuery.inspectImage = null this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; }, } diff --git a/src/views/dev/DeviceRepairOrderAuditModify.vue b/src/views/dev/DeviceRepairOrderAuditModify.vue index 32c61e6b..57f37efb 100644 --- a/src/views/dev/DeviceRepairOrderAuditModify.vue +++ b/src/views/dev/DeviceRepairOrderAuditModify.vue @@ -559,8 +559,8 @@ export default { } this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; this.repairOrder.uploadImage = null; this.getDeptList(); diff --git a/src/views/dev/DeviceRepairOrderModify.vue b/src/views/dev/DeviceRepairOrderModify.vue index 8bdd1e5e..e0659c71 100644 --- a/src/views/dev/DeviceRepairOrderModify.vue +++ b/src/views/dev/DeviceRepairOrderModify.vue @@ -640,8 +640,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; this.repairOrder.deptCode = this.$store.getters.locDeptCode this.repairOrder.invCode = this.$store.getters.locInvCode diff --git a/src/views/dev/DeviceRepairOrderStart.vue b/src/views/dev/DeviceRepairOrderStart.vue index 1a6ac412..fab4bbeb 100644 --- a/src/views/dev/DeviceRepairOrderStart.vue +++ b/src/views/dev/DeviceRepairOrderStart.vue @@ -483,8 +483,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; this.repairOrder.repariImage = null; this.getDeptList(); diff --git a/src/views/dev/DeviceTemperamentDialog.vue b/src/views/dev/DeviceTemperamentDialog.vue index 4090b48f..1366a6e5 100644 --- a/src/views/dev/DeviceTemperamentDialog.vue +++ b/src/views/dev/DeviceTemperamentDialog.vue @@ -288,8 +288,8 @@ export default { // } this.getBasicUnitMaintainsList(); this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; }, components: { diff --git a/src/views/dev/invDeviceEditDialog.vue b/src/views/dev/invDeviceEditDialog.vue index af9ce1f5..fa808820 100644 --- a/src/views/dev/invDeviceEditDialog.vue +++ b/src/views/dev/invDeviceEditDialog.vue @@ -286,8 +286,8 @@ export default { // } this.getBasicUnitMaintainsList(); this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; }, components: { diff --git a/src/views/dev/invTechniclDialog.vue b/src/views/dev/invTechniclDialog.vue index c8a8a76d..120840af 100644 --- a/src/views/dev/invTechniclDialog.vue +++ b/src/views/dev/invTechniclDialog.vue @@ -285,8 +285,8 @@ export default { // } this.getBasicUnitMaintainsList(); this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; }, components: { diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue index fb8bf616..f5d40496 100644 --- a/src/views/inout/DialogCheck.vue +++ b/src/views/inout/DialogCheck.vue @@ -564,8 +564,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; if (this.formData.formData == null) { this.formData = {} diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue index ffe8779b..3429b8dc 100644 --- a/src/views/inout/DialogInvoice.vue +++ b/src/views/inout/DialogInvoice.vue @@ -326,8 +326,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; if (this.formData.formData == null) { this.formData = {} diff --git a/src/views/inout/DialogInvoiceOrder.vue b/src/views/inout/DialogInvoiceOrder.vue index e366a232..638731f8 100644 --- a/src/views/inout/DialogInvoiceOrder.vue +++ b/src/views/inout/DialogInvoiceOrder.vue @@ -730,8 +730,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; this.getOrderDetail(); }, diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 77468e48..58e4284e 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -768,8 +768,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token, + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token, }; this.getOrderDetail(); }, diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue index 8560cbbd..e67a1c6b 100644 --- a/src/views/inout/InvoiceRegCkeck.vue +++ b/src/views/inout/InvoiceRegCkeck.vue @@ -785,8 +785,8 @@ export default { created() { this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file' this.headers = { - ADMIN_ID: store.getters.adminId, - ADMIN_TOKEN: store.getters.token + ADMINID: store.getters.adminId, + ADMINTOKEN: store.getters.token } if(this.curInvoice.id!=null){ this.inputQuery=this.curInvoice diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue index 426927d5..d5a4b634 100644 --- a/src/views/inout/receive/DialogNewReceive.vue +++ b/src/views/inout/receive/DialogNewReceive.vue @@ -125,7 +125,7 @@ - +