MES-WEB-LayUI.git

			@@ -46,13 +46,10 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 80px;">æ£æééåå·</label>
			<label class="layui-form-label" style="width: 85px; margin-left: -5px;">æ£æééåå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
			</div>
			<label class="layui-form-label"></label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
			<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;display:none">
			</div>
			</div>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">å¹éåºå</button>
			@@ -127,6 +124,31 @@
			get_FastQuery();
			})

			//éåº
			form.on('submit(Edit)', function () {
			Pub_Close(1);
			})

			//å¹éåºå
			form.on('submit(Ppkc)', function () {
			layer.confirm("ç¡®å®è¦å¹éåºå?", {
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index) {
			layer.close(index)
			sWhere = $("#HInterID").val();
			get_Display1(sWhere);
			set_InitGrid1();
			$('#Ppkc').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			$('#Ckfl').removeClass("layui-btn-disabled").attr("disabled", false); //æé®æ¢å¤
			}
			})
			})

			//ä»åºåæ
			form.on('submit(Ckfl)', function () {
			get_Ckfl();
			})

			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
			@@ -142,60 +164,43 @@
			set_InitGrid();
			get_Display(sWhere);

			//set_InitGrid1();
			//get_Display1(sWhere);
			//ç¦ç¨æé®
			$('#Ckfl').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			//#region æ£æä¿¡æ¯
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 350
			, height: 420
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			{ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·',width: 150 }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 170}
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 170 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 260, }
			, { field: 'äº§åè§æ ¼åå·', title: 'äº§åè§æ ¼åå·', width: 160 }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 160 }
			, { field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ', width: 160, templet: "<div>{{d.è®¡åå¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			{ field: 'åæ®å·', title: 'åæ®å·',width: 150 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 170}
			, { field: 'æ¥æ', title: 'æ¥æ', width: 170, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®ç¶æ', title: 'åæ®ç¶æ', width: 260, }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 160 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'åé¡¹åä½', title: 'åé¡¹åä½', width: 160 }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', width: 160}
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', width: 160 }
			, { field: 'å«ææ°é', title: 'å«ææ°é', width: 160, edit: 'text'}
			, { field: 'éææ°é', title: 'éææ°é', width: 160, edit: 'text'}
			, { field: 'éæåå ', title: 'éæåå ', width: 160, edit: 'text'}
			, { field: 'å·²å«ææ°é', title: 'å·²å«ææ°é', width: 160}
			, { field: 'å·²ééæ°é', title: 'å·²ééæ°é', width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, edit: 'text', event: 'Warehouse' }
			, { field: 'è°åºä»åºid', title: 'è°åºä»åºid', width: 160, hide: true }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 160 }
			, { field: 'è°åºä»åºåºåæ°é', title: 'è°åºä»åºåºåæ°é', width: 160 }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', title: 'è°åºä»åºå¯ç¨åºåæ°é', width: 160 }
			, { field: 'å¯ç¨åºå', title: 'å¯ç¨åºå', width: 160 }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 160}
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 160 }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 160 }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
			, { field: 'HMaterialID', title: 'HMaterialID', hide: true }
			, { field: 'HWHID', title: 'HWHID', hide: true }
			, { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
			, { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
			, { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
			, { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
			, { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
			, { field: 'æ°é', title: 'æ°é', width: 160 }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 160 }
			, { field: 'ä»åº', title: 'ä»åº', width: 160}
			, { field: 'ä»ä½', title: 'ä»ä½', width: 160 }
			, { field: 'éåäºº', title: 'éåäºº', width: 160 }
			, { field: 'éåæ¥æ', title: 'éåæ¥æ', width: 160, templet: "<div>{{d.éåæ¥æ ==null ?'':layui.util.toDateString(d.éåæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'éååå ', title: 'éååå ', width: 160 }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 160 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 160, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 160 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 160, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 160 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 160, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
			]]
			};
			}
			@@ -207,9 +212,11 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsBill',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere},
			success: function (data1) {
			if (data1.count == 1) {
			$("#HRemark").val(data1.data[0].åæ®å·);
			$("#HInterID").val(data1.data[0].hmainid);
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);
			@@ -231,7 +238,7 @@

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
			url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsBill_C',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			@@ -255,87 +262,29 @@
			option1 = {
			elem: '#mainTable1'
			//, toolbar: '#toolbarDemo'
			, height: 350
			, height: 420
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			{ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150 }
			//, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 170 }
			//, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 170 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 260, }
			, { field: 'äº§åè§æ ¼åå·', title: 'äº§åè§æ ¼åå·', width: 160 }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 160 }
			, { field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ', width: 160, templet: "<div>{{d.è®¡åå¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'åé¡¹åä½', title: 'åé¡¹åä½', width: 160 }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', width: 160 }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', width: 160 }
			, { field: 'å«ææ°é', title: 'å«ææ°é', width: 160, edit: 'text' }
			, { field: 'éææ°é', title: 'éææ°é', width: 160, edit: 'text' }
			, { field: 'éæåå ', title: 'éæåå ', width: 160, edit: 'text' }
			, { field: 'å·²å«ææ°é', title: 'å·²å«ææ°é', width: 160 }
			, { field: 'å·²ééæ°é', title: 'å·²ééæ°é', width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, edit: 'text', event: 'Warehouse' }
			, { field: 'è°åºä»åºid', title: 'è°åºä»åºid', width: 160, hide: true }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 160 }
			, { field: 'è°åºä»åºåºåæ°é', title: 'è°åºä»åºåºåæ°é', width: 160 }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', title: 'è°åºä»åºå¯ç¨åºåæ°é', width: 160 }
			, { field: 'å¯ç¨åºå', title: 'å¯ç¨åºå', width: 160 }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 160 }
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 160 }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 160 }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
			, { field: 'HMaterialID', title: 'HMaterialID', hide: true }
			, { field: 'HWHID', title: 'HWHID', hide: true }
			, { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
			, { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
			, { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
			, { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
			, { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
			{ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 260, }
			, { field: 'æ±æ»å«ææ°é', title: 'æ±æ»å«ææ°é', width: 160 }
			, { field: 'æªæ£ææ°é', title: 'æªæ£ææ°é', width: 160 }
			, { field: 'æ¬æ¬¡æ£ææ°é', title: 'æ¬æ¬¡æ£ææ°é', width: 160, edit: "text" }
			, { field: 'æå¤§æ£ææ°é', title: 'æå¤§æ£ææ°é', width: 160 }
			, { field: 'å½åä»åºåºå', title: 'å½åä»åºåºå', width: 160 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 160 }
			, { field: 'å·¥æ®µ', title: 'å·¥æ®µ', width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160 }
			, { field: 'è°åºä»ä½', title: 'è°åºä»ä½', width: 160 }
			]]
			};
			}
			//#endregion

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var MaterialNumber = $("#MaterialNumber").val(); //ç©æä»£ç
			var MaterialName = $("#MaterialName").val(); //ç©æåç§°
			var MaterialModel = $("#MaterialModel").val(); //ç©æè§æ ¼åå·
			var HGD = $("#HGD").val(); //å·¥æ®µ
			var HWHName = $("#HWHName").val(); //ä»åº
			var Organization = $("#Organization").val(); //ç»ç»
			var HBeginDate = $("#HBeginDate").val(); //æ£ææ¥æ
			var HEndDate = $("#HEndDate").val(); //ç»ææ¥æ
			var HDeptName = $("#HDeptName").val(); //é¨é¨
			var HJLStatus = $("#HJLStatus").val(); //æ£æç¶æ
			var user = sessionStorage["HUserName"]; //å¶åäºº
			sWhere = {

			MaterialNumber: MaterialNumber,
			MaterialName: MaterialName,
			MaterialModel: MaterialModel,
			HGD: HGD,
			HWHName: HWHName,
			Organization: Organization,
			HBeginDate: HBeginDate,
			HEndDate: HEndDate,
			HDeptName: HDeptName,
			HJLStatus: HJLStatus,
			user: user
			};
			get_Display(JSON.stringify(sWhere));
			sWhere = "";
			}

			//è¡åå¿«æ·é®
			function set_GridCellCheck(obj) {
			@@ -387,6 +336,47 @@
			return vars;
			}

			//ä»åºåæ
			function get_Ckfl() {
			if (table.cache['mainTable1'].length == 0) {
			return layer.msg("æ æ°æ®,æ æ³åæ!");
			}
			else {
			layer.confirm("ç¡®å®è¦ééçæè°æ¨å", {
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index) {
			$('#Ckfl').addClass("layui-btn-disabled").attr("disabled", true); //ä»åºåææé®ç¦æ¢
			layer.close(index);

			var sMainStr = JSON.stringify(table.cache['mainTable1']) + ";" + sessionStorage["HUserName"] + ";" + $("#HInterID").val() + ";" + $("#HRemark").val();//sessionStorage["HUserName"]

			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Sc_ComplementGoods/JIT_SendGoodsBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.alert("éè¯¯:" + err, { icon: 5 });
			console.log("Reason" + sMainStr);
			}
			});
			}
			})
			}
			}

			//#endregion

			});