From 3f80a6b774191f64648e16ad866aa35c86aa58d2 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 二月 2026 09:36:05 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 13
WebTM/WebTM.csproj.user | 6
WebTM/views/车间管理/单品过站_小卫/Cj_BlueToothBarCodePrint.html | 7
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 13
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 12
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html | 373 ++++++++++++++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 23
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemAverageType.html | 12
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 7
WebTM/WebTM.csproj | 8
WebTM/views/基础资料/成本基础资料/Add_Edit_Gy_CostAverageType.html | 8
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html | 544 +++++++++++------------------
12 files changed, 660 insertions(+), 366 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 629feac..b006e73 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -204,9 +204,13 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_Check_PDA.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Car.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostCenter.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CarList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostCenter.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DriverList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillEdit.html" />
<Content Include="views\鍖呰鍑哄叆搴撴槑缁哱Kf_PackStockDetailQuery.html" />
@@ -662,8 +666,12 @@
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillList.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillEdit.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
+ <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
+<<<<<<< HEAD
+=======
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
+>>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1eb74aa..3e543f0 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -5,9 +5,13 @@
<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>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|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 fd7b537..f412d6b 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"
@@ -131,7 +131,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>
@@ -384,6 +384,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#HStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
+ $("#HWIPFlag").val(true);
layui.form.render('checkbox');
}
@@ -417,13 +418,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/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
index d0afbdf..08e4533 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
@@ -40,8 +40,8 @@
lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
lay-filter="Cancel">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
- lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
+ lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>-->
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -373,9 +373,9 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
- var IsHStopflag = data.绂佺敤鏍囪;
+ var IsHStopflag = data.绂佺敤鏍囧織;
//绂佺敤鏍囪
- if (IsHStopflag) {
+ if (IsHStopflag=="Y") {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
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 7b8eb9e..16a097c 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
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"
new file mode 100644
index 0000000..2c58820
--- /dev/null
+++ "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"
@@ -0,0 +1,373 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+ <style type="text/css">
+ .loader {
+ border: 8px solid #f3f3f3; /* Light grey */
+ border-top: 8px solid #3498db; /* Blue */
+ border-radius: 50%;
+ width: 50px;
+ height: 50px;
+ animation: spin 2s linear infinite;
+ }
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <h1 style="text-align: center; padding: 30px 0;"><b>鎴愭湰鏍哥畻</b></h1>
+ <div class="layui-colla-item" style="padding-top:20px;">
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID" disabled>-->
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <!--</select>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <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">
+ <option value="1" selected="selected">鎴愭湰鏍哥畻</option>
+ <!--<option value="2">璐圭敤鎴愭湰寮曞叆</option>-->
+
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <option value="2023">2023骞�</option>
+ <option value="2024">2024骞�</option>
+ <option value="2025">2025骞�</option>
+ <option value="2026" selected="selected">2026骞�</option>
+ <option value="2027">2027骞�</option>
+ <option value="2028">2028骞�</option>
+ <option value="2029">2029骞�</option>
+ <option value="2030">2030骞�</option>
+ <option value="2031">2031骞�</option>
+ <option value="2032">2032骞�</option>
+ <option value="2033">2033骞�</option>
+ <option value="2034">2034骞�</option>
+ <option value="2035">2035骞�</option>
+ <option value="2036">2036骞�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HMonth" id="HMonth" lay-verify="HMonth">
+ <option value="1">1鏈�</option>
+ <option value="2">2鏈�</option>
+ <option value="3">3鏈�</option>
+ <option value="4">4鏈�</option>
+ <option value="5">5鏈�</option>
+ <option value="6">6鏈�</option>
+ <option value="7">7鏈�</option>
+ <option value="8">8鏈�</option>
+ <option value="9">9鏈�</option>
+ <option value="10">10鏈�</option>
+ <option value="11">11鏈�</option>
+ <option value="12">12鏈�</option>
+ </select>
+
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
+ </div>
+ <div class="layui-colla-item" style="height:600px;margin-top:20px;">
+ <font size="5" color="blue" id="HRemark"></font>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
+ var HModName = "CB_CostAccounting";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ var currentDate = new Date();
+ var currentYear = currentDate.getFullYear();
+ var currentMonth = currentDate.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ+1
+
+ // 璁剧疆榛樿閫変腑褰撳墠骞翠唤
+ var yearSelect = document.getElementById('HYear');
+ if (yearSelect) {
+ yearSelect.value = currentYear;
+ }
+
+ // 璁剧疆榛樿閫変腑褰撳墠鏈堜唤
+ var monthSelect = document.getElementById('HMonth');
+ if (monthSelect) {
+ monthSelect.value = currentMonth;
+ }
+ //閮ㄩ棬杈撳叆妗�
+ tableSelect.render({
+ elem: '#HWorkShopIDName',//杈撳叆妗哾om閫夋嫨
+ searchKey: '閮ㄩ棬鍚嶇О,HItemID',//鏌ヨ鐨勫垪鍚�
+ sWhere: " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ",//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": HMaker, "Organization": sessionStorage["Organization"] },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ //url: GetWEBURL() + 'Gy_Supplier/page',
+ //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝ｇ‘鐐瑰嚮
+ { field: 'HItemID', title: 'HItemID' },
+ { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' },
+ ]],
+ page: true,
+ limit: 5,
+ limits: [5]
+ },
+ done: function (elem, data) {
+ if (data != []) {
+ $("#HWorkShopIDName").val(data.data[0]['閮ㄩ棬鍚嶇О']);
+ $("#HWorkShopID").val(data.data[0]['HItemID']);
+ }
+
+ }
+ })
+ Organ();
+ }
+ //鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+
+ //#endregion
+
+ //#region 寮�濮嬭垂鐢ㄥ紩鍏�
+ form.on('submit(btn_Import)', function (data) {
+ if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
+ var index = layer.open({
+ type: 1, // page 灞傜被鍨�
+ area: ['20%', '20%'],
+ shade: 0.6, // 閬僵閫忔槑搴�
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+ anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
+ });
+ setTimeout(function () {
+ set_Calculate(data);
+ layer.close(index);
+ layer.close(index1);
+ }, 1000)
+ }
+
+ });
+
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+
+ function set_Calculate() {
+ //var HWorkShopID = $("#HWorkShopID").val();
+ //if (HWorkShopID == 0) {
+ // layer.close(ajaxLoad);
+ // layer.msg("璇烽�夋嫨閮ㄩ棬");
+ // return
+ //}
+ var HMonth = $("#HMonth").val();
+ var HYear = $("#HYear").val();
+ var Type = $("#HType").val();
+ //娆犳枡杩愮畻
+
+ var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
+ var startTime = new Date().getTime();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ // 璁＄畻璇锋眰鑺辫垂鐨勬椂闂�
+ var endTime = new Date().getTime();
+ var executionTime = endTime - startTime; // 姣
+ var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
+ if (data1.count == 1) {
+ layer.msg("瀹屾垚璐圭敤寮曞叆");
+ // 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁＄畻鏃堕棿锛�
+ setTimeout(function () {
+ layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
+ layer.close(ajaxLoad);
+ }, 1000);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HProdORGID").append(Organization);
+ $("#HProdORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btn_Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ Pub_Close(2);
+ });
+ })
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇杞﹂棿
+ function btnHWorkShopID() {
+ var HOrgName = $(".layui-form-select input").val();
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ /*get_WriteConfigFile();*/
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ });
+ function GetHDeptNameValue(obj) //杩斿洖閲囪喘閮ㄩ棬
+ {
+ $("#HWorkShopID").val(obj[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(obj[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ }
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 156939b..38ff811 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -424,11 +424,11 @@
</div>
<!--琛ㄤ綋淇℃伅-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -1740,7 +1740,10 @@
} else {
isFristClick = false;
}
-
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//琛屽唴浜嬩欢--妫�楠岄」鐩�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 7e132f5..c722d6c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -304,11 +304,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -3167,6 +3167,10 @@
} else {
isFristClick = false;
}
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 3c3f8f1..ac14e7f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -447,11 +447,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -3536,7 +3536,10 @@
} else {
isFristClick = false;
}
-
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
index 9cff162..ceefd52 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
@@ -67,7 +67,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜*</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" placeholder="璇烽�夋嫨钃濈墮鐗╂枡淇℃伅">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -395,6 +395,11 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ var materName = checkStatus.data[0].鐗╂枡鍚嶇О;
+ if (!materName || materName.indexOf('钃濈墮') === -1) {
+ layer.msg('璇烽�夋嫨钃濈墮鐗╂枡锛佺墿鏂欏悕绉颁腑蹇呴』鍖呭惈"钃濈墮"瀛楁牱', { icon: 5 });
+ return; // 涓嶅叧闂脊绐楋紝璁╃敤鎴烽噸鏂伴�夋嫨
+ }
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index f0587ca..463601d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -547,8 +547,17 @@
sWhere += " and 宸ュ崟缂栧彿 like '%" + HICMOBillNo + "%'";
}
+ //if (HBarcode_SN) {
+ // sWhere += " and DSN like '%" + HBarcode_SN + "%'";
+ //}
if (HBarcode_SN) {
- sWhere += " and DSN like '%" + HBarcode_SN + "%'";
+ HBarcode_SN = HBarcode_SN.replace(/锛�/g, ',')
+ .split(',')
+ .map(item => `'${item.trim()}'`)
+ .join(',');
+
+ console.log("澶勭悊缁撴灉:", HBarcode_SN);
+ sWhere += " and DSN in (" + HBarcode_SN + ")";
}
if (HBarcode_ZB) {
sWhere += "and 鏍堟澘鐮� like '%" + HBarcode_ZB + "%'";
@@ -556,12 +565,12 @@
if (HBarcode_ZX) {
sWhere += "and 涓鐮� like '%" + HBarcode_ZX + "%'";
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+ //if (HDate) {
+ // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
+ //}
+ //if (HDate1) {
+ // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index 5f01e8f..d027989 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -335,7 +335,12 @@
if (event.keyCode == 13) {
var HBarCode = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
-
+ if (HBarCode.length !== 20) {
+ layer.msg("鏉＄爜闀垮害蹇呴』涓�20浣嶏紒褰撳墠闀垮害锛�" + HBarCode.length, { icon: 5 });
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ return false;
+ }
if (!checkHSNAndDate(HBarCode)) {
return
}
--
Gitblit v1.9.1