MES-WEB-LayUI.git

			@@ -382,6 +382,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>åºåæ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>

			@@ -411,6 +412,7 @@

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "7525";
			var HModName = "Add_Edit_QC_RequestCheckBill";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) \|\| $("h1").html();
			$("h1").html('<b>' + HPageTitle + '</b>');
			@@ -485,7 +487,10 @@
			};

			switch (obj.event) {

			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			//æ°å¢ä¸è¡
			case 'btn-AddLine': btnAddLine(NewRow);
			break;
			@@ -504,6 +509,11 @@
			}
			});
			//#endregion

			// å¨set_InitGrid()å½æ°æ«å°¾æ·»å
			DisPlay_HideColumn();





			@@ -558,7 +568,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HCheckEmp', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -644,6 +654,32 @@
			});
			//#endregion


			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HSourceOrgID").append(Organization);
			$("#HSourceOrgID").val(sessionStorage["OrganizationID"]);
			$("#HInspectOrgID").append(Organization);
			$("#HInspectOrgID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}


			//#region éæ©çäº§çç»å¼¹çª
			form.on('submit(btnSearchHGroup)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -655,7 +691,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup&openType=2', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -688,7 +724,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html?Type=HShifts', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -709,40 +745,127 @@
			});
			//#endregion

			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HSourceOrgID").append(Organization);
			$("#HSourceOrgID").val(sessionStorage["OrganizationID"]);
			$("#HInspectOrgID").append(Organization);
			$("#HInspectOrgID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			}
			layer.closeAll("loading");

			// åè®¾ç½®å½æ°
			function get_HideColumn() {
			var colName = "";
			var colTitleName = "";

			// æå»ºååååæ é¢åç¬¦ä¸²
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			colTitleName += option.cols[0][i]["title"] + ",";
			}

			// å»é¤æåä¸ä¸ªéå·å¹¶ç¼ç
			colName = encodeURI(colName.substring(0, colName.length - 1));

			layer.open({
			type: 2,
			skin: "layui-layer-rim",
			title: "éèåè®¾ç½®",
			closeBtn: 1,
			shift: 2,
			area: ["50%", "90%"],
			maxmin: true,
			content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName=' + colTitleName, "yes"],
			btn: ["ç¡®å®", "åæ¶"],
			btn1: function (index, laero) {
			// å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(index);
			}
			})
			});
			}




			// æ¾ç¤º/éèåå½æ°
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');

			// éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}

			// è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}

			// è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}

			// æ¾ç¤ºå
			if (dataCols[1] == 0) {
			option.cols[0][i + 1]["hide"] = false;
			}

			// åä½å¯¹é½æ¹å¼
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}

			// è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			// åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			} else {
			break;
			}
			}

			// å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}

			table.render(option);
			} else {
			table.render(option);
			}
			},
			error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#region æ°å¢
			form.on('submit(Add)', function (data) {
			clear();
			OperationType = 1;
			set_AddFNew();
			//è¯»åæ¬å°åå¨æ°æ®ï¼æ ¹æ®ä¸æ¬¡è®¾ç½®åå§åæ°æ®

			get_ReadConfigFile();
			});
			//#endregion
			@@ -1027,32 +1150,7 @@
			}
			//#endregion

			//#region å¤å¶
			function set_CopyFromGrid(linterid) {
			option.data = [{
			"HMaterID": 0,
			"HMaterCode": "",
			"HMaterName": "",
			"HMaterSpec": "",
			"HUnitID": 0,
			"HUnitCode": "",
			"HUnitName": "",
			"HQty": 0,
			"HSampleDamageQty": 0,
			"HSourceBillNo": "",
			"HSourceBillType": "",
			"HRelationQty": 0,
			"HRelationMoney": 0,
			"HRemark": ""
			}];
			set_EditForm(linterid); //ç¼è¾è·åè¡¨å¤´
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½
			table.render(option);

			//è¦çåæ®åç ãåæ®å·ãæ¥æ
			get_MAXNum();
			}
			//#endregion


			//#region ç¼è¾
			function set_EditFromGrid(linterid) {
			@@ -1177,7 +1275,7 @@
			};
			});

			console.log("æ å°åçæ°æ®:", mappedData); // è°è¯ï¼æ¥çæ å°ç»æ


			option.data = mappedData;
			} else {
			@@ -1348,71 +1446,74 @@
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {

			// ç©æä¿¡æ¯ å¦æå¨ç©æä»£ç åæF7
			if (obj.event === 'HMaterCode') {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			//æ¨¡å·ä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			if (obj.event === 'HMaterCode') //æ¨¡å·ä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			{
			//é¡µé¢å±-èªå®ä¹ //F7éæ©æ¨¡å·
			layer.open({
			type: 2,
			skin: 'layui-layer-rim',
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ç©æåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?selectMode=1', 'yes'], // æ·»å åæ°
			btn: ['ç¡®å®', 'åæ¶'],
			btn1: function (index, layero) {
			var iframeWindow = window['layui-layer-iframe' + index];
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			if (checkStatus.data.length === 0) {
			layer.msg('è¯·éæ©æ°æ®');
			return;
			}
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			//if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			//}
			//console.log(obj.data);

			var selectedData = checkStatus.data[0];
			var HMaterID = selectedData.HItemID;

			// è·åç©æè¯¦ç»ä¿¡æ¯
			$.ajax({
			url: GetWEBURL() + "/QC_RequestCheckBill/getMaterialByMaterID",
			async: false,
			type: "GET",
			data: { "HMaterID": HMaterID },
			success: function (result) {
			if (result.code == 1) {
			var materialData = result.data[0];
			obj.update({
			HMaterID: HMaterID,
			HMaterCode: materialData.HMaterNumber,
			HMaterName: materialData.HMaterName,
			HMaterSpec: materialData.HMaterModel,
			HUnitID: materialData.HUnitID,
			HUnitCode: materialData.HUnitNumber,
			HUnitName: materialData.HUnitName
			});

			layer.close(index);
			} else {
			layer.msg('è·åç©æä¿¡æ¯å¤±è´¥: ' + result.msg);
			}
			},
			error: function () {
			layer.msg('è·åç©æä¿¡æ¯å¤±è´¥');
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
			btnAddLine(NewRow);
			}
			});

			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].HMaterCode = resultData.HMaterNumber;
			option.data[rowIndex + i].HMaterName = resultData.HMaterName;
			option.data[rowIndex + i].HMaterRuleType = resultData.HMaterRuleType;
			option.data[rowIndex + i].HMaterSpec = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].HUnitCode = resultData.HUnitNumber;
			option.data[rowIndex + i].HUnitName = resultData.HUnitName;

			option.data[rowIndex + i].HDesignLife = 0;
			option.data[rowIndex + i].HLeaveLife = 0;
			option.data[rowIndex + i].HMoney = 0;

			}
			table.render(option);
			layer.closeAll();
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			btn2: function (index, layero) {
			// åæ¶æé®
			},
			success: function (layero, index) {
			// å¼¹çªæååè°
			end: function () {
			obj.update({
			"HMaterID": OptionData.HItemID
			, "HMaterCode": OptionData.ç©æä»£ç
			, "HMaterName": OptionData.ç©æåç§°
			, "HMaterSpec": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "HUnitName": OptionData.è®¡éåä½åç§°
			})
			}
			});
			}


			obj.event = "";
			return false;
			}
			@@ -1553,15 +1654,63 @@
			//#endregion
			});

			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData[0] = data
			function GetGySource(obj) { //çäº§èµæº
			$("#HSourceName").val(obj[0].çäº§èµæºåç§°);
			$("#HSourceID").val(obj[0].HItemID);
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData[0] = data
			//åå»è¿åæ¹æ³
			//ç³è¯·äºº
			function GetHEmpValue(obj) {
			$("#HCheckEmpName").val(obj[0].èååç§°);
			$("#HCheckEmp").val(obj[0].HItemID);
			}


			//çæ¬¡
			function GetHShiftsValue(obj) {
			$("#HShiftsName").val(obj[0].çæ¬¡åç§°);
			$("#HShiftsID").val(obj[0].HItemID);
			}
			//çç»
			function GetHGroupValue(obj) {
			$("#HGroupName").val(obj[0].çç»åç§°);
			$("#HGroupID").val(obj[0].HItemID);
			}
			//é¨é¨
			function GetHDeptNameValue(obj) {
			$("#HDeptName").val(obj[0].é¨é¨åç§°);
			$("#HDeptID").val(obj[0].HItemID);
			$("#HDeptNumber").val(obj[0].é¨é¨ä»£ç );
			}
			//å·¥åº
			function GetProcessValue(obj) {
			$("#HProcName").val(obj[0].å·¥åºåç§°);
			$("#HProcID").val(obj[0].HItemID);
			}


			//æ£éªé¡¹ç®
			function GetCheckItemValue(obj) {
			OptionData = obj;
			}
			//æ£éªä»ªå¨
			function GetInspectInstruMentValue(obj) {
			OptionData = obj;
			}
			//è´¨éæ å
			function GetQualityStdValue(obj) {
			OptionData = obj;
			}
			//æ£éªæ¹æ³
			function GetInspectMethodValue(obj) {
			OptionData = obj;
			}

			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData = data
			}

			//#region å¤çå°æ°æ¾ç¤ºä½æ°
			function dealDoubleToFixed(data) {
			//ç¨äºè®¾ç½®å°æ°ä½æ°