MES-WEB-LayUI.git

			@@ -28,7 +28,7 @@
			<div style="padding: 10px; ">
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">æ åä»¶å«æ</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">éå¥å«æ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">æå°åè£å«æ</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">æå°åè£å«æ</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">å¼åºExcel</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">ä¸æ¥</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">æ¥è¯¢</button>
			@@ -49,9 +49,12 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">éå®è®¢åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è®¢å</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="width: 60%;display: inline-block;" >
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			@@ -129,13 +132,99 @@
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è®¢å</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<label class="layui-form-label" style="width: 85px;">éå®è®¢åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<div style="padding-left: 50px;">
			<input type="checkbox" name="checkZXBZ" id="checkZXBZ" lay-skin="primary" lay-filter="checkZXBZ" title="æå°åè£">
			</div>
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -191,7 +280,7 @@
			var HICMOBillNo = $("#HICMOBillNo").val();
			if (HICMOBillNo == "") {
			$("#Ptjl").hide();
			$("#Zxbzjl").hide();
			//$("#Zxbzjl").hide();
			$("#Jl").hide();
			$("#Scjld").hide();
			$("#Yltl").hide();
			@@ -200,7 +289,7 @@
			$("#Sctld").hide();
			} else {
			$("#Ptjl").show();
			$("#Zxbzjl").show();
			//$("#Zxbzjl").show();
			$("#Jl").show();
			$("#Scjld").show();
			$("#Yltl").show();
			@@ -286,6 +375,45 @@
			get_HideColumn();
			})

			//æå°åè£
			form.on('checkbox(checkZXBZ)', function (data) {
			var checkZXBZ = $("input[name='checkZXBZ']").prop("checked");//å¤éæ¡

			if (checkZXBZ) {
			for (var i = 0; i < option.cols[0].length; i++) {
			if (option.cols[0][i]["field"] == "åæ°") {
			option.cols[0][i]["edit"] = "text";
			}
			if (option.cols[0][i]["field"] == "å«ææ°é") {
			option.cols[0][i]["edit"] = "";
			}
			}
			} else {
			for (var i = 0; i < option.cols[0].length; i++) {
			if (option.cols[0][i]["field"] == "åæ°") {
			option.cols[0][i]["edit"] = "";
			}
			if (option.cols[0][i]["field"] == "å«ææ°é") {
			option.cols[0][i]["edit"] = "text";
			}
			}
			}
			table.render(option);
			})

			//è¡åé¼ æ ç¦»å¼äºä»¶
			table.on('edit(mainTable)', function (obj) {
			var HQty = 0.0;

			if (obj.field == "åæ°") {
			HQty = parseFloat(obj.data["åæ°"]) * parseFloat(obj.data["æå°åè£"])
			//ä¿®æ¹æ°æ®
			obj.update({
			"å«ææ°é": HQty
			});
			}
			})

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -294,13 +422,15 @@
			function set_ClearBill()
			{
			NotGeneratedMaterial();
			set_InitGrid();
			get_Display(sWhere);
			Organ();
			DisPlay_HideColumn();
			//è¯»åè¿æ»¤æ¡ä»¶
			get_ReadConfigFile();
			set_InitGrid();
			get_Display(sWhere);
			DisPlay_HideColumn();
			ColFilter();
			}

			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			@@ -308,6 +438,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false,
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			@@ -322,7 +453,9 @@
			if (dataG != null) {
			var data2 = JSON.parse(dataG);
			$("#Organization").val(data2["Organization"]);
			}
			} else {
			$("#Organization").val(sessionStorage["OrganizationID"]);
			}
			form.render('select');

			}
			@@ -337,6 +470,7 @@
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, totalRow: true
			, cellMinWidth: 90
			, limit: 500
			, cols: [[
			@@ -352,20 +486,22 @@
			, { 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: 'åä½ç¨é', totalRow: true, width: 160}
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', totalRow: true, width: 160 }
			, { field: 'æå°åè£', title: 'æå°åè£', width: 160}
			, { field: 'åæ°', title: 'åæ°', totalRow: true,width: 160}
			, { field: 'å«ææ°é', title: 'å«ææ°é', totalRow: true, width: 160, edit: 'text'}
			, { field: 'éææ°é', title: 'éææ°é', totalRow: true,width: 160, edit: 'text'}
			, { field: 'éæåå ', title: 'éæåå ', width: 160, edit: 'text'}
			, { field: 'å·²å«ææ°é', title: 'å·²å«ææ°é', width: 160}
			, { field: 'å·²ééæ°é', title: 'å·²ééæ°é', width: 160 }
			, { field: 'å·²å«ææ°é', title: 'å·²å«ææ°é', totalRow: true, width: 160}
			, { field: 'å·²ééæ°é', title: 'å·²ééæ°é', totalRow: true,width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, edit: 'text', event: 'OutWarehouse' }
			, { field: 'è°åºä»åºid', title: 'è°åºä»åºid', width: 160, hide: true }
			, { field: 'è°å¥ä»åº', title: 'è°å¥ä»åº', width: 160, edit: 'text', event: 'InWarehouse' }
			, { field: 'è°å¥ä»åºid', title: 'è°å¥ä»åºid', width: 160, hide: true }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 160 }
			, { field: 'è°åºä»åºåºåæ°é', title: 'è°åºä»åºåºåæ°é', width: 160 }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', title: 'è°åºä»åºå¯ç¨åºåæ°é', width: 160 }
			, { field: 'åºåæ°é', title: 'åºåæ°é', totalRow: true, width: 160 }
			, { field: 'è°åºä»åºåºåæ°é', title: 'è°åºä»åºåºåæ°é', totalRow: true, width: 160 }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', title: 'è°åºä»åºå¯ç¨åºåæ°é', totalRow: true, width: 160 }
			, { field: 'å¯ç¨åºå', title: 'å¯ç¨åºå', width: 160 }
			, { field: 'è°åºç»ç»', title: 'è°åºç»ç»', width: 160}
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
			@@ -392,6 +528,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -504,6 +641,80 @@
			var CPModel = $("#CPModel").val(); //äº§åè§æ ¼åå·
			var HICMOBillNo = $("#HICMOBillNo").val(); //çäº§è®¢åå·
			var ps = $("#ps").prop("checked"); //ä»æ¾ç¤ºæªå®å¨éé

			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();
			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (DepartmentName=="") {
			return layer.msg("è¯·éæ©çäº§è½¦é´!");
			@@ -748,6 +959,8 @@
			}
			}



			//æ°å¢æ¥åºéæç³è¯·å
			function set_AddNew_Bftl() {
			if (table.cache['mainTable'].length == 0) {
			@@ -792,7 +1005,9 @@
			else {
			layer.confirm('ç¡®å®è¦çææ£æåï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			, btn1: function (index) {
			layer.close(index);

			var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]

			$.ajax(
			@@ -833,7 +1048,9 @@
			else {
			layer.confirm('ç¡®å®è¦çæéæåï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			, btn1: function (index) {
			layer.close(index);

			var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]

			$.ajax(
			@@ -994,6 +1211,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
			type: "GET",
			async: false,
			data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -1013,6 +1231,27 @@
			});
			}

			//#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_btnICMOBill() {
			layer.open({
			@@ -1021,7 +1260,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§è®¢ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html', 'yes']
			, content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html?HDeptID='+ $("#DepartmentID").val(), 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1046,9 +1285,37 @@
			$("#CPName").val("");
			$("#CPModel").val("");
			$("#HICMOBillNo").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = "";
			}


			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);

			form.render('select');
			}
			//è¯»åéç½®æä»¶
			function get_ReadConfigFile() {
			//è·åæ¬å°åå¨çæ°æ®