MES-WEB-LayUI.git

			@@ -9,6 +9,7 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -172,7 +173,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			// #region å¨å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -191,6 +192,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var sWhere = " HRealPotType=HBookPotType and HRealPot=HBookPot";
			var option1 = [];
			@@ -201,17 +203,17 @@
			var option6 = [];
			var option7 = [];
			var col = [
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HItemID', title: 'HItemID', width: 200,hide: true}
			, { field: 'HBarCode', title: 'å¨å·æ¡ç ', width: 200 }
			, { field: 'HMouldNo', title: 'å¨å·ç¼å·', width: 200 }
			, { field: 'HStockCheck', title: 'çç¹æ¹æ¡', width: 200 }
			, { field: 'HRealPotType', title: 'å®éä½ç½®ç±»å', width: 200 }
			, { field: 'HRealPot', title: 'å®éä½ç½®', width: 200 }
			, { field: 'HBookPotType', title: 'è´¦é¢ä½ç½®ç±»å', width: 200 }
			, { field: 'HBookPot', title: 'è´¦é¢ä½ç½®', width: 200 }
			, { field: 'HOWNERName', title: 'çç¹ç»ç»', width: 200 }
			, { field: 'HMakeDate', title: 'çç¹æ¥æ', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>" }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' }
			, { field: 'HItemID', title: 'HItemID', width: 200, hide: true, sort: true}
			, { field: 'HBarCode', title: 'å¨å·æ¡ç ', width: 200, sort: true}
			, { field: 'HMouldNo', title: 'å¨å·ç¼å·', width: 200, sort: true}
			, { field: 'HStockCheck', title: 'çç¹æ¹æ¡', width: 200, sort: true}
			, { field: 'HRealPotType', title: 'å®éä½ç½®ç±»å', width: 200, sort: true}
			, { field: 'HRealPot', title: 'å®éä½ç½®', width: 200, sort: true}
			, { field: 'HBookPotType', title: 'è´¦é¢ä½ç½®ç±»å', width: 200, sort: true}
			, { field: 'HBookPot', title: 'è´¦é¢ä½ç½®', width: 200, sort: true}
			, { field: 'HOWNERName', title: 'çç¹ç»ç»', width: 200, sort: true}
			, { field: 'HMakeDate', title: 'çç¹æ¥æ', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>", sort: true }
			];
			//#endregion

			@@ -396,7 +398,7 @@
			option1.data = data1.list[0];
			table1.render(option1);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -532,7 +534,7 @@
			//åå§åè¡¨æ ¼(éåº)
			set_InitGrid7();
			//åå§æ¥æ£å¸¸é¡µç¾
			zc_Display();
			//zc_Display();
			}

			//åå§åè¡¨æ ¼(æ£å¸¸)
			@@ -543,10 +545,14 @@
			, toolbar: '#toolbarDemo1'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [col]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			};
			option1.data = [];
			table1.render(option1);
			@@ -561,6 +567,7 @@
			, toolbar: '#toolbarDemo2'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -579,6 +586,7 @@
			, toolbar: '#toolbarDemo3'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -597,6 +605,7 @@
			, toolbar: '#toolbarDemo4'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -615,6 +624,7 @@
			, toolbar: '#toolbarDemo5'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -633,6 +643,7 @@
			, toolbar: '#toolbarDemo6'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -651,6 +662,7 @@
			, toolbar: '#toolbarDemo7'
			, height: '550'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -750,7 +762,7 @@
			}
			//ççæ¥è¯¢
			function py_Display() {
			var sWhere = "isnull(HBookPot,'''')='''' and isnull(HRealPot,'''')!=''''";
			var sWhere = "py";
			var HItemID = $("#HItemID").val();//åæ®ç±»å

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -822,7 +834,7 @@
			var checkStatus = table.checkStatus('mainTable2')
			, data = checkStatus.data;
			if (checkStatus.data.length >= 1) {
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
			$('#btn-Check2').addClass("layui-btn-disabled").attr("disabled", true);
			$.ajax({
			type: "POST",
			@@ -857,7 +869,7 @@
			var checkStatus = table.checkStatus('mainTable3')
			, data = checkStatus.data;
			if (checkStatus.data.length >= 1) {
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
			$('#btn-Check3').addClass("layui-btn-disabled").attr("disabled", true);
			$.ajax({
			type: "POST",
			@@ -891,7 +903,7 @@
			var checkStatus = table.checkStatus('mainTable4')
			, data = checkStatus.data;
			if (checkStatus.data.length >= 1) {
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
			$('#btn-Check4').addClass("layui-btn-disabled").attr("disabled", true);
			$.ajax({
			type: "POST",
			@@ -925,7 +937,7 @@
			var checkStatus = table.checkStatus('mainTable5')
			, data = checkStatus.data;
			if (checkStatus.data.length >= 1) {
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
			$('#btn-Check5').addClass("layui-btn-disabled").attr("disabled", true);
			$.ajax({
			type: "POST",
			@@ -993,7 +1005,7 @@
			var checkStatus = table.checkStatus('mainTable7')
			, data = checkStatus.data;
			if (checkStatus.data.length >= 1) {
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
			var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
			$('#btn-Check7').addClass("layui-btn-disabled").attr("disabled", true);
			$.ajax({
			type: "POST",