MES-WEB-LayUI.git

			@@ -57,6 +57,15 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç±»å</label>
			<div class="layui-input-inline">
			<select name="HBillSubType" lay-filter="HBillSubType" id="HBillSubType">
			<option value="æ åé¢æ" selected="selected">æ åé¢æ</option>
			<option value="ç½å¯é¢æ">ç½å¯é¢æ</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			@@ -121,6 +130,7 @@
			<div class="layui-input-inline">
			<select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
			<option value="3720" selected="selected">çäº§ç¨ææ¸å</option>
			<option value="3710">çäº§è®¢å</option>
			</select>
			</div>
			</div>
			@@ -548,42 +558,179 @@
			});
			//è¡¨å¤´æºåå¼¹çª
			form.on('submit(HSourceInterList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çäº§ç¨æåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../çäº§ç®¡ç/çäº§ææå/Sc_PPBomBillList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			var sourceBillType = $("#HSourceBillType").val();
			var url = '';
			var title = '';

			//æé®ãæé®ä¸ãçåè°
			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('è¯·éæ©æ°æ®');
			if (sourceBillType == '3720') {
			url = '../../çäº§ç®¡ç/çäº§ææå/Sc_PPBomBillList.html';
			title = 'çäº§ç¨æåè¡¨';

			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: title,
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: [url, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			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('è¯·éæ©æ°æ®');
			}
			$("#HSourceBillNo").val(checkStatus.data[0].åæ®å·);
			$("#HSourceInterID").val(checkStatus.data[0].hmainid);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			$("#HSourceBillNo").val(checkStatus.data[0].åæ®å·);
			$("#HSourceInterID").val(checkStatus.data[0].hmainid);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			},
			success: function (layero, index) {
			}
			});
			}
			else if (sourceBillType == '3710') {
			// çäº§è®¢åï¼å¤éè¿½å å°åè¡¨ï¼
			url = '../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html?openType=2';
			title = 'çäº§è®¢ååè¡¨';

			},
			success: function (layero, index) {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: title,
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: [url, 'yes'],
			btn: ['ç¡®å®è¿½å ', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			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('è¯·éæ©æ°æ®');
			}

			}
			});
			// æ¸ç©ºè¡¨å¤´æºåä¿¡æ¯ï¼å ä¸ºæ¯æè¡è¿½å ï¼
			$("#HSourceBillNo").val(checkStatus.data[0].åæ®å·);
			$("#HSourceInterID").val(checkStatus.data[0].hmainid);

			// è°ç¨å½æ°å°éä¸çæ°æ®è¿½å å°åè¡¨
			appendICMODataToTable(checkStatus.data);
			layer.close(layer.index); //å³éå¼¹çª
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			},
			success: function (layero, index) {
			}
			});
			}
			else {
			layer.msg('æªç¥çæºåç±»å');
			}
			});
			//#region çäº§è®¢åæ°æ®è¿½å å°åè¡¨
			function appendICMODataToTable(selectedData) {
			if (!selectedData \|\| selectedData.length === 0) {
			layer.msg('æªéæ©æææ°æ®');
			return;
			}

			// è·åå½åè¡¨æ ¼æ°æ®
			var currentData = table.cache["mainTable"] \|\| [];

			// æ£æ¥ç¬¬ä¸è¡æ¯å¦æ¯ç©ºè¡ï¼ææå³é®åæ®µé½æ¯ç©ºæ0ï¼
			var firstRowIsEmpty = true;
			if (currentData.length > 0) {
			var firstRow = currentData[0];
			if (firstRow.HMaterID !== 0 && firstRow.HMaterID !== "0") {
			firstRowIsEmpty = false;
			}
			if (firstRow.HMaterCode && firstRow.HMaterCode.trim() !== "") {
			firstRowIsEmpty = false;
			}
			if (firstRow.HMaterName && firstRow.HMaterName.trim() !== "") {
			firstRowIsEmpty = false;
			}
			}

			// å¦æç¬¬ä¸è¡æ¯ç©ºè¡ï¼ååæ¸ç©ºè¡¨æ ¼æ°æ®
			if (firstRowIsEmpty) {
			currentData = [];
			table.cache["mainTable"] = currentData;
			}

			var addedCount = 0;

			// éåææéä¸çè¡
			for (var i = 0; i < selectedData.length; i++) {
			var rowData = selectedData[i];

			// ç¡®ä¿æ°æ®æææ§
			if (!rowData.HMaterID \|\| rowData.HMaterID === 0) {
			// å¦æè¡æ°æ®ä¸æ²¡æHMaterIDï¼å°è¯ä½¿ç¨å¶ä»åæ®µ
			if (!rowData.äº§åä»£ç \|\| rowData.äº§åä»£ç .trim() === "") {
			continue; // è·³è¿æ ææ°æ®
			}
			}

			// æé åè¡¨è¡æ°æ®
			var newRow = {
			"HMaterID": rowData.HMaterID \|\| 0,
			"HMaterCode": rowData["äº§åä»£ç "] \|\| rowData["ç©æä»£ç "] \|\| "",
			"HMaterName": rowData["äº§ååç§°"] \|\| rowData["ç©æåç§°"] \|\| "",
			"HMaterSpec": rowData["è§æ ¼åå·"] \|\| "",
			"HUnitID": rowData.HUnitID \|\| 0,
			"HUnitCode": rowData["è®¡éåä½ä»£ç "] \|\| "",
			"HUnitName": rowData["è®¡éåä½"] \|\| "",
			"HQtyMust": parseFloat(rowData["çäº§ä»»å¡åæ°é"] \|\| rowData["è®¡åçäº§æ°é"] \|\| 0),
			"HQty": parseFloat(rowData["çäº§ä»»å¡åæ°é"] \|\| rowData["è®¡åçäº§æ°é"] \|\| 0), // é»è®¤å®åæ°éçäºåºåæ°é
			"HPrice": 0,
			"HMoney": 0,
			"HWHID": $("#HWHID").val() \|\| 0,
			"HWHCode": "",
			"HWHName": $("#HWHName").val() \|\| "",
			"HRemark": rowData["åºé¨å¤æ³¨"] \|\| rowData["è¡¨å¤´å¤æ³¨"] \|\| "",
			// å¯ä»¥æ·»å æºåä¿¡æ¯åæ®µ
			"HSourceInterID": rowData.hmainid \|\| 0,
			"HSourceEntryID": rowData.hsubid \|\| 0,
			"HSourceBillNo": rowData["åæ®å·"] \|\| "",
			"HSourceBillType": "3710"
			};

			// å°æ°è¡è¿½å å°åè¡¨
			currentData.push(newRow);
			addedCount++;
			}

			// æ´æ°è¡¨æ ¼ç¼ååæ°æ®
			table.cache["mainTable"] = currentData;
			option.data = currentData;

			// éæ°æ¸²æè¡¨æ ¼
			table.render(option);

			// æ»å¨å°åºé¨æ¾ç¤ºæ°æ·»å çè¡
			setTimeout(function () {
			var $tableBody = $('#mainTable').next('.layui-table-view').find('.layui-table-body');
			$tableBody.scrollTop($tableBody[0].scrollHeight);
			}, 100);

			layer.msg('æåæ·»å ' + addedCount + 'è¡æ°æ®');
			}
			//ä¿å
			form.on('submit(Saver)', function (data) {
			var refSav = "";
			@@ -597,7 +744,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];

			console.log("æºåç±»å", $("#HBillSubType").val());
			if (!AllowLoadData(sSubStr))//æ°æ®éªè¯
			{
			return false;
			@@ -780,6 +927,8 @@
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120 }
			, { field: 'HWHName', title: 'åæä»åºåç§°', edit: 'text', width: 120 }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100 }
			, { field: 'HSourceInterID', title: 'HSourceInterID', width: 100, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			option = {
			@@ -794,12 +943,15 @@
			, done: function (res, curr, count) {
			}
			};
			option.data = [];
			table.render(option);
			}
			//æ æºåæ°å¢
			function set_AddFNew() {
			//è·åæå¤§åæ®å·
			get_MAXNum();
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
			option.data = [];
			//option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
			table.render(option);
			}
			//è·åæå¤§åæ®å·
			@@ -824,7 +976,7 @@
			function set_EditFromGrid(linterid) {
			set_EditForm(linterid); //ç¼è¾è·åè¡¨å¤´
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
			//option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
			table.render(option);
			}
			//ç¼è¾è·åè¡¨å¤´
			@@ -844,7 +996,10 @@
			, "HDate": formatDate(data[0]["æ¥æ"])
			//, "HInnerBillNo": data.åé¨åæ®å·
			, "HWHID": data[0]["HWHIDMain"] //ä»åºID
			, "HSourceInterID": data[0]["HSourceInterID"] //ä»åºID
			, "HSourceBillNo": data[0]["HSourceBillNo"] //ä»åºID
			, "HWHName": data[0]["ä»åº"] //ä»åºåç§°
			, "HBillSubType": data[0]["HBillSubType"] //ä»åºåç§°
			, "HSecManagerID": data[0]["hsecmanagerid"] //éªæ¶åID
			, "HSecManagerName": data[0]["é¢æå"] //éªæ¶ååç§°
			, "HKeeperID": data[0]["hkeeperid"] //ä¿ç®¡åID
			@@ -853,7 +1008,7 @@
			, "HMangerName": data[0]["ä¸»ç®¡"] //ä¿ç®¡ååç§°
			, "HDeptID": data[0]["HDeptID"] //é¨é¨ID
			, "HDeptName": data[0]["é¨é¨"] //é¨é¨åç§°
			, "HSourceBillType": data[0]["æºåç±»å"] //æºåç±»å
			, "HSourceBillType": data[0]["HSourceBillType"] //æºåç±»å
			, "XDH": "" //éåå·
			, "HRemark": data[0]["è¡¨å¤´å¤æ³¨"] //å¤æ³¨
			});