MES-WEB-LayUI.git

			@@ -11,6 +11,8 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -24,6 +26,11 @@
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			overflow: visible !important;
			}
			.layui-table th, .layui-table td {
			white-space: nowrap; /* ä¸æ¢è¡ */
			overflow: hidden; /* è¶åºåå®¹éè */
			text-overflow: ellipsis; /* æ¾ç¤ºçç¥å· */
			}
			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			td .layui-form-select {
			@@ -57,6 +64,7 @@
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align:center;"><b>å·¥åºæµè½¬å¡æ´¾å·¥</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			@@ -86,39 +94,29 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çäº§ç»ç»</label>
			<div class="layui-input-inline">
			<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
			<select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çäº§ç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchORG" id="btnSearchORG" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<label class="layui-form-label">æ´¾å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HDate" id="HDate">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">æè¦</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;width:600px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;width:600px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline" style="display:none">
			@@ -130,7 +128,7 @@
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--å¶ä»ä¿¡æ¯-->
			@@ -213,6 +211,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><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>
			</form>
			@@ -251,6 +250,14 @@
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "3798";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			var HModName = 'Sc_ProcessSendWorkEdit'

			//åå§åçé¢
			set_ClearBill();
			@@ -266,6 +273,7 @@
			var linterid = params[params[1]];//æºåid
			var HEntryID = params[params[2]];//æºååid
			var HIeID = params[params[3]]; //æºåid + æºååid
			var HEmpIDs = params[params[4]];//èååè¡¨
			}

			//å·¥åºæ´¾å·¥æ°å¢
			@@ -281,13 +289,13 @@
			$("#HMaker").val(sessionStorage["HUserName"]);
			}
			});
			//æ¥è¯¢å·¥åºæµè½¬å¡
			get_ProcessExchange();
			//åå§åçé¢
			set_ClearBill();
			//æ¥è¯¢å·¥åºæµè½¬å¡
			get_ProcessExchange();
			} else if (OperationType == 3) {
			//ç¦ç¨ç»ç»éé¡¹
			$("#HUSEORGID").attr("disabled", true);
			$("#HPRDORGID").attr("disabled", true);
			//åå§åçé¢
			set_ClearBill();
			RoadBillMain(linterid);
			@@ -303,6 +311,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
			"HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
			"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
			"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
			@@ -338,6 +347,10 @@
			}
			form.render('select');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
			break;
			}
			});
			@@ -401,7 +414,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -411,10 +424,10 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HMaterName: checkStatus.data[0].HName
			HMaterName: checkStatus.data[0].ç©æåç§°
			, HMaterID: checkStatus.data[0].HItemID
			, HMaterNumber: checkStatus.data[0].HNumber
			, HMaterModel: checkStatus.data[0].HModel
			, HMaterNumber: checkStatus.data[0].ç©æä»£ç
			, HMaterModel: checkStatus.data[0].è§æ ¼åå·
			});

			layer.close(layer.index);
			@@ -435,7 +448,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -445,9 +458,9 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HUnitName: checkStatus.data[0].HName
			HUnitName: checkStatus.data[0].è®¡éåä½åç§°
			, HUnitID: checkStatus.data[0].HItemID
			, HUnitNumber: checkStatus.data[0].HNumber
			, HUnitNumber: checkStatus.data[0].è®¡éåä½ä»£ç
			});

			layer.close(layer.index);
			@@ -581,6 +594,11 @@
			}
			});

			//æå°
			form.on('submit(btn_print)', function (data) {
			get_print(data);
			});

			//éæ©çäº§è½¦é´å¼¹çª
			form.on('submit(btnSearchWorkShop)', function () {
			layer.open({
			@@ -590,7 +608,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -600,7 +618,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWorkShopName").val(checkStatus.data[0].HName);
			$("#HWorkShopName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HWorkShopID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -625,6 +643,7 @@
			$("#HPlanEndDate").val(Format(new Date().setMonth(new Date().getMonth() + 1), "yyyy-MM-dd"));//å·¥åºè®¡åå®å·¥æ¥æ
			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
			}

			//è·åç»ç»
			@@ -640,8 +659,8 @@
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HUSEORGID").append(Organization);
			$("#HUSEORGID").val(sessionStorage["OrganizationID"])
			$("#HPRDORGID").append(Organization);
			$("#HPRDORGID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -654,9 +673,19 @@
			//è¡¨å¤´
			columns = [ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { type: 'numbers', field: 'åºå·', title: 'åºå·' }
			, { field: 'HMainID', title: 'æ´¾å·¥åä¸»ID', hide: true }// ç¨äºæå°æ¶è·åæ°æ®
			, { field: 'HEntryID', title: 'æ´¾å·¥ååID', hide: true }// ç¨äºæå°æ¶è·åæ°æ®
			, { field: 'HSourceInterID', title: 'æµè½¬å¡ID', hide: true }
			, { field: 'HSourceEntryID', title: 'æµè½¬å¡åID', hide: true }
			, { field: 'HSourceBillNo', title: 'æµè½¬å¡å·', width: 165 }
			, { field: 'HSourceBillType', title: 'åæ®ç±»å', hide: true }
			, { field: 'HProcNo', title: 'æµæ°´å·' }
			, { field: 'HProcName', title: 'å·¥åºåç§°' }
			, { field: 'HPlanQty', title: 'æµè½¬å¡æ°é',totalRow: true }
			, { field: 'HQty', title: 'æ´¾å·¥æ°é', totalRow: true, edit: 'text'}
			, { field: 'HPlanBeginDate', title: 'è¦æ±å¼å·¥æ¥æ', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
			, { field: 'HPlanEndDate', title: 'è¦æ±å®å·¥æ¥æ', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
			, { field: 'HMaterID', title: 'äº§åID', hide: true }
			, { field: 'HMaterNumber', title: 'äº§åä»£ç ', edit: 'text', event: "HMaterCheck" }
			, { field: 'HMaterName', title: 'äº§ååç§°' }
			@@ -668,16 +697,12 @@
			, { field: 'HSourceNumber', title: 'çäº§èµæºä»£ç ', edit: 'text', event: "HSourceCheck" }
			, { field: 'HSourceName', title: 'çäº§èµæºåç§°' }
			, { field: 'HWorkerID', title: 'æä½å·¥ID', hide: true }
			, { field: 'HWorkerNumber', title: 'æä½å·¥ä»£ç ', edit: 'text', event: "HWorkerCheck" }
			, { field: 'HWorkerName', title: 'æä½å·¥åç§°' }
			, { field: 'HWorkerNumber', title: 'æä½å·¥ä»£ç ', edit: 'text', event: "HWorkerCheck", hide: false }
			, { field: 'HWorkerName', title: 'æä½å·¥åç§°', hide: true }
			, { field: 'HGroupID', title: 'çç»ID', hide: true }
			, { field: 'HGroupNumber', title: 'çç»ä»£ç ', edit: 'text', event: "HGroupCheck" }
			, { field: 'HGroupName', title: 'çç»åç§°' }
			, { field: 'HPlanQty', title: 'æµè½¬å¡æ°é' }
			, { field: 'HQty', title: 'æ´¾å·¥æ°é', edit: 'text'}
			, { field: 'HGroupNumber', title: 'çç»ä»£ç ', edit: 'text', event: "HGroupCheck", hide: true}
			, { field: 'HGroupName', title: 'çç»åç§°', hide: true}
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text' }
			, { field: 'HPlanBeginDate', title: 'è¦æ±å¼å·¥æ¥æ', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
			, { field: 'HPlanEndDate', title: 'è¦æ±å®å·¥æ¥æ', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
			, { field: 'HICMOBillNo', title: 'ä»»å¡åå·', hide: true }
			, { field: 'HICMOInterID', title: 'ä»»å¡åID', hide: true }
			, { field: 'HICMOEntryID', title: 'ä»»å¡åååç ', hide: true }
			@@ -688,6 +713,7 @@
			, elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: false
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, cols: [columns]
			@@ -712,6 +738,7 @@
			}
			};
			option.data = [{
			"HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
			"HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
			"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
			"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
			@@ -749,6 +776,7 @@
			for (var i = 0; i < result.data.length; i++) {
			rowdata.push(
			{
			"HSourceInterID": result.data[i]["hmainid"], "HSourceEntryID": result.data[i]["HEntryID"], "HSourceBillNo": result.data[i]["åæ®å·"], "HSourceBillType": result.data[i]["HBillType"],
			"HProcNo": result.data[i]["æµæ°´å·"], "HProcName": result.data[i]["å·¥åºåç§°"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["äº§åä»£ç "], "HMaterName": result.data[i]["äº§ååç§°"], "HMaterModel": result.data[i]["è§æ ¼åå·"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["åä½ä»£ç "], "HUnitName": result.data[i]["åä½"],
			"HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["çäº§èµæºä»£ç "], "HSourceName": result.data[i]["çäº§èµæº"], "HWorkerID": result.data[i]["HWorkerID"], "HWorkerNumber": result.data[i]["æä½å·¥ä»£ç "], "HWorkerName": result.data[i]["æä½å·¥"],
			"HGroupID": result.data[i]["HGroupID"], "HGroupNumber": result.data[i]["çç»ä»£ç "], "HGroupName": result.data[i]["çç»"], "HPlanQty": result.data[i]["æµè½¬å¡æ°é"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
			@@ -757,6 +785,9 @@
			)
			}
			option.data = rowdata;

			setTableHEmp(HEmpIDs);

			table.render(option);
			form.render('select');
			} else {
			@@ -769,7 +800,53 @@
			});

			}
			function setTableHEmp(HEmpIDs) {
			if (HEmpIDs != undefined && HEmpIDs != null && HEmpIDs != 0 && HEmpIDs != "") {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Gy_Employee/list",
			async: false,
			type: "GET",
			data: {
			"sWhere": " and HItemID in (" + HEmpIDs + ")", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			const newData = [];

			// éå option.data çæ¯ä¸ªå¯¹è±¡
			option.data.forEach(templateItem => {
			// å¯¹æ¯ä¸ª templateItemï¼å¤å¶ data1.length æ¬¡
			data.forEach(dataItem => {
			// æ·±æ·è´ templateItem
			const newItem = JSON.parse(JSON.stringify(templateItem));

			// æ¿æ¢åæ®µ
			newItem.HWorkerID = dataItem.HItemID;
			newItem.HWorkerNumber = dataItem.èåä»£ç ;
			newItem.HWorkerName = dataItem.èååç§°;

			// æ·»å å°æ°æ°ç»
			newData.push(newItem);
			});
			});

			// æ¿æ¢å option.data
			option.data = newData;
			table.render(option);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			}
			//éç©ºéªè¯
			function AllowLoadData(data) {

			@@ -777,7 +854,6 @@

			//ä¿åHMaker
			function set_AddNew(data) {

			var num_1 = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			@@ -785,11 +861,9 @@
			num_1.push(table.cache["mainTable"][i])
			}
			}

			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num_1);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];

			var index = layer.load();
			$.ajax({
			type: "POST",
			@@ -820,7 +894,7 @@
			{
			var sWhere = " and hmainid=" + linterid;
			$.ajax({
			url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList",
			url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillEdit",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			@@ -855,6 +929,32 @@
			})
			}

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTablemainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			//æå°
			function get_print(data) {

			}

			function get_UrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');