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,7 +143,7 @@
			<input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFeedback" lay-filter="HFeedback">
			@@ -144,7 +155,7 @@
			</select>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<div class="layui-inline">
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			@@ -160,9 +171,9 @@
			<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-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-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-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>
			@@ -311,7 +322,7 @@
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			//get_HEmpName();
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			}
			@@ -334,12 +345,23 @@
			, { 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 }
			@@ -454,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);
			@@ -474,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);
			@@ -503,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 () {
			@@ -1026,7 +1048,11 @@
			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 + "%'";
			}
			@@ -1075,7 +1101,7 @@

			}
			//æ·»å æ¥è¯¢æ¡ä»¶ï¼æ ¹æ®å½åç»å½ç¨æ·å³èèåè¿åæ°æ®
			sWhere += " and HUserID =" + sessionStorage["Czybm"]
			//sWhere += " and HUserID =" + sessionStorage["Czybm"]
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -1099,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 () {
			@@ -1201,7 +1227,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if(dataCol[i]){
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;