From dfb6546bf808be7134a773fa01d12bf8cd1cc633 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 四月 2023 10:27:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 5
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 28 ++--
WebTM/views/user/login.html | 6
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 5
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 8
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 10 +
WebTM/views/index_Mobile.html | 4
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 61 ++++----
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 12 +
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 1
WebTM/views/系统管理/会计期间/Xt_AccountPeriodList.html | 4
WebTM/views/Baseset/基础资料/Gy_ProcList.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 143 +++++++++++++------
WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/系统管理/公告/GG_NoticeBillList.html | 4
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 8
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 4
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 52 +++++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 8
22 files changed, 235 insertions(+), 146 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
index 5e9a0eb..ca36b26 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
@@ -85,6 +85,12 @@
, { field: 'HItemID', title: '宸ュ簭ID', hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭', title: '宸ュ簭鍚嶇О', sort: true }
+ , { field: '宸ヤ綔涓績ID', title: '宸ヤ綔涓績ID', hide: true }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', sort: true, hide: true }
+ , { field: '閮ㄩ棬ID', title: '閮ㄩ棬ID', hide: true, hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', hide: true }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, hide: true }
]]
, page: true
});
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 07d3c15..2128c7c 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -107,7 +107,7 @@
宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
</a>
</dd>-->
- <dd>
+ <!--<dd>
<a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭濮斿鍙戝嚭鍗�
@@ -142,7 +142,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
浜х嚎鍏抽敭浠剁粦瀹�
</a>
- </dd>
+ </dd>-->
<!--<dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 817d15a..6dc8a69 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -153,9 +153,9 @@
//瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰�
$('#LAY-user-login-password').on('keydown', function (e) {
if (e.keyCode == 13) {
- //playSound();
+ loging();
}
- });
+ });
//鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
$('#LAY-user-login-username').on('keydown', function (e) {
if (e.keyCode == 13) {
@@ -268,7 +268,7 @@
$("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
var audio = document.getElementById("cs");
audio.play();
- }
+ }
});
</script>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 2dafc0c..bdddf81 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -253,6 +253,10 @@
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
set_HBarCodeType();
+ var rowdata = [{
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ }];
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
@@ -272,12 +276,7 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //#endregion
-
- var rowdata = [{
- "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0,"HPackQty":0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
- }];
+ //#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
//澶村伐鍏锋爮
@@ -506,12 +505,14 @@
HMaterID = result.list[0].HMaterID;
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
-
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0] //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟
}
-
+
+ BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+ //for (let i = 0; i < result.list.length; i++) {
+ // result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+ //}
table.reload('mainTable', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -638,7 +639,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺, HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+ var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -793,7 +794,7 @@
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
, { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
, { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
, { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
@@ -801,34 +802,32 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
+ , { field: 'HBQty', title: '绠辨暟', width: 100 }
+ , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
+ , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+ , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+ , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+ , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+ , { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
+ , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
+ , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
+ , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
, { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
, { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
, { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitNumber', width: 100 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅',width: 100 }
- , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
-
- , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
- , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
- , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
, { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
- , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
- , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
- , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
-
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
- , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
- , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
- , { field: 'HBQty', title: '绠辨暟', width: 100 }
- , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
, { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
- , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
- , { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
- , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -836,7 +835,7 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
- , cellMinWidth: 120
+ , cellMinWidth: 75
, height: 'full-325'
, cols: [columns]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
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/xmlLBM_Sc_ProcessExchangeBillList.aspx" "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index 879c318..23db39e 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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸,a.娴佽浆鍗℃暟閲� 鐢熶骇鏁伴噺,a.鍗曟嵁鍙� + '&' + ltrim(b.HEntryID) 鏉＄爜缂栧彿 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
+ SqlXMLReportData.GenEntireData(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鐢熶骇璁㈠崟鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸,a.娴佽浆鍗℃暟閲� 鐢熶骇鏁伴噺,a.鍗曟嵁鍙� + '&' + ltrim(b.HEntryID) 鏉＄爜缂栧彿 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index ecc43c1..1c153b2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -153,10 +153,10 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-lg" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
- <button type="button" class="layui-btn" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
index a1539cd..e192455 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
@@ -68,7 +68,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
@@ -77,7 +77,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
index 60fa129..772b139 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
@@ -115,11 +115,11 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 91421e3..24abdde 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -22,7 +22,7 @@
<div style="padding: 10px;">
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+ <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>-->
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index 19bf91a..318af48 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -87,12 +87,12 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index f90d97f..e6ed9e1 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -77,11 +77,11 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
index 501c8e4..8842dfb 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
@@ -70,13 +70,13 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
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_RoutingBill.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_RoutingBill.html"
index b9f49f7..da9a894 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_RoutingBill.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_RoutingBill.html"
@@ -1138,7 +1138,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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_RoutingBillList.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_RoutingBillList.html"
index 8ee3ac9..fdb8bff 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_RoutingBillList.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_RoutingBillList.html"
@@ -447,6 +447,7 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ sWhere += " and 宸ュ簭浠ｇ爜 != '9999'"
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 9435da1..7f8516d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -80,18 +80,17 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
- </div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -157,17 +156,18 @@
</div>
</div>-->
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈嚭绔欐暟閲�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index eed01da..094c691 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -29,6 +29,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛樹唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛樺悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐘舵��</label>
<div class="layui-input-block">
<select name="HStatus" lay-filter="HStatus" style="width:190px;">
@@ -39,22 +51,24 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </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>
- <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 class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
@@ -176,7 +190,7 @@
var option = [];
var HModName = "JIT_LiftMaterPlaBillnList";
- var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID","閫夋嫨","鏌ヨ鏃ユ湡","鎴愭湰瀵硅薄","鎴愭湰瀵硅薄鍚嶇О","HBillStatus","HBillType","HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -601,6 +615,8 @@
$("#Comparator").val("0");
$("#HNumber").val("");
$("#HName").val("");
+ $("#HEmpNumber").val("");
+ $("#HEmpName").val("");
form.render('select');
sWhere = "";
}
@@ -619,6 +635,8 @@
var ColContent = $("#ColContent").val();
var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
var HName = $("#HName").val(); //褰撳墠宸ュ簭
+ var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
+ var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -669,6 +687,12 @@
if (HName) {
sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
}
+ if (HEmpNumber) {
+ sWhere += " and 鎿嶄綔鍛樹唬鐮� like '%" + HEmpNumber + "%'";
+ }
+ if (HEmpName) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
+ }
if (HStatus) {
switch (HStatus) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9481578..0d6c621 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1143,11 +1143,17 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
- }
+ }
obj.update({
HProcName: checkStatus.data[0].宸ュ簭
, HProcID: checkStatus.data[0].HItemID
, HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ , HCenterID: checkStatus.data[0].宸ヤ綔涓績ID
+ , HCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ , HCenterName: checkStatus.data[0].宸ヤ綔涓績
+ , HDeptID: checkStatus.data[0].閮ㄩ棬ID
+ , HDeptNumber: checkStatus.data[0].閮ㄩ棬浠ｇ爜
+ , HDeptName: checkStatus.data[0].閮ㄩ棬
});
layer.close(layer.index);
@@ -1666,7 +1672,7 @@
type: "get",
url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
async: true,
- data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
+ data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'" + " and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data;
var Tablerow = [];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index 841bf1d..bb9425f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -30,28 +30,26 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎵撳嵃鐘舵��</label>
- <div class="layui-input-block" style="width:100px">
- <select name="city" lay-verify="required" id="SHPrintQty">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
- <option value="鏈墦鍗�">鏈墦鍗�</option>
- <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
</select>
</div>
- </div>
- <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
- </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>
@@ -76,12 +74,27 @@
<input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
</div>
</div>
- </div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">鎵撳嵃鐘舵��</label>
+ <div class="layui-input-block" style="width:100px">
+ <select name="city" lay-verify="required" id="SHPrintQty">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�">鏈墦鍗�</option>
+ <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ </select>
+ </div>
+ </div>
+ <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <input type="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate1">
</div>
</div>
</div>
@@ -138,6 +151,7 @@
var option2 = "";
var HBillNo = "";
var wybj = false;
+ var HDeptID = 0;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -145,8 +159,8 @@
//
var HModName = "Sc_ProcessExchangeIssueBillList";
//鍒濆鍖栫晫闈�
- set_ClearBill();
-
+ set_ClearBill();
+
//#endregion
//#region 澶村伐鍏锋爮浜嬩欢
@@ -224,8 +238,29 @@
set_InitGrid();
//鏌ヨ
get_FastQuery();
+ //杞﹂棿鍒楄〃
+ getDept();
}
+ //鑾峰彇杞﹂棿鍒楄〃
+ function getDept() {
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
@@ -237,9 +272,12 @@
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HModel").val("");//瑙勬牸鍨嬪彿
+ $("#HDeptName").val("0");//杞﹂棿
+ form.render('select');
//$("#btnSearch").click();
- sWhere = "";
get_FastQuery() ;
+ sWhere = "";
}
//#endregion
@@ -252,6 +290,8 @@
var HWorkBillNo = $("#HWorkBillNo").val();
var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+ var HDeptName = $("#HDeptName").val();//杞﹂棿
if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
if (SHPrintQty == "鍏ㄩ儴") {
sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
@@ -284,6 +324,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
}
+ if (HDeptName && HDeptName != "0") {
+ sWhere += " and HWorkShopID = '" + HDeptName + "'";
+ }
+ if (HModel) {
+ sWhere += " and 瀛愪欢瑙勬牸 like '%" + HModel + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -312,6 +358,29 @@
, { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
, { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
, { field: '涓嬭揪鐘舵��', title: '涓嬭揪鐘舵��' }
+ , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+ , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
+ , { field: '瀛愪欢鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '瀛愪欢瑙勬牸', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
+ , { field: '鍗曚綅', title: '鍗曚綅' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , {
+ field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
+ }
+ , {
+ field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+ }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
+
+
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
, {
field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
@@ -321,38 +390,16 @@
, { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
- , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , {
- field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
- }
- , {
- field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"
- }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
, { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
, { field: '瀛愪欢浠ｇ爜', title: '瀛愪欢浠ｇ爜' }
- , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
- , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
+ , { field: '浜у搧鍚嶇О', title: '瀛愪欢鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瀛愪欢瑙勬牸' }
, { field: '鎵瑰彿', title: '鎵瑰彿' }
, { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
- , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
- , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
- , { field: '鍗曚綅', title: '鍗曚綅' }
, { field: '璁惧妯″叿浠ｇ爜', title: '璁惧妯″叿浠ｇ爜' }
, { field: '璁惧妯″叿', title: '璁惧妯″叿' }
, { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
, { field: '鎽樿', title: '鎽樿' }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
@@ -379,7 +426,7 @@
}
//#region 鏌ヨ
function get_Display(sWhere) {
- sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and 宸ュ簭鍚嶇О != '杞伐搴�'";
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 39729ad..b49065e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1119,7 +1119,9 @@
//$("#HStockPlaceID").val(result.data[0].HItemID);
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
- element.tabChange('tab-POStockInBill', '2');
+ element.tabChange('tab-SellOutBill', '3');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
}
else {
// $("#verifycode").click();
@@ -1680,9 +1682,9 @@
//$("#HDeptID").val(result.data[0].HDeptID);
//$("#HDeptName").val(result.data[0].HDeptName);
HSourceFlag = true;
- element.tabChange('tab-SellOutBill', '3');
+ element.tabChange('tab-SellOutBill', '2');
//鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HBarCode").focus();
+ $("#HWHNAME").focus();
//table.reload('wl-table', {
// where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
//});
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2a75eaa..ef11660 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -416,7 +416,7 @@
$("#HBillerID").hide();
var HSourceFlag = sessionStorage["SourceFlag"];//婧愬崟宸叉爣璁�
- //鍏夋爣榛樿鏄剧ず鍦ㄥ師鍗曞彿浣嶇疆
+ //鍏夋爣榛樿鏄剧ず鍦ㄦ簮鍗曞彿浣嶇疆
$("#HSourceBillNo").focus();
//鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛�
@@ -801,7 +801,9 @@
//$("#HStockPlaceID").val(result.data[0].HItemID);
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
- element.tabChange('tab-POStockInBill', '2');
+ element.tabChange('tab-MateOutBill', '3');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
}
else {
// $("#verifycode").click();
@@ -1272,9 +1274,9 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("readonly", "readonly");
}
- element.tabChange('tab-MateOutBill', '3');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HBarCode").focus();
+ element.tabChange('tab-MateOutBill', '2');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
+ $("#HWHNAME").focus();
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();//鎾斁澹伴煶
layer.load(3)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index c2402ba..f207774 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -120,7 +120,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -357,7 +357,7 @@
var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
- $("#HBarCode").focus();
+ $("#HWHNAME").focus();
// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
function formatDate(date) {
@@ -1167,6 +1167,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//$("#HStockPlaceName").val(result.data[0].HName);
//$("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HBarCode").focus();
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
element.tabChange('tab-POStockInBill', '2');
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index e2544f4..69dc78e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -556,8 +556,8 @@
else {
//榛樿杩涘叆鍗曟嵁淇℃伅椤电
element.tabChange('tab-POStockInBill', '2');
- //榛樿鍏夋爣鏄剧ず鍦ㄦ潯鐮侀噷闈�
- var pFocus = $("#HBarCode");
+ //榛樿鍏夋爣鏄剧ず鍦ㄤ粨搴撻噷闈�
+ var pFocus = $("#HWHNAME");
pFocus.focus();
pFocus.select();
}
@@ -911,6 +911,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//$("#HStockPlaceName").val(result.data[0].HName);
//$("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HBarCode").focus();
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
element.tabChange('tab-POStockInBill', '2');
--
Gitblit v1.9.1