MES-WEB-LayUI.git

			@@ -1,5 +1,6 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>å¨å·æ¡£æ¡</title>
			@@ -18,11 +19,13 @@
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<style>
			/æ ç¶å¾ç¹å»é«äº®åè²/
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			.layui-tree-set-active>.layui-tree-entry .layui-tree-main {
			background: #aef0f7;
			}

			/* ç¡®ä¿bodyå¯æ»å¨ */
			html, body {
			html,
			body {
			height: 100%;
			overflow: auto;
			}
			@@ -41,9 +44,9 @@
			::-webkit-scrollbar-track {
			background: #f5f5f5;
			}

			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -61,31 +64,37 @@
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
			id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName"
			id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> *
			</label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 300px;">
			<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
			id="HFilterScheme_Now"></div>
			</div>

			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			@@ -93,19 +102,25 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName" id="ColName" lay-filter="ColName"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator" id="Comparator" lay-filter="Comparator"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -113,26 +128,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName1" id="ColName1" lay-filter="ColName1"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -140,26 +162,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName2" id="ColName2" lay-filter="ColName2"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -167,18 +196,20 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div class="layui-col-xs2 layui-inline" id="TreeTableOuter"
			style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			</div>
			<div class="layui-col-xs9 layui-inline" style="padding-left: 5px; width: 82%">
			<div>
			<div class="layui-col-xs9 layui-inline" style="padding-left: 5px; width: 82%" >
			<div id="mainTableOuter">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page"></div>
			</div>
			@@ -235,7 +266,7 @@
			var sWhere = "";
			var option = [];
			var sql = "";
			var titleData = ["hmainid", "HMouldTypeID", "HBillStatus", "å½åä»åºID", "å½åä»ä½ID", "HMaterID", "HMouldType", "HUnitID", "HDeptID", "HSupID", "HWhID", "HMouldMaintainRuleInterID", "HMouldDotCheckRuleInterID", "HSPID", "hsubid", "HBillType", "HMadeSupID", "HUserID","HUSEORGID"];
			var titleData = ["hmainid", "HMouldTypeID", "HBillStatus", "å½åä»åºID", "å½åä»ä½ID", "HMaterID", "HMouldType", "HUnitID", "HDeptID", "HSupID", "HWhID", "HMouldMaintainRuleInterID", "HMouldDotCheckRuleInterID", "HSPID", "hsubid", "HBillType", "HMadeSupID", "HUserID", "HUSEORGID"];

			var HModName = "Gy_MouldFileList"
			var HBillType = "3899";
			@@ -266,7 +297,7 @@

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'æ¨¡å·ç¼å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid;
			var linterid = data.hmainid;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -281,11 +312,13 @@
			location.reload();
			}
			, cancel: function () {


			}
			})
			}
			});



			//#region é¡µé¢æé®ç¹æ£äºä»¶è§¦å
			table.on('toolbar(mainTable)', function (obj) {
			@@ -414,11 +447,17 @@
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//æ¥è¯¢
			get_FastQuery();

			//æ¥è¯¢å¨å·åç±»
			get_Display_Tree();


			get_DefaultModule();

			var mainTableHeight = $("#mainTableOuter").height()
			$("#TreeTableOuter").css("overflow", "auto")
			$("#TreeTableOuter").css("height", mainTableHeight+"px")

			}

			//#region å¯¼åºExecel
			@@ -428,8 +467,7 @@
			//#endregion

			//åå§åè¡¨æ ¼
			function set_InitGrid()
			{
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -443,16 +481,17 @@
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>",sort:true}
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', sort: true }
			, { field: 'å¯¹åºERPç©æç¼ç ', title: 'ç©æç¼å·', sort: true }
			, {
			field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·', sort: true, event: 'æ¨¡å·ç¼å·', templet: function (d) {
			return '<span style="color: blue;">' + d.æ¨¡å·ç¼å· + '</span>'
			}, style: 'cursor: pointer;' }
			}, style: 'cursor: pointer;'
			}
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', sort: true }
			, { field: 'æ¨¡å·åå·', title: 'å¨å·åå·', sort: true }
			, { field: 'æ¨¡å·åç±»', title: 'å¨å·åç±»', sort: true }
			@@ -486,14 +525,14 @@
			, { field: 'èæä»', title: 'èæä»', sort: true }
			, { field: 'å½åæ¨¡å·è§æ ¼', title: 'å½åå¨å·è§æ ¼', sort: true }
			, { field: 'åå§æ¨¡å·è§æ ¼', title: 'åå§å¨å·è§æ ¼', sort: true }
			, { field: 'å½åè®¾è®¡å¯¿å½', title: 'å½åè®¾è®¡å¯¿å½', sort: true, totalRow: true}
			, { field: 'åå§è®¾è®¡å¯¿å½', title: 'åå§è®¾è®¡å¯¿å½', sort: true, totalRow: true}
			, { field: 'å½åè®¾è®¡å¯¿å½', title: 'å½åè®¾è®¡å¯¿å½', sort: true, totalRow: true }
			, { field: 'åå§è®¾è®¡å¯¿å½', title: 'åå§è®¾è®¡å¯¿å½', sort: true, totalRow: true }
			, { field: 'ä½¿ç¨å¯¿å½', title: 'ä½¿ç¨å¯¿å½', sort: true, totalRow: true }
			, { field: 'å©ä½å¯¿å½', title: 'å©ä½å¯¿å½', sort: true, totalRow: true }
			, { field: 'å·²çäº§æ°é', title: 'å·²çäº§æ°é', sort: true, totalRow: true}
			, { field: 'å·²çäº§æ°é', title: 'å·²çäº§æ°é', sort: true, totalRow: true }
			, { field: 'å·²çäº§éé', title: 'å·²çäº§éé', sort: true, totalRow: true }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', sort: true }
			, { field: 'å³èæ°é', title: 'å³èæ°é', sort: true, totalRow: true}
			, { field: 'å³èæ°é', title: 'å³èæ°é', sort: true, totalRow: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			@@ -564,13 +603,13 @@
			//#region æ¥è¯¢(ä¸»è¡¨)-åé¡µ
			function get_DisplayPage(sWhere) {
			var ajaxLoad = layer.load();//é®ç½©
			var ModRightNameSelect = 'Gy_MouldFileList';
			var ModRightNameSelect = 'Gy_MouldFileList';
			sWhere += addSWhereByOpenType();//æ·»å åæ®æ¨¡åéæ©åºç¡èµææ¶çè¿æ»¤æ¡ä»¶ï¼å·²å®¡æ ¸æªå³é
			$.ajax({
			url: GetWEBURL() + '/Gy_Mould/page',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"],"page": optionPage.curr, "size": optionPage.limit },
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			@@ -614,11 +653,11 @@
			}
			}
			}


			option.cols = [col];
			option.data = data1.data;
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			laypage.render(optionPage);
			laypage.render(optionPage);
			//åè®¾ç½®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
			////å·æ°è¡¨æ ¼æ°æ®
			@@ -634,6 +673,7 @@
			laypage.render(optionPage);
			option.data = [];
			table.render(option);

			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			@@ -809,8 +849,7 @@
			}

			//ä¿®æ¹
			function set_ShowBill()
			{
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			@@ -892,12 +931,12 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HBillStatus = data[0].HBillStatus.toString(); //åæ®ç¶æ
			var HInterID = data[0].hmainid.toString();
			var HInterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": HInterID,"IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -1175,29 +1214,29 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].hmainid.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
			data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
			data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			});
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			@@ -1279,7 +1318,7 @@
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var addSWhere = "";
			if (typeof(openType) != "undefined") {
			if (typeof (openType) != "undefined") {
			addSWhere = " and ä½åºäºº = '' and å³éäºº = '' and å®¡æ ¸äºº <> ''";
			}
			return addSWhere;
			@@ -1512,7 +1551,7 @@

			//#endregion



			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			@@ -1559,4 +1598,5 @@
			</script>

			</body>

			</html>

	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/IpadIndex.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html	186 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -36,7 +36,7 @@
			//var WEBURL = "http://121.36.199.126:8181/API/"; //ä¸å
			//var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //éå¸
			//var WEBURL = "http://172.16.1.85/API/"; //è¿¦å
			// var WEBURL = "http://61.164.64.222:8082/API_WW/"
			var WEBURL = "http://61.164.64.222:8082/API_WW/"
			return WEBURL
			}

			@@ -87,7 +87,7 @@
			function () {
			TSLoad();
			},
			10000, // é´é3åé
			180000, // é´é3åé
			'interval' // å¾ªç¯ç±»å
			);

			@@ -881,6 +881,10 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if(!dataCol[i]){
			continue;
			}

			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {