From 30f55b75e2323454e33a494786b8d6ce795a4eaa Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 10 二月 2026 23:00:28 +0800
Subject: [PATCH] 成本项目分配标准： 1：核算在制品单选按钮 选中后前端页面未展示 2：对应方法 文本框填写内容未保存 成本费用单： 1：编辑页面，子表增加一行，成本项目按f7，无法带出对应的数据，同理，物料和部门也是 2：子表日期没有控制，需要控制成日期选择器 3：子表尾端增加操作按钮（可以删除子表中的数据）修复了对应的bug
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemAverageType.html | 12
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html | 544 +++++++++++++++++++++---------------------------------
2 files changed, 218 insertions(+), 338 deletions(-)
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/Add_Edit_Gy_CostItemAverageType.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/Add_Edit_Gy_CostItemAverageType.html"
index 08b66fe..0a53928 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/Add_Edit_Gy_CostItemAverageType.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/Add_Edit_Gy_CostItemAverageType.html"
@@ -123,7 +123,7 @@
<div class="layui-col-xs11">
<label class="layui-form-label"> 瀵瑰簲鏂规硶锛�</label>
<div class="layui-input-block">
- <input class="layui-input" name="HProcNam" id="HProcNam" autocomplete="off">
+ <input class="layui-input" name="HProcName" id="HProcName" autocomplete="off">
</div>
</div>
</div>
@@ -311,6 +311,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#HStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
+ $("#HWIPFlag").val(true);
layui.form.render('checkbox');
}
@@ -344,13 +345,14 @@
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
$("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
$("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
- $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
- $("#HCostItemID").val(data.鎴愭湰椤圭洰鍐呯爜);
+ $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵�丠ProcName
$("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
- $("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
+
$("#HFixRate").val(data.鏈熸湯鍦ㄥ埗绯绘暟);
$("#HRemark").val(data.澶囨敞);
- $("input[name='HWIPFlag']").attr("checked", data.鏄惁鏍哥畻鍦ㄥ埗鍝� == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("#HProcName").val(data.瀵瑰簲鏂规硶);
+ $("#HCostItemID").val(data.鎴愭湰椤圭洰鍐呯爜);
+ $("input[name='HWIPFlag']").attr("checked", data.鏄惁鏍哥畻鍦ㄥ埗鍝� == true ? true : false);//true:閫変腑 false:涓嶉�変腑
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
$("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
index b350eb9..b159458 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
@@ -253,11 +253,10 @@
<!--瀛愯〃琛細鍒犻櫎-->
<script type="text/html" id="barDemo">
- <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
-
+
<script>
@@ -293,7 +292,7 @@
}, function () { window.location.href = "../../user/login.html"; });
}
-
+
@@ -356,9 +355,9 @@
});
//#endregion
-
-
+
+
//#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
table.on('toolbar(mainTable)', function (obj) {
@@ -378,16 +377,41 @@
};
switch (obj.event) {
case 'btn-AddLine':
+ // 鑾峰彇褰撳墠鏃ユ湡
+ var today = new Date();
+ var formattedDate = today.getFullYear() + '-' +
+ String(today.getMonth() + 1).padStart(2, '0') + '-' +
+ String(today.getDate()).padStart(2, '0');
+
+ var NewRow = {
+ "HCostItemID": "0"
+ , "HCostItemName": ""
+ , "HMaterID": "0"
+ , "HMaterName": ""
+ , "HMaterialCode": ""
+ , "HDeptName": ""
+ , "HDeptID": "0"
+ , "HMoney": "0"
+ , "HWaster": "0"
+ , "HQty": "0"
+ , "HPrice": "0"
+ , "HDate": formattedDate // 璁剧疆褰撳墠鏃ユ湡
+ , "HBeginBalance": "0"
+ , "HEndBalance": "0"
+ , "HTimes": "0"
+ };
+
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- for (var i = 1; i <= option.data.length; i++) {
- $('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").attr("selected", true);
- }
- form.render('select');
+ // 閲嶆柊缁戝畾鏃ユ湡閫夋嫨鍣ㄤ簨浠�
+ bindDatePickers();
+ layer.msg('澧炲姞涓�琛屾垚鍔燂紒');
break;
+
+
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
if (data.length <= 0) {
@@ -705,6 +729,36 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ // 缁戝畾鏃ユ湡閫夋嫨鍣ㄤ簨浠�
+ function bindDatePickers() {
+ // 绉婚櫎鏃х殑浜嬩欢缁戝畾
+ $(document).off('change', '#mainTable .date-picker');
+
+ // 缁戝畾鏂扮殑浜嬩欢
+ $(document).on('change', '#mainTable .date-picker', function () {
+ var selectedDate = $(this).val();
+ var tr = $(this).closest('tr');
+ var index = tr.attr('data-index');
+
+ // 鑾峰彇琛ㄦ牸鏁版嵁
+ var tableData = table.cache.mainTable;
+ if (tableData && tableData[index]) {
+ // 鏇存柊鏁版嵁
+ tableData[index].HDate = selectedDate;
+
+ // 鍙�夛細濡傛灉闇�瑕佺珛鍗虫洿鏂版樉绀�
+ $(this).val(selectedDate);
+
+ console.log('绗�' + (parseInt(index) + 1) + '琛屾棩鏈熸洿鏂颁负:', selectedDate);
+ }
+ });
+ }
+
+ // 鍦ㄩ〉闈㈠姞杞藉悗鍒濆鍖栫粦瀹�
+ setTimeout(function () {
+ bindDatePickers();
+ }, 300);
+
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -789,7 +843,7 @@
//#region 寮圭獥椤甸潰鏂规硶
- //#region 鍏朵粬搴旀敹鍗曞瓙琛ㄥ垵濮嬪寲
+ //#region
function get_InitGrid() {
option = {
elem: '#mainTable'
@@ -803,41 +857,51 @@
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HCostItemID', title: '鎴愭湰椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCostItemName', title: '鎴愭湰椤圭洰鍚嶇О', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
- , { field: 'HMaterID', title: '鐗╂枡ID', hide: true, event: "HAreaList_1",style: 'background-color: #f9f9f9;' }
+ , { field: 'HMaterID', title: '鐗╂枡ID', hide: true, event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
, { field: 'HMaterialCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
- , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HDeptName', title: '閮ㄩ棬', edit: 'text', event: "HAreaList_2", style: 'background-color: #f9f9f9;' }
, { field: 'HMoney', title: '閲戦', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HWaster', title: '鎹熻��', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
-
- , { field: 'HDate', title: '鏃ユ湡', edit: 'date', style: 'background-color: #f9f9f9;' }
+ , {
+ field: 'HDate',
+ title: '鏃ユ湡',
+ width: 160,
+ edit: false, // 绂佺敤layui鐨勭紪杈戯紝浣跨敤鎴戜滑鑷繁鐨�
+ templet: function (d) {
+ // 浣跨敤HTML5鐨刣ate杈撳叆妗�
+ var dateValue = d.HDate || new Date().toISOString().split('T')[0];
+ return '<input type="date" class="layui-input date-picker" value="' + dateValue + '" style="height: 28px; padding: 0 5px; width: 100%; border: none; background: transparent;">';
+ }
+ }
, { field: 'HBeginBalance', title: '寮�濮嬫暟鍊�', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HEndBalance', title: '缁撴潫鏁板��', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HTimes', title: '鏃堕棿鍛ㄦ湡', edit: 'text', style: 'background-color: #f9f9f9;' }
-
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
- var rowdata = [
- {
- "HCostItemID": "0"
- , "HCostItemName": ""
- , "HMaterID": "0"
- , "HMaterName": ""
- , "HPMoneyName": ""
- , "HTransType": ""
- , "HMoney": "0"
- , "HDeptName": ""
- , "HDeptID": "0"
- , "HMaterialCode": ""
- // , "HTaxRate": "0"
- // , "HSumMoney": "0"
- , "HRemark": ""
- }
- ];
+ var rowdata = [{
+ "HCostItemID": "0"
+ , "HCostItemName": ""
+ , "HMaterID": "0"
+ , "HMaterName": ""
+ , "HMaterialCode": ""
+ , "HDeptName": ""
+ , "HDeptID": "0"
+ , "HMoney": "0"
+ , "HWaster": ""
+ , "HQty": "0"
+ , "HPrice": "0"
+ , "HDate": ""
+ , "HBeginBalance": "0"
+ , "HEndBalance": "0"
+ , "HTimes": ""
+ }];
+
option.data = rowdata;
table.render(option);
DisPlay_HideColumn();
@@ -875,103 +939,110 @@
function set_GridCellCheck(obj) {
window.tableEditObj = obj;
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- //鍣ㄥ叿绠＄悊
- // 鍘熶唬鐮侊細if (obj.event == "HAreaList") { ... } 鍐呴儴
- if (obj.event == "HAreaList") {
- CusType = 2;
- // 鏂板锛氬皢缂栬緫瀵硅薄obj璧嬪�肩粰鍏ㄥ眬鍙橀噺锛屼緵GetProjectMoneyValue浣跨敤
- tableEditObj = obj;
- // 鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣擄紙鍘熸湁浠ｇ爜涓嶅彉锛�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim',
- area: ['90%', '90%'],
- title: '椤圭洰璐圭敤鍒楄〃',
- shift: 2,
- content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ItemMoney.html", "yes"],
- // 浠ヤ笅鍘熸湁浠ｇ爜鍏ㄩ儴淇濈暀锛屾棤闇�淇敼
- btn: ['纭畾', '鍙栨秷'],
- btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (event.key == "F7") {
+ // 鑾峰彇褰撳墠缂栬緫鐨勫瓧娈�
+ var field = $(this).attr('data-field');
+
+ // 鎴愭湰椤圭洰閫夋嫨
+ if (field === 'HCostItemName' || obj.event === 'HAreaList') {
+ CusType = 2;
+ tableEditObj = obj;
+
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ area: ['90%', '90%'],
+ title: '椤圭洰璐圭敤鍒楄〃',
+ shift: 2,
+ content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ItemMoney.html", "yes"],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //OptionData = checkStatus.data[0];
+
+ // 鏇存柊褰撳墠缂栬緫琛屾暟鎹�
+ var selected = checkStatus.data[0];
obj.update({
- "HCostItemID": checkStatus.data[0].HItemID
- , "HCostItemName": checkStatus.data[0].璐圭敤椤圭洰鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
+ "HCostItemID": selected.HItemID || '',
+ "HCostItemName": selected['璐圭敤椤圭洰鍚嶇О'] || selected.璐圭敤椤圭洰鍚嶇О || ''
+ });
+ layer.close(index);
+ },
+ end: function () {
+ // 寮圭獥鍏抽棴鍚庣殑澶勭悊
+ tableEditObj = null;
}
- , end: function () {
- //obj.update({
- // "HBeginAddr": OptionData.HItemID
- // , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
- //})
- }
- })
+ });
}
- if (obj.event === "HAreaList_1") {
- CusType = 2;
- tableEditObj = obj; // 璧嬪�煎叏灞�缂栬緫瀵硅薄锛屼緵GetGyMaterial鎺ユ敹
- layer.open({
- type: 2,
- skin: 'layui-layer-rim',
- area: ['90%', '90%'],
- title: '鐗╂枡鍒楄〃',
- shift: 2,
- content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html", "yes"],
- btn: ['纭畾', '鍙栨秷'],
- btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index];
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鐗╂枡鏁版嵁', { icon: 2 });
- }
- // 鎵嬪姩閫夋嫨鏁版嵁鏃剁殑鍥炴樉锛堝弻鍑昏嚜鍔ㄥ洖鏄惧吋瀹癸級锛屽尮閰嶇墿鏂欏脊绐楀瓧娈�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID || '',
- "HMaterName": checkStatus.data[0]['鐗╂枡鍚嶇О'] || '',
- "HMaterialCode": checkStatus.data[0]['鐗╂枡浠ｇ爜'] || '',
-
- });
- layer.close(index);
- }
- });
- }
- if (obj.event === "HAreaList_2") {
+ // 鐗╂枡閫夋嫨
+ else if (field === 'HMaterName' || obj.event === 'HAreaList_1') {
CusType = 2;
- tableEditObj = obj; // 璧嬪�煎叏灞�缂栬緫瀵硅薄锛屼緵GetGyMaterial鎺ユ敹
+ tableEditObj = obj;
+
layer.open({
type: 2,
skin: 'layui-layer-rim',
area: ['90%', '90%'],
title: '鐗╂枡鍒楄〃',
shift: 2,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html", "yes"],
btn: ['纭畾', '鍙栨秷'],
btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鐗╂枡鏁版嵁', { icon: 2 });
}
- // 鎵嬪姩閫夋嫨鏁版嵁鏃剁殑鍥炴樉锛堝弻鍑昏嚜鍔ㄥ洖鏄惧吋瀹癸級锛屽尮閰嶇墿鏂欏脊绐楀瓧娈�
+
+ var selected = checkStatus.data[0];
obj.update({
-
- "HDeptName": checkStatus.data[0]['閮ㄩ棬鍚嶇О'] || '',
- "HDeptID": checkStatus.data[0]['HItemID'] || ''
-
+ "HMaterID": selected.HItemID || '',
+ "HMaterName": selected['鐗╂枡鍚嶇О'] || '',
+ "HMaterialCode": selected['鐗╂枡浠ｇ爜'] || ''
});
layer.close(index);
+ },
+ end: function () {
+ tableEditObj = null;
+ }
+ });
+ }
+ // 閮ㄩ棬閫夋嫨
+ else if (field === 'HDeptName' || obj.event === 'HAreaList_2') {
+ CusType = 2;
+ tableEditObj = obj;
+
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ area: ['90%', '90%'],
+ title: '閮ㄩ棬鍒楄〃',
+ shift: 2,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁', { icon: 2 });
+ }
+
+ var selected = checkStatus.data[0];
+ obj.update({
+ "HDeptName": selected['閮ㄩ棬鍚嶇О'] || '',
+ "HDeptID": selected['HItemID'] || ''
+ });
+ layer.close(index);
+ },
+ end: function () {
+ tableEditObj = null;
}
});
}
- // 娓呯┖浜嬩欢鏍囪瘑锛岄伩鍏嶉噸澶嶈Е鍙�
- obj.event = "";
// 闃绘浜嬩欢鍐掓场鍜岄粯璁よ涓�
e.preventDefault();
e.stopPropagation();
@@ -1147,14 +1218,14 @@
}
}
//#endregion
-
-
-
-
-
+
+
+
+
+
//#endregion
//#region 闈炵┖楠岃瘉
@@ -1259,7 +1330,7 @@
$.ajax({
type: "POST",
-
+
url: GetWEBURL() + "CB_ItemMoneyBillTran/SaveCB_ItemMoneyBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainSub },
@@ -1528,243 +1599,50 @@
});
-
-
- //function GetHDeptNameValue(obj) {
- // if (!tableEditObj || !tableEditObj.update || !obj || !obj[0]) {
- // return layer.msg('鏁版嵁浼犻�掑紓甯革紝璇烽噸鏂伴�夋嫨', { icon: 2 });
- // }
- // var data = obj[0];
- // tableEditObj.update({
- // HDeptID: data.HItemID || '',
- // HDeptName: data.閮ㄩ棬鍚嶇О || data['閮ㄩ棬鍚嶇О'] || ''
- // });
- // tableEditObj = null; // 娓呯┖涓存椂瀵硅薄
- //}
-
-
- //function GetProjectMoneyValue(selectData) {
- // if (!tableEditObj || !tableEditObj.update || !selectData) {
- // return layer.msg('鏁版嵁浼犻�掑紓甯革紝璇烽噸鏂伴�夋嫨', { icon: 2 });
- // }
- // tableEditObj.update({
- // HCostItemID: selectData.HItemID || '',
- // HCostItemName: selectData['璐圭敤椤圭洰鍚嶇О'] || selectData.璐圭敤椤圭洰鍚嶇О || ''
- // });
- // tableEditObj = null;
- //}
-
- //var tableEditObj = null; // 鍏ㄥ眬涓存椂瀛樺偍琛ㄦ牸缂栬緫瀵硅薄obj
-
- function GetHDeptNameValue(obj) {
- try {
- console.log('GetHDeptNameValue琚皟鐢紝鍙傛暟:', obj);
-
- if (!obj) {
- console.error('GetHDeptNameValue: 鍙傛暟obj涓虹┖');
- return layer.msg('鏁版嵁浼犻�掑紓甯革細鍙傛暟涓虹┖', { icon: 2 });
- }
-
- if (!Array.isArray(obj) || obj.length === 0) {
- console.error('GetHDeptNameValue: 鍙傛暟涓嶆槸鏁扮粍鎴栨暟缁勪负绌�');
- return layer.msg('鏁版嵁浼犻�掑紓甯革細璇烽�夋嫨鏈夋晥鏁版嵁', { icon: 2 });
- }
-
- console.log('tableEditObj鐘舵��:', tableEditObj);
- if (!tableEditObj) {
- console.error('GetHDeptNameValue: tableEditObj涓虹┖锛屽彲鑳芥槸F7蹇嵎閿湭姝ｇ‘璁剧疆');
- return layer.msg('缂栬緫瀵硅薄涓㈠け锛岃閲嶆柊鎸塅7閫夋嫨', { icon: 2 });
- }
-
- if (!tableEditObj.update) {
- console.error('GetHDeptNameValue: tableEditObj.update鏂规硶涓嶅瓨鍦�');
- console.error('瀹屾暣鐨則ableEditObj瀵硅薄:', JSON.stringify(tableEditObj));
- return layer.msg('缂栬緫瀵硅薄寮傚父锛屾棤娉曟洿鏂版暟鎹�', { icon: 2 });
- }
-
- var data = obj[0];
- console.log('鎺ユ敹鍒扮殑閮ㄩ棬鏁版嵁:', data);
-
- // 妫�鏌ュ繀瑕佸瓧娈�
- if (!data.HItemID && !data['HItemID']) {
- console.warn('閮ㄩ棬鏁版嵁缂哄皯HItemID瀛楁锛屽彲鐢ㄥ瓧娈�:', Object.keys(data));
- }
-
- var deptName = data.閮ㄩ棬鍚嶇О || data['閮ㄩ棬鍚嶇О'] || '';
- var deptId = data.HItemID || '';
-
- console.log('鍗冲皢鏇存柊閮ㄩ棬鏁版嵁 - ID:', deptId, '鍚嶇О:', deptName);
-
- tableEditObj.update({
- HDeptID: deptId,
- HDeptName: deptName
- });
-
- console.log('閮ㄩ棬鏁版嵁鏇存柊鎴愬姛');
-
- // 娓叉煋琛ㄥ崟
- layui.form.render();
-
- tableEditObj = null; // 娓呯┖涓存椂瀵硅薄
- console.log('tableEditObj宸叉竻绌�');
-
- } catch (error) {
- console.error('GetHDeptNameValue鎵ц鍑洪敊:', error);
- console.error('閿欒鍫嗘爤:', error.stack);
- layer.msg('閮ㄩ棬閫夋嫨澶辫触锛�' + error.message, { icon: 2 });
- }
- }
function GetProjectMoneyValue(selectData) {
- try {
- console.log('GetProjectMoneyValue琚皟鐢紝鍙傛暟:', selectData);
- console.log('鍙傛暟绫诲瀷:', typeof selectData);
- console.log('鏄惁鏄暟缁�:', Array.isArray(selectData));
-
- // 澶勭悊鍙傛暟锛氬彲鑳芥槸鏁扮粍涔熷彲鑳芥槸瀵硅薄
- var data;
- if (Array.isArray(selectData)) {
- console.log('鍙傛暟鏄暟缁勶紝闀垮害:', selectData.length);
- if (selectData.length === 0) {
- return layer.msg('璇烽�夋嫨鏈夋晥鐨勬暟鎹�', { icon: 2 });
- }
- data = selectData[0]; // 鍙栫涓�涓厓绱�
- console.log('浠庢暟缁勪腑鎻愬彇鐨勬暟鎹�:', data);
- } else {
- data = selectData; // 宸茬粡鏄璞�
- }
-
- console.log('鏈�缁堝鐞嗙殑鏁版嵁:', data);
-
- if (!data) {
- console.error('GetProjectMoneyValue: 澶勭悊鍚庣殑鏁版嵁涓虹┖');
- return layer.msg('鏁版嵁浼犻�掑紓甯革細璐圭敤椤圭洰鏁版嵁涓虹┖', { icon: 2 });
- }
-
- console.log('tableEditObj鐘舵��:', tableEditObj);
- if (!tableEditObj) {
- console.error('GetProjectMoneyValue: tableEditObj涓虹┖');
- console.log('灏濊瘯浠巜indow.currentEditObj鑾峰彇:', window.currentEditObj);
-
- // 灏濊瘯浠庡叾浠栧彲鑳界殑鍏ㄥ眬鍙橀噺鑾峰彇
- if (window.currentEditObj) {
- console.log('浣跨敤window.currentEditObj鏇夸唬');
- tableEditObj = window.currentEditObj;
- } else {
- console.log('灏濊瘯浠嶧7浜嬩欢涓仮澶峵ableEditObj...');
- // 鍙兘鏄湪寮圭獥涓弻鍑绘椂锛宼ableEditObj宸茬粡琚竻绌轰簡
- // 闇�瑕佹鏌ユ槸鍚︽湁鍏朵粬鏂瑰紡鑾峰彇褰撳墠缂栬緫琛�
- layer.msg('缂栬緫瀵硅薄涓㈠け锛岃閲嶆柊鎸塅7閫夋嫨', { icon: 2 });
- return;
- }
- }
-
- if (!tableEditObj.update) {
- console.error('GetProjectMoneyValue: tableEditObj.update鏂规硶涓嶅瓨鍦�');
- console.error('瀹屾暣鐨則ableEditObj瀵硅薄:', tableEditObj);
-
- // 灏濊瘯鑾峰彇tr鍏冪礌
- var trElement = tableEditObj.tr;
- if (trElement) {
- console.log('鎵惧埌tr鍏冪礌锛宒ata-index:', $(trElement).attr('data-index'));
- }
-
- return layer.msg('缂栬緫瀵硅薄寮傚父锛屾棤娉曟洿鏂拌垂鐢ㄩ」鐩暟鎹�', { icon: 2 });
- }
-
- console.log('鎺ユ敹鍒扮殑璐圭敤椤圭洰鏁版嵁:', data);
- console.log('鏁版嵁鐨勬墍鏈夊瓧娈�:', Object.keys(data));
-
- // 妫�鏌ュ繀瑕佸瓧娈� - 鍏堟煡鐪嬫湁鍝簺瀛楁
- console.log('鏌ユ壘璐圭敤椤圭洰鐩稿叧瀛楁...');
- var itemId = '';
- var itemName = '';
-
- // 灏濊瘯澶氱鍙兘鐨勫瓧娈靛悕
- if (data.HItemID) itemId = data.HItemID;
- else if (data['HItemID']) itemId = data['HItemID'];
- else if (data.id) itemId = data.id;
- else if (data.ID) itemId = data.ID;
-
- if (data['璐圭敤椤圭洰鍚嶇О']) itemName = data['璐圭敤椤圭洰鍚嶇О'];
- else if (data.璐圭敤椤圭洰鍚嶇О) itemName = data.璐圭敤椤圭洰鍚嶇О;
- else if (data.HName) itemName = data.HName;
- else if (data.name) itemName = data.name;
- else if (data.鍚嶇О) itemName = data.鍚嶇О;
-
- console.log('鎵惧埌鐨勮垂鐢ㄩ」鐩暟鎹� - ID:', itemId, '鍚嶇О:', itemName);
-
- if (!itemId && !itemName) {
- console.warn('鏈壘鍒版湁鏁堢殑璐圭敤椤圭洰瀛楁锛屽叏閮ㄥ瓧娈�:', data);
- layer.msg('鏈壘鍒拌垂鐢ㄩ」鐩俊鎭紝璇锋鏌ユ暟鎹�', { icon: 2 });
- return;
- }
-
- console.log('鍗冲皢鏇存柊璐圭敤椤圭洰鏁版嵁 - ID:', itemId, '鍚嶇О:', itemName);
-
- tableEditObj.update({
- HCostItemID: itemId,
- HCostItemName: itemName
+ if (window.tableEditObj && window.tableEditObj.update) {
+ var data = Array.isArray(selectData) ? selectData[0] : selectData;
+ window.tableEditObj.update({
+ "HCostItemID": data.HItemID || '',
+ "HCostItemName": data['璐圭敤椤圭洰鍚嶇О'] || data.璐圭敤椤圭洰鍚嶇О || ''
});
-
- console.log('璐圭敤椤圭洰鏁版嵁鏇存柊鎴愬姛');
-
- // 閲嶆柊娓叉煋琛ㄦ牸浠ョ‘淇濇暟鎹樉绀�
- if (layui.table) {
- var option = window.option || {};
- if (option.data) {
- console.log('閲嶆柊娓叉煋琛ㄦ牸锛屾暟鎹鏁�:', option.data.length);
- layui.table.render(option);
- }
- }
-
- // 娓叉煋琛ㄥ崟
- layui.form.render();
-
- // 涓嶆竻绌簍ableEditObj锛岄伩鍏嶇浜屾璋冪敤澶辫触
- // tableEditObj = null;
- // if (window.currentEditObj) {
- // window.currentEditObj = null;
- // }
- console.log('鏇存柊瀹屾垚锛屼繚鐣檛ableEditObj浠ュ鍚庣画浣跨敤');
-
- // 鍙�夛細娣诲姞鎴愬姛鎻愮ず
- layer.msg('璐圭敤椤圭洰閫夋嫨鎴愬姛', { icon: 1, time: 1000 });
-
- } catch (error) {
- console.error('GetProjectMoneyValue鎵ц鍑洪敊:', error);
- console.error('閿欒鍫嗘爤:', error.stack);
- console.error('褰撳墠selectData:', selectData);
- console.error('褰撳墠tableEditObj:', tableEditObj);
- layer.msg('璐圭敤椤圭洰閫夋嫨澶辫触锛�' + error.message, { icon: 2 });
}
}
-
-
- var tableEditObj = null; // 鍏ㄥ眬涓存椂瀛樺偍琛ㄦ牸缂栬緫瀵硅薄obj锛堣嫢宸插畾涔夛紝鏃犻渶閲嶅瀹氫箟锛�
function GetGyMaterial(selectData) {
- // 鏍￠獙锛氱‘淇濈紪杈戝璞°�佹帴鏀舵柟娉曘�佸脊绐楁暟鎹潎鏈夋晥
- if (!tableEditObj || !tableEditObj.update || !selectData) {
- return layer.msg('鐗╂枡鏁版嵁浼犻�掑紓甯革紝璇烽噸鏂伴�夋嫨', { icon: 2 });
+ if (window.tableEditObj && window.tableEditObj.update) {
+ var data = Array.isArray(selectData) ? selectData[0] : selectData;
+ window.tableEditObj.update({
+ "HMaterID": data.HItemID || '',
+ "HMaterName": data['鐗╂枡鍚嶇О'] || '',
+ "HMaterialCode": data['鐗╂枡浠ｇ爜'] || ''
+ });
}
- // 鍥炴樉鏁版嵁鍒扮埗琛ㄦ牸鍗曞厓鏍硷紙瀛楁涓庣埗琛ㄦ牸鍒楅厤缃弗鏍煎搴旓級
- tableEditObj.update({
- HMaterID: selectData.HItemID || '', // 鐗╂枡ID锛堝脊绐楄繑鍥炴牳蹇冨瓧娈礖ItemID锛�
- HMaterialCode: selectData['鐗╂枡浠ｇ爜'] || '', // 鐗╂枡浠ｇ爜锛堝脊绐楄繑鍥炰腑鏂囧瓧娈靛悕锛�
- HMaterName: selectData['鐗╂枡鍚嶇О'] || '', // 鐗╂枡鍚嶇О锛堝脊绐楄繑鍥炰腑鏂囧瓧娈靛悕锛�
-
- });
- // 娓呯┖鍏ㄥ眬涓存椂瀵硅薄锛岄伩鍏嶉噸澶嶈祴鍊�
- tableEditObj = null;
}
+ function GetHDeptNameValue(obj) {
+ if (window.tableEditObj && window.tableEditObj.update) {
+ var data = Array.isArray(obj) ? obj[0] : obj;
+ window.tableEditObj.update({
+ "HDeptName": data.閮ㄩ棬鍚嶇О || data['閮ㄩ棬鍚嶇О'] || '',
+ "HDeptID": data.HItemID || ''
+ });
+ }
+ }
+
+ setTimeout(function () {
+ // 閲嶆柊缁戝畾琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ }, 300);
-
function dealDoubleToFixed(data, num) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
var dotLength = 0;
@@ -1798,7 +1676,7 @@
}
}
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1