MES-WEB-LayUI.git

			@@ -1354,38 +1354,105 @@
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			if (checkStatus.data.length ==0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}
			var HCenterID = 0;
			var HCenterNUmber = "";
			var HCenterName = "";

			//è·åå·¥åºä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			ProcessNumber.push("'" + checkStatus.data[i]["å·¥åºä»£ç "] + "'");
			}

			//è·åå½åä½ç½®æå¨è¡æ°
			var NowNum = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
			NowNum = i + 1;
			}
			}

			//æ¥è¯¢å·¥ä½ä¸å¿çæ°æ®
			var WorkCente = [];
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§° from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber";
			$.ajax({
			type: "get",
			url: GetWEBURL() + '/Gy_WorkCenter/list',
			type: "GET",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "sWhere": " and å·¥ä½ä¸å¿ä»£ç ='" + checkStatus.data[0].å·¥åºä»£ç + "' ", user: sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			if (result.data.length > 0) {
			HCenterID = result.data[0]["HItemID"];
			HCenterNUmber = result.data[0]["å·¥ä½ä¸å¿ä»£ç "];
			HCenterName = result.data[0]["å·¥ä½ä¸å¿åç§°"];
			}
			data: { "sWhere": sWhere },
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			WorkCente = data.data;
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			}
			})
			});

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"å·¥åº": checkStatus.data[0].å·¥åºåç§°
			, "HProcID": checkStatus.data[0].HItemID
			, "å·¥ä½ä¸å¿": HCenterName
			, "HCenterID": HCenterID
			, "å·¥ä½ä¸å¿ä»£ç ": HCenterNUmber
			})
			//å¤æéæ©çæ°æ®æ»æ° æ¯å¦å¤§äºè¡¨æ ¼ç°æçæ°æ®
			if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
			//è·åè¡¨æ ¼å©ä½è¡æ°é
			var num = ProcessNumber.length - option.data.length + (NowNum - 1);
			//å¾ªç¯èµå¼ å¨å·²æçè¡¨æ ¼èµå¼
			var j = 0;
			for (var i = (NowNum - 1); i < option.data.length; i++) {
			option.data[i]["å·¥åº"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["å·¥ä½ä¸å¿"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			j++;
			}

			//å¨ä¸æ¹æ·»å æ°çè¡¨æ ¼æ°æ®
			for (var i = 0; i < num; i++) {
			option.data.push({
			"HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": WorkCente[j]["å·¥åºåç§°"]
			, "HProcID": WorkCente[j]["HProcID"], "å·¥ä½ä¸å¿ä»£ç ": WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "], "HCenterID": WorkCente[j]["HCenterID"], "å·¥ä½ä¸å¿": WorkCente[j]["å·¥ä½ä¸å¿åç§°"], "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
			, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
			, "HWHID": 0, "HWHName": ""
			})
			j++;
			}
			} else {
			//å¾ªç¯èµå¼ å¨å·²æçè¡¨æ ¼èµå¼
			var j = 0;
			for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
			option.data[i]["å·¥åº"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["å·¥ä½ä¸å¿"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			j++;
			}
			}
			table.render(option);
			//var HCenterID = 0;
			//var HCenterNUmber = "";
			//var HCenterName = "";


			////æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			//obj.update({
			// "å·¥åº": checkStatus.data[0].å·¥åºåç§°
			// , "HProcID": checkStatus.data[0].HItemID
			// , "å·¥ä½ä¸å¿": HCenterName
			// , "HCenterID": HCenterID
			// , "å·¥ä½ä¸å¿ä»£ç ": HCenterNUmber
			//})

			layer.close(index);//å³éå¼¹çª
			}

	WebTM/views/系统管理/组织架构设置/Gy_DutyList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html	115 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -59,7 +59,7 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			</div>
			<div class="layui-col-xs8 layui-inline">