MES-WEB-LayUI.git

			@@ -7,8 +7,8 @@
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<!--<script src="../../../layuiadmin/Scripts/json2.js"></script>-->
			<!--<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>-->
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			@@ -17,7 +17,7 @@
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-col-md13">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			@@ -29,8 +29,8 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>-->
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">éå®ç³è¯·</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">è§£éç³è¯·</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			@@ -250,10 +250,10 @@
			</div>
			</div>
			<div id="HProgressBar"></div>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-row" style="padding:0px 0">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div class="resizable-container layui-tab layui-tab-card" style="margin-top:40px;">
			<div class="resizable-container layui-tab layui-tab-card" style="margin-top: 40px; display: none;">
			<ul class="layui-tab-title">
			<li class="layui-this">çäº§è®¢å</li>
			<li>ç¼ºæåæ</li>
			@@ -312,14 +312,14 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>åå¤æåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyWorkQty"><i class="layui-icon layui-icon-delete"></i>åå¤(åæ¥äº§è½)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>éäº§çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>å·¥èºè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>å·¥åæ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo2">
			<!--<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>æäº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			@@ -331,7 +331,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_Material"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</script>-->
			</form>
			</div>
			</div>
			@@ -351,7 +351,7 @@
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			soulTable: 'soulTable'
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
			}).use(['index', 'form', 'table', 'element', 'laydate', 'util', 'soulTable','jquery'], function () {
			//#region å¬ç¨åé

			var $ = layui.$
			@@ -360,7 +360,6 @@
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, excel = layui.excel
			, soulTable = layui.soulTable
			, element = layui.element;
			var ins;
			@@ -431,25 +430,29 @@
			return layer.msg("æåæ°éä¸è½ä¸º0!");
			}

			if (SumHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
			if (SumHQty > (parseInt(obj.data["è®¡åæ°é"])) && obj.field == "æåæ°é") {
			obj.update({
			"æåæ°é": "0"
			"æåæ°é": $(this).prev().text()
			});

			obj.tr.find('td[data-field=æåæ°é] input').val($(this).prev().text()); // è¿å¥ä»£ç æ¯å¿è¦çæ´æ°æ¾ç¤ºåå®¹

			return layer.msg("æåæ°éå¤§äºè®¢åæ°é!");
			}

			var NowDate = obj.field;
			if (dateHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
			if (dateHQty > (parseInt(obj.data["æåæ°é"]))) {
			obj.update({
			"æ¥è®¡åæ°éæ»é": dateHQty - obj.value,
			[NowDate]: 0
			});
			return layer.msg("æäº§æ°éå¤§äºè®¢åæ°é!")
			obj.tr.find(`td[data-field=${NowDate}] input`).val(0); // è¿å¥ä»£ç æ¯å¿è¦çæ´æ°æ¾ç¤ºåå®¹
			return layer.msg("æäº§æ°éå¤§äºæåæ°é!")
			}

			if (Date.parse(obj.field) > Date.parse(obj.data.è®¡åç»ææ¥æ)) {
			return layer.msg("æäº§æ¥æè¶åºè®¡åç»ææ¥æ!");
			}
			//if (Date.parse(obj.field) > Date.parse(obj.data.è®¡åç»ææ¥æ)) {
			// return layer.msg("æäº§æ¥æè¶åºè®¡åç»ææ¥æ!");
			//}


			//ä¿®æ¹æ°æ®
			@@ -592,8 +595,21 @@
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnReady(data);
			layer.close(index);
			// 1. è·åâç¡®å®âæé®å¹¶æ·»å å è½½å¨ç»
			var confirmBtn = $(layero).find('.layui-layer-btn0'); // ç¡®å®æé®
			confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> å¤çä¸...');
			confirmBtn.prop('disabled', true);
			if (data.length <= 0) {
			layer.msg("è¯·éæ©æ°æ®")
			layer.close(index);
			} else {
			setTimeout(function () {
			get_btnReady(data);
			layer.close(index);
			}, 5); // å»¶è¿æ§è¡ç¡®ä¿æé®å¾æ æ¸²æå®
			}


			}
			})
			break;
			@@ -1073,7 +1089,8 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_FastQuery(2);
			get_FastQuery_ICMO();
			//çäº§è®¢åæ¥è¯¢
			/get_FastQuery_ICMO();/
			}
			//#region åå§åä¸æåè¡¨ æäº§æ¶é´
			function setSelect_HArrangeProductDayQty() {
			@@ -1094,9 +1111,10 @@

			$("#HArrangeProductDayQty").empty();
			$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
			form.render('select');


			$("#HArrangeProductDayQty").val("40");
			form.render('select');
			}
			//#endregion

			@@ -1676,7 +1694,7 @@
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, filter: true, sort: true});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, filter: true, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, filter: true, sort: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, filter: true, sort: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, filter: true, sort: true });
			@@ -1688,7 +1706,7 @@
			columns.push({ field: 'çäº§è®¢åæ¥æ', title: 'çäº§è®¢åæ¥æ', width: 150, templet: "<div>{{d.çäº§è®¢åæ¥æ ==null ?'':layui.util.toDateString(d.çäº§è®¢åæ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });

			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, filter: true, sort: true});
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, sort: true});
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true, sort: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', filter: true, sort: true });
			@@ -1715,7 +1733,7 @@
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, filter: true, sort: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
			@@ -1740,11 +1758,12 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-120'
			, title: "è®¡åæ¥è¡¨"
			, height: 'full-175'
			, page: false
			, cellMinWidth: 90
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, limit: 5000//é»è®¤æ¾ç¤ºå¨é¨
			, contextmenu: {
			// è¡¨æ ¼åå®¹å³é®èåéç½®
			body: [
			@@ -1828,6 +1847,8 @@
			//})
			}
			}

			table.render(option);
			}

			//ç¼ºæåæè¡¨æ ¼æ°æ®
			@@ -1864,7 +1885,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
			type: "GET",
			async: false,
			async: true,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -1878,7 +1899,7 @@
			}
			layer.close(ajaxLoad);
			if (HinterID_S.length > 0) {
			get_Display_1(HinterID_S);
			/get_Display_1(HinterID_S);/
			get_Display_2(HinterID_S);
			}

			@@ -2072,7 +2093,7 @@
			, area: ['100%', '100%']
			, title: 'Excelå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../çäº§è®¡åå¹³å°/JIT_DayPlanPlatFormImport.html?OperationType=1'
			, content: '../ä¸åæäº§/JIT_DayPlanPlatFormImport_SS_Sec.html?OperationType=1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -2085,7 +2106,7 @@
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'Excelå¯¼å¥'
			, title: 'äº¤æå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../ä¸åæäº§/JIT_DayPlanPlatFormImport_SS.html?OperationType=1'
			, end: function () {
			@@ -2837,7 +2858,7 @@
			});

			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 ) or HMasterDate < CAST(GETDATE() AS DATE)";
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
			type: "GET",
			@@ -3605,13 +3626,21 @@
			layer.confirm('ä½ ç¡®å®è¦æ§è¡ä¼åçº§æä½åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			// 1. è·åâç¡®å®âæé®å¹¶æ·»å å è½½å¨ç»
			var confirmBtn = $(layero).find('.layui-layer-btn0'); // ç¡®å®æé®
			confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> å¤çä¸...');
			confirmBtn.prop('disabled', true);
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			layer.close(index);
			setTimeout(function () {
			table.reload('mainTable', { data: data });
			layer.close(index);
			}, 5); // å»¶è¿æ§è¡ç¡®ä¿æé®å¾æ æ¸²æå®


			}
			})
			}
			@@ -3621,6 +3650,10 @@
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æåºæä½åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			// 1. è·åâç¡®å®âæé®å¹¶æ·»å å è½½å¨ç»
			var confirmBtn = $(layero).find('.layui-layer-btn0'); // ç¡®å®æé®
			confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> å¤çä¸...');
			confirmBtn.prop('disabled', true);
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			@@ -3651,12 +3684,16 @@
			}
			}
			}
			table.render(option);
			setTimeout(function () {
			table.reload('mainTable', { data: option.data });
			layer.close(index);
			}, 5); // å»¶è¿æ§è¡ç¡®ä¿æé®å¾æ æ¸²æå®
			}
			else {
			return layer.msg("æ æ°æ®!")
			layer.close(index);
			}
			layer.close(index);

			}
			})

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

			if (checkStatus.data.length != 1) {
			if (checkStatus.data.length == 1) {
			OptionData[0] = checkStatus.data[0];
			} else if (checkStatus.data.length == 0) {
			//çäº0æ¶æ¸ç©ºçäº§èµæº
			OptionData[0] = { "HItemID": 0, "çäº§èµæºåç§°": "" };
			} else {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData[0] = checkStatus.data[0];
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			@@ -3775,7 +3816,7 @@
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éæè¯¯,è¯·éæ°è¾å¥!");
			}
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) - parseFloat(table.cache["mainTable"][i]["æåæ±æ¥æ°é"]) < parseFloat(table.cache["mainTable"][i]["æ¥è®¡åæ°éæ»é"])) { // - å·²æ±æ¥æ°é
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) > parseFloat(table.cache["mainTable"][i]["è®¡åæ°é"])) { // - å·²æ±æ¥æ°é
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éè¶åºè®¢åæ°é!");
			}
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;