From eb778a78b58b6fb97c6f00a05849d54f7ef95624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 23 Aug 2023 17:28:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9Ebase=5Fdirect=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 1 + fe/PC/src/App.vue | 1 + fe/PC/src/api/wms-job.js | 3 ++- fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 99679ba8a..c9dd0413d 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -11,6 +11,7 @@ // dev_win window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60099' +window.SITE_CONFIG['base_direct'] = 'http://dev.ccwin-in.com:60085' window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60099/api/auth' // window.SITE_CONFIG['print'] = 'print'21384 window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074' diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue index 124f1fd8a..be7af16b3 100644 --- a/fe/PC/src/App.vue +++ b/fe/PC/src/App.vue @@ -9,6 +9,7 @@ export default { name: 'App' } localStorage.setItem('base',window.SITE_CONFIG['base']) +localStorage.setItem('base_direct',window.SITE_CONFIG['base_direct']) localStorage.setItem('user',window.SITE_CONFIG['user']) localStorage.setItem('print',window.SITE_CONFIG['print']) localStorage.setItem('warehouseCode',window.SITE_CONFIG['warehouseCode']) diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js index 8dd3f1479..178969e8d 100644 --- a/fe/PC/src/api/wms-job.js +++ b/fe/PC/src/api/wms-job.js @@ -1,6 +1,7 @@ import request from '@/utils/request' // let baseURL = process.env.VUE_APP_BASE_API + '/' let baseURL = localStorage.getItem('base') + '/api/' +let baseDirectURL = localStorage.getItem('base_direct') + '/api/' //分页+筛选 export function getPageList(data, url) { return request({ @@ -199,7 +200,7 @@ export function preparationPlanByNumber(params) { //质检——完成质检 export function completeSummaryDetailStatus(params, data) { return request({ - url: baseURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id, + url: baseDirectURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id, method: 'post', params: {summaryDetailId:params.summaryDetailId}, data diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index ee53e91f5..9ff80e0fc 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -849,7 +849,6 @@ export default { completeSummaryDetailStatus( {id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData, - // 'http://dev.ccwin-in.com:60085/api/' ).then(res => { // 更新数据============================================================ that.inspectNoticeDetailsShow = false From cd18a07ebc806d71ae8b97db3217e44f5027ef8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 24 Aug 2023 09:14:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=B8=90=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=AA=9C=E8=A1=8C=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- .../reportForm/InventoryBookDetail_innerPage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 4190593f4..575f2d01f 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.70" + "version": "1.0.71" } \ No newline at end of file diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue index 72b529968..f693c9f37 100644 --- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue +++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue @@ -291,7 +291,7 @@ export default { // level2:item2, // level3:{locationCode:null}, level2:{erpLocatioCode:null}, - level3:{locationCode:item2.erpLocatioCode},//此处为了合并单元格做模拟locationCode处理 + level3:{locationCode:null},//此处为了合并单元格做模拟locationCode处理 total_item:item1, }) }