From c357c383608c56b96f4cd82870fe6e1ae7c7aa1a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 22 五月 2025 08:51:31 +0800
Subject: [PATCH] fix: 修正 批改页面中 选中样式 问题
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/基础资料/公用基础资料/Gy_MaterialCorrection.html | 52 +++++++++++++++++++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index cbf1153..2f7c57c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
index 017b0d8..68e7137 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
@@ -273,6 +273,7 @@
var tempOption = []
var tempData = []
var tempIns = []
+ var dataChecked = false
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -502,10 +503,10 @@
if (obj.type === 'all') { // 鍏ㄩ�変簨浠�
if (obj.checked === true) {
let checked = $(document.getElementsByClassName('layui-form-checked'))
- checked.closest('tr').not(':has(th)').attr({ "style": "background:#ceedfa;color:black" }).addClass('checked');
+ checked.closest('tr').not(':has(th)').not(':has(.data-confirm)').attr({ "style": "background:#ceedfa;color:black" }).addClass('checked');
} else {
let checked = $(document.getElementsByClassName('checked'))
- checked.closest('tr').not(':has(th)').attr({ "style": "background: #ffffff;color: #666666" }).removeClass('checked');
+ checked.closest('tr').not(':has(th)').not(':has(.data-confirm)').attr({ "style": "background: #ffffff;color: #666666" }).removeClass('checked');
}
}
});
@@ -535,7 +536,7 @@
}
//#endregion
- //鑾峰彇缁勭粐
+ //#region 鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
@@ -557,7 +558,7 @@
}
})
}
-
+ //#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
@@ -828,7 +829,7 @@
}
//#endregion
- //瀛樺偍閰嶇疆鏂囦欢
+ //#region瀛樺偍閰嶇疆鏂囦欢
function get_WriteConfigFile() {
//娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
localStorage.removeItem("Gy_SouceList");
@@ -843,6 +844,7 @@
//鏈湴瀛樺偍
localStorage.setItem("Gy_SouceList", JSON.stringify(data));
}
+ //#endregion
//#region 鍚戦〉闈腑娣诲姞鏂扮殑杩囨护鍣�
function add_Filter() {
@@ -867,8 +869,6 @@
d.name = d.name + '-' + count;
}
})
-
-
filterUnit = filterUnit.html();
$('#btnAddFilter').before(filterUnit);
@@ -1118,20 +1118,26 @@
var checked = $(document.getElementsByClassName('layui-form-checked'))
// checked.addClass('row-locked')
-
- checked.closest('tr').attr({
+
+ checked.closest('tbody').find('tr').filter(':has(.layui-form-checked)').attr({
style: 'background: #dddddd !important; ' +
'cursor: not-allowed !important; pointer-events: none !important'
- })
+ }).addClass('data-confirm')
var $checkbox = checked.find('input[type="checkbox"]')
$checkbox.addClass('layui-checkbox-disbaled layui-disabled').attr('disabled', true);
form.render("select")
+ dataChecked = true
+ }else {
+ // 娌℃湁閫変腑鏁版嵁锛屽垯娓呯┖涓存椂琛�
+ table.reload("tempTable", {
+ data: []
+ })
}
}
+ //#region 淇濆瓨涓存椂琛�
function set_BillSave(mode) {
-
try {
if (mode === 1) {
var filterConditions = $('#filter-condition-wrapper')
@@ -1148,17 +1154,26 @@
var checked = $(document.getElementsByClassName('layui-form-checked'))
// checked.addClass('row-locked')
- checked.closest('tr').attr({
+ checked.closest('tbody').find('tr').filter(':has(.layui-form-checked)').attr({
style: 'background: #ceedfa; ' +
'cursor: auto; pointer-events: auto'
- })
+ }).removeClass('data-confirm')
var $checkbox = checked.find('input[type="checkbox"]')
$checkbox.removeClass('layui-checkbox-disbaled layui-disabled').attr('disabled', false);
form.render()
+ dataChecked = false
return; // 瑙嗕负閫�鍑�
}
- let data = tempOption.data;
+ let data = table.cache['tempTable'];
+ if(dataChecked === false) {
+ layer.alert('璇峰厛纭鏁版嵁鍐嶈繘琛屾彁浜�!', {icon: 5})
+ return;
+ }
+ if(data.length < 1) {
+ layer.alert('璇疯嚦灏戦�変腑涓�鏉℃暟鎹�!', {icon: 5})
+ return;
+ }
let dataMapped = data.map(item => {
let mapped = Object.assign(item,
@@ -1475,9 +1490,9 @@
// $("#ColName").empty();
// $("#ColName").append(Organization);
- var filterGroup = $('#filter-group')
+ let filterGroup = $('#filter-group')
Array.from(filterGroup.find('select')).forEach(d => {
- var temp = $(d).val()
+ let temp = $(d).val()
if (colNameReg.test(d.id)) {
$(d).empty();
$(d).append(Organization);
@@ -1920,6 +1935,7 @@
});
}
//#endregion
+ //#region 鍏冪礌鏈夋晥鎬ф牎楠�
function elementValidCheck(element) {
if (element.type === 'checkbox') {
return false
@@ -1944,7 +1960,8 @@
}
return true
}
-
+ //#endregion
+ //#region 鏍规嵁鍏冪礌鍚嶅垽鏂簨浠跺悕
function elementEventBindCheck(element) {
const UnitReg = /璁￠噺|Unit/;
const WHReg = /浠撳簱|WH/;
@@ -1965,6 +1982,7 @@
return null
}
}
+ //#endregion
function divisionJudgment(divisionStr) {
switch (divisionStr) {
--
Gitblit v1.9.1