MES-WEB-LayUI.git

			@@ -54,15 +54,20 @@
			</div>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
			<div class="layui-tab" lay-filter="tab-Gy_BarCodeConfirmBill_PDA">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1">æ«ç ä¿¡æ¯</li>
			<li lay-id="2">åæ®ä¿¡æ¯</li>
			<li lay-id="2">è¡¥æ«ä¿¡æ¯</li>
			<li lay-id="3">åæ®ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--æ«ç ä¿¡æ¯-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			<!--è¡¥æ«æ¸åä¿¡æ¯-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="wl-table1" lay-filter="wl-table1"></table>
			</div>
			<!--åæ®ä¿¡æ¯-->
			<div class="layui-tab-item">
			@@ -108,8 +113,11 @@
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">éåº</button>
			</div>
			<div class="layui-col-xs3">
			<!--<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdExport">å¯¼åº</button>
			</div>-->
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSuppRush">è¡¥æ«æ¸å</button>
			</div>
			</div>
			</div>
			@@ -149,6 +157,7 @@
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"]
			var option = [];
			var option1 = [];

			var ins; //ç¨äºå¯¼åºexcel

			@@ -265,6 +274,9 @@

			//#region æ¾ç¤ºå®¢æ·ç©ææ¡ç åè¡¨ä¿¡æ¯
			function DisBillEntryList() {
			//åæ¢é¡µç¾ä¸ºæ«ç åè¡¨
			element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '1');

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			@@ -470,6 +482,12 @@
			get_Export();
			})
			//#endregion

			//#region è¡¥æ«æ¸å åè½æ§ä»¶
			form.on('submit(cmdSuppRush)', function () {
			get_SuppRushList();
			})
			//#endregion
			//#endregion


			@@ -493,6 +511,30 @@
			function set_InitGrid() {
			option = {
			elem: '#wl-table'
			, height: 'full-50'
			//, page: true
			, cellMinWidth: 90
			, limit: 100000
			//, limits: [50, 500, 5000, 20000]
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HItemID', title: 'HItemID', hide: true }
			, { field: 'HInterID', title: 'HInterID', hide: true }
			, { field: 'HBillNo', title: 'åæ®å·', width: 125, sort: true }
			, { field: 'HBillType', title: 'åæ®ç±»å', width: 125, sort: true, hide: true }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', width: 125, sort: true }
			, { field: 'HQty', title: 'æ°é', width: 125, sort: true, totalRow: true, hide: true }
			, { field: 'HOrgID', title: 'HOrgID', sort: true, hide: true }
			, { field: 'HDate', title: 'æ¥æ', width: 125, sort: true }
			, { field: 'HRelationInterID', title: 'HRelationInterID', width: 125, sort: true, hide: true }
			, { field: 'HMaker', title: 'æ«ç äºº', width: 125, sort: true }
			]]
			};

			option1 = {
			elem: '#wl-table1'
			, height: 'full-50'
			//, page: true
			, cellMinWidth: 90
			@@ -578,6 +620,63 @@
			//});
			}
			//#endregion

			//#region è¡¥æ«æ¸å
			function get_SuppRushList() {
			//åæ¢é¡µç¾ä¸ºè¡¥æ«æ¸å
			element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '2');

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/Gy_BarCodeConfirmBill_getSuppRushList',
			async: false,
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HOrgID": HStockOrgID },
			success: function (data1) {
			var col = [];
			if (data1.count == 1) {
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¤ææ¯å¦æ¯çº¯è±æ
			var patrn = new RegExp("[\u4E00-\u9FA5]+");
			col.push({ type: 'radio' });
			col.push({ type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' });
			for (var i = 0; i < data.length; i++) {
			if (!patrn.test(data[i].name)) {
			col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
			}
			else {
			switch (data[i].Type) {
			case 'DateTime':
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
			}
			}
			}

			option1.cols = [col];
			option1.data = data1.data;
			table.cache['wl-table1'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.render(option1);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion
			//#endregion
			});

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/扫码验证/Gy_BarCodeConfirmBill_PDA.html	105 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2013,7 +2013,7 @@
			<publishTime>07/25/2024 11:21:38</publishTime>
			</File>
			<File Include="views/WMSæ«ç æ¨¡å/æ«ç éªè¯/Gy_BarCodeConfirmBill_PDA.html">
			<publishTime>07/25/2024 13:25:01</publishTime>
			<publishTime>07/29/2024 15:15:30</publishTime>
			</File>
			<File Include="views/WMSæ«ç æ¨¡å/æ¡ç åºå¥åºæ¥è¯¢/Gy_BarCodeBillInOut__PDA.html">
			<publishTime>03/05/2024 12:29:40</publishTime>