MES-WEB-LayUI.git

			@@ -227,7 +227,22 @@
			</div>
			</div>
			</div>
			<div class="layui-tab layui-tab-card">
			<ul class="layui-tab-title">
			<li class="layui-this">çäº§æ±æ¥å</li>
			<li>äº§éæ±æ¥åæç»</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--çäº§æ±æ¥åæç»-->
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div class="layui-tab-item">
			<!--äº§éæ±æ¥å-->
			<table class="layui-hide" id="mainTable_prodReport" lay-filter="mainTable_prodReport"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			@@ -265,10 +280,11 @@
			, laydate = layui.laydate
			, element = layui.element;
			var option;
			var option_prodReport;
			var sBillType = "3711";
			//var TabRow = {
			// "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			// "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			// "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0,"HBadQty":0, "HRemark": ""
			//};
			var Sctag = "0";
			var columns = "";
			@@ -327,7 +343,7 @@
			var AddRow = table.cache['mainTable'];
			var NewRow = {
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			};
			switch (obj.event) {
			//æ°å¢ä¸è¡
			@@ -412,7 +428,7 @@
			, btn1: function (index, layero) {
			option.data = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			}];
			table.render(option);
			//æé®ãæé®ä¸ãçåè°
			@@ -442,7 +458,7 @@
			//var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
			table.cache["mainTable"].push({
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			});
			option.data = table.cache["mainTable"];
			table.render(option);
			@@ -490,10 +506,10 @@
			//#region æäº¤ä¿å
			form.on('submit(Saver)', function (data) {//ä¿å
			var refSav = "";
			if (linterid == "" \|\| linterid == null) {
			if (OperationType == 1 \|\| OperationType == 2) {
			refSav = "Add";
			}
			if (linterid != "" && linterid != null) {
			if (linterid == 3) {
			refSav = "Update";
			}
			data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
			@@ -822,6 +838,7 @@
			, { field: 'HWorkerCode', title: 'æä½åä»£ç ', edit: 'text', event: 'HWorkerCode', width: 100 }
			, { field: 'HWorkerName', title: 'æä½ååç§°', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100 }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 150 }
			];
			@@ -833,6 +850,37 @@
			, cellMinWidth: 120
			, height: 500
			, cols: [columns]
			, done: function (res, curr, count) {

			}
			};

			columns_prodReport = [
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HSourceID', title: 'HSourceID', edit: 'text', width: 100, hide: true }
			, { field: 'HSourceCode', title: 'èµæºä»£ç ', edit: 'text', event: 'HSourceCode', width: 100 }
			, { field: 'HSourceName', title: 'èµæºåç§°', edit: 'text', width: 100 }
			, { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
			, { field: 'HWorkerCode', title: 'æä½åä»£ç ', edit: 'text', event: 'HWorkerCode', width: 100 }
			, { field: 'HWorkerName', title: 'æä½ååç§°', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100 }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100 }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢å', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 150 }
			];
			option_prodReport = {
			id: 'mainTable_prodReport'
			, elem: '#mainTable_prodReport'
			, page: false
			, cellMinWidth: 120
			, height: 500
			, cols: [columns_prodReport]
			, done: function (res, curr, count) {

			}
			@@ -878,7 +926,7 @@
			$('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
			option.data = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			}];
			table.render(option);
			}
			@@ -888,11 +936,61 @@
			function set_AddNew() {
			//è·åæå¤§åæ®å·
			get_MAXNum();
			if (linterid.length > 0 && HSouceBillType == 3724) {
			var arr = [];
			var arr_detail = [];
			$.ajax({
			url: GetWEBURL() + "Sc_ICMOReportBill/GetProdReportBillList",
			type: "GET",
			data: {
			"HInterID": linterid,
			"user": sessionStorage["HUserName"]
			},
			async: false,
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_p_Sc_ICMOBillWorkQtyStatus_TmpList1; //æ±æ»ä¿¡æ¯
			var data_detail = result.data.h_p_Sc_ICMOBillWorkQtyStatus_TmpList; //æç»ä¿¡æ¯

			for (let i = 0; i < data.length; i++) {
			arr.push({
			"HMaterID": data[i].ç©æID, "HMaterCode": data[i].ç©æä»£ç , "HMaterName": data[i].ç©æåç§°, "HMaterSpec": data[i].è§æ ¼åå·,
			"HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].çäº§èµæºID, "HSourceCode": data[i].çäº§èµæºä»£ç ,
			"HSourceName": data[i].çäº§èµæºåç§°, "HWorkerid": data[i].æä½åID, "HWorkerCode": data[i].æä½åä»£ç ,
			"HWorkerName": data[i].æä½ååç§°, "HQty": data[i].äº§é, "HBadQty": data[i].ä¸è¯æ°é, "HRemark": ""
			});
			}

			for (let j = 0; j < data_detail.length; j++) {
			arr_detail.push({
			"HMaterID": data_detail[j].ç©æID, "HMaterCode": data_detail[j].ç©æä»£ç , "HMaterName": data_detail[j].ç©æåç§°,
			"HMaterSpec": data_detail[j].è§æ ¼åå·, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data_detail[j].çäº§èµæºID,
			"HSourceCode": data_detail[j].çäº§èµæºä»£ç , "HSourceName": data_detail[j].çäº§èµæºåç§°, "HWorkerid": data_detail[j].æä½åID,
			"HWorkerCode": data_detail[j].æä½åä»£ç , "HWorkerName": data_detail[j].æä½ååç§°, "HQty": data_detail[j].äº§é,
			"HBadQty": data_detail[j].ä¸è¯æ°é, "HICMOBillNo": data_detail[j].çäº§è®¢åå·, "HRemark": ""
			})
			}
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});

			option.data = arr;
			table.render(option);

			option_prodReport.data = arr_detail;
			table.render(option_prodReport);
			} else {
			option.data = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			}];
			table.render(option);
			}

			}
			//#endregion

			@@ -902,7 +1000,7 @@
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½
			option.data = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": ""
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
			}];
			table.render(option);
			}