MES-WEB-LayUI.git

			@@ -149,7 +149,7 @@
			<tr>
			<th>å½åå·¥åº</th>
			<td class="bz_td">
			<input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="å½åå·¥åº" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="å½åå·¥åº" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			@@ -164,7 +164,7 @@
			<tr>
			<th>åæ ¼æ°é</th>
			<td class="bz_td">
			<input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="è¯·è¾å¥åæ ¼æ°é" style="border-radius: 50px;height:55px">
			<input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="è¯·è¾å¥åæ ¼æ°é" style="border-radius: 50px;">
			</td>
			</tr>
			<tr>
			@@ -184,14 +184,14 @@
			<tr>
			<th>äº§ååç§°</th>
			<td class="bz_td">
			<input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="äº§ååç§°" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="äº§ååç§°" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>è§æ ¼åå·</th>
			<td class="bz_td">
			<input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="è§æ ¼åå·" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="è§æ ¼åå·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>

			@@ -270,14 +270,14 @@
			<tr>
			<th>æä½å</th>
			<td class="bz_td">
			<input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="æä½åå§å" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
			<input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="æä½åå§å" style="background-color:#efefef4d;border-radius: 50px;" readonly>
			</td>
			</tr>


			<tr>
			<th>æ¥åºæ°é</th>
			<td class="bz_td">
			<input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="è¯·è¾å¥æ¥åºæ°é" style="border-radius: 50px;height:55px">
			<input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="è¯·è¾å¥æ¥åºæ°é" style="border-radius: 50px;">
			</td>
			</tr>
			<tr>
			@@ -384,6 +384,7 @@
			</tbody>
			</table>
			</div>
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<ul class="layui-tab-title">
			<li class="layui-this">åæ®ä¿¡æ¯</li>
			@@ -805,24 +806,14 @@
			elem: '#mainTable',
			url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
			//, cellMinWidth: 80
			toolbar: '#toolbarDemo'
			, where: { HProcExchHinteID: HProcExchHinteID }
			//toolbar: '#toolbarDemo'
			where: { HProcExchHinteID: HProcExchHinteID }
			,limit: 50
			, cols: [[
			{ type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HOrderProcNO', title: 'è®¢åè·è¸ªå·', edit: 'text' }
			, { field: 'hbillno', title: 'æµè½¬å¡å·', hide: true }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', edit: 'text' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', edit: 'text' }
			{ field: 'æµæ°´å·', title: 'æµæ°´å·' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }
			, { field: 'æ¯å¦å§å¤', title: 'æ¯å¦å§å¤', edit: 'text' }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			, { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', edit: 'text' }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é' }
			, { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°' }
			]]
			, height: 500
			}
			@@ -1422,13 +1413,13 @@
			}
			});

			//if (data.Verify == "Y") {
			// location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
			//}
			//else {
			// //ä¿ååæµè§
			// ReRoadBillMain();
			//}
			if (data.Verify == "Y") {
			location.replace('MES_StationOutBill_PDA_QiaoYi.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
			}
			else {
			//ä¿ååæµè§
			ReRoadBillMain();
			}
			}
			else {
			layer.close(index);