MES-WEB-LayUI.git

			@@ -51,14 +51,14 @@
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">åºå®é¡¹ç®</label>
			<div class="layui-input-block">
			<input type="radio" name="HSelectCus" id="HSelectCus" value="true" title="å·¥åº">
			<input type="radio" name="HSelectMater" id="HSelectMater" value="false" title="ç©æ">
			<input type="radio" name="HSelectCusNone" id="HSelectCusNone" value="false" title="èªç±" checked>
			<input type="radio" name="FixedItems" value="SProc" title="å·¥åº">
			<input type="radio" name="FixedItems" value="SMater" title="ç©æ">
			<input type="radio" name="FixedItems" value="SFree" title="èªç±" checked>
			</div>
			</div>
			</div>
			@@ -116,7 +116,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å·¥åºå·¥ä»·ä»£ç </label>
			<label class="layui-form-label">å·¥åºå·¥ä»·<br/>èµæä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="å·¥åºå·¥ä»·ä»£ç " id="å·¥åºå·¥ä»·ä»£ç " onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			@@ -248,7 +248,8 @@
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;
			, element = layui.element
			, util = layui.util;
			//å¬ç¨åé
			var rowdata;
			var option = [];
			@@ -299,6 +300,23 @@
			};
			switch (obj.event) {
			case 'btn-AddLine':
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SFree") {

			}
			else if (FixedItems == "SMater") {
			NewRow.HMaterIDCol = $("#HMaterID").val();
			NewRow.HMaterNumberCol = $("#HMaterNumber").val();
			NewRow.HMaterNameCol = $("#HMaterName").val();
			NewRow.HMaterModelCol = $("#HMaterModel").val();
			}
			else if (FixedItems == "SProc") {
			NewRow.HProcIDCol = $("#HProcID").val();
			NewRow.HProcNumberCol = $("#HProcNumber").val();
			NewRow.HProcNameCol = $("#HProcName").val();
			}
			NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			NewRow.HEndDateCol = "2100-01-01";
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			@@ -404,6 +422,14 @@
			, HMaterNameCol: checkStatus.data[0].HName
			, HMaterModelCol: checkStatus.data[0].HModel
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SProc") {
			obj.update({
			HProcIDCol: $("#HProcID").val()
			, HProcNumberCol: $("#HProcNumber").val()
			, HProcNameCol: $("#HProcName").val()
			});
			}
			layer.close(layer.index);
			}
			, btn2: function (index, layero) {
			@@ -435,6 +461,15 @@
			, HProcNumberCol: checkStatus.data[0].å·¥åºä»£ç
			, HProcNameCol: checkStatus.data[0].å·¥åº
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SMater") {
			obj.update({
			HMaterIDCol: $("#HMaterID").val()
			, HMaterNumberCol: $("#HMaterNumber").val()
			, HMaterNameCol: $("#HMaterName").val()
			, HMaterModelCol: $("#HMaterModel").val()
			});
			}
			layer.close(layer.index);
			}
			, btn2: function (index, layero) {
			@@ -688,8 +723,23 @@
			, { field: 'HSourceNumberCol', title: 'èµæºä»£ç ', edit: 'text', event: "HSourceCheck" }
			, { field: 'HSourceNameCol', title: 'èµæºåç§°' }
			, { field: 'HPriceCol', title: 'åä»·', edit: 'text' }
			, { field: 'HBeginDateCol', title: 'å¼å§æ¥æ', edit: 'text' }
			, { field: 'HEndDateCol', title: 'ç»ææ¥æ', edit: 'text' }
			, { field: 'HBeginDateCol', title: 'å¼å§æ¥æ', edit: 'text', width: 110
			, templet: function (d) {
			if (d.HBeginDateCol == null) {
			return "";
			}
			return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
			}
			}
			, {
			field: 'HEndDateCol', title: 'ç»ææ¥æ', edit: 'text', width: 110
			, templet: function (d) {
			if (d.HEndDateCol == null) {
			return "";
			}
			return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
			}
			}
			, { field: 'HCostFlagCol', title: 'ææ¬å¿é', templet: '#HCostFlagCol' }
			, { field: 'HFlowFlagCol', title: 'æµè½¬é»è®¤', templet: '#HFlowFlagCol' }
			, { field: 'HPayFlagCol', title: 'å·¥èµé»è®¤', templet: '#HPayFlagCol' }
			@@ -715,6 +765,8 @@
			none: 'æ æ°æ®ï¼'
			}
			};
			rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			rowdata[0].HEndDateCol = "2100-01-01";
			option.data = rowdata;
			table.render(option);
			}

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -5,14 +5,14 @@
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
			//var WEBURL = "http://192.168.1.253:8080/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨åç½
			//var WEBURL = "http://220.189.218.154:8092/API/"; //ä¸¸äºåç»´å°æå¡å¨
			//var WEBURL = "http://localhost/API/";
			var WEBURL = "http://localhost/API/";
			return WEBURL
			}

			@@ -342,9 +342,13 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'çäº§çç»-ç¼è¾'
			, title: 'å·¥åºå·¥ä»·èµæ-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èµåºç¡èµæ/Gy_ProcPrice.html?OperationType=3&linterid=' + linterid
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');