From 3aafc15f780b8bf1030f1b2a9553e65a1880a8ac Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 25 二月 2026 14:02:22 +0800
Subject: [PATCH] 1
---
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillList.html | 4 +-
WebTM/WebTM.csproj.user | 5 --
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemFixRate.html | 49 +++++++++++++++++++++---
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html | 10 ++--
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemAverageType.html | 4 +
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html | 8 ++--
6 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3e543f0..2c596da 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -5,13 +5,10 @@
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
-<<<<<<< HEAD
<NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
-=======
<NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
<ProjectView>ProjectFiles</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/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 f412d6b..6a27ba6 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"
@@ -420,7 +420,9 @@
$("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵�丠ProcName
$("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
-
+ $("#HCostItemName").val(data.鎴愭湰椤圭洰鍚嶇О);
+ $("#HAverageTypeName").val(data.鎴愭湰鍒嗛厤绫诲瀷鍚嶇О);
+
$("#HFixRate").val(data.鏈熸湯鍦ㄥ埗绯绘暟);
$("#HRemark").val(data.澶囨敞);
$("#HProcName").val(data.瀵瑰簲鏂规硶);
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_CostItemFixRate.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_CostItemFixRate.html"
index 816170a..2c54536 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_CostItemFixRate.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_CostItemFixRate.html"
@@ -66,10 +66,15 @@
<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" autocomplete="off">
</div>
</div>
+
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鎴愭湰椤圭洰锛�</label>
+ <label class="layui-form-label">鎴愭湰椤圭洰</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCostItemID" id="HCostItemID" autocomplete="off">
+ <input type="text" name="HCostItemName" id="HCostItemName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+ <input type="hidden" name="HCostItemID" id="HCostItemID" class="layui-input" value="0" style="float:left;width:130px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCostItemList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -232,6 +237,11 @@
}
//#endregion
+ //#region 閫夋嫨椤圭洰鎸夐挳
+ form.on('submit(HCostItemList)', function () {
+ get_checkHCostItemID();
+ });
+
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
@@ -311,6 +321,30 @@
$("#HFixRate ").val("0");
$("#HNumber").val("");
}
+
+ //#region 椤圭洰閫夋嫨
+ function get_checkHCostItemID() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鎴愭湰椤圭洰鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.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 (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCostItemName").val(checkStatus.data[0].鎴愭湰椤圭洰鍚嶇О);
+ $("#HCostItemID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//缂栬緫
function set_EditFromGrid() {
$("#HItemID").val(linterid);
@@ -335,11 +369,12 @@
$("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
$("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
- $("#HCostItemID").val(data.鎴愭湰椤圭洰);//澶囨敞
- $("#HFixRate").val(data.鍥哄畾鍒嗛厤鐜�);//澶囨敞
- $("#HCountRemark ").val(data.鎴愭湰椤圭洰璁＄畻姒傝堪);//澶囨敞
- $("#HProcName").val(data.瀵瑰簲鏂规硶);//澶囨敞
- $("#HRemark").val(data.澶囨敞);//澶囨敞
+ $("#HCostItemID").val(data.鎴愭湰椤圭洰);
+ $("#HCostItemName").val(data.鎴愭湰椤圭洰鍚嶇О);
+ $("#HFixRate").val(data.鍥哄畾鍒嗛厤鐜�);
+ $("#HCountRemark ").val(data.鎴愭湰椤圭洰璁＄畻姒傝堪);
+ $("#HProcName").val(data.瀵瑰簲鏂规硶);
+ $("#HRemark").val(data.澶囨敞);
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
$("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
$("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
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 16a097c..27d5255 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"
@@ -952,9 +952,9 @@
type: 2,
skin: 'layui-layer-rim',
area: ['90%', '90%'],
- title: '椤圭洰璐圭敤鍒楄〃',
+ title: '鎴愭湰椤圭洰鍒楄〃',
shift: 2,
- content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ItemMoney.html", "yes"],
+ content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.html", "yes"],
btn: ['纭畾', '鍙栨秷'],
btn1: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index];
@@ -967,7 +967,7 @@
var selected = checkStatus.data[0];
obj.update({
"HCostItemID": selected.HItemID || '',
- "HCostItemName": selected['璐圭敤椤圭洰鍚嶇О'] || selected.璐圭敤椤圭洰鍚嶇О || ''
+ "HCostItemName": selected['鎴愭湰椤圭洰鍚嶇О'] || selected.璐圭敤椤圭洰鍚嶇О || ''
});
layer.close(index);
},
@@ -1607,7 +1607,7 @@
var data = Array.isArray(selectData) ? selectData[0] : selectData;
window.tableEditObj.update({
"HCostItemID": data.HItemID || '',
- "HCostItemName": data['璐圭敤椤圭洰鍚嶇О'] || data.璐圭敤椤圭洰鍚嶇О || ''
+ "HCostItemName": data['鎴愭湰椤圭洰鍚嶇О'] || 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_ItemMoneyBillList.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_ItemMoneyBillList.html"
index 8437e78..62d1b23 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_ItemMoneyBillList.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_ItemMoneyBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>杩愬崟璐圭敤缁撶畻鍗�</title>
+ <title>鎴愭湰璐圭敤鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -200,7 +200,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2102";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) || document.title;
+ var HPageTitle = '鎴愭湰璐圭敤鍗�';
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
index 2c58820..b27c59c 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璐圭敤鍗曞紩鍏�</title>
+ <title>鎴愭湰鏍哥畻</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,7 +46,7 @@
</div>
</div>-->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮曞叆绫诲瀷</label>
+ <label class="layui-form-label" style="width: 85px;">绫诲瀷</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HType" id="HType" lay-verify="HType">
@@ -108,7 +108,7 @@
</button>
</div>
</div>-->
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬪紩鍏�</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬫牳绠�</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
</div>
<div class="layui-colla-item" style="height:600px;margin-top:20px;">
@@ -221,7 +221,7 @@
//#region 寮�濮嬭垂鐢ㄥ紩鍏�
form.on('submit(btn_Import)', function (data) {
- if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
+ if (set_ModCheck("CB_CostAccounting") == true) {
var index = layer.open({
type: 1, // page 灞傜被鍨�
area: ['20%', '20%'],
@@ -286,7 +286,7 @@
var executionTime = endTime - startTime; // 姣
var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
if (data1.count == 1) {
- layer.msg("瀹屾垚璐圭敤寮曞叆");
+ layer.msg("瀹屾垚鎴愭湰鏍哥畻");
// 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁＄畻鏃堕棿锛�
setTimeout(function () {
layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
--
Gitblit v1.9.1