Merge branch 'dev' of http://git.local.topsunit.com/ximai/mes-pda-scan into dev

common/config.js

@@ -24,7 +24,6 @@ const config = {
 config.baseUrl = 'http://182.140.132.45:9094';
 // config.baseUrl = process.env.NODE_ENV === 'development' ? '/api' : 'http://182.140.132.45:9094';   // 上海环境
 // config.baseUrl = process.env.NODE_ENV === 'development' ? '/api' : 'http://192.168.1.128:20091';   // 外网环境
-// 
 //config.baseUrl = "http://101.200.162.168:8080";
 
 export default config;

common/http.api.js

@@ -12,58 +12,58 @@ const install = (Vue, vm) => {
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
     vm.$u.api = {
         // 基础服务：登录登出、身份信息、菜单授权、切换系统、字典数据等
-        login: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/login', params),
+        login: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/login', params),
         getExAccountInfoApi: (params = {}) => vm.$u.postJson(config.adminPath + '/common/getExAccountInfo', params),
-        changepassword: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/cmsmv/changepassword', params),
+        changepassword: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/cmsmv/changepassword', params),
 		// 到货条码打印查询
-        getforprint: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purcc/getforprint', params),
+        getforprint: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purcc/getforprint', params),
 		// 到货条码打印
-        purccprint: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purcc/print', params),
+        purccprint: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purcc/print', params),
 		// 到货检验查询
-		getforcheck: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purcc/getforcheck', params),
+		getforcheck: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purcc/getforcheck', params),
 		// 到货检验确认
-        purcccheck: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purcc/check', params),
+        purcccheck: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purcc/check', params),
         // 查询进货单创建列表
-        getforcreate: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purtg/getforcreate', params),
+        getforcreate: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purtg/getforcreate', params),
         // 创建进货单
-        purtgcreate: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/purtg/create', params),
+        purtgcreate: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/purtg/create', params),
         // 委外进货打印查询
-        mocthgetforprint: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/getforprint', params),
+        mocthgetforprint: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/getforprint', params),
 		// 委外进货打印
-        mocthprint: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/print', params),
+        mocthprint: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/print', params),
         // 委外检验查询
-		mocthgetforcheck: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/getforcheck', params),
+		mocthgetforcheck: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/getforcheck', params),
 		// 委外检验确认
-        mocthcheck: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/check', params),
+        mocthcheck: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/check', params),
         // 委外扫码上架
-		mocthgetforputon: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/getforputon', params),
+		mocthgetforputon: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/getforputon', params),
 		// 委外扫码上架
-        mocthputon: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/mocth/puton', params),
+        mocthputon: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/mocth/puton', params),
         // 领料单查询
-		moctcgetforcreate: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/moctc/getforcreate', params),
+		moctcgetforcreate: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/moctc/getforcreate', params),
 		// 领料单创建
-        moctccreate: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/moctc/create', params),
+        moctccreate: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/moctc/create', params),
         // 品号信息
-        getforinvmbinfo: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/invmb/getforinvmbinfo', params),
+        getforinvmbinfo: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/invmb/getforinvmbinfo', params),
         // 入库单创建
-        createforstorage: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/sfctb/createforstorage', params),
-        stockSaleOutList: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockSaleOut/list', params),
-        stockList: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockSaleOut/stockList', params),
-        confirmStock: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockSaleOut/confirm', params),
-        getforinvmlinfo: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/invml/getforinvmlinfo', params),
-        validateArrival: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockArrival/validate', params),
-        confirmArrival: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockArrival/confirm', params),
-        warehouseList: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/warehouseArrive/list', params),
+        createforstorage: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/sfctb/createforstorage', params),
+        stockSaleOutList: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockSaleOut/list', params),
+        stockList: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockSaleOut/stockList', params),
+        confirmStock: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockSaleOut/confirm', params),
+        getforinvmlinfo: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/invml/getforinvmlinfo', params),
+        validateArrival: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockArrival/validate', params),
+        confirmArrival: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockArrival/confirm', params),
+        warehouseList: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/warehouseArrive/list', params),
 		// 查询产品库存
-		getforinvmlinfoApi: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/invml/getforinvmlinfo', params),
+		getforinvmlinfoApi: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/invml/getforinvmlinfo', params),
 		// 新增库存交易单
-		stockConfirmApi: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockTaking/confirm', params),
+		stockConfirmApi: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockTaking/confirm', params),
 		// 调拨确认
-		transferConfirmApi: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/stockAllocate/confirm', params),
+		transferConfirmApi: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/stockAllocate/confirm', params),
 		// 仓库查询
-		getWarehouseListApi: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/cmsmc/getCmsmcList', params),
+		getWarehouseListApi: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/cmsmc/getCmsmcList', params),
 		// 库位查询
-		getStorageListApi: (params = {}) => vm.$u.postJson(uni.getStorageSync('apiUrl') + '/cmsni/getCmsniList', params),
+		getStorageListApi: (params = {}) => vm.$u.postJson(vm.vuex_api_url + '/cmsni/getCmsniList', params),
     };
 
 }

pages/stockTransfer/index.vue

@@ -84,7 +84,7 @@
 					return;
 				}
 				const params = {
-					ml001: this.value,
+					ml001: this.value,
 					gtStock: 0
 				}
 				this.$u.api.getforinvmlinfoApi(params)

pages/sys/login/login.vue

@@ -88,9 +88,8 @@ import {setLocal} from '@/lang'
 				})
 			},
 			handleChange(val) {
-				config.baseUrl = val.mesUrl;
-				uni.setStorageSync('mesUrl', val.mesUrl)
-				uni.setStorageSync('apiUrl', val.apiUrl)
+				this.$u.vuex('vuex_mes_url', val.mesUrl);
+				this.$u.vuex('vuex_api_url', val.apiUrl);
 				// #ifdef APP-PLUS
 				checkappupdate.check({
 					title: i18n.t('检测到有新版本！'),

store/index.js

@@ -17,7 +17,7 @@ try {
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
 let saveStateKeys = ['vuex_user', 'vuex_user_factory', 'vuex_token', 'vuex_remember', 'vuex_locale', 'vuex_isAgent',
-	'vuex_workstation', 'vuex_task', 'vuex_sales_outbound'
+	'vuex_workstation', 'vuex_task', 'vuex_sales_outbound', 'vuex_mes_url', 'vuex_api_url'
 ];
 
 // 保存变量到本地存储中
@@ -55,7 +55,10 @@ const store = new Vuex.Store({
 		vuex_workunit: null,
 		//当前工作站正在进行的生产任务
 		vuex_task: null,
-
+		// 接口请求地址
+		vuex_mes_url: "",
+		// 用户信息接口请求地址
+		vuex_api_url: "http://182.140.132.45:9011",
 		// 自定义tabbar数据
 		// vuex_tabbar: [{
 		// 		iconPath: "/static/uview/example/component.png",