~jhz/STUWMS.git

			@@ -110,7 +110,7 @@
			"杭州凯贝奈特": 'http://192.168.50.253:8080/API/',
			"杭州凯贝奈特外网": 'http://erp.hzcabinet.cn:9090/API/',
			"翁涛涛本地测试": 'http://localhost:81/API/',
			"陈镐哲本地测试": 'http://192.168.0.121:81/API/',
			"陈镐哲本地测试": 'http://192.168.0.101:81/API/',
			"陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
			"张瑞广本地测试": 'http://localhost:8082/API/',
			"余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
			@@ -127,8 +127,8 @@
			"宁波华舟包装1": "http://192.168.110.222:8082/API_NW/",
			"宁波华舟包装2": "http://192.168.88.167:8082/API_NW/",
			"宁波华舟包装": "http://61.164.64.222:8082/API_WW/",
			//余姚华远
			"余姚华远": "http://192.168.3.248:82/HuaYuaAPI/",
			//余姚华远
			"余姚华远": "http://192.168.3.248:82/HuaYuaAPI/",
			},
			serverUrlName: uni.getStorageSync('serverUrlName') \|\| '宁波华舟包装',

			@@ -164,8 +164,11 @@
			methods: {
			async ApplyLanguagePack(lang, forceUpdate = false) {
			// 读取语言包并加载
			let {data, getRemoteFile} = await getLanguagePackJson(lang)
			if(getRemoteFile){
			let {
			data,
			getRemoteFile
			} = await getLanguagePackJson(lang)
			if (getRemoteFile) {
			this.$i18n.setLocaleMessage(lang, data)
			}
			this.$i18n.locale = lang
			@@ -302,112 +305,126 @@
			title: '登录中...',
			mask: true
			})
			var data = {
			HUserNumber: this.UserName,
			HPassWord: this.PassWord,
			HStockOrgID: this.HOrgName,
			HStockOrgName: this.Organization
			if (this.serverUrlName == "余姚华远") { //华远不需要wms验证
			var data = {
			UserName: this.UserName,
			PassWord: this.PassWord,
			HOrgName: this.HOrgName,
			Organization: this.Organization
			}
			var data2 = { //用于保存登录信息
			HUserNumber: this.UserName,
			HPassWord: this.PassWord,
			HStockOrgID: this.HOrgName,
			HStockOrgName: this.Organization
			}
			uni.setStorageSync('loginData', JSON.stringify(data2));
			uni.request({
			url: this.serverUrl + '/Web/GetUser',
			method: 'GET',
			data: data,
			success: (res) => {
			console.log(res)
			uni.hideLoading()
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			if (res.data.count == 1) {
			setLoginData(data2)
			setUserInfo(res.data.data[0])
			uni.setStorageSync('HUserName', res.data.data[0].Czymc);
			uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
			uni.setStorageSync('SourceFlag', false);
			uni.setStorageSync('login', "login");
			uni.setStorageSync('Organization', this.Organization);
			uni.setStorageSync('OrganizationID', this.HOrgName);
			this.CommonUtils.setServerUrl(this.serverUrl)
			uni.reLaunch({
			url: '/pages/index/index'
			})
			}
			},
			fail: (res) => {
			console.log(res);
			uni.hideLoading()
			uni.showToast({
			title: '接口请求失败',
			icon: 'none'
			})
			},
			});
			} else {
			var data = {
			HUserNumber: this.UserName,
			HPassWord: this.PassWord,
			HStockOrgID: this.HOrgName,
			HStockOrgName: this.Organization
			}


			uni.setStorageSync('loginData', JSON.stringify(data));
			uni.request({
			url: this.serverUrl + 'WEBSController/GetUser_Json',
			method: 'GET',
			data: data,
			success: (res) => {
			console.log(res)
			uni.hideLoading()
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			if (res.data.count == 1) {
			setLoginData(data)
			setUserInfo(res.data.data[0])
			uni.setStorageSync('HUserName', res.data.data[0].Czymc);
			uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
			uni.setStorageSync('SourceFlag', false);
			uni.setStorageSync('login', "login");
			uni.setStorageSync('Organization', this.Organization);
			uni.setStorageSync('OrganizationID', this.HOrgName);
			//存储部门职员仓库等信息
			uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //部门
			uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
			uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //职员
			uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
			uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //调入仓库
			uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
			uni.setStorageSync('HWhID', res.data.data[0].HWhID); //对应仓库
			uni.setStorageSync('HWhName', res.data.data[0].HWhName);
			uni.setStorageSync('HWorkCenterID', res.data.data[0]
			.HWorkCenterID); //工作中心
			uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
			uni.setStorageSync('HSecManagerID', res.data.data[0]
			.HSecManagerID); //对应验收
			uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
			uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //对应班组
			uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
			uni.setStorageSync('HProcID', res.data.data[0].HProcID); //对应工序
			uni.setStorageSync('HProcName', res.data.data[0].HProcName);
			uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //对应生产资源
			uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
			this.CommonUtils.setServerUrl(this.serverUrl)
			// this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
			// getuiUtils.getClientID()
			getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
			uni.reLaunch({
			url: '/pages/index/index'
			})
			}
			},
			fail: (res) => {
			console.log(res);
			uni.hideLoading()
			uni.showToast({
			title: '接口请求失败',
			icon: 'none'
			})
			},
			});
			}

			// UserName: this.UserName,
			// PassWord: this.PassWord,
			// HOrgName: this.HOrgName,
			// Organization: this.Organization
			// }
			uni.setStorageSync('loginData', JSON.stringify(data));
			uni.request({
			url: this.serverUrl + 'WEBSController/GetUser_Json',
			method: 'GET',
			data: data,
			success: (res) => {
			console.log(res)
			uni.hideLoading()
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			if (res.data.count == 1) {
			setLoginData(data)
			setUserInfo(res.data.data[0])
			uni.setStorageSync('HUserName', res.data.data[0].Czymc);
			uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
			uni.setStorageSync('SourceFlag', false);
			uni.setStorageSync('login', "login");
			uni.setStorageSync('Organization', this.Organization);
			uni.setStorageSync('OrganizationID', this.HOrgName);
			//存储部门职员仓库等信息
			uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //部门
			uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
			uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //职员
			uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
			uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //调入仓库
			uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
			uni.setStorageSync('HWhID', res.data.data[0].HWhID); //对应仓库
			uni.setStorageSync('HWhName', res.data.data[0].HWhName);
			uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //工作中心
			uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
			uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //对应验收
			uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
			uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //对应班组
			uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
			uni.setStorageSync('HProcID', res.data.data[0].HProcID); //对应工序
			uni.setStorageSync('HProcName', res.data.data[0].HProcName);
			uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //对应生产资源
			uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
			this.CommonUtils.setServerUrl(this.serverUrl)
			// this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
			// getuiUtils.getClientID()
			getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
			uni.reLaunch({
			url: '/pages/index/index'
			})
			}
			},
			fail: (res) => {
			console.log(res);
			uni.hideLoading()
			uni.showToast({
			title: '接口请求失败',
			icon: 'none'
			})
			},
			});

			// uni.request({
			// url: this.serverUrl + '/Web/GetUser',
			// method: 'GET',
			// data: data,
			// success: (res) => {
			// console.log(res)
			// uni.hideLoading()
			// uni.showToast({
			// title: res.data.Message,
			// icon: 'none'
			// })
			// if (res.data.count == 1) {
			// setLoginData(data)
			// setUserInfo(res.data.data[0])
			// uni.setStorageSync('HUserName', res.data.data[0].Czymc);
			// uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
			// uni.setStorageSync('SourceFlag', false);
			// uni.setStorageSync('login', "login");
			// uni.setStorageSync('Organization', this.Organization);
			// uni.setStorageSync('OrganizationID', this.HOrgName);
			// this.CommonUtils.setServerUrl(this.serverUrl)
			// uni.reLaunch({
			// url: '/pages/index/index'
			// })
			// }
			// },
			// fail: (res) => {
			// console.log(res);
			// uni.hideLoading()
			// uni.showToast({
			// title: '接口请求失败',
			// icon: 'none'
			// })
			// },
			// });
			}
			}
			}