MES-WEB-VUEUI.git

			@@ -3,7 +3,7 @@
			<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
			<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">生成</el-button>
			<el-button type="primary" @click="get_PrintReport">打印</el-button>
			<!-- <el-button type="primary" @click="close">退出</el-button> -->
			<el-button type="primary" @click="get_BarCodeBillList">条码档案</el-button>
			</div>
			<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">条码生成</div>
			<el-form :model="initMainData" label-width="80px">
			@@ -222,7 +222,8 @@
			,HReInspectionDate:null //复检日期
			,HPOOrderBillMTO:"" //采购跟踪号
			,HSeOrderBillNo:"" //客户订单号
			,HCusModel:"" //产品型号
			,HCusModel:"" //产品型号
			,HMTONo:null //计划跟踪号

			,HOrganizationID:0 //组织ID
			,HOrganization:"" //组织名称
			@@ -290,13 +291,13 @@
			},
			async created() {
			await this.loging(); //自动登录
			this.judgeIsLoging(); //判断是否登录，未登录则跳转回登录页面
			await this.judgeIsLoging(); //判断是否登录，未登录则跳转回登录页面
			await this.get_OrganizationList(); //页面初始化获取组织下拉列表数据
			await this.initPageData(); //页面初始化
			},
			methods: {
			//#region 判断是否登录，未登录则跳转回登录页面
			judgeIsLoging(){
			async judgeIsLoging(){
			if (sessionStorage["login"] != "login") {
			this.$modal.msgError("登录失效，请重新登录！！");
			this.$router.push({ path: "/" }).catch(() => { })
			@@ -305,7 +306,7 @@
			//#endregion

			//#region 页面初始化
			initPageData(){
			async initPageData(){
			var params = this.get_UrlVars();
			var OperationType = params[params[0]]; //操作类型

			@@ -323,7 +324,7 @@

			//#region 获取组织下拉列表数据
			async get_OrganizationList() {
			axios.get(this.baseURL + '/Web/GetOrganizations',{async:false}).then(response => {
			axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
			let result = response.data
			if (result.count == 1) {
			var data = result.data;
			@@ -428,6 +429,13 @@
			return Result = false;
			}

			var regex = /^\d{4}-\d{2}-\d{2}$/; //正则表达式：校验 yyyy-MM-dd
			temp = this.initMainData.HInspectionDate;
			if(!regex.test(temp)){
			this.$modal.msgError("请设置生产日期！！！");
			return Result = false;
			}

			// var HEndQty = this.initMainData.HEndQty;
			// if (HEndQty == "") {
			// this.$modal.msgError("尾包数量不能为空！！");
			@@ -519,6 +527,7 @@
			, "HReInspectionDate": this.initMainData.HReInspectionDate
			, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
			, "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
			, "HMTONo": this.initMainData.HMTONo
			}
			]

			@@ -553,6 +562,12 @@
			},
			//#endregion

			//#region 条码档案按钮点击事件
			get_BarCodeBillList(){
			this.$router.push({ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin" }).catch(() => { });
			},
			//#endregion

			//#region 条码列表复选框选择状态变更监听事件
			onSelectionChange_BarCode(selection){
			this.selectedData_BarCode = selection;
			@@ -577,7 +592,7 @@
			var res = "none";
			var sql = "select * from h_v_IF_POInStockBillList_Source where 1=1 and HMainID = " + HSourceInterID + " and HSubID = " + HSourceEntryID;
			var ModRightNameCheck = "";
			return axios.get(this.baseURL + '/CommonModel/searchMethod', {
			return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
			async:false,
			params: {
			"sql": sql
			@@ -655,6 +670,7 @@
			this.initMainData.HPOOrderBillMTO = dataArray[0].采购跟踪号;
			this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
			this.initMainData.HCusModel = dataArray[0].产品型号;
			this.initMainData.HMTONo = dataArray[0].计划跟踪号;
			this.initMainData.HMinQty = 0;
			if(this.initMainData.HMinQty>0){
			this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
			@@ -671,7 +687,7 @@
			SaveBarCodeCreate(sMainSub, CampanyName) {
			axios({
			method: 'post',
			url: this.baseURL + "/Sc_BarCode/Sub_SaveBill_JinLong",
			url: this.$baseUrl + "/Sc_BarCode/Sub_SaveBill_JinLong",
			data: {
			"msg": sMainSub, "CampanyName": CampanyName
			},
			@@ -710,7 +726,7 @@
			var HPwdWord = params[params[6]]; //登录密码
			var HOrgID = params[params[7]]; //组织id
			var HOrgName = "";


			if (HOrgID == 0) {
			//判断是否登录未登录则跳到登录页
			if (sessionStorage.login != "login") {
			@@ -722,44 +738,50 @@

			var sql_getHOrgName = "select HName from Xt_Organizations where HItemID = " + HOrgID;
			var ModRightNameCheck = "";
			axios.get(this.baseURL + "/CommonModel/searchMethod", {
			try{
			let response = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
			params: {
			"sql": sql_getHOrgName
			, "user": HUserName
			, "ModRightNameCheck": ModRightNameCheck
			}
			}).then(response => {
			var data1 = response.data
			if (data1.count == 1) {
			if (data1.data.length > 0) {
			HOrgName = data1.data[0]["HName"];
			} else {
			this.$modal.msgError("登录失败！！组织不存在，请重新登录！！");
			this.$router.push({ path: "/" }).catch(() => { })
			}
			}
			else {
			this.$modal.msgError(data1.code + data1.Message);
			})

			var data1 = response.data
			if (data1.count == 1) {
			if (data1.data.length > 0) {
			HOrgName = data1.data[0]["HName"];
			} else {
			this.$modal.msgError("登录失败！！组织不存在，请重新登录！！");
			this.$router.push({ path: "/" }).catch(() => { })
			}
			}).catch(error => {
			}
			else {
			this.$modal.msgError(data1.code + data1.Message);
			this.$router.push({ path: "/" }).catch(() => { })
			}
			}catch(error){
			this.$modal.msgError("接口请求失败!");
			this.$router.push({ path: "/" }).catch(() => { })
			});
			};


			// 写入sessionStorage 需要时间，后续操作需要等待写入sessionStorage完成后再执行
			var sql_login = "select * from h_v_Gy_Czygl_Login where Czymc = '" + HUserName + "'";
			axios.get(this.baseURL + "/CommonModel/searchMethod", {
			params: {
			"sql": sql_login
			, "user": HUserName
			, "ModRightNameCheck": ""
			}
			}).then(response => {
			var data1 = response.data
			try{
			let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
			params: {
			"sql": sql_login
			, "user": HUserName
			, "ModRightNameCheck": ""
			}
			})


			var data1 = res.data
			if (data1.count == 1) {
			if (data1.data.length > 0) {
			HUserName = data1.data[0]["Czybm"];

			var result = data1;
			sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//金蝶云账号
			sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
			@@ -803,6 +825,7 @@
			sessionStorage["Organization"] = HOrgName;
			sessionStorage["HTranSlate"] = "1";
			sessionStorage["HAutoLogin"] = "1";

			} else {
			this.$modal.msgError("加载失败！！账号不存在，请联系管理员维护账号信息！！");
			this.$router.push({ path: "/" }).catch(() => { });
			@@ -811,10 +834,10 @@
			this.$modal.msgError("登录失败!!"+result.Message);
			this.$router.push({ path: "/" }).catch(() => { })
			}
			}).catch(error => {
			}catch(error){
			this.$modal.msgError("接口请求失败!");
			this.$router.push({ path: "/" }).catch(() => { })
			});
			};
			},
			//#endregion
			}