MES-WEB-LayUI.git

			@@ -13,6 +13,8 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>

			</head>
			<body>
			@@ -21,27 +23,28 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 10px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">ä¿å</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">æ°å¢</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">å®¡æ ¸</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">åå®¡æ ¸</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">éåº</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">æå°</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">ä¿å</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">æ°å¢</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">å®¡æ ¸</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">åå®¡æ ¸</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">éåº</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">æå°</button>
			</div>
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">åå»ºç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input"value="å®æ³¢åç»´å°">
			<input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="å®æ³¢åç»´å°">
			<input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
			<input id="HItemID" name="HItemID" type="hidden" />
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½¿ç¨ç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input"value="å®æ³¢åç»´å°">
			<input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="å®æ³¢åç»´å°">
			<input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
			@@ -60,136 +63,130 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline"style="width: 56%;">
			<div class="layui-inline" style="width: 56%;">
			<label class="layui-form-label">å©è®°ç </label>
			<div class="layui-input-inline"style="width: 56%;">
			<div class="layui-input-inline" style="width: 56%;">
			<input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			</div>
			</div>
			<!--<div class="title">åºæ¬ä¿¡æ¯</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>
			<li lay-id="2" style="padding:1px;">å¶ä»</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">å¶é è´¹ç¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HMadeMoney" id="HMadeMoney" lay-verify="HMadeMoney" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">æ åå·¥èµ</label>
			<div class="layui-input-inline">
			<input type="text" name="HStdPay" id="HStdPay" lay-verify="HStdPay" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<!--<div class="title">åºæ¬ä¿¡æ¯</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>
			<li lay-id="2" style="padding:1px;">å¶ä»</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">å¶é è´¹ç¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HMadeMoney" id="HMadeMoney" lay-verify="HMadeMoney" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			</div>
			</div>
			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item ">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">åå»ºäºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">åå»ºæ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä¿®æ¹äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">æ åå·¥èµ</label>
			<div class="layui-input-inline">
			<input type="text" name="HStdPay" id="HStdPay" lay-verify="HStdPay" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">å®¡æ ¸äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item ">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">åå»ºäºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä½åºäºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">åå»ºæ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä½åºæ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä¿®æ¹äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label">å®¡æ ¸äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä½åºäºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label">ä½åºæ¥æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--éèåæ®µ-->
			<input type="hidden" name="lngBillKey" id="lngBillKey">
			<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
			<input type="hidden" name="HMaker" id="HMaker"><!--å¶åäºº-->
			</form>
			</div>
			<!--éèåæ®µ-->
			<input type="hidden" name="lngBillKey" id="lngBillKey">
			<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
			<input type="hidden" name="HMaker" id="HMaker"><!--å¶åäºº-->
			</form>
			</div>
			</div>
			</div>
			<script>
			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			}

			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var HType = params[params[1]]; //åæ®ç¶æ
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å

			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -204,14 +201,15 @@
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			//å¤ææ°å¢è¿æ¯ç¼è¾
			if (HType == "Modify") {
			//ç¼è¾
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			set_AddNew();
			}
			else if (OperationType == 3) {//ç¼è¾
			set_ShowBill();
			}
			else {
			//æ°å¢
			set_AddNew();
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}

			//#endregion
			@@ -236,9 +234,14 @@

			//éåº
			form.on('submit(Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦å³éæ¬é¡µåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index.html";
			});
			if (linterid == undefined) {
			//å³éé¡µç¾
			Pub_Close(2);
			}
			else {
			//å³éé¡µç¾
			Pub_Close(1);
			}
			});

			//éæ©éªæ¶
			@@ -272,15 +275,13 @@
			//#region æ¬é¡µé¢å è½½æææ¹æ³

			//æ°å¢
			function set_AddNew()
			{
			function set_AddNew() {
			$("#HCreator").val(sessionStorage["HUserName"]);//åå»ºäºº
			get_MAXNum();
			}

			//è·åæå¤§ID
			function get_MAXNum()
			{
			function get_MAXNum() {
			//è·åæå¤§åºç¡èµæID
			$.ajax({
			url: GetWEBURL() + "/Gy_EquipMent/GetMAXBillID",
			@@ -288,14 +289,14 @@
			data: {},
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].hitemid);
			$("#HItemID").val(d.data[0].hitemid);
			}
			});
			}

			//ç¼è¾
			function set_ShowBill()
			{
			function set_ShowBill() {
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			$.ajax({
			url: GetWEBURL() + "/Gy_EquipMent/xg",
			type: "GET",
			@@ -325,8 +326,7 @@
			}

			//éªè¯
			function AllowLoadData(data)
			{
			function AllowLoadData(data) {
			var HCreateOrg = $("#HCreateOrg").val();
			if (HCreateOrg == null \|\| HCreateOrg == undefined \|\| HCreateOrg == "") {

			@@ -372,8 +372,7 @@
			}

			//ä¿åè¯·æ±
			function set_SaveUrl(data)
			{
			function set_SaveUrl(data) {
			var ModRightNameAdd = 'Gy_EquipMent_Edit';
			var user = sessionStorage["HUserName"];