MES-WEB-LayUI.git

			@@ -6,9 +6,10 @@
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<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>
			</head>
			<body>

			@@ -138,12 +139,13 @@
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Pushdown"><i class="layui-icon layui-icon-form"></i>ä¸æ¨å§å¤æ±æ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Pushdown"><i class="layui-icon layui-icon-form"></i>ä¸æ¨å§å¤æ±æ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushdownZC"><i class="layui-icon layui-icon-form"></i>ä¸æ¨å§å¤è½¬åºå</button>
			</div>
			</script>
			</div>
			@@ -206,13 +208,14 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
			}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','soulTable'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, laydate = layui.laydate
			, table = layui.table
			, form = layui.form
			, soulTable = layui.soulTable
			, element = layui.element;
			//å¸¸è§ç¨æ³
			laydate.render({
			@@ -236,76 +239,69 @@
			// , where: { msg: "", NowPage: 1, OnePage: 10 }
			, cellMinWidth: 100
			, cols: [[
			//{ checkbox: true, fixed: true }
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'HDeptID ', title: 'HDeptID', width: 105 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ' }
			, { field: 'é¨é¨', title: 'é¨é¨' }
			, { field: 'HMaterID', title: 'HMaterID' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 115 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115 }
			, { field: 'HUnitID', title: 'HUnitID' }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 160 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 160 }
			, { field: 'HSupID', title: 'HSupID', width: 160 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 160 }
			, { field: 'ä¾åºååç§°', title: 'ä¾åºååç§°', width: 160 }
			, { field: 'HprocID ', title: 'HprocID', width: 215 }
			////, { field: 'hunitid', title: 'hunitid' }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 115 }
			, { field: 'å·¥åº', title: 'å·¥åº' }
			////, { field: 'hempid', title: 'hempid' }
			, { field: 'HGroupID ', title: 'HGroupID', width: 100 }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ' }
			, { field: 'çç»åç§°', title: 'çç»åç§°' }
			, { field: 'HSourceID', title: 'HSourceID' }
			, { field: 'èµæºä»£ç ', title: 'èµæºä»£ç ' }
			////, { field: 'HCenterID', title: 'HCenterID' }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº' }
			, { field: 'HWorkerID ', title: 'HWorkerID' }
			////, { field: 'hbomid', title: 'hbomid' }
			, { field: 'èåä»£ç ', title: 'èåä»£ç ' }
			////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
			, { field: 'èå ', title: 'èå' }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'æ°é', title: 'æ°é' }
			, { field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ' }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ' }
			, { field: 'è®¡åå·¥æ¶', title: 'è®¡åå·¥æ¶' }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			, { field: 'HICMOInterID', title: 'HICMOInterID ' }
			, { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·' }
			, { field: 'HSeOrderInterID', title: 'HSeOrderInterID' }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·' }
			////, { field: 'hsubid', title: 'hsubid' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº ' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ' }
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ' }
			, { field: 'æºåååç ', title: 'æºåååç ' }
			, { field: 'æºååå·', title: 'æºååå·' }
			, { field: 'æºåç±»å', title: 'æºåç±»å' }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº' }
			, { field: 'HBillType', title: 'HBillType' }
			, { field: 'HQtyDecimal', title: 'HQtyDecimal' }
			, { field: 'HPriceDecimal', title: 'HPriceDecimal' }
			, { field: 'HDeptID ', title: 'HDeptID', width: 105, sort: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', sort: true }
			, { field: 'é¨é¨', title: 'é¨é¨', sort: true }
			, { field: 'HMaterID', title: 'HMaterID', sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 115, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115, sort: true }
			, { field: 'HUnitID', title: 'HUnitID', sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 160, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 160, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 160, sort: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 160, sort: true }
			, { field: 'ä¾åºååç§°', title: 'ä¾åºååç§°', width: 160, sort: true }
			, { field: 'HprocID ', title: 'HprocID', width: 215, sort: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 115, sort: true }
			, { field: 'å·¥åº', title: 'å·¥åº', sort: true }
			, { field: 'HGroupID ', title: 'HGroupID', width: 100, sort: true }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', sort: true }
			, { field: 'çç»åç§°', title: 'çç»åç§°', sort: true }
			, { field: 'HSourceID', title: 'HSourceID', sort: true }
			, { field: 'èµæºä»£ç ', title: 'èµæºä»£ç ', sort: true }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', sort: true }
			, { field: 'HWorkerID ', title: 'HWorkerID', sort: true }
			, { field: 'èåä»£ç ', title: 'èåä»£ç ', sort: true }
			, { field: 'èå ', title: 'èå', sort: true }
			, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
			, { field: 'æ°é', title: 'æ°é', sort: true }
			, { field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ', sort: true }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', sort: true }
			, { field: 'è®¡åå·¥æ¶', title: 'è®¡åå·¥æ¶', sort: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', sort: true }
			, { field: 'HICMOInterID', title: 'HICMOInterID ', sort: true }
			, { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·', sort: true }
			, { field: 'HSeOrderInterID', title: 'HSeOrderInterID', sort: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº ', sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', sort: true }
			, { field: 'å³éäºº', title: 'å³éäºº', sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', sort: true }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', sort: true }
			, { field: 'æºåååç ', title: 'æºåååç ', sort: true }
			, { field: 'æºååå·', title: 'æºååå·', sort: true }
			, { field: 'æºåç±»å', title: 'æºåç±»å', sort: true }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', sort: true }
			, { field: 'HBillType', title: 'HBillType', sort: true }
			, { field: 'HQtyDecimal', title: 'HQtyDecimal', sort: true }
			, { field: 'HPriceDecimal', title: 'HPriceDecimal', sort: true }
			]]
			//, skin: 'row' //è¡¨æ ¼é£æ ¼
			// , even: true
			, page: true //æ¯å¦æ¾ç¤ºåé¡µ
			, limits: [10, 20, 50, 100]
			, limits: [50, 500, 5000, 20000]
			, limit: 50 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			//, height: 500
			, done: function (res, curr, count) {
			@@ -350,147 +346,40 @@

			}
			break;
			//case 'btn-getCheckData':
			// var data = checkStatus.data;
			// layer.alert(JSON.stringify(data));
			// break;
			////case 'getCheckLength':
			//// var data = checkStatus.data;
			//// layer.msg('éä¸äºï¼' + data.length + ' ä¸ª');
			//// break;
			////case 'isAll':
			//// layer.msg(checkStatus.isAll ? 'å¨é' : 'æªå¨é');
			//// break;

			//èªå®ä¹å¤´å·¥å·æ å³ä¾§å¾æ - æç¤º
			//case 'btn-reload':
			// _cur_page = $(".layui-laypage-em").next().html();
			// RoadHBillNo(sql);
			// break;
			//case 'btn-confirm':
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;
			// _cur_page = $(".layui-laypage-em").next().html();
			// if (data[0]["ç¶æ"] == "æªç¡®è®¤") {
			// layer.confirm('æ¯å¦ç¡®è®¤åæ®?', { icon: 3, title: 'æç¤º' }, function (index) {
			// $.ajax({
			// type: "get",
			// url: GetWEBURL() + "POOrderAccept",
			// data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["åæ®å·"].toString(), "HUser": sessionStorage["HUserName"] },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// layer.msg(result.Message, { icon: 1 });
			// RoadHBillNo(sql);
			// }
			// else {
			// // $("#verifycode").click();
			// layer.msg(result.Message, { icon: 5 });
			// }
			// layer.closeAll("loading");
			// }
			// })
			case 'btn-PushdownZC':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			ajaxLabelData = data;
			var rows = '';
			var HEntry = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].hmainid.toString() + ',';

			// layer.close(index);
			// });
			}

			// }
			// else {
			// layer.msg("å¿é¡»æ¯æªç¡®è®¤åæ®æè½è¿è¡ç¡®è®¤æä½ï¼", { icon: 5 });
			// }
			// break;
			//case 'btn-back':
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;
			// _cur_page = $(".layui-laypage-em").next().html();
			// var HBackRemark;
			// if (data[0]["ç¶æ"] == "æªç¡®è®¤") {
			if (checkStatus.data.length < 1) {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨');
			} else {
			//é¡µé¢å±
			layer.open({
			type: 2 //Pageå±ç±»å
			, area: ['100%', '100%']
			, title: 'æ°å¢å§å¤è½¬åºå'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../å§å¤å·¥åºè®¡åè½¬åºå/WW_Add_EntrustProcessSendOutBill.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}

			// layer.prompt({
			// formType: 2,
			// //value: '',
			// title: 'è¯·è¾å¥é©³åçç±',
			// area: ['400px', '200px'] //èªå®ä¹ææ¬åå®½é«
			// }, function (value, index, elem) {
			// HBackRemark = value.toString();
			// $.ajax({
			// type: "get",
			// url: GetWEBURL() + "POOrderRefuse",
			// data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["åæ®å·"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// layer.msg("æç»æåï¼", { icon: 1 });
			// RoadHBillNo(sql);
			// }
			// else {
			// // $("#verifycode").click();
			// layer.msg(result.Message, { icon: 5 });
			// }
			// layer.closeAll("loading");
			// }
			// })
			// //alert(value); //å¾å°value
			// layer.close(index);
			// });
			});

			// }
			// else {
			// layer.msg("å¿é¡»æ¯æªç¡®è®¤åæ®æè½è¿è¡é©³åæä½ï¼", { icon: 5 });
			// }
			// break;
			//case 'btn-details':
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;

			// var linterid = data[0].hmainid.toString();
			// //if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'éè´è®¢å'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			// break;
			//case 'btn-generate':
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;
			// ajaxLabelData = data;
			// var rows = '';
			// var HEntry = '';
			// for (var i = 0; i < data.length; i++) {
			// if (data[i]["ç¶æ"] == "å·²ç¡®è®¤") {
			// rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
			// }
			// else {
			// HEntry += (i + 1) + ',';
			// }
			// }
			// if (HEntry != '') {
			// HEntry = HEntry.substring(0, HEntry.length - 1);
			// layer.msg("ç¬¬" + HEntry + "è¡æªç¡®è®¤ï¼", { icon: 5 });
			// }
			// else {
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'éè´§å'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: false //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
			// , resize: false
			// //, cancel: function () {
			// // $(".layui-btn").removeClass("layui-btn-disabled");
			// //}
			// })
			// }
			// break;
			}
			break;

			case 'btn-exit':
			//var index = parent.layer.getFrameIndex(window.name);
			//element.tabDelete('layadmin-layout-tabs', this);
			@@ -509,7 +398,7 @@
			type: "get",
			url: GetWEBURL() + "/Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json",
			async: true,
			data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
			data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
			success: function (result) {
			if (result.count == 1) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			@@ -521,7 +410,7 @@
			}
			, loading: false
			, done: function (index, res) {

			soulTable.render(this);
			}
			});
			} else {