MES-WEB-LayUI.git

			@@ -125,6 +125,7 @@

			var sBillType = '1203';
			var col = [];
			var option = {}
			//å¨æå è½½æºåç±»ååè¡¨ new

			//å è½½æºåç±»å
			@@ -132,7 +133,26 @@
			//åå§åçé¢
			function set_ClearBill() {
			get_Display();

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			table.render({
			elem: '#dj-table'
			@@ -141,20 +161,21 @@
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			, { field: 'åæ®åç ', title: 'åæ®åç ', width: 80 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 80 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 100 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100, totalRow: true}
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'çº¢èå', title: 'çº¢èå', width: 100 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})
			table.render(option);
			//å·²ä¸ä¼ åè¡¨
			table.render({
			elem: '#yd-table'
			@@ -173,7 +194,7 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true}
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			@@ -195,7 +216,7 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			@@ -204,8 +225,10 @@
			}

			//éåº
			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"
			form.on('submit(cmdCancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html"
			});
			//window.close();//å³éå½åé¡µ
			})
			//ç¼è¾
			@@ -238,22 +261,25 @@
			form.on('submit(cmdRescind)', function () {
			var checkStatus = table.checkStatus('yd-table');
			var checkStatus2 = table.checkStatus('sy-table');
			var checkStatus3 = table.checkStatus('dj-table');
			var data = "";
			if (checkStatus.data.length != 0) {
			data = checkStatus.data;
			} else if (checkStatus2.data.length != 0) {
			data = checkStatus2.data;
			} else {
			} else if (checkStatus3.data.length != 0) {
			data = checkStatus3.data;
			}else {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			var sInterID = data[0].HInterID
			var sBillNo = data[0].HBillNo
			var sInterID = data[0].HInterID == 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			var sBillNo = data[0].HBillNo == 'undefined' ? data[0].åæ®å· : data[0].HBillNo;
			var sBillType = '1203'
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/Web/Rescind_Json",
			async: true,
			async: false,
			data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
			dataType: "json",
			success: function (data) {
			@@ -274,7 +300,7 @@
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			time: 2000
			}, function () {
			//do something
			});
			@@ -289,14 +315,14 @@
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var sInterID = data[0].HInterID
			var sInterID = data[0].HInterID == 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/Web/Delete_Json",
			async: true,
			async: false,
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			@@ -368,7 +394,7 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			@@ -386,6 +412,7 @@
			$.ajax({
			url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
			type: "GET",
			async:false,
			data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
			success: function (data1) {
			if (data1.count == 1) {
			@@ -395,6 +422,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}

			col.push({ type: 'radio' });
			for (var i = 0; i < data.length; i++) {
			if (data[i].name == 'åæ®åç ' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			@@ -405,23 +433,33 @@
			case 'DateTime':
			col.push({ field: data[i].id, 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;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			table.render({
			option = {
			elem: '#dj-table'
			, cols: [col]
			, data: data1.data
			, height: 550
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			});
			};

			//å¨ææ¾ç¤ºåå
			table.render(option);

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			@@ -435,7 +473,7 @@
			}
			});
			}


			//å·æ°æç»é¡µç¾
			table.render({
			elem: '#mx-table'