From 5403141e073965360a9836b890f552a2be396867 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 28 二月 2026 11:32:49 +0800
Subject: [PATCH] 1
---
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 20 +
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html | 35 -
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 35 +
WebTM/views/基础资料/成本基础资料/CB_Wip_excelImport.html | 1
WebTM/views/成本管理/期初在产品表/Gy_WIPBal_Excel.html | 275 +++++++++++++++
WebTM/views/成本管理/期初在产品表/Kf_WIPBal.html | 463 +++++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 4
WebTM/WebTM.csproj | 2
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html | 195 +---------
WebTM/views/成本管理/费用单引入/CB_ItemMoneyBill_Excel.html | 1
12 files changed, 837 insertions(+), 198 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ed6452d..e580f39 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -665,6 +665,8 @@
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeMaterEntryReport.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillList.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillEdit.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鏈熷垵鍦ㄤ骇鍝佽〃\Gy_WIPBal_Excel.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鏈熷垵鍦ㄤ骇鍝佽〃\Kf_WIPBal.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7645aa8..22ea10d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index 781c1ac..72569ec 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -100,6 +100,7 @@
<option value="3721">鐢熶骇澶囨枡鍗�</option>
<option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
<option value="3710">鐢熶骇璁㈠崟</option>
+ <option value="1256">鐢熶骇棰嗘枡鐢宠鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -694,6 +695,14 @@
$("#HMainSourceBillType").empty();
var optionHtml = '';
optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇璁㈠崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (d.data[0].HSourceBillType == "1256") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇棰嗘枡鐢宠鍗�' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
@@ -1388,6 +1397,9 @@
else if (HSourceBillType == '3710') {
HSourceTitle = "鐢熶骇璁㈠崟";
}
+ else if (HSourceBillType == '1256') {
+ HSourceTitle = "鐢熶骇棰嗘枡鐢宠鍗�";
+ }
layer.open({
type: 2
@@ -1706,6 +1718,14 @@
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
}
+ else if (result.data.hSourceBillTypeField == "1256") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇棰嗘枡鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
else {
$("#HMainSourceBillType").empty();
var optionHtml = '';
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/CB_Wip_excelImport.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/CB_Wip_excelImport.html"
index c150c16..9cc5fee 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/CB_Wip_excelImport.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/CB_Wip_excelImport.html"
@@ -191,6 +191,7 @@
if (monthSelect) {
monthSelect.value = currentMonth;
}
+ form.render('select');
}
//#endregion
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 f1904fb..ae5eb83 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"
@@ -264,14 +264,15 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , laydate = layui.laydate;
//妯″潡鍚�
var HModName = "CB_ItemMoneyBillEdit";
@@ -314,6 +315,8 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
}
@@ -363,18 +366,6 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
-
- //鏂板琛岃〃鏍兼暟鎹�
- var NewRow =
- {
- "HBeginAddr": "0"
- , "HBeginAddrName": ""
- , "HEndAddr": "0"
- , "HEndAddrName": ""
- , "HTransType": ""
- , "HMoney": "0"
-
- };
switch (obj.event) {
case 'btn-AddLine':
// 鑾峰彇褰撳墠鏃ユ湡
@@ -406,9 +397,6 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
-
- // 閲嶆柊缁戝畾鏃ユ湡閫夋嫨鍣ㄤ簨浠�
- bindDatePickers();
layer.msg('澧炲姞涓�琛屾垚鍔燂紒');
break;
@@ -447,6 +435,22 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ var data = obj.data; //鑾峰彇褰撳墠琛岀殑鏁版嵁 //灏唎bj.data 瀛楃涓茬被鍨� 璧嬪�肩粰data
+ if (obj.event == 'HDate') { //鍒ゆ柇鎺ュ彈鍒扮殑鏁版嵁瀛楁 id鏄惁涓� Hdata
+ var field = $(this).data('field');//鑾峰彇鏃ユ湡瀛楁
+ laydate.render({
+ elem: this.firstChild //灏嗘棩鏈熼�夋嫨鍣ㄧ粦瀹氬埌瑙﹀彂浜嬩欢鐨勫厓绱犵殑绗竴涓瓙鍏冪礌
+ , show: true //鐩存帴鏄剧ず 鏃ユ湡閫夋嫨鍣紝鑰屼笉鏄瓑寰呯敤鎴风偣鍑�
+ , closeStop: this // 鍒ゆ柇鐐瑰嚮鏃ユ湡閫夋嫨鍣ㄥ閮ㄦ椂鏄惁鍏抽棴
+ , done: function (nowDate) { //褰撴棩鏈熼�夋嫨瀹屾垚鏃舵墽琛岀殑鍥炶皟鍑芥暟
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate; //data瀵硅薄涓殑鏃ユ湡瀛楁
+ obj.update(data); //鏇存柊鍥炶皟鏁版嵁
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
});
@@ -731,36 +735,6 @@
//#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;
@@ -870,17 +844,7 @@
, { 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: '鏃ユ湡',
- 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: 'HDate',title: '鏃ユ湡',width: 160,event: 'HDate'}
, { 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;' }
@@ -899,13 +863,13 @@
, "HProcName": ""
, "HProcID": "0"
, "HMoney": "0"
- , "HWaster": ""
+ , "HWaster": "0"
, "HQty": "0"
, "HPrice": "0"
- , "HDate": ""
+ , "HDate": Format(new Date(), "yyyy-MM-dd")
, "HBeginBalance": "0"
, "HEndBalance": "0"
- , "HTimes": ""
+ , "HTimes": "0"
}];
option.data = rowdata;
@@ -1155,106 +1119,7 @@
function setInit_PushBill() {
//鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
createBillNo();
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , cellMinWidth: 120
- , height: 400
- , limit: 100
- , cols: [[
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
- , { field: 'HBeginAddr', title: '濮嬪彂鍦癐D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HBeginAddrName', title: '濮嬪彂鍦�', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
- , { field: 'HEndAddr', title: '鐩殑鍦癐D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEndAddrName', title: '鐩殑鍦�', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
-
- , { field: 'HTransType', title: '杩愯緭鏂瑰紡', templet: '#HTransType' }
- , { field: 'HMoney', title: '杩愯緭璐圭敤', edit: 'text', style: 'background-color: #f9f9f9;' }
- /* , { field: 'HTaxRate', title: '绋庣巼', edit: 'text', style: 'background-color: #f9f9f9;' }*/
-
-
- , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
- , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' }
- ]]
- }
- //鍒濆鍖栨棩鏈熴�佸埗鍗曚汉銆佸埗鍗曟棩鏈�
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HDeptID").val(sessionStorage["HDeptID"]);
- $("#HDeptName").val(sessionStorage["HDept"]);
- $("#HDeptName").val(sessionStorage["HDept"]);
- $("#HEmpID").val(sessionStorage["HEmpID"]);
- $("#HEmpName").val(sessionStorage["HEmpName"]);
-
- //璁剧疆婧愬崟绫诲瀷
- //$("#HSourceBillType").val(HSourceBillType);
- //var temp = $("#HSourceBillType").val();
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
- //$("#HSourceBillType").val() == "3321"
- if (true) {
- //鑾峰彇 getUrlVars
- var data = getUrlVars_JSON().data;
- var dataArray = [];
-
- for (var i = 0; i < data.length; i++) {
- var temp = getPushSource_ICMOBillInit(data[i].HInterID, data[i].HEntryID);
- if (temp != "none") {
- dataArray.push(temp);
- dataID = dataID + "," + data[i].HInterID;
- } else {
- layer.alert("鐩爣鎵胯繍鍟嗗拰杩愬崟鎵胯繍鍟嗕笉鍚�!", {
- icon: 5,
- btn: ['纭畾']
- }, function () {
- // 鍏抽棴褰撳墠寮圭獥
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- parent.$("#btnSearch").trigger('click');
-
-
- });
- return;
- }
- }
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMainSourceInterID": "0"
- , "HMainSourceEntryID": "0"
- , "HMainSourceBillNo": ""
- , "HMainSourceBillType": $("#BillType").val()
-
-
- , "HCarrierID": dataArray[0].鎵胯繍鍟咺D
- , "HCarrierName": dataArray[0].鎵胯繍鍟嗗悕绉�
- , "HCurID": dataArray[0].甯佸埆
- , "HCurName": dataArray[0].甯佸埆鍚嶇О
- // , "HExRate": dataArray[0].姹囩巼
- });
-
- //瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
- {
- 'HBeginAddr': dataArray[i].濮嬪彂鍦�
- , 'HBeginAddrName': dataArray[i].濮嬪彂鍦板悕绉� ?? ""
- , 'HEndAddr': dataArray[i].鐩殑鍦�
- , 'HEndAddrName': dataArray[i].鐩殑鍦板悕绉� ?? ""
- , "HTransType": dataArray[i].杩愯緭鏂瑰紡 ?? ""
- , "HMoney": dataArray[i].杩愯緭璐圭敤 ?? ""
- }
- );
- }
- option.data = rowdata;
- table.render(option);
- }
- else {
- return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟涓嬫帹锛侊紒');
- }
+
}
//#endregion
@@ -1673,14 +1538,6 @@
});
}
}
-
- setTimeout(function () {
- // 閲嶆柊缁戝畾琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- });
- }, 300);
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
new file mode 100644
index 0000000..e22448e
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
@@ -0,0 +1,275 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍣ㄥ叿涓绘。瀵煎叆</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <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>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">骞存湀</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-type-month" placeholder="閫夋嫨骞存湀" readonly>
+ </div>
+ </div>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+
+
+ laydate.render({
+ elem: '#ID-laydate-type-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: new Date(),
+ done: function (value, date) {
+ if (!option.data || option.data.length === 0) {
+ layer.msg('璇峰厛瀵煎叆鏁版嵁锛�', { icon: 0 });
+ return;
+ }
+ var parts = value.split('-');
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]['骞�'] = parts[0];
+ option.data[i]['鏈�'] = parts[1];
+ }
+ table.render(option);
+ layer.msg('骞存湀宸叉洿鏂颁负锛�' + value, { icon: 1, time: 1500 });
+ }
+ });
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Kf_WIPBal/Kf_WIPBal_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '骞�', title: '骞�', width: 120 }
+ , { field: '鏈�', title: '鏈�', width: 120 }
+ , { field: 'HWorkShopID', title: 'HWorkShopID', width: 120, hide: true }
+ , { field: '杞﹂棿浠ｇ爜', title: '杞﹂棿浠ｇ爜', width: 120 }
+ , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О', width: 120 }
+ , { field: 'HCostObjID', title: 'HCostObjID', width: 120, hide: true }
+ , { field: '鎴愭湰瀵硅薄浠ｇ爜', title: '鎴愭湰瀵硅薄浠ｇ爜', width: 120 }
+ , { field: '鎴愭湰瀵硅薄鍚嶇О', title: '鎴愭湰瀵硅薄鍚嶇О', width: 120 }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120,hide:true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120}
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: 'HCostItemID', title: 'HCostItemID', width: 120, hide: true }
+ , { field: '鎴愭湰椤圭洰浠ｇ爜', title: '鎴愭湰椤圭洰浠ｇ爜', width: 120 }
+ , { field: '鎴愭湰椤圭洰鍚嶇О', title: '鎴愭湰椤圭洰鍚嶇О', width: 120 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 120, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HProcID', title: 'HProcID', width: 120, hide: true }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 120 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
+ , { field: '鏈熷垵閲戦', title: '鏈熷垵閲戦', width: 120}
+ , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120}
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Kf_WIPBal/Kf_WIPBal_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html"
new file mode 100644
index 0000000..78fb115
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html"
@@ -0,0 +1,463 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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">
+ <!-- 娉ㄦ剰锛氭墍鏈夊紩鐢ㄨ矾寰勪繚鎸佷笌鍘熼」鐩竴鑷达紝纭繚鍔熻兘瀹屾暣 -->
+ <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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <!-- 鐢熶骇杞﹂棿 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!-- 鍔ㄦ�佹覆鏌撹溅闂� -->
+ </select>
+ </div>
+ </div>
+ <!-- 鐗╂枡 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" 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">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
+ </div>
+ </div>
+ <!-- 缁撴潫鏃ユ湡 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">
+ </div>
+ </div>
+ <!-- 鏌ヨ鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <!-- 閲嶇疆鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ </form>
+ <div style="margin-top: 10px;">
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ <!-- 琛ㄦ牸澶村伐鍏锋爮 -->
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/'
+ }).extend({
+ index: 'lib/index',
+ }).use(['index', 'form', 'table', 'element', 'laydate', 'soulTable', 'tableSelect'], function () {
+ var $ = layui.$,
+ admin = layui.admin,
+ layer = layui.layer,
+ table = layui.table,
+ form = layui.form,
+ element = layui.element,
+ laydate = layui.laydate,
+ soulTable = layui.soulTable,
+ tableSelect = layui.tableSelect;
+
+ // 妯″潡鍚嶏紙鐢ㄤ簬鍒楄缃瓨鍌級
+ var HModName2 = "Pay_PaymentEntryReport2";
+ // 琛ㄦ牸閫夐」
+ var option2 = {
+ elem: '#mainTable2',
+ toolbar: '#toolbarDemo2',
+ height: 'full-120', // 閫傚綋鐣欏嚭搴曢儴绌洪棿
+ page: true,
+ cellMinWidth: 90,
+ totalRow: true,
+ limit: 500,
+ limits: [50, 500, 5000, 20000],
+ done: function (res, curr, count) {
+ soulTable.render(this);
+ },
+ cols: [[]]
+ };
+
+ // 鍏ㄥ眬鏌ヨ鏉′欢瀛楃涓�
+ var sWhere = "";
+
+ // ---------- 鍒濆鍖� ----------
+ function initPage() {
+ // 娓叉煋杞﹂棿涓嬫媺妗�
+ loadDeptSelect();
+ // 璁剧疆榛樿鏃ユ湡: 寮�濮嬫棩鏈熶负7澶╁墠锛岀粨鏉熸棩鏈熶负浠婂ぉ
+ $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ getFastQuery(2);
+ // 閲嶆柊娓叉煋琛ㄥ崟鍏冪礌锛坰elect绛夛級
+ form.render('select');
+ }
+
+ // 鑾峰彇杞﹂棿涓嬫媺
+ function loadDeptSelect() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] || 1 }, // 榛樿缁勭粐1
+ success: function (result) {
+ var html = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ if (result.count == 1 && result.data) {
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ html += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ }
+ $("#HDeptID").html(html);
+ form.render('select');
+ },
+ error: function () {
+ layer.alert('鑾峰彇杞﹂棿鍒楄〃澶辫触', { icon: 2 });
+ }
+ });
+ }
+
+
+
+ // 鏌ヨ骞舵覆鏌撻樁姊姤琛�
+ function getFastQuery(type) {
+ var HBeginDate = $("#HBDate").val();
+ var HEndDate = $("#HEDate").val();
+ var HCostObjID = $("#HMaterID").val() || '0';
+ var HWorkShopID = $("#HDeptID").val() || '0';
+
+ var spParams = "'" + HBeginDate + "','" + HEndDate + "','" + HWorkShopID + "','" + HCostObjID+ "'";
+ sWhere = spParams; // 鐢ㄤ簬鍐呴儴
+
+ if (type == 2) {
+ get_Display(spParams);
+ }
+ }
+
+ // 鍔犺浇闃舵璁′欢鏁版嵁
+ function get_Display(params) {
+ var loadIndex = layer.load(1, { shade: false });
+
+ var sql = "exec h_p_Kf_WIPBalReport" + params;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ data: { "sWhere": sql },
+ success: function (data1) {
+ layer.close(loadIndex);
+ if (data1.count == 1) {
+ // 瑙ｆ瀽鍒楀畾涔�
+ var colDefs = []; // 瀛樻斁 {id, name, Type}
+ if (data1.list && data1.list.length > 0) {
+ for (var k in data1.list) {
+ colDefs.push({
+ id: data1.list[k].ColmCols,
+ name: data1.list[k].ColmCols,
+ Type: data1.list[k].ColmType
+ });
+ }
+ }
+
+ // 鏋勫缓琛ㄦ牸鍒�
+ var cols = [];
+ // 澶氶�夋鍒�
+ cols.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+
+ // 杈呭姪鍒ゆ柇鏃ユ湡瀛楁(褰㈠"2025-02-20")锛屽師浠ｇ爜鐢╥sValidDate浣嗘湭瀹氫箟锛岀畝鍗曟寜瀛楁鍚嶆槸鍚﹀惈妯嚎鍒ゆ柇锛屽疄闄呮牴鎹笟鍔¤皟鏁�
+ for (var i = 0; i < colDefs.length; i++) {
+ var fieldName = colDefs[i].name;
+ var fieldId = colDefs[i].id;
+ var fieldType = colDefs[i].Type;
+
+ // 閽堝闃舵鎶ヨ〃锛屾湁浜涘垪鍙兘鏄姩鎬佹棩鏈�(渚嬪鈥�02-20鈥�)锛屽師浠ｇ爜鐢╥sValidDate鍒ゆ柇锛屾垜浠畝鍗曟ā鎷燂細濡傛灉瀛楁鍚嶅寘鍚� '-' 涓旈暱搴�<=10 瑙嗕负鏃ユ湡鐭垪
+ var isShortDate = (fieldName.indexOf('-') > 0 && fieldName.length <= 10);
+ if (isShortDate) {
+ // 鏄剧ず鎴� MM-dd 鏍煎紡锛屽師浠ｇ爜灏濊瘯Format浣嗘湭瀹氫箟锛屾澶勭洿鎺ユ樉绀哄師瀛楁鍚�
+ cols.push({
+ field: fieldId,
+ title: fieldName, // 鍘熶唬鐮�: Format(fieldName,'MM-dd') 浣咶ormat鍑芥暟鍙兘鏈紩鍏ワ紝淇濇寔鍘熸牱
+ width: 70,
+ totalRow: true,
+ filter: true,
+ align: 'center'
+ });
+ } else if (fieldType == 'DateTime') {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ filter: true,
+ templet: "<div>{{ d." + fieldId + " == '' ? '' : layui.util.toDateString(d." + fieldId + ", 'yyyy-MM-dd HH:mm:ss') }}</div>",
+ width: 180
+ });
+ } else {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ width: 150,
+ filter: true
+ });
+ }
+ }
+
+ // 鏇存柊琛ㄦ牸閰嶇疆
+ option2.cols = [cols];
+ option2.data = data1.data || [];
+
+ // 搴旂敤鍒楅殣钘忚缃紙濡傛灉瀛樺湪锛�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"] || 'admin', option2, []);
+
+ // 娓叉煋琛ㄦ牸
+ table.render(option2);
+ } else {
+ layer.alert(data1.code + ' ' + data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(loadIndex);
+ layer.alert("鎺ュ彛璇锋眰澶辫触", { icon: 5 });
+ }
+ });
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function clearQuery() {
+ $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeptID").val(0);
+ $("#HEmpID").val(0);
+ $("#HEmpName").val("");
+ $("#HGroupID").val(0);
+ $("#HGroupName").val("");
+ $("#HMaterID").val("0");
+ $("#HMaterName").val("");
+ form.render('select');
+ }
+
+ // ---------- 浜嬩欢缁戝畾 ----------
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function () {
+ getFastQuery(2);
+ return false;
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function () {
+ clearQuery();
+ getFastQuery(2);
+ return false;
+ });
+
+ // 鐝粍寮瑰嚭妗�(淇濈暀鍘熸湁寮圭獥鏂瑰紡锛屼笌tableSelect鍏卞瓨锛屼紭鍏堜娇鐢╰ableSelect锛涘悓鏃舵敮鎸佸脊绐楅�夋嫨)
+ form.on('submit(HGroupList)', function () {
+ openGroupDialog();
+ return false;
+ });
+
+ // 鑱屽憳寮瑰嚭妗�
+ form.on('submit(HMaterList)', function () {
+ openHMaterDialog();
+ return false;
+ });
+
+ // 鎵撳紑鐝粍寮圭獥锛堝師鍑芥暟 get_checkGroup锛�
+ function openGroupDialog() {
+ layer.open({
+ type: 2,
+ skin: "layui-layer-rim",
+ title: "鐝粍鍒楄〃",
+ closeBtn: 1,
+ shift: 2,
+ area: ["90%", "90%"],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
+ btn: ["纭畾", "鍙栨秷"],
+ btn1: function (index, laero) {
+ var iframeWindow = window["layui-layer-iframe" + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 鎵撳紑鑱屽憳寮圭獥 (鍘� get_checkEmp)
+ function openHMaterDialog() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鑱�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=HMaterList', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 澶村伐鍏锋爮浜嬩欢 (mainTable2)
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ case 'set_HideColumn2':
+ get_HideColumnNoPage(HModName2, sessionStorage["HUserName"] || 'admin', option2, function () { getFastQuery(2); });
+ break;
+ case 'btn-reload2':
+ getFastQuery(2);
+ break;
+ case 'get_export2':
+ exportExcel2();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ default:
+ break;
+ }
+ });
+
+ // 瀵煎嚭Excel (鍘� get_Export2)
+ function exportExcel2() {
+ var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option2.data || [];
+ // 娓呮礂鏁版嵁
+ data.forEach(function (item) {
+ for (var key in item) {
+ if (item[key] == null) item[key] = "";
+ if (typeof item[key] === 'string') {
+ item[key] = item[key].replace(/[\r\n]+/g, '').replace(/,/g, '');
+ }
+ }
+ });
+ table.exportFile("mainTable2", data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璧勬枡瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_WIPBal_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
+ // 鍏ㄥ眬杈呭姪鍑芥暟 Format (濡傛灉涓嶅瓨鍦紝绠�鍗曞畾涔�)
+ if (typeof Format !== 'function') {
+ window.Format = function (date, fmt) {
+ if (!date) return '';
+ var d = new Date(date);
+ var o = {
+ "M+": d.getMonth() + 1,
+ "d+": d.getDate(),
+ "H+": d.getHours(),
+ "m+": d.getMinutes(),
+ "s+": d.getSeconds()
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+ };
+ }
+
+ // 鍚姩椤甸潰
+ initPage();
+ });
+
+ // 涓嬮潰涓や釜鏂规硶渚涘脊绐楀洖璋冧娇鐢� (Gy_EmployeeList.html 鍜� Gy_Group.html 浼氳皟鐢�)
+ function GetHEmpListValue(obj) {
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) {
+ if (obj && obj.length > 0) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ }
+ </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"
index b27c59c..784c9b4 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"
@@ -273,7 +273,7 @@
var Type = $("#HType").val();
//娆犳枡杩愮畻
- var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
+ var sql = `exec h_p_CB_CostAccounting ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
var startTime = new Date().getTime();
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
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_ItemMoneyBill_Excel.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_ItemMoneyBill_Excel.html"
index 884cd43..9879a0f 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_ItemMoneyBill_Excel.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_ItemMoneyBill_Excel.html"
@@ -190,6 +190,7 @@
if (monthSelect) {
monthSelect.value = currentMonth;
}
+ form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
index 059848f..a719061 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
@@ -192,6 +192,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-UpdateMaterTechParam" id="btn-UpdateMaterTechParam"><i class="layui-icon layui-icon-form"></i>鏇存柊鍒嗙粍鐗╂枡</button>
</div>
</script>
</form>
@@ -297,6 +298,9 @@
case 'btn-DeDrop': set_DropBill(1);
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //鏇存柊鐩稿悓鐗╂枡缁�+妯″叿鐨勫伐鑹哄弬鏁�
+ case 'btn-UpdateMaterTechParam': set_UpdateMaterTechParam();
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -1022,6 +1026,37 @@
}
//#endregion
+ //鏇存柊鍚屼竴鐗╂枡缁勪笅 妯″叿鐩稿悓鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
+ function set_UpdateMaterTechParam() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ layer.confirm("纭瑕佹洿鏂拌繖涓墿鏂欑粍鐩稿叧鐨勬爣鍑嗗悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterialTechParamBill/SaveGy_MaterialTechParamBill_Update',
+ type: "GET",
+ data: { "HInterID": InterID,"user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ get_FastQuery(1);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ }
+
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
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_batchKeyElement.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_batchKeyElement.html"
index 6afb790..0083303 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_batchKeyElement.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_batchKeyElement.html"
@@ -426,36 +426,17 @@
});
//鎹骇鍝�
form.on('submit(btnNextProc)', function (data) {
- //for (var i = 0; i < option.data.length; i++) {
- // if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
- // layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
- // return;
- // }
- //}
- //淇濆瓨鍏抽敭浠�
- if (AllowLoadData(data)) {
- set_SaveBill(data);
- }
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_Key").val("");
+ option.data = [];
+ table.render(option);
-
+ //鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").css('background', '#FFFFFF')//浜у搧鐮佹枃鏈鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").focus();
- //閲嶆柊鑾峰彇鍗曟嵁鍙�
- //$.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNumPDA",
- // type: "GET",
- // data: { "HBillType": '3727' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
- // //閲嶆柊鍚敤淇濆瓨鎸夐挳
- // $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
- // }
- //});
-
- //鍘嗗彶缁戝畾璁板綍鏌ヨ
- //get_Display();
});
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 d027989..66dc52b 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"
@@ -602,6 +602,10 @@
function dy_PL(HBarCode) {
var sWhere = "select Top 1 * from h_v_IF_BarCodeBillList with(nolock) where 鏉＄爜缂栧彿 = '" + HBarCode + "'"
+ if ($("#HProcName").val() == "鎵撳嵃69鐮佹爣绛�" ) {
+ sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
+ }
+
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1