MES-WEB-LayUI.git

			@@ -27,14 +27,14 @@
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			td:has(select) .layui-table-cell {
			overflow: visible !important;
			padding: 0;
			box-sizing: border-box;
			}

			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			th .layui-form-select {
			/* td:has(select) .layui-form-select {
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			}
			} */
			</style>
			</head>

			@@ -104,9 +104,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< <option value="<">
			<< <option value="<>">
			<>
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -223,11 +225,11 @@
			<option value="0">å§å¤</option>
			</select>
			</script>
			<script type="text/html" id="materFormula">
			<select name="HMaterRuleType" id="HMaterRuleType" lay-verify="HMaterRuleType">
			<option value="å¶ä»">å¶ä»</option>
			<option value="ææ">ææ</option>
			<option value="å©å">å©å</option>
			<script type="text/html" id="Division">
			<select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID" lay-filter="divisionIDSelect">
			<option value="3">æ³¨å¡äºä¸é¨</option>
			<option value="4">è½¯ç£äºä¸é¨</option>
			<option value="0">å¶ä»äºä¸é¨</option>
			</select>
			</script>
			</form>
			@@ -236,6 +238,7 @@
			</div>
			</div>
			<script>
			var optionData = []
			//#region æå æ³¨é
			//#endregion
			layui.config({
			@@ -449,18 +452,30 @@
			// ä¸ææ¡äºä»¶
			form.on('select(materPropertySelect)', function (obj) {
			let value = obj.value
			let curretDate = tempOption.data


			let curretDate = table.cache['tempTable']
			curretDate.forEach(item => {
			if (item.ColmCols === 'ç©æå±æ§') {
			item['value'] = value
			}

			})
			// table.reload('tempTable', {
			// data: tempOption.data,
			// })
			table.reload('tempTable', {
			data: curretDate
			})
			})

			form.on('select(divisionIDSelect)', function (obj) {
			let value = obj.value
			let curretDate = table.cache['tempTable']

			curretDate.forEach(item => {
			if (item.ColmCols === 'äºä¸é¨') {
			item['value'] = value
			}
			})

			table.reload('tempTable', {
			data: curretDate
			})
			})

			//#region æ¥è¯¢æé®
			@@ -684,8 +699,16 @@
			soulTable.render(this);
			}
			}
			let _dataCol;
			//å·æ°è¡¨æ ¼æ°æ®
			// DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			DisPlay_HideColumnWithCallback(HModName, sessionStorage["HUserName"], option, titleData,
			function () {
			let that = this
			_dataCol = dataCol

			}
			)

			ins = table.render(option);

			//å·æ°æé®æ¾ç¤º
			@@ -753,8 +776,18 @@

			// Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);


			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			//å·æ°è¡¨æ ¼æ°æ®
			ins = table.render(option);

			let _newData = option.cols[0]
			let hideCols = []
			_newData.forEach(item => {
			if (item.hide === true) {
			hideCols.push(item.field);
			}
			})

			let list2 = data1.list;
			let data2 = []
			@@ -770,7 +803,7 @@
			tempOption.done = function (res, curr, count) {
			let filterReg = new RegExp(/äºº\|æ¶é´\|ID\|æ è®°\|Flag\|éæ©\|ç©æä»£ç \|ç©æåç§°/i) // éèæå®å±æ§
			$.each(res.data, function (index, item) {
			if (filterReg.test(item.ColmCols) === true) {
			if (filterReg.test(item.ColmCols) === true \|\| hideCols.includes(item.ColmCols)) {
			var tr = $('tr[data-index="' + index + '"] td[data-field="value"]').closest('tr')
			tr.addClass('layui-hide')
			}
			@@ -785,7 +818,23 @@
			$(td).prepend(selectMaterProperty);
			let select = $('tr[data-index="' + index + '"] select[name="HMaterClsID"]'); // ç©æå±æ§å¯¹åºçä¸ææ¡
			if (item['value'] === '') {
			select.val('0');
			select.val(' ');
			} else {
			select.val(item['value']);
			}
			form.render('select')
			}

			if (item.ColmCols === 'äºä¸é¨') {
			let selectMaterProperty = $("#Division").clone(true, true).html();
			let tr = $('tr[data-index="' + index + '"] div:contains("äºä¸é¨")').closest('tr');
			let td = tr.find('td[data-field="value"]') // éè¦åå«ä¸ææ¡çå®¹å¨
			td.removeAttr("data-edit")
			td.find('.layui-table-cell').addClass('layui-hide')
			$(td).prepend(selectMaterProperty);
			let select = $('tr[data-index="' + index + '"] select[name="HDivisionID"]'); // ç©æå±æ§å¯¹åºçä¸ææ¡
			if (item['value'] === '') {
			select.val(' ');
			} else {
			select.val(item['value']);
			}
			@@ -812,7 +861,7 @@
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			// layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			//option.data = [[]]
			//table.render(option);
			@@ -889,8 +938,6 @@
			}
			})



			filterUnit = filterUnit.html();
			$('#btnAddFilter').before(filterUnit);
			ColFilter()
			@@ -919,14 +966,6 @@
			$("#ColContent").val(data2["ColContent"]);
			form.render('select');
			}
			}
			//æ¹éæ´æ°
			function batchUpdate(obj, reg) {
			let field = obj.field;
			let value = obj.value;
			tempData.forEach(item => {
			item[field] = value
			})
			}

			function btnrowDouble(obj) {
			@@ -1187,18 +1226,43 @@
			return; // è§ä¸ºéåº
			}
			let dataObj = {}
			let data = tempOption.data.forEach(item => {
			let data = table.cache['tempTable'].forEach(item => {
			let mergeObj = {}
			mergeObj[item['ColmCols']] = item['value']
			Object.assign(dataObj, mergeObj)
			});
			let mainTableCache = table.checkStatus('mainTable')
			let idStr = '(' + Array.from(mainTableCache.data).map(e => "'" + e.HItemID + "'").join(',') + ')'

			let mainTableCache = table.checkStatus('mainTable').data

			if (mainTableCache.length < 1) {
			layer.alert('è³å°è¦æä¸æ¡éä¸çæ°æ®!', { icon: 5 })
			return
			}
			let metaInfo = mainTableCache.map(item => Object.assign(item, {
			// HOnceRightRate: item['ä¸æ¬¡åæ ¼çæ åå¼']
			// , HDivisionID: divisionJudgment(dataObj['äºä¸é¨'])
			HNumber: item['ç©æä»£ç ']
			// , HName: item['ç©æåç§°']
			// , HModel: item['è§æ ¼åå·']
			// , HMaterClsID: item['ç©æå±æ§']
			// , HRemark: item['å¤æ³¨']
			// , HQtyDec: item['æ°éç²¾åº¦']
			// , HPriceDec: item['åä»·ç²¾åº¦']
			// , HMoneyDec: item['éé¢ç²¾åº¦']
			// , HTaxRate: item['é»è®¤ç¨ç']
			// , HProfitRate: item['é»è®¤å©æ¶¦ç']
			// , HTaxCost: item['å«ç¨ææ¬ä»·']
			// , HFootPrice: item['ç»ç®ä»·']
			// , HWeight: item['åé']
			// , HColorRemark: item['æè²è¦æ±']
			// , HWidth: item['å¹å®½']
			}));
			let idStr = '(' + Array.from(mainTableCache).map(e => "'" + e.HItemID + "'").join(',') + ')'

			let mapped = Object.assign(dataObj,
			{
			HOnceRightRate: dataObj['ä¸æ¬¡åæ ¼çæ åå¼']
			// , HDivisionID: divisionJudgment(dataObj['äºä¸é¨'])
			, HDivisionID: dataObj['äºä¸é¨']
			, HNumber: dataObj['ç©æä»£ç ']
			, HName: dataObj['ç©æåç§°']
			, HModel: dataObj['è§æ ¼åå·']
			@@ -1214,14 +1278,26 @@
			, HWeight: dataObj['åé']
			, HColorRemark: dataObj['æè²è¦æ±']
			, HWidth: dataObj['å¹å®½']
			// , HWHID: dataObj['HWHID']
			}
			)
			let chineseReg = new RegExp(/^[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef]+$/)
			// å»é¤ä¼ è¾æ°æ®çä¸æé¨åï¼æ°æ®åºååç«¯çåæ®µä¸ä¼æ¯ä¸æï¼åå°ä¼ è¾æ°æ®çé¿åº¦
			$.each(mapped, (key, value) => {
			if (value === '' \|\| chineseReg.test(key)) {
			delete mapped[key]
			}
			})

			// XXX: å¯è½å¨æ°æ®éå¤§çæåµä¸å½±åæ§è½ éæå é¤
			$.each(metaInfo[0], (key, value) => {
			if (value === '' \|\| chineseReg.test(key)) {
			metaInfo.forEach(item => {
			delete item[key]
			})
			}
			})


			if (mapped.HNumber == 0) {
			throw "è¯·è¾å¥ç©æä»£ç ï¼";
			@@ -1235,7 +1311,7 @@
			if (mapped.HUnitName == 0) {
			throw "è¯·éæ©ä¸»è®¡éåä½ï¼";
			}
			debugger;
			;
			if (mapped.HWeight !== undefined) {
			let HWeight = mapped.HWeight.toString()
			if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
			@@ -1269,15 +1345,16 @@
			throw "éé¢ç²¾åº¦ï¼è¯·è¾å¥0-9æ£ç¡®æ°å"
			}

			debugger;
			;

			let dataStr = JSON.stringify(mapped)
			metaInfo = JSON.stringify(metaInfo)
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Gy_Material/SaveGy_MaterialList_Modify", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": dataStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + idStr },
			data: { "msg": metaInfo + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + idStr + ';' + dataStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			@@ -1517,11 +1594,17 @@
			var filterGroup = $('#filter-group')
			Array.from(filterGroup.find('select')).forEach(d => {
			var temp = $(d).val()

			if (colNameReg.test(d.id)) {
			$(d).empty();
			$(d).append(Organization);
			}
			$(d).val(temp)
			if (temp === null) {
			$(d).val('0')
			} else {
			$(d).val(temp)
			}

			})
			form.render('select');
			}
			@@ -1740,7 +1823,7 @@
			// $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			// if (event.key == "F7") {
			// var obj = obj
			// debugger;
			// ;
			// }
			// })
			// }
			@@ -1750,6 +1833,7 @@
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (e.key == 'F7') {
			let eventName = obj.event
			let tempTableCacheData = table.cache['tempTable']

			if (eventName === 'onHUnitNameKeyDownHandler') {
			layer.open({
			@@ -1771,7 +1855,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			} else if (checkStatus.data.length === 1) {
			tempOption.data.forEach(item => {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'HUnitName') {
			item['value'] = checkStatus.data[0].è®¡éåä½åç§°
			}
			@@ -1786,13 +1870,34 @@
			}
			})
			table.reload('tempTable', {
			data: tempOption.data
			data: tempTableCacheData
			})
			}

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if (optionData.length > 0) {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'HUnitName') {
			item['value'] = optionData[0].è®¡éåä½åç§°
			}
			if (item.ColmCols === 'HUnitID') {
			item['value'] = optionData[0].HItemID
			}
			if (item.ColmCols === 'è®¡éåä½åç§°') {
			item['value'] = optionData[0].è®¡éåä½åç§°
			}
			if (item.ColmCols === 'è®¡éåä½ä»£ç ') {
			item['value'] = optionData[0].è®¡éåä½ä»£ç
			}
			})
			table.reload('tempTable', {
			data: tempTableCacheData
			})
			}
			}
			})
			}
			else if (eventName === 'onBasicUnitCodeKeyDownHandler') {
			@@ -1815,8 +1920,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			} else if (checkStatus.data.length === 1) {
			debugger
			tempOption.data.forEach(item => {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'HBASEUNITID') {
			item['value'] = checkStatus.data[0].HItemID
			}
			@@ -1828,16 +1932,33 @@
			}
			})
			table.reload('tempTable', {
			data: tempOption.data
			data: tempTableCacheData
			})

			}

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}


			, btn2: function (index, layero) { }
			, end: function () {
			if (optionData.length > 0) {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'HBASEUNITID') {
			item['value'] = optionData[0].HItemID
			}
			if (item.ColmCols === 'åºæ¬è®¡éåä½ä»£ç ') {
			item['value'] = optionData[0].è®¡éåä½ä»£ç
			}
			if (item.ColmCols === 'åºæ¬è®¡éåä½') {
			item['value'] = optionData[0].è®¡éåä½åç§°
			}
			})
			table.reload('tempTable', {
			data: tempTableCacheData
			})

			}
			}
			})
			}
			else if (eventName === 'onWareHouseKeyDownHandler') {
			@@ -1861,11 +1982,11 @@
			return layer.msg('è¯·éæ©ä¸æ¡æ°æ®');
			}

			tempOption.data.forEach(item => {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'ä»åºåç§°') {
			item['value'] = checkStatus.data[0].ä»åºåç§°
			}
			if (item.ColmCols === 'HWhID') {
			if (item.ColmCols === 'HWHID') {
			item['value'] = checkStatus.data[0].HItemID
			}
			if (item.ColmCols === 'ä»åºä»£ç ') {
			@@ -1874,12 +1995,31 @@
			})

			table.reload('tempTable', {
			data: tempOption.data
			data: tempTableCacheData
			})

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if (optionData.length > 0) {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'ä»åºåç§°') {
			item['value'] = optionData[0].ä»åºåç§°
			}
			if (item.ColmCols === 'HWHID') {
			item['value'] = optionData[0].HItemID
			}
			if (item.ColmCols === 'ä»åºä»£ç ') {
			item['value'] = optionData[0].ä»åºä»£ç
			}
			})

			table.reload('tempTable', {
			data: tempTableCacheData
			})
			}
			}
			})
			}
			else if (eventName === 'onMaterialClassKeyDownHandler') {
			@@ -1902,7 +2042,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg('è¯·éæ©ä¸æ¡æ°æ®');
			}
			tempOption.data.forEach(item => {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'ç©æåç±»åç§°') {
			item['value'] = checkStatus.data[0].ç©æåç±»åç§°
			}
			@@ -1915,13 +2055,30 @@
			})

			table.reload('tempTable', {
			data: tempOption.data
			data: tempTableCacheData
			})


			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if (optionData.length > 0) {
			tempTableCacheData.forEach(item => {
			if (item.ColmCols === 'ç©æåç±»åç§°') {
			item['value'] = optionData[0].ç©æåç±»åç§°
			}
			if (item.ColmCols === 'HMaterTypeID') {
			item['value'] = optionData[0].HItemID
			}
			if (item.ColmCols === 'ç©æåç±»ä»£ç ') {
			item['value'] = optionData[0].ç©æåç±»ä»£ç
			}
			})

			table.reload('tempTable', {
			data: tempTableCacheData
			})
			}
			}
			})
			}
			obj.event = ''
			@@ -1999,7 +2156,6 @@
			const WHReg = new RegExp(/ä»åº\|WH/);
			const MaterReg = new RegExp(/ç©æåç±»\|MaterType/);
			const baseMaterReg = new RegExp(/åºæ¬è®¡éåä½ä»£ç \|HBASEUNITID\|åºæ¬è®¡éåä½/)
			debugger;
			if (baseMaterReg.test(colName) === true) {
			return 'onBasicUnitCodeKeyDownHandler';
			} else if (UnitReg.test(colName) === true) {
			@@ -2023,12 +2179,28 @@

			function materClsJudgment(materClsStr) {
			switch (materClsStr) {
			case 'å¤è´': return '1';
			case 'èªå¶': return '2';
			default: return '0';
			case 'å¤è´': return 1;
			case 'èªå¶': return 2;
			default: return 0;
			}
			}

			// è®¡éåä½åè°
			function GetUnitValue(data) {

			optionData = data;
			}

			// ä»åºåè°
			function GetHWHValue(data) {

			optionData = data;
			}

			// ç©æåç±»åè°
			function GetMaterTypeValue(data) {
			optionData = data;
			}

			</script>