From 8c3fad6d162b780679432739b09abe893e7069e2 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 19 十二月 2025 17:06:42 +0800
Subject: [PATCH] 工价阶梯优化
---
WebTM/WebTM.csproj.user | 27 ++
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillEdit.html | 2
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html | 522 +++++----------------------------------------------
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 4
WebTM/Vlog/webapi20251219.txt | 17 +
WebTM/layuiadmin/Scripts/webConfig.js | 14 -
6 files changed, 105 insertions(+), 481 deletions(-)
diff --git a/WebTM/Vlog/webapi20251219.txt b/WebTM/Vlog/webapi20251219.txt
new file mode 100644
index 0000000..88a999d
--- /dev/null
+++ b/WebTM/Vlog/webapi20251219.txt
@@ -0,0 +1,17 @@
+2025/12/19 16:35:55 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:35:56 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:35:56 ReportDataSet:1
+
+2025/12/19 16:36:27 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:36:27 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:36:27 ReportDataSet:1
+
+2025/12/19 16:51:08 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:51:08 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:51:08 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 17a8236..e26c84d 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,6 +1,31 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d77cc5e..91527bb 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,19 +7,9 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
-<<<<<<< HEAD
-
- var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
-
-/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
-
-=======
- var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
->>>>>>> a12e0abce941275b1d4295790546c673e556cd89
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
index 9d8f8b8..226dc80 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
@@ -948,7 +948,7 @@
OperationType = 3;
}
} else {
- layer.msg("宸ュ簭鏈�夋嫨");
+ layer.msg(result.Message);
}
},
error: function (xhr, status, error) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
index fad6f7e..3979ea4 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
@@ -173,7 +173,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="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" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
@@ -221,15 +221,13 @@
console.log("GetWEBURL:", typeof GetWEBURL);
var HModName = "Gy_SteppedPriceCoefficientBillList";
- var HBillType = "GYSTPRICECOEFF";
+ var HBillType = "3341";
var HMaker = sessionStorage["HUserName"];
var Organization = sessionStorage["Organization"];
// 鏌ヨ鏉′欢
var sWhere = "";
var option = {};
- var page = 1;
- var size = 50;
var set_HideButton_ID = "toolbarDemo_ButtonSet"; // 鎸夐挳瀹瑰櫒ID
//#region 銆愯繃婊ゆ柟妗堛��
@@ -344,8 +342,6 @@
//鍒锋柊
function btn_Refresh() {
$("#btnSearch").click();
- // 鍒锋柊鍚庨噸鏂拌缃垪鏍囬
- setTimeout(refreshTableWithChineseTitles, 500);
}
@@ -387,7 +383,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: false
+ , page: true
, cellMinWidth: 120
, totalRow: true
, limit: 50
@@ -413,128 +409,6 @@
console.log("琛ㄦ牸鍒濆鍖栧畬鎴�");
}
- // 瀛楁鍚嶅埌涓枃鏍囬鐨勬槧灏�
- function getColumnChineseTitle(fieldName) {
- var titleMap = {
- // 涓昏〃瀛楁
- "HInterID": "鍗曟嵁鍐呯爜",
- "HItemMainID": "涓昏〃鍐呯爜",
- "HBillNo": "鍗曟嵁鍙�",
- "HDate": "鍗曟嵁鏃ユ湡",
- "HYear": "骞翠唤",
- "HPeriod": "鏈堜唤",
- "HBillType": "鍗曟嵁绫诲瀷",
- "HBillSubType": "鍗曟嵁瀛愮被鍨�",
- "HBillStatus": "鍗曟嵁鐘舵��",
- "HRemark": "涓昏〃澶囨敞",
- "HChecker": "瀹℃牳浜�",
- "HCheckDate": "瀹℃牳鏃ユ湡",
- "HMaker": "鍒跺崟浜�",
- "HMakeDate": "鍒跺崟鏃ユ湡",
- "HUpDater": "淇敼浜�",
- "HUpDateDate": "淇敼鏃ユ湡",
- "HCloseMan": "鍏抽棴浜�",
- "HCloseDate": "鍏抽棴鏃ユ湡",
- "HCloseType": "鍏抽棴绫诲瀷",
- "HDropMan": "浣滃簾浜�",
- "HDropDate": "浣滃簾鏃ユ湡",
- "HReturnMan": "閫�鍥炰汉",
- "HReturnDate": "閫�鍥炴棩鏈�",
- "HReturnReason": "閫�鍥炲師鍥�",
- "HProcID": "宸ュ簭ID",
- "HEmpID": "璐熻矗浜篒D",
- "HDeptID": "閮ㄩ棬ID",
- "HStockOrgID": "缁勭粐ID",
-
- // 瀛愯〃瀛楁
- "HItemID": "瀛愯〃鍐呯爜",
- "RowNum": "搴忓彿",
- "HMinQty": "鏈�灏忔暟閲�",
- "HMaxQty": "鏈�澶ф暟閲�",
- "HCoefficient": "宸ヤ环绯绘暟",
- "HMaxPrice": "鏈�澶у伐浠�",
- "HRowCloseMan": "琛屽叧闂汉",
- "HRowCloseDate": "琛屽叧闂棩鏈�",
- "HRowCloseType": "琛屽叧闂被鍨�",
- "HRowRemark": "瀛愯〃澶囨敞",
- "HRelativeQty": "鍏宠仈鏁伴噺",
- "HRelativeMoney": "鍏宠仈閲戦",
- "HSubStockOrgID": "瀛愯〃缁勭粐ID",
- "HSourceHInterID": "婧愬崟ID",
- "HSourceItemID": "婧愬崟瀛怚D",
- "HSourceBillNo": "婧愬崟鍗曞彿",
- "HSourceBillType": "婧愬崟绫诲瀷",
- // 鏂板鐨勬眹鎬诲瓧娈�
- "TotalMinQty": "鎬绘渶灏忔暟閲�",
- "TotalMaxQty": "鎬绘渶澶ф暟閲�",
- "TotalCoefficient": "鎬荤郴鏁�",
- "SubCount": "瀛愯〃琛屾暟",
- "TotalMaxPrice": "鎬讳环鏍�"
-
-
- };
-
- return titleMap[fieldName] || fieldName;
- }
-
- // ========== 鏍稿績淇锛氱洿鎺ヤ娇鐢ㄩ澶勭悊鏁版嵁 ==========
- // 鍩轰簬鎺у埗鍙版樉绀虹殑鏁版嵁鏍煎紡杩涜绠�鍗曞鐞�
- // 瓒呯骇绠�鍗曠殑鏃ユ湡鏄剧ず鍑芥暟 - 涓撻棬澶勭悊鎮ㄧ殑鏁版嵁鏍煎紡
- // 閫氱敤鏃ユ湡鏍煎紡鍖栧嚱鏁� - 閫傞厤鎵�鏈夊悗绔繑鍥炴牸寮�
- function formatDateForDisplay(fieldName, dateValue) {
- if (!dateValue) return '';
-
- // 杞负瀛楃涓插苟娓呯悊棣栧熬绌烘牸
- var str = String(dateValue).trim();
-
- // 杩囨护缁濆鏃犳晥鐨勯粯璁ゆ棩鏈�
- var invalidDates = ['2001-10-01', '1900-01-01', '2000-01-01', '1970-01-01'];
- if (invalidDates.some(invalid => str.startsWith(invalid))) {
- return '';
- }
-
- // 鍦烘櫙1锛氬鐞嗙壒娈婃牸寮� 2025-12-11(15):48:28
- if (str.includes('(') && str.includes(')')) {
- try {
- // 鎻愬彇鏃ユ湡閮ㄥ垎 2025-12-11 鍜屾椂闂撮儴鍒� 15:48:28
- var datePart = str.split('(')[0].trim();
- var timePart = str.split('(')[1].replace(')', '').split(':').slice(0, 3).join(':');
- // 鍗曟嵁鏃ユ湡鍙樉绀烘棩鏈燂紝鍏朵粬鏃堕棿鏄剧ず瀹屾暣鏍煎紡
- return fieldName === 'HDate' ? datePart : `${datePart} ${timePart}`;
- } catch (e) {
- console.warn(`瑙ｆ瀽鐗规畩鏍煎紡鏃ユ湡澶辫触: ${str}`, e);
- }
- }
-
- // 鍦烘櫙2锛氬鐞� ISO 鏍煎紡 2025-12-16T14:33:50 鎴� 2025-12-16T14:33:50.35
- if (str.includes('T')) {
- try {
- var [datePart, timePart] = str.split('T');
- // 绉婚櫎鏃堕棿閮ㄥ垎鐨勬绉�
- var cleanTime = timePart.includes('.') ? timePart.split('.')[0] : timePart;
- // 鍙繚鐣欐椂鍒嗙
- cleanTime = cleanTime.split(':').slice(0, 3).join(':');
- return fieldName === 'HDate' ? datePart : `${datePart} ${cleanTime}`;
- } catch (e) {
- console.warn(`瑙ｆ瀽ISO鏍煎紡鏃ユ湡澶辫触: ${str}`, e);
- }
- }
-
- // 鍦烘櫙3锛氬鐞嗙函鏃ユ湡 2025-12-16 鎴� 瀹屾暣鏃堕棿 2025-12-16 14:33:50
- if (str.match(/^\d{4}-\d{2}-\d{2}/)) {
- // 鍖归厤 骞�-鏈�-鏃� 寮�澶寸殑鍚堟硶鏍煎紡
- if (fieldName === 'HDate' || str.length === 10) {
- return str.substring(0, 10); // 鍙樉绀烘棩鏈�
- } else {
- // 琛ュ叏鏃堕棿閮ㄥ垎锛堝鏋滃彧鏈夋棩鏈燂級
- return str.length > 10 ? str : `${str} 00:00:00`;
- }
- }
-
- // 鎵�鏈夎В鏋愬け璐ョ殑鎯呭喌锛岃繑鍥炲師濮嬪�硷紙閬垮厤绌烘樉绀猴級
- return str;
- }
-
//鍔犺浇缃戞牸锛堝姩鎬佸垪鍔犺浇鏂规硶锛�
@@ -551,320 +425,70 @@
"user": sessionStorage["HUserName"] || "guest"
},
success: function (data1) {
- console.log("=== API 杩斿洖鏁版嵁 ===");
-
- if (data1 && data1.list && data1.list.length > 0) {
- console.log("鍒楀畾涔夋暟閲�:", data1.list.length);
-
- // 姝ラ1锛氬垪鍘婚噸
- var uniqueColumns = [];
- var seenColumns = new Set();
- var columnData = [];
-
- for (var key in data1.list) {
- var colDef = data1.list[key];
- var colName = colDef.ColmCols;
-
- if (!seenColumns.has(colName)) {
- seenColumns.add(colName);
- uniqueColumns.push(colDef);
- columnData.push({
- "id": colName,
- "name": colName,
- "Type": colDef.ColmType,
- "chineseTitle": getColumnChineseTitle(colName)
- });
- }
- }
-
- console.log("鍘婚噸鍚庡垪鏁�:", columnData.length);
-
- // 姝ラ2锛氭瀯寤鸿〃鏍煎垪閰嶇疆 - 浣跨敤宸ュ巶鍑芥暟閬垮厤闂寘闂
+ if (data1.code == 1) {
+ var data = [];
var col = [];
-
- // 娣诲姞鍕鹃�夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
-
- // 鍒涘缓妯℃澘鍑芥暟鐢熸垚鍣�
- function createTempletFunction(fieldName, fieldType) {
- switch (fieldType) {
- case 'DateTime':
- return function (d) {
- var value = d[fieldName];
- if (!value) return '';
-
- var str = String(value).trim();
-
- // 杩囨护鏃犳晥鏃ユ湡
- var invalidDates = ['2001-10-01', '1900-01-01', '2000-01-01', '1970-01-01', '0001-01-01'];
- if (invalidDates.some(invalid => str.startsWith(invalid))) {
- return '';
- }
-
- // 鎻愬彇鏃ユ湡閮ㄥ垎
- if (str.includes('(')) {
- return str.split('(')[0].trim();
- } else if (str.includes('T')) {
- return str.split('T')[0];
- } else if (str.match(/^\d{4}-\d{2}-\d{2}/)) {
- return str.substring(0, 10);
- }
-
- return str;
- };
-
- case 'Decimal':
- case 'Double':
- case 'Float':
- return function (d) {
- var value = d[fieldName];
- if (value === null || value === undefined || value === '') {
- return '';
- }
- var num = parseFloat(value);
- return isNaN(num) ? '' : num.toFixed(2);
- };
-
- case 'Int32':
- case 'Int64':
- case 'Integer':
-
-
- // 鏁存暟绫诲瀷鐨勭壒娈婂鐞�
- if (fieldName === 'HBillStatus') {
- return function (d) {
- var status = d[fieldName] || '0';
- // 杞崲涓烘暟瀛楀啀鍒ゆ柇
- var statusNum = parseInt(status);
- switch (statusNum) {
- case 1: return '鏈';
- case 2: return '瀹℃牳閫氳繃';
- case 3: return '鍏抽棴';
- case 4: return '浣滃簾';
- case 5: return '瀹℃牳閫�鍥�';
- case 6: return '瀹℃牳涓�';
- case 7: return '宸查槄';
- case 8: return '宸插洖澶�';
- case 9: return '缁撴';
- case 10: return '楠岃瘉';
- case 11: return '涓嬭揪';
- case 12: return '寮�宸�';
- case 13: return '鐢宠瀹℃壒';
- case 15: return '鐢宠妫�楠�';
- case 16: return '鍒ゅ畾鍚堟牸';
- case 17: return '鍒ゅ畾涓嶅悎鏍�';
- case 0:
- default: return '鏈'; // 榛樿鏄剧ず涓烘湭瀹�
- }
- };
- }
- return null; // 鍏朵粬鏁存暟绫诲瀷涓嶉渶瑕佺壒娈婃ā鏉�
-
- default:
- // 鏂囨湰瀛楁鐨勭壒娈婂鐞�
- if (fieldName === 'HBillNo') {
- return function (d) {
- var billNo = d[fieldName] || '';
- return '<span style="color: blue; cursor: pointer;">' + billNo + '</span>';
- };
- }
- return null;
- }
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
-
- // 鍒涘缓浜嬩欢澶勭悊鏄犲皠
- function getEventForField(fieldName) {
- if (fieldName === 'HBillNo') {
- return '鍗曟嵁鍙�';
- }
- return null;
- }
-
- // 鑾峰彇瀹藉害璁剧疆
- function getWidthForField(fieldName, fieldType) {
- if (fieldName === 'HBillNo') return 500;
- if (fieldName === 'HBillStatus') return 100;
- if (fieldType === 'DateTime') return 160;
- if (fieldType === 'Decimal' || fieldType === 'Double' || fieldType === 'Float') return 120;
- if (fieldType === 'Int32' || fieldType === 'Int64' || fieldType === 'Integer') return 100;
- return 150;
- }
-
- // 鑾峰彇瀵归綈鏂瑰紡
- function getAlignForField(fieldType) {
- if (fieldType === 'Decimal' || fieldType === 'Double' || fieldType === 'Float' ||
- fieldType === 'Int32' || fieldType === 'Int64' || fieldType === 'Integer') {
- return 'right';
- }
- return 'center';
- }
-
- // 鏋勫缓鍒楅厤缃�
- // 鏋勫缓鍒楅厤缃�
- for (var i = 0; i < columnData.length; i++) {
- var colItem = columnData[i];
- var columnTitle = colItem.chineseTitle;
- var fieldName = colItem.id;
- var fieldType = colItem.Type;
- var columnTitle = getColumnChineseTitle(fieldName); // 杩欓噷閲嶅浜嗭紝鍒犻櫎杩欎竴琛�
-
- var columnConfig = {
- field: fieldName,
- title: columnTitle, // 纭繚浣跨敤涓枃鏍囬
- align: getAlignForField(fieldType),
- sort: true,
- width: getWidthForField(fieldName, fieldType)
- };
-
-
- // 璁剧疆妯℃澘鍑芥暟
- var templetFunc = createTempletFunction(fieldName, fieldType);
- if (templetFunc) {
- columnConfig.templet = templetFunc;
- }
-
- // 璁剧疆浜嬩欢
- var event = getEventForField(fieldName);
- if (event) {
- columnConfig.event = event;
- }
-
- col.push(columnConfig);
- }
-
- console.log("鏋勫缓鐨勫垪閰嶇疆鏁伴噺:", col.length);
- // 璋冭瘯锛氭樉绀哄墠鍑犱釜鍒楃殑閰嶇疆
- for (var j = 0; j < Math.min(5, col.length); j++) {
- console.log(`鍒�${j}: field=${col[j].field}, title=${col[j].title}, templet=${typeof col[j].templet}`);
- }
-
- // 姝ラ3锛氬鐞嗚〃鏍兼暟鎹�
- var tableData = data1.data || [];
- console.log("鍘熷鏁版嵁鏉℃暟:", tableData.length);
-
- // 璋冭瘯锛氭樉绀哄墠鍑犺鏁版嵁鐨勬墍鏈夊瓧娈�
- if (tableData.length > 0) {
- console.log("=== 绗竴琛屾暟鎹畬鏁寸粨鏋� ===");
- var firstRow = tableData[0];
- for (var key in firstRow) {
- console.log(`${key}: ${firstRow[key]} (绫诲瀷: ${typeof firstRow[key]})`);
- }
- }
-
- // 濡傛灉鏄富琛ㄥ垪琛紝鎸夊崟鎹彿鍘婚噸
- if (tableData.length > 0 && tableData[0].HBillNo) {
- var uniqueMap = {};
- var uniqueList = [];
-
- for (var k = 0; k < tableData.length; k++) {
- var row = tableData[k];
- var billNo = row.HBillNo;
-
- if (!uniqueMap[billNo]) {
- uniqueMap[billNo] = true;
- uniqueList.push(row);
- }
- }
-
- tableData = uniqueList;
- console.log("鍘婚噸鍚庢暟鎹潯鏁�:", tableData.length);
- }
-
- // 姝ラ4锛氶厤缃苟娓叉煋琛ㄦ牸
- option.cols = [col];
- option.data = tableData;
-
- console.log("option 閰嶇疆:", {
- colsLength: option.cols[0].length,
- dataLength: option.data.length
- });
-
- // 鍒楄缃�
- // 淇敼 get_Display 鍑芥暟涓殑鍒楄缃儴鍒�
- // 鍒楄缃�
- // 鍒楄缃�
- if (typeof DisPlay_HideColumn === 'function') {
- // 鍏堜繚瀛樺師濮嬪垪閰嶇疆锛堜腑鏂囨爣棰橈級
- var originalCols = [];
- for (var i = 0; i < col.length; i++) {
- originalCols.push({
- field: col[i].field,
- title: col[i].title,
- align: col[i].align,
- sort: col[i].sort,
- width: col[i].width,
- templet: col[i].templet,
- event: col[i].event
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
});
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ }
}
-
- // 鎵ц鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
-
- // 寮哄埗鎵ц涓枃鏍囬鎭㈠
- setTimeout(function () {
- if (option.cols && option.cols[0]) {
- var currentCols = option.cols[0];
- for (var i = 0; i < currentCols.length; i++) {
- var currentCol = currentCols[i];
- if (currentCol.field && currentCol.field !== 'LAY_CHECKED' && currentCol.field !== 'checkbox') {
- // 鏌ユ壘鍘熷閰嶇疆涓殑涓枃鏍囬
- for (var j = 0; j < originalCols.length; j++) {
- if (originalCols[j].field === currentCol.field) {
- currentCol.title = originalCols[j].title;
- break;
- }
- }
- }
- }
- }
-
- // 閲嶆柊娓叉煋琛ㄦ牸
- try {
- table.render(option);
- console.log("琛ㄦ牸宸查噸鏂版覆鏌擄紝鍒楁爣棰樺己鍒朵负涓枃");
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- }
- }, 200);
}
- // 閲嶆柊鍒濆鍖栦笅鎷夋
- ColFilter();
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+ ins = table.render(option);
- // 娓叉煋琛ㄦ牸
- // 娓叉煋琛ㄦ牸
- try {
- // 鍏堥攢姣佹棫鐨勮〃鏍�
- var mainTable = table.render(option);
- console.log("琛ㄦ牸娓叉煋鎴愬姛");
-
- // 娴嬭瘯锛氭鏌ヨ〃鏍兼暟鎹�
- var tableCache = table.cache.mainTable;
- if (tableCache && tableCache.length > 0) {
- console.log("琛ㄦ牸缂撳瓨绗竴琛屾暟鎹�:");
- var cacheRow = tableCache[0];
- console.log("HBillNo:", cacheRow.HBillNo);
- console.log("HDate:", cacheRow.HDate);
- console.log("TotalCoefficient:", cacheRow.TotalCoefficient);
- }
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- layer.msg("琛ㄦ牸娓叉煋澶辫触: " + e.message, { icon: 5 });
- }
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(wait);
- if (tableData.length > 0) {
- layer.msg(`鍏� ${tableData.length} 鏉℃暟鎹甡, { icon: 1, time: 2000 });
- } else {
- layer.msg("鏆傛棤鏁版嵁", { icon: 3, time: 2000 });
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
}
+
} else {
- console.warn("鏁版嵁鏍煎紡涓嶆纭垨 list 涓虹┖");
layer.close(wait);
- layer.msg("鏁版嵁鍔犺浇澶辫触", { icon: 2 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
+
+
},
error: function (xhr, status, error) {
console.error("AJAX 璇锋眰閿欒:", error);
@@ -959,13 +583,13 @@
// 娣诲姞鏃ユ湡鏉′欢
if (HMakeDate_Begin) {
- sWhere += " and CONVERT(date, HMakeDate) >= '" + HMakeDate_Begin + "'";
+ sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) >= '" + HMakeDate_Begin + "'";
}
if (HMakeDate_End) {
- sWhere += " and CONVERT(date, HMakeDate) <= '" + HMakeDate_End + "'";
+ sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) <= '" + HMakeDate_End + "'";
}
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
// 绉婚櫎寮�澶寸殑 "and "
@@ -1061,7 +685,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1079,7 +702,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1102,7 +724,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1129,7 +750,6 @@
if (result.code === "1") {
layer.msg("鍒犻櫎鎴愬姛锛�", { time: 1000, icon: 1 }, function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
});
} else {
layer.msg(result.Message || "鍒犻櫎澶辫触", { icon: 2 });
@@ -1174,7 +794,6 @@
if (result.code === "1") {
layer.msg(result.Message || (num === 1 ? "瀹℃牳鎴愬姛" : "鍙嶅鏍告垚鍔�"), { time: 1000, icon: 1 }, function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
});
} else {
layer.msg(result.Message || "鎿嶄綔澶辫触", { icon: 2 });
@@ -1189,34 +808,7 @@
}
}
//#endregion
- function refreshTableWithChineseTitles() {
- console.log("=== 寮�濮嬭缃腑鏂囧垪鏍囬 ===");
-
- // 纭繚鍒楁爣棰樹负涓枃
- if (option.cols && option.cols[0]) {
- var cols = option.cols[0];
- console.log("褰撳墠鍒楁暟:", cols.length);
-
- for (var i = 0; i < cols.length; i++) {
- var col = cols[i];
- if (col.field && col.field !== 'LAY_CHECKED' && col.field !== 'checkbox') {
- var chineseTitle = getColumnChineseTitle(col.field);
- if (chineseTitle && chineseTitle !== col.field) { // 纭繚涓嶆槸瀛楁鍚嶆湰韬�
- col.title = chineseTitle;
- console.log(`璁剧疆鍒楁爣棰�: ${col.field} -> ${chineseTitle}`);
- }
- }
- }
- }
-
- // 閲嶆柊娓叉煋琛ㄦ牸
- try {
- table.render(option);
- console.log("琛ㄦ牸宸查噸鏂版覆鏌擄紝鍒楁爣棰樹负涓枃");
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- }
- }
+
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable'),
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index 2f24f4c..ef2fe66 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -704,7 +704,7 @@
//#endregion
//#region 鍒嗛〉鏌ヨ
- function get_DisplayPage(sWhere) {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainListPage',
@@ -905,7 +905,7 @@
}
}
//RoadHBillNo(sqlWhere);
- get_DisplayPage(sqlWhere);
+ get_Display(sqlWhere);
}
//#endregion
--
Gitblit v1.9.1