MES-WEB-LayUI.git

			@@ -37,11 +37,15 @@
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius"
			lay-submit="" lay-filter="set_SaveBill">ä¿å</button>
			lay-submit="" lay-filter="set_SaveBill">
			ä¿å
			</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
			lay-filter="Cancel">éåº</button>
			lay-filter="Cancel">
			éåº
			</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
			lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>-->
			lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>-->
			</div>
			</div>
			<div class="layui-form-item" style="padding-top: 10px;">
			@@ -54,17 +58,19 @@
			<div class="layui-tab-item layui-show">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ææ¬åéç±»åä»£ç <span
			style="color: red;">*</span></label>
			<label class="layui-form-label">
			ææ¬åéç±»åä»£ç <span style="color: red;">*</span>
			</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HNumber" lay-verify="HNumber"
			id="HNumber" autocomplete="off">
			id="HNumber" autocomplete="off">
			<input id="HItemID" name="HItemID" type="hidden" />
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ææ¬åéç±»ååç§°<span
			style="color: red;">*</span></label>
			<label class="layui-form-label">
			ææ¬åéç±»ååç§°<span style="color: red;">*</span>
			</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HName" id="HName" autocomplete="off">
			</div>
			@@ -73,7 +79,7 @@
			<label class="layui-form-label">çä»£ç </label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HShortNumber" id="HShortNumber"
			autocomplete="off">
			autocomplete="off">
			</div>
			</div>

			@@ -93,10 +99,10 @@
			autocomplete="off">
			</div>
			</div>



			</div>


			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä½¿ç¨ç¶æï¼</label>
			@@ -133,21 +139,21 @@
			<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="HMakeEmp" id="HMakeEmp"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</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="HStopEmp" id="HStopEmp"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</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="HCheckEmp" id="HCheckEmp"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -156,21 +162,21 @@
			<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="HMakeTime" id="HMakeTime"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</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="HStopTime" id="HStopTime"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</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="HCheckTime" id="HCheckTime"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -179,7 +185,7 @@
			<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="HModifyEmp" id="HModifyEmp"
			style="background-color:#efefef4d;" readonly>
			style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -188,11 +194,29 @@
			<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="HModifyTime"
			id="HModifyTime" style="background-color:#efefef4d;" readonly>
			id="HModifyTime" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">é¡¹ç®</li>
			</ul>
			<div class="layui-tab-content">
			<!--åè¡¨-->
			<div class="layui-tab-item layui-show">
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<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>
			</div>
			</div>
			</div>
			@@ -225,7 +249,8 @@
			;
			//#endregion


			//æ¨¡åå
			var HModName = "Gy_CostAverageType";
			//#region è¿å¥é¡µé¢å³å è½½
			Organ();
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -249,6 +274,7 @@
			$("#HUseFlag").attr("disabled", true);
			$("#HMakeEmp").val(sessionStorage["HUserName"]);; //æ ¹æ®ç»å½ç¨æ·å¸¦åºåå»ºäºº
			$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
			get_InitGrid();
			}
			else if (OperationType == 2) {//å¤å¶

			@@ -269,6 +295,7 @@

			}
			else if (OperationType == 3) {//ç¼è¾
			get_InitGrid();
			//ç¦ç¨ç»ç»éé¡¹
			$("#HUSEORGID").attr("disabled", true);
			$("#HCREATEORGID").attr("disabled", true);
			@@ -397,7 +424,24 @@
			"HModifyEmp": data.ä¿®æ¹äºº,
			"HModifyTime": data.ä¿®æ¹æ¶é´ ? util.toDateString(data.ä¿®æ¹æ¶é´, 'yyyy-MM-dd') : ""
			});

			// 2. å è½½åè¡¨æ°æ®
			var rowdata = [];
			if (data && result.data.length > 0) {
			for (var i = 0; i < result.data.length; i++) {
			var row = result.data[i];
			rowdata.push({
			"HMaterTypeID": row["HMaterTypeID"] \|\| 0,
			"HMaterType": row["HName"] \|\| "",
			"HWeight": row["æé"] \|\| 0,

			});
			}
			} else {
			console.log("æ²¡æåè¡¨æ°æ®");
			}
			// 3. éæ°æ¸²æè¡¨æ ¼
			option.data = rowdata;
			table.render(option);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -451,9 +495,15 @@
			layer.msg("è¯·è¾å¥ææ¬åéç±»ååç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}


			var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			}
			var sSubStr = JSON.stringify(num);
			var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ";"+sessionStorage["HUserName"];
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Gy_CostAverageType/SaveGy_CostAverageType", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -489,9 +539,258 @@

			//#endregion

			//#region åè¡¨ï¼å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow =
			{
			"HWeight": "0"
			, "HMaterTypeID": "0"
			, "HMaterType": ""


			};
			switch (obj.event) {
			case 'btn-AddLine':
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			for (var i = 1; i <= option.data.length; i++) {
			$('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").attr("selected", true);

			}
			form.render('select');

			break;
			case 'btn-CopyLine':
			var copydata = JSON.stringify(data);
			if (data.length <= 0) {
			layer.msg("è¯·éæ©éè¦å¤å¶çä¸è¡ï¼");
			}
			else if (data.length > 1) {
			layer.msg("åªè½éæ©å¤å¶ä¸è¡ï¼");
			}
			else {
			var copydata2 = copydata.substring(1, copydata.length);//å»é¤é¦è¡åç¬¦'['
			var copyrow = copydata2.substring(0, copydata2.length - 1);//å»é¤æ«å°¾åç¬¦']'
			table.cache["mainTable"].push(JSON.parse(copyrow));//å°å¤å¶çè¡å¼ºè½¬æjsonè¿½å å°è¡¨æ ¼ä¸
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸
			for (var i = 1; i <= option.data.length; i++) {
			$('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").attr("selected", true);

			}
			form.render('select');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});
			//#endregion

			//#region åè¡¨åå§å
			function get_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, limit: 100
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', field: 'åºå·', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterTypeID', title: 'HMaterTypeID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterType', title: 'ç©æåç±»', edit: 'text', event: "HMaterTypeList", style: 'background-color: #f9f9f9;' }

			, { field: 'HWeight', title: 'æé', edit: 'text', style: 'background-color: #f9f9f9;' }

			]]
			}

			var rowdata = [
			{
			"HMaterTypeID": "0"
			, "HMaterType": ""
			, "HWeight": "0"

			}
			];
			option.data = rowdata;
			table.render(option);
			// DisPlay_HideColumn();
			}
			//#endregion
			//#region åè¡¨ï¼è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			set_GridCellCheck(obj); //è¡åå¿«æ·é®çé

			});

			//#endregion
			//#region è¡åå é¤
			function set_GridDelete(obj) {
			var data = obj.data;
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			//if (rowIndex === '0') {
			// layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			//} else {
			var oldData = table.cache["mainTable"];
			oldData.splice(obj.tr.data('index'), 1)
			option.data = oldData;//å°æ°æ®ç»å®å°dataä¸
			table.render(option);
			//for (var i = 0; i < oldData.length; i++) {
			// //åç¥¨ç±»å
			// $('#HTransType' + (i + 1)).find("option[value='" + oldData[i].HTransType + "']").attr("selected", true);
			//}
			//form.render('select');
			layer.close(index);
			/}/
			});
			}
			}
			//#endregion
			//#region åè¡¨ï¼å¿«æ·é®(F7)æå¼å¼¹çª
			function set_GridCellCheck(obj) {
			window.tableEditObj = obj;
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {

			if (obj.event == "HMaterTypeList") {
			//CusType = 2;
			// æ°å¢ï¼å°ç¼è¾å¯¹è±¡objèµå¼ç»å¨å±åéï¼ä¾GetProjectMoneyValueä½¿ç¨
			//tableEditObj = obj;
			// æå¼å¨å·ç®¡çå°çªä½ï¼åæä»£ç ä¸åï¼
			layer.open({
			type: 2,
			skin: 'layui-layer-rim',
			area: ['90%', '90%'],
			title: 'é¡¹ç®è´¹ç¨åè¡¨',
			shift: 2,
			content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_MaterType.html", "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('è¯·éæ©æ°æ®');
			}
			//OptionData = checkStatus.data[0];
			obj.update({
			"HMaterTypeID": checkStatus.data[0].HItemID
			, "HMaterType": checkStatus.data[0].ç©æåç±»åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			//obj.update({
			// "HBeginAddr": OptionData.HItemID
			// , "HBeginAddrName": OptionData.å°åºåç§°
			//})
			}
			})
			}
			// æ¸ç©ºäºä»¶æ è¯ï¼é¿åéå¤è§¦å
			obj.event = "";
			// é»æ¢äºä»¶åæ³¡åé»è®¤è¡ä¸º
			e.preventDefault();
			e.stopPropagation();
			return false;
			}
			});
			}
			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			////æ¾ç¤ºåæ°æ®
			//function DisPlay_HideColumn() {
			// $.ajax({
			// url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			// type: "GET",
			// async: false,
			// data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			// success: function (data1) {
			// if (data1.data.length != 0) {

			// var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			// var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			// dataCol = data1.data[0].HGridString.split(',');

			// for (var i = 0; i < option.cols[0].length - 2; i++) {
			// var dataCols = dataCol[i].split('\|');
			// //éèå
			// if (dataCols[1] == 1) {
			// option.cols[0][i + 1]["hide"] = true;
			// }
			// //è®¾ç½®åå®¹åä½å¤§å°
			// if (data1.data[0].HFontSize != 0) {
			// option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			// } else {
			// option.cols[0][i + 1]["style"] = "font-size:100%";
			// }
			// //è®¾ç½®åå®½
			// if (dataCols[3] > 0) {
			// option.cols[0][i + 1]["width"] = dataCols[3];
			// }
			// //æ¾ç¤ºå
			// if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			// option.cols[0][i + 1]["hide"] = false;
			// }
			// //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			// switch (dataCols[2]) {
			// case "L":
			// option.cols[0][i + 1]["align"] = "left";
			// break;
			// case "M":
			// option.cols[0][i + 1]["align"] = "center";
			// break;
			// case "R":
			// option.cols[0][i + 1]["align"] = "right";
			// break;
			// }
			// //è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			// if (dataCols[4] != null && dataCols[4] != "") {
			// option.cols[0][i + 1]["title"] = dataCols[4];
			// }
			// }
			// //åæ¶å»ç»å
			// for (var i = 1; i < option.cols[0].length - 1; i++) {
			// if (option.cols[0][i]["fixed"] != null) {
			// option.cols[0][i]["fixed"] = null;
			// }
			// else {
			// break;
			// }
			// }
			// //å»ç»å
			// if (data1.data[0].HFixCols != 0) {
			// for (var i = 0; i < data1.data[0].HFixCols; i++) {
			// if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			// data1.data[0].HFixCols += 1;
			// }
			// option.cols[0][i + 1]["fixed"] = "left";
			// }
			// }
			// table.render(option);
			// } else {
			// table.render(option);
			// }
			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// })
			//}
			function getCar(data) {
			$("#HParentID").val(data[0]["HItemID"])
			$("#HParentName").val(data[0]["HItemName"])

	WebTM/WebTM.csproj	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/成本基础资料/Add_Edit_Gy_CostAverageType.html	347 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -668,10 +668,9 @@
			<Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_CostProjectImport.html" />
			<Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_CostAccounting.html" />
			<Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_ItemMoneyBillImport.html" />
			<<<<<<< HEAD
			=======

			<Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_ItemMoneyBill_Excel.html" />
			>>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d

			<Content Include="views\æ¡ç æç»\Kf_MateOutBillList_CodeDetail.html" />
			<Content Include="views\æ¡ä¾ä»£ç \åè¿\HY_HistogramReport_ForPCSCheckNote.html" />
			<Content Include="views\æ¡ä¾ä»£ç \åè¿\HY_HistogramReport.html" />