MES-WEB-LayUI.git

			@@ -31,21 +31,22 @@
			<li lay-id="1" style="padding:1px;" class="layui-this">æºåä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">ç©ææ¸å</li>
			<li lay-id="3" style="padding:1px;">æç»æ¸å</li>
			<li lay-id="4" style="padding:1px;">éä»¶ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--æºåä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item">
			<!--<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name="HBillType" id="HBillType">
			<option value="1103">æ¶æéç¥å</option>
			</select>
			</div>
			</div>-->
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name="HBillType" id="HBillType">
			<option value="1103">æ¶æéç¥å</option>
			</select>
			</div>
			</div>-->
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">ç©ææ¡ç </label>
			@@ -85,10 +86,16 @@
			</div>
			</div>
			<!--<input id="upload" type="file" accept="image/*" @change="changePic" />-->
			<input id="takepicture" type="file" accept="image/*">
			<div>
			<img id="blah" src="#" alt="æ¾ç¤ºæ¨ä¸ä¼ çååå¾ç" />
			</div>
			<!--<input id="takepicture" type="file" accept="image/*">
			<div>
			<img id="blah" src="#" alt="æ¾ç¤ºæ¨ä¸ä¼ çååå¾ç" />
			</div>-->






			</div>
			</div>
			<!--ç©ææ¸å-->
			@@ -328,24 +335,44 @@
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">éåº</button>
			<!-- <button id="capture">æç§</button>-->
			</div>
			<div id="" style="display:none;">
			<audio id="cs" hidden controls>
			<source src="../../video/jingbao.wav" type="audio/ogg">
			</audio>
			</div>
			<div id="" style="display:none;">
			<audio id="cs2" hidden controls>
			<source src="../../video/success.wav" type="audio/ogg">
			</audio>
			</div>
			</form>
			<!--éä»¶ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-upload">
			<button type="button" class="layui-btn" id="testList">éæ©æä»¶</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
			<div class="layui-upload-list">
			<table class="layui-table">
			<thead>
			<tr>
			<th>æä»¶å</th>
			<th>å¤§å°</th>
			<th>ç¶æ</th>
			<th>æä½</th>
			</tr>
			</thead>
			<tbody id="ProImgByList">
			</tbody>
			</table>
			</div>
			</div>
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">éåº</button>
			<!-- <button id="capture">æç§</button>-->
			</div>
			<div id="" style="display:none;">
			<audio id="cs" hidden controls>
			<source src="../../video/jingbao.wav" type="audio/ogg">
			</audio>
			</div>
			<div id="" style="display:none;">
			<audio id="cs2" hidden controls>
			<source src="../../video/success.wav" type="audio/ogg">
			</audio>
			</div>
			</form>
			</div>
			</div>
			</div>
			@@ -365,11 +392,12 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			}).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, upload = layui.upload
			, form = layui.form
			, element = layui.element;
			//æ¸ç©ºçé¢ new
			@@ -519,6 +547,7 @@
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			PicUpload();
			}
			});
			}
			@@ -772,6 +801,10 @@
			var HSLSeQ = $("#HSLSeQ").val(); //æ¶æéç¥åè¡å·
			var HBatchNo = $("#HBatchNo").val(); //æ¹å·


			var HBillNo = $("#HBillNo").val(); //æ¥ææ£éªååå·
			var HInterID = $("#HInterID").val(); //æ¥ææ£éªåä¸»ID

			if (HBadQty == "") {
			HBadQty = 0;
			}
			@@ -809,7 +842,7 @@
			, "HBadQty": HBadQty, "HCheckResult": HCheckResult, "HSupNumber": HSupNumber, "HWHNumber": HWHNumber
			, "HUseResult": HUseResult, "HSeQ": HSeQ, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo
			, "user": sessionStorage["HUserName"], "HWHID": HWHID, "HSPID": HSPID, "HSupID": HSupID, "HKeeperID": HKeeperID
			, "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ
			, "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ, "HBillNo": HBillNo, "HInterID": HInterID
			},
			dataType: "json",
			success: function (data) {
			@@ -1108,6 +1141,73 @@
			var audio = document.getElementById("cs2");
			audio.play();
			}


			//æä»¶ä¸ä¼
			function PicUpload() {
			//å¤å¾çä¸ä¼
			//å¤æä»¶åè¡¨ç¤ºä¾
			var ProImgByList = $('#ProImgByList')
			, uploadListIns = upload.render({
			elem: '#testList'
			, url: GetWEBURL() + "/Cj_StationOutBill/UploadFile2"
			, accept: 'file'
			, multiple: true
			, auto: false
			//, bindAction: '#testListAction' //ææç»å®
			, data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
			, choose: function (obj) {
			var files = this.files = obj.pushFile(); //å°æ¯æ¬¡éæ©çæä»¶è¿½å å°æä»¶éå
			//è¯»åæ¬å°æä»¶
			obj.preview(function (index, file, result) {
			var tr = $(['<tr id="upload-' + index + '">'
			, '<td>' + file.name + '</td>'
			, '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
			, '<td>çå¾ä¸ä¼ </td>'
			, '<td>'
			, '<button class="layui-btn layui-btn-xs demo-reload ">ä¸ä¼ </button>'
			, '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">å é¤</button>'
			, '</td>'
			, '</tr>'].join(''));

			//åä¸ªéä¼
			tr.find('.demo-reload').on('click', function () {
			obj.upload(index, file);
			return false;
			});

			//å é¤
			tr.find('.demo-delete').on('click', function () {
			delete files[index]; //å é¤å¯¹åºçæä»¶
			tr.remove();
			uploadListIns.config.elem.next()[0].value = ''; //æ¸ç©º input file å¼ï¼ä»¥åå é¤ååºç°ååæä»¶ä¸å¯é
			});

			ProImgByList.append(tr);
			});
			}
			, done: function (res, index, upload) {
			if (res.code == 1) { //ä¸ä¼ æå
			var tr = ProImgByList.find('tr#upload-' + index)
			, tds = tr.children();
			tds.eq(2).html('<span style="color: #5FB878;">ä¸ä¼ æå</span>');
			tds.eq(3).html(''); //æ¸ç©ºæä½
			//tds.eq(3).find('.demo-reload').addClass('layui-hide'); //éèä¸ä¼
			return delete this.files[index]; //å é¤æä»¶éåå·²ç»ä¸ä¼ æåçæä»¶
			}
			this.error(index, upload);
			}
			, error: function (index, upload) {
			var tr = ProImgByList.find('tr#upload-' + index)
			, tds = tr.children();
			tds.eq(2).html('<span style="color: #FF5722;">ä¸ä¼ å¤±è´¥[æ£æ¥æä»¶ååæä»¶æ ¼å¼]</span>');
			tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //æ¾ç¤ºä¸ä¼
			}
			});
			}



			//æ«æºå
			function GetMeesageBySourceBillNo(obj) {
			var HSourceBillNo = $('#HSourceBillNo').val()