Merge branch 'dev_web' into dev_web_online

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'

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.70"
+    "version": "1.0.71"
 }

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'])

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

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,
             })
           }

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