MES-WEB-LayUI.git

			@@ -68,14 +68,13 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>



			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>


			<div class="layui-colla-content">
			@@ -89,6 +88,12 @@
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
			<option value="">å¨é¨</option>
			<option value="æç¾é">æç¾é</option>
			<option value="å¾å·§ä¹">å¾å·§ä¹</option>
			<option value="æ¶æä»">æ¶æä»</option>
			<option value="æ±æ¬§é³">æ±æ¬§é³</option>
			<option value="ææ°çº¢">ææ°çº¢</option>
			</select>
			</div>
			</div>
			@@ -103,11 +108,11 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -118,6 +123,12 @@
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ§ç©æç¼ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -132,8 +143,8 @@
			<input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
			<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFeedback" lay-filter="HFeedback">
			<option value="" selected>å¨é¨</option>
			@@ -144,15 +155,25 @@
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			<option value="" selected>å¨é¨</option>
			<option value="æªå®æ" selected>æªå®æ</option>
			<option value="å·²å®æ">å·²å®æ</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>
			@@ -160,6 +181,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			@@ -188,6 +210,7 @@
			var sWhere = "";
			var option = [];
			var Name = "MouldProdInHouseCellWidth";
			var HModName = "Cg_POOrderBillList";
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -230,6 +253,9 @@
			case 'btn-yxj': set_Yxj();
			break;
			case 'btn-back': set_Back();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});
			@@ -293,14 +319,16 @@
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			//get_HEmpName();
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			@@ -309,31 +337,43 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			//, { field: 'HBillType', title: 'HBillType', hide: true }
			//, { field: 'HSupID', title: 'HSupID', hide: true }
			//, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 130 }
			, { field: 'æ§ç©æç¼ç ', title: 'æ§ç©æç¼ç ', width: 130 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'å¯æå°æ¡ç æ°é', title: 'å¯æå°æ¡ç æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'å¯åè´§æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'éææ°é', title: 'éææ°é', width: 120 }
			, { field: 'å®æ¶æ°é', title: 'å®æ¶æ°é', width: 120 }
			, { field: 'å¥åºæ°é', title: 'å¥åºæ°é', width: 120 }
			, { field: 'å©ä½å¥åºæ°é', title: 'å©ä½å¥åºæ°é', width: 120 }
			, { field: 'å©ä½æ¶ææ°é', title: 'å©ä½æ¶ææ°é', width: 120 }
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			//, { field: 'HUnitID', title: 'HUnitID', hide: true } éå¤
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			//, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			//, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			@@ -436,7 +476,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
			content: './Cg_POOrderBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			@@ -456,12 +496,12 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾å¨å·éè´å¥åºå'
			, title: 'ç¼è¾éè´è®¢å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
			, content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			get_FastQuery(table, option);
			@@ -485,8 +525,8 @@
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MouldProdInBill/set_DeleteBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -525,7 +565,7 @@
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
			, resize: false
			})
			@@ -994,8 +1034,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			@@ -1007,7 +1047,12 @@
			//var HXTFKStatus = $("#HXTFKStatus").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ

			var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ
			var HOldMaterNumber = $("#HOldMaterNumber").val();//æ§ç©æç¼ç

			if (HOldMaterNumber) {
			sWhere += " and æ§ç©æç¼ç like '%" + HOldMaterNumber + "%'";
			}
			if (HStatus) {
			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			}
			@@ -1051,6 +1096,12 @@
			sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

			}
			if (HFinishStatus) {
			sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

			}
			//æ·»å æ¥è¯¢æ¡ä»¶ï¼æ ¹æ®å½åç»å½ç¨æ·å³èèåè¿åæ°æ®
			//sWhere += " and HUserID =" + sessionStorage["Czybm"]
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -1074,9 +1125,9 @@
			function set_ResCnz() {
			var HBillno2 = $('#HBillno2').val();
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
			url: GetWEBURL() + '/Cg_POOrderBill/Cg_POOrderBillViewApi',
			type: "GET",
			data: { "HBillNo": HBillno2,"HBillType":1102 },
			data: { "BillNo": HBillno2,"BillType":1102 },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -1124,6 +1175,126 @@
			}
			})
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid","HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if(dataCol[i]){
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>