From ab74d0158285413ed05fcd1ce61661140fc4be59 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 04 十一月 2024 08:25:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/PublicPage/MaterialInfo.html | 25
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_TK.html | 33
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 15
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 2
WebTM/views/质量管理/质量报表/QC_ProdBadReasonStatistics.html | 26
WebTM/views/index_Mobile.html | 152 ++--
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery.html | 81 ++
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill_PDA.html | 1160 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html | 99 +++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 2
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 2
WebTM/views/Baseset/SRM_OpenTmpList.html | 29
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 2
WebTM/WebTM.csproj | 1
18 files changed, 1,538 insertions(+), 119 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9f55b3d..bdd5222 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -473,6 +473,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
<Content Include="views\鐪嬫澘\閲囪喘鏀舵枡\KB_CGSL.html" />
<Content Include="views\鐪嬫澘\閿�鍞彂璐KB_XSFH.html" />
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index b02e4d3..f46e42d 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -35,7 +35,7 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
</div>
@@ -66,10 +66,10 @@
, loading: false
, cols: [[
{ type: 'radio' }
- , { field: 'HItemID', width: 150, title: 'ID', hide: true }
- , { field: 'HNumber', width: 150, title: '妯″潡浠ｇ爜' }
- , { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
- , { field: '妯℃澘鍚嶇О', width: 150, title: '妯℃澘鍚嶇О' }
+ , { field: 'HItemID', title: 'ID', hide: true }
+ , { field: 'HNumber', title: '妯″潡浠ｇ爜' }
+ , { field: 'HName', title: '妯″潡鍚嶇О', hide: true }
+ , { field: '妯℃澘鍚嶇О', title: '妯℃澘鍚嶇О' }
]]
, page: true
, limits: [50, 500, 5000, 50000]
@@ -78,12 +78,21 @@
DisPlay_HideColumn();
- table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
- obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
- form.render('radio');
- });
+ //table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ // obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
+ // obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
+ // form.render('radio');
+ //});
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
function getUrlVars() {
var vars = [], hash;
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 97009a0..8feafc5 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -99,7 +99,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
@@ -121,6 +121,27 @@
]]
};
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -162,7 +183,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 0bee0b0..9cc20ed 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -85,83 +85,83 @@
</a>
<dl class="layui-nav-child">
<!--<dd>
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭杩涚珯鎺ユ敹鍗�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul_PDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_OLD.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭鍑虹珯姹囨姤鍗�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_PDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
- </a>
- </dd>-->
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭杩涚珯鎺ユ敹鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_OLD.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭鍑虹珯姹囨姤鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
+ </a>
+ </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;" />
- 宸ュ簭濮斿鍙戝嚭鍗�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul_PDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭濮斿鍙戝嚭鍗曟壒閲�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭濮斿鎺ユ敹鍗�
- </a>
- </dd>
- <dd>
- <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul_PDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭濮斿鎺ユ敹鍗曟壒閲�
- </a>
- </dd>
- <dd>
- <a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭姹囨姤鍏ュ簱鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 浜х嚎鍏抽敭浠剁粦瀹�
- </a>
- </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;" />
+ 宸ュ簭濮斿鍙戝嚭鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭濮斿鍙戝嚭鍗曟壒閲�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭濮斿鎺ユ敹鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭濮斿鎺ユ敹鍗曟壒閲�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭姹囨姤鍏ュ簱鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 浜х嚎鍏抽敭浠剁粦瀹�
+ </a>
+ </dd>-->
<!--<dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭姹囨姤鍗昻ull
- </a>
- </dd>-->
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 宸ュ簭姹囨姤鍗昻ull
+ </a>
+ </dd>-->
<!--<dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿宸ュ簭璁″垝杞嚭鍗昻ull
- </a>
- </dd>-->
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿宸ュ簭璁″垝杞嚭鍗昻ull
+ </a>
+ </dd>-->
<!--<dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
- </a>
- </dd>-->
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
+ </a>
+ </dd>-->
<dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html?type=jzd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -175,6 +175,12 @@
</a>
</dd>
<dd>
+ <a href="鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇璐ㄩ噺姹囨姤鍗�
+ </a>
+ </dd>
+ <dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBillList_PDA_QiaoYi.html?type=czd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭鍑虹珯姹囨姤鍗曞垪琛ㄦ煡璇�
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 8a98c2b..d3fab6b 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"
@@ -676,7 +676,25 @@
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].鏁伴噺.toFixed(2), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": "" }]
+
+ var data = checkStatus.data;
+ var arr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ arr.push({
+ "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+ , "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+ , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "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": data[i].HISKFPERIOD == false ? 0 : 1
+ , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+ , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+ , "HCheckEmpName": ""
+ })
+ }
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -874,7 +892,7 @@
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, hide: true }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
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/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index fe01877..cab1f2d 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/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -502,7 +502,7 @@
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
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/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index c903dd4..3493760 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/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -849,7 +849,7 @@
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index cc7e971..8e4f235 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -301,7 +301,7 @@
rows = rows.substring(rows.length - 1, 0);
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 8eafd39..72cbc9f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -204,6 +204,8 @@
<div class="layui-input-block">
<select name="HMouldStatus" lay-filter="HMouldStatus" id="HMouldStatus">
<option value="鍦ㄥ簱" selected="selected">鍦ㄥ簱</option>
+ <option value="涓婃満">涓婃満</option>
+ <option value="鍑哄簱">鍑哄簱</option>
<option value="鍦ㄩ��">鍦ㄩ��</option>
<option value="涓㈠け">涓㈠け</option>
<option value="閿佸畾">閿佸畾</option>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill_PDA.html"
new file mode 100644
index 0000000..3cb7e38
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill_PDA.html"
@@ -0,0 +1,1160 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title class="gxcz">鐢熶骇璐ㄩ噺姹囨姤鍗�</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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+ th {
+ width: 70px;
+ text-align: left;
+ font-size: 17px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;" class="sczlhbd"><i class="layui-icon layui-icon-form"></i>鐢熶骇璐ㄩ噺姹囨姤鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佹按鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" value="" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">褰撳墠宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璧勬簮</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎿嶄綔鍛�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇鐝粍</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇杞﹂棿</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨鐢熶骇杞﹂棿" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDept-BT" id="HDept-BT" style="font-weight:bolder">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">浜у搧鍚嶇О</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">浜у搧鍚嶇О</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璁￠噺鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HUnitName" class="layui-input" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">澶囨敞</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" style="border-radius: 50px;">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇缁勭粐</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HSTOCKORG" class="layui-input" id="HSTOCKORG" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璁㈠崟</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鏄庣粏淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">涓嶈壇鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode1" class="layui-input" id="HBarCode1" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBarCodeList" style="line-height: 30px;">纭畾</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HResult">
+ <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="宸ュ簾">宸ュ簾</option>
+ <option value="鏂欏簾">鏂欏簾</option>
+ <option value="杩斿伐">杩斿伐</option>
+ <option value="鐗归噰">鐗归噰</option>
+ <option value="鏀捐">鏀捐</option>
+ </select>
+ </script>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒跺崟浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒跺崟鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍏抽棴浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍏抽棴鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>鏄庣粏淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ </div>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="">
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
+ <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , upload = layui.upload
+ , element = layui.element;
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
+ //#region 鍒濆鍖栭〉闈�
+
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ var option;
+ var HModName = "MES_StationOutBill_PDA";
+
+ /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+ /* 1.鏃犳簮鍗曟柊澧�
+ * 2.鏈夋簮鍗曟柊澧�
+ * 3.缂栬緫
+ * 4.娴忚
+ * 5.鍙樻洿
+ */
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+ /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3717' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ //鑾峰彇褰撳墠鐢ㄦ埛榛樿鍊�
+ GetDefValByUser();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ function GetDefValByUser() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+ type: "GET",
+ data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+
+ form.val("formData", {
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+ "HEmpID": data.HEmpID,
+ "HEmpNumber": data.鎿嶄綔鍛樹唬鐮�,
+ "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+ });
+ layer.close(index);
+ }
+ , error: function () {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触");
+ }
+ })
+ }
+ //#endregion
+
+
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+
+ //鏉″舰鐮佸洖杞︽柟娉� 娴佽浆鍗�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉� 涓嶈壇鍘熷洜
+ $('#HBarCode1').on('keydown', function (event) {
+ var HBarCode1 = $('#HBarCode1').val();
+ var HProcName = $('#HProcName').val();
+ var HSourceName = $('#HSourceName').val();
+ var HDeptName = $('#HDeptName').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode1) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ if (!HProcName) {
+ layer.msg("宸ュ簭涓嶈兘涓虹┖锛�")
+ return;
+ }
+ if (!HSourceName) {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�")
+ return;
+ }
+ if (!HDeptName) {
+ layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ txtHBarCode_KeyDown1(HBarCode1);
+ }
+ });
+ //娴佽浆鍗�
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchInterID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": 0,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOInterID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HUnitID": data.HUnitID,
+ "HUnitName": data.鍗曚綅,
+ "HDeptID": data.HWorkShopID,
+ "HDeptName": data.鐢熶骇杞﹂棿,
+ "HSTOCKORGID": data.缁勭粐,
+ "HSTOCKORG": data.缁勭粐鍚嶇О,
+
+ "HMainSourceBillType": data.HBillSubType,
+ "HMainSourceInterID": data.hicmointerid,
+ "HMainSourceEntryID": data.HICMOEntryID,
+ "HMainSourceBillNo": data.鐢熶骇璁㈠崟鍙�
+ });
+ $("#HProcNo").attr('disabled', 'disabled');
+ HProcExchBillNoFlag = true;
+
+ var HProcExchInterID = $('#HProcExchInterID').val();
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ });
+
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //涓嶈壇鍘熷洜
+ function txtHBarCode_KeyDown1(HBarCode1) {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_QualityReportStepBill/get_HBadReasonID",
+ type: "GET",
+ data: { "HBadReasonNumber": HBarCode1 },
+ success: function (result) {
+ if (result.count == 1) {
+ var rowdata = {
+ "HMaterID": $("#HMaterID").val(), "HMaterName": $("#HMaterName").val(), "HUnitID": $("#HUnitID").val(), "HUnitName": $("#HUnitName").val(),
+ "HEmpID": $("#HEmpID").val(), "HEmpName": $("#HEmpName").val(), "HSourceID": $("#HSourceID").val(), "HSourceName": $("#HSourceName").val(),
+ "HBadReasonID": result.data[0].HItemID, "HBadReasonNumber": result.data[0].HNumber, "HBadReasonName": result.data[0].HName, "HQty": "1",
+ "HResult": "", "HProcID": $("#HProcID").val(), "HProcName": $("#HProcName").val(),
+ "HNowProcID": "0", "HNowProcName": "", "HBadProcID": "0",
+ "HBadProcName": "", "HAddr": "", "HReportType": "1", "HRemark": "",
+ "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(), "HICMOBillNo": $("#HICMOBillNo").val(),
+ "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(),
+ "HSourceInterID": $("#HICMOInterID").val(), "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val(), "HSourceBillType": $("#HMainSourceBillType").val(),
+ "HMaker": $("#HEmpName").val(),
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd hh:mm:ss')
+ };
+ option.data.push(rowdata);
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+ $("#HBarCode1").val("");
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ $("#HBarCode1").val("");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ $("#HBarCode1").val("");
+ }
+ });
+ }
+
+
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //#region [鍩虹璧勬枡鍥炶溅鏂规硶]
+ //鐢熶骇璧勬簮
+ $('#HSourceName').on('keydown', function (event) {
+ var sBillNo = $('#HSourceName').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ BasicInfo_KeyDown(sBillNo);
+ }
+ })
+
+ //鐢熶骇鐝粍
+ $('#HGroupName').on('keydown', function (event) {
+ var sBillNo = $('#HGroupName').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ BasicInfo_KeyDown(sBillNo);
+ }
+ })
+
+ //鎿嶄綔鍛�
+ $('#HEmpNumber').on('keydown', function (event) {
+ var sBillNo = $('#HEmpNumber').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ BasicInfo_KeyDown(sBillNo);
+ }
+ })
+
+ //鎿嶄綔鍛樺洖杞︽柟娉�
+ function Operator_KeyDown(sBillNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown_Operator",
+ type: "GET",
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchInterID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HEmpID": data.HItemID,
+ "HEmpNumber": data.鑱屽憳浠ｇ爜,
+ "HEmpName": data.鑱屽憳鍚嶇О
+ });
+
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
+ });
+
+ function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchEntryID": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#HProcNo").val() == "") {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //鑾峰彇瀛愯〃鏁版嵁
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ //鑾峰彇鎿嶄綔鏂瑰紡
+ var refSav = "";
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ refSav = "Add";
+ }
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (OperationType == 3) {
+ refSav = "Update";
+ data.field.HUpdater = sessionStorage["HUserName"];
+ data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+ $("#HUpdater").val(sessionStorage["HUserName"]);
+ $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+
+ //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+ var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
+ //瀛愯〃鏁版嵁搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
+
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Sc_QualityReportBill/SaveSc_QualityReportBill_PDA",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //娓呯┖鏉″舰鐮佽緭鍏ユ鍐呭
+ $("#HBarCode").val("");
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $("#Add").attr("style", "display:inline;");//鏄剧ず鏂板鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+ }
+ else {
+ //娓呯┖鏉″舰鐮佽緭鍏ユ鍐呭
+ $("#HBarCode").val("");
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ // 纭畾鎸夐挳
+ form.on('submit(QueDin)', function (data) {//
+ var HBarCode = $('#HBarCode').val();
+
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ });
+
+ //涓嶈壇鍘熷洜鏉＄爜纭畾鎸夐挳
+ form.on('submit(HBarCodeList)', function (data) {//
+ var HBarCode1 = $('#HBarCode1').val();
+
+ if (!HBarCode1) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown1(HBarCode1);
+ });
+
+ // 鎿嶄綔鍛樼‘瀹氭寜閽�
+ form.on('submit(QueDin_CZY)', function (data) {//
+ var sBillNo = $('#HEmpNumber').val();
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ Operator_KeyDown(sBillNo);
+ });
+
+ //閫夋嫨閮ㄩ棬寮圭獥
+ form.on('submit(HDept-BT)', function () {//閮ㄩ棬
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+
+ //閫夋嫨娴佹按鍙峰脊绐�
+ form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+ var value = $("#HProcExchInterID").val();
+ // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+ if (value) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '娴佹按鍙�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ , end: function () {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HProcExchBillNo').val();
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
+ }
+ })
+ } else {
+ layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
+ }
+ });
+
+ //閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝粍'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName_second").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ console.log($('#HProcNo').val())
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ // 鏂板鎸夐挳
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('Sc_QualityReportBill_PDA.html');
+ });
+ })
+
+ //閫�鍑�--鍏ㄥ睆鐗�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 50 }
+ , { field: 'HMaterID', title: '鐗╂枡id', templet: '#HDotCheckResult', width: 55, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 115 }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅', edit: 'text', hide: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text'}
+ , { field: 'HEmpID', title: '妫�楠屽憳id', edit: 'text', hide: true }
+ , { field: 'HEmpName', title: '妫�楠屽憳', edit: 'text' }
+ , { field: 'HSourceID', title: '鐢熶骇璧勬簮id', edit: 'text', hide: true }
+ , { field: 'HSourceName', title: '鐢熶骇璧勬簮', edit: 'text' }
+ , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜', edit: 'text', hide: true }
+ , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text', width: 100 }
+ , { field: 'HBadReasonName', title: '涓嶈壇鍘熷洜鍚嶇О', edit: 'text', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text'}
+ , { field: 'HResult', title: '鍒ゅ畾缁撴灉', templet: '#HResult', event: 'HResult' }
+ , { field: 'HProcID', title: '宸ュ簭id', edit: 'text', hide: true }
+ , { field: 'HProcName', title: '宸ュ簭鍚嶇О', edit: 'text',width: 150}
+ , { field: 'HNowProcID', title: '褰撳墠宸ュ簭id', edit: 'text', hide: true }
+ , { field: 'HNowProcName', title: '褰撳墠宸ュ簭', edit: 'text', width: 150,hide: true}
+ , { field: 'HBadProcID', title: '璐ｄ换宸ュ簭id', edit: 'text', hide: true }
+ , { field: 'HBadProcName', title: '璐ｄ换宸ュ簭', edit: 'text', width: 150, hide: true}
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愮爜', edit: 'text', hide: true}
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text', hide: true}
+ , { field: 'HProcExchInterID', title: '娴佽浆鍗″唴鐮�', edit: 'text', hide: true}
+ , { field: 'HProcExchEntryID', title: '娴佽浆鍗″瓙鐮�', edit: 'text', hide: true}
+ , { field: 'HProcExchBillNo', title: '娴佽浆鍗″彿', edit: 'text', hide: true }
+ , { field: 'HAddr', title: 'MAC鏈�', edit: 'text', hide: true }
+ , { field: 'HReportType', title: '姹囨姤绫诲瀷', edit: 'text', hide: true }
+ , { field: 'HMaker', title: '鎵弿浜�', edit: 'text' }
+ , { field: 'HMakeDate', title: '鎵弿鏃堕棿', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', hide: true }
+ , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , page: false
+ , cellMinWidth: 100
+ , limit: 100
+ , height: 'full-205'
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ //$cr.find('input').val(value.HResult);
+ }
+ });
+ });
+ }
+ };
+
+ option.data = [];
+
+ table.render(option);
+ }
+
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ 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 {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //#endregion
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+
+ //杩斿洖娴佹按鍙�
+ function GetProcNoValue(obj) {
+ $("#HProcNo").val(obj[0].娴佹按鍙�);
+ }
+ //杩斿洖鐢熶骇鐝粍
+ function GetProductionTeamValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ //杩斿洖妫�楠屽憳
+ function GetHSecManagerValue(obj) {
+ $("#HQCCheckName").val(obj[0].HName);
+ $("#HQCCheckID").val(obj[0].HItemID);
+ }
+ //杩斿洖鐢熶骇璧勬簮
+ function GetProductionResourcesValue(obj) {
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ }
+ //杩斿洖鎿嶄綔鍛�
+ function GetHWorkerValue(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+ </script>
+</body>
+</html>
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 7655ab5..b2ae33e 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"
@@ -1461,6 +1461,8 @@
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else if (table.cache["mainTable"][obj.tr.data('index')].HProcNo == "9999") {
+ layer.msg('绯荤粺杞伐搴忥紝涓嶅厑璁稿垹闄わ紒锛侊紒');
} else {
var oldData = table.cache["mainTable"];
oldData.splice(obj.tr.data('index'), 1)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
index 3ecc103..c87ea9e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
@@ -25,6 +25,44 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-inline">
+ <label class="layui-form-label">浜嬩欢鐘舵��</label>
+ <div class="layui-input-block">
+ <select id="HReadFlag" name="HReadFlag" lay-filter="HReadFlag" class="ForFilteringSchemes" style="width:190px;">
+ <option value="" selected="selected">鍏ㄩ儴</option>
+ <option value="2">宸插弽棣�</option>
+ <option value="13">宸茬鍒�</option>
+ <option value="9">宸插鐞�</option>
+ <option value="10">宸查獙鏀�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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 ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" 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 class="layui-tab layui-tab-card" style="margin-top:20px;">
<ul class="layui-tab-title">
<li class="layui-this">鎴戞帴鏀剁殑</li>
@@ -118,8 +156,10 @@
set_InitGrid_send();
//鍒濆鍖栨妱閫佸垪琛�
set_InitGrid_copy();
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鏌ヨ
- get_Display();
+ get_FastQuery();
}
table.on('toolbar(mainTable_receive)', function (obj) {
@@ -157,6 +197,15 @@
};
});
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
//鍒濆鍖栨帴鏀跺垪琛�
function set_InitGrid_notStart() {
@@ -209,7 +258,7 @@
url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
type: "GET",
async: false,
- data: { "user": sessionStorage["HUserName"] },
+ data: { "sWhere":sWhere,"user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -311,6 +360,34 @@
}
//#endregion
+ function get_FastQuery() {
+ var HStatus = $("#HReadFlag").val();//闃呰鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HSourceID = $("#HSourceID").val();//鍙戦�佷汉
+ sWhere = {
+ HStatus: HStatus
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HSourceID: HSourceID
+ }
+ get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $('#HReadFlag').val("");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HSourceName").val("");
+ $('#HSourceID').val("0");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
var data = option_receive.data
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
index 0b9f660..dc1b815 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
@@ -23,15 +23,53 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-inline">
+ <label class="layui-form-label">浜嬩欢鐘舵��</label>
+ <div class="layui-input-block">
+ <select id="HReadFlag" name="HReadFlag" lay-filter="HReadFlag" class="ForFilteringSchemes" style="width:190px;">
+ <option value="" selected="selected">鍏ㄩ儴</option>
+ <option value="2">宸插弽棣�</option>
+ <option value="13">宸茬鍒�</option>
+ <option value="9">宸插鐞�</option>
+ <option value="10">宸查獙鏀�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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 ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" 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 class="layui-tab layui-tab-card" style="margin-top:20px;">
<ul class="layui-tab-title">
- <li class="layui-this">鏈獙鏀�</li>
+ <li class="layui-this">鏈獙鏀�</li>
</ul>
- <div class="layui-tab-content">
+ <div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<!--鎴戝彂閫佺殑-->
<table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
- </div>
+ </div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -44,9 +82,9 @@
</script>
<script type="text/html" id="toolbarDemo1">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-XTCheck" lay-filter="btn-XTCheck" id="btn-XTCheck" style="/* display: inline; */height: 100px;margin-left: 100px;">涓嬫帹楠屾敹鍗�</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-View1" lay-filter="btn-View1" id="btn-View1" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">鏌ョ湅</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnEdit" id="btnEdit" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-XTCheck" lay-filter="btn-XTCheck" id="btn-XTCheck" style="/* display: inline; */height: 100px;margin-left: 100px;">涓嬫帹楠屾敹鍗�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-event="btn-View1" lay-filter="btn-View1" id="btn-View1" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">鏌ョ湅</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnEdit" id="btnEdit" style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">閫�鍑�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
@@ -108,7 +146,10 @@
//鍒濆鍖栨妱閫佸垪琛�
set_InitGrid_copy();
//鏌ヨ
- get_Display();
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鏌ヨ
+ get_FastQuery();
}
table.on('toolbar(mainTable_receive)', function (obj) {
@@ -145,6 +186,17 @@
break;
};
});
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
//閫�鍑�
form.on('submit(btnEdit)', function () {
@@ -199,12 +251,12 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
-
+
$.ajax({
url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
type: "GET",
async: false,
- data: { "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -292,6 +344,35 @@
}
//#endregion
+ function get_FastQuery() {
+ var HStatus = $("#HReadFlag").val();//闃呰鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HSourceID = $("#HSourceID").val();//鍙戦�佷汉
+ sWhere = {
+ HStatus: HStatus
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HSourceID: HSourceID
+ }
+ get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $('#HReadFlag').val("");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HSourceName").val("");
+ $('#HSourceID').val("0");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+
//#region 瀵煎嚭Execel
function get_Export() {
var data = option_receive.data
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
index 43ba134..4d00565 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProdBadReasonStatistics.html"
@@ -91,6 +91,7 @@
<div class="layui-btn-container">
<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="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -332,6 +333,10 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭
+ case 'get_export':
+ get_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -438,6 +443,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -472,6 +478,26 @@
get_FastQuery();
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option.data
+ data.forEach((item) => {
+
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(",","锛�"); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
index 541bec2..f112fa5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
@@ -516,6 +516,21 @@
// option_detail.data.push(option.data[i])
//}
+ if (data.field.HMaterName.indexOf("\"") != -1 || data.field.HMaterName.indexOf(";") != -1) {
+ data.field.HMaterName = data.field.HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (data.field.HMaterModel.indexOf("\"") != -1 || data.field.HMaterModel.indexOf(";") != -1) {
+ data.field.HMaterModel = data.field.HMaterModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].HMaterName.indexOf("\"") != -1 || option.data[i].HMaterName.indexOf(";") != -1) {
+ option.data[i].HMaterName = option.data[i].HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (option.data[i].HMaterModel.indexOf("\"") != -1 || option.data[i].HMaterModel.indexOf(";") != -1) {
+ option.data[i].HMaterModel = option.data[i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(option.data);
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index 892e1a0..7b34f66 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -2871,7 +2871,7 @@
}
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
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_BatchSplit.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_BatchSplit.html"
index 4c2a4f9..0680789 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_BatchSplit.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_BatchSplit.html"
@@ -586,7 +586,7 @@
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
index 8d42ff9..0b3427a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
@@ -239,25 +239,26 @@
function set_Aduit() {
var index = layer.load();
- for (var i = 0; i < table.cache["mainTable"].length; i++) {
- if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
- table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
- table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
- table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
- }
- }
+ //for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ // if (table.cache["mainTable"][i].HMaterNum.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterNum.indexOf(";") != -1) {
+ // table.cache["mainTable"][i].HMaterNum = table.cache["mainTable"][i].HMaterNum.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ // if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ // table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ // if (table.cache["mainTable"][i].HModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HModel.indexOf(";") != -1) {
+ // table.cache["mainTable"][i].HModel = table.cache["mainTable"][i].HModel.replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�").replace("\"", "鈥�").replace(";", "锛�")
+ // }
+ //}
- var HInterID = $('#HInterID').val();
- var HBillNo = $('#HBillNo').val();
- var sSubStr = table.cache['mainTable'];
+ //var HInterID = $('#HInterID').val();
+ //var HBillNo = $('#HBillNo').val();
+ //var sSubStr = table.cache['mainTable'];
+ var FID = table.cache['mainTable'][0].FID;
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
- type: "Post",
- data: { "msg": JSON.stringify(sSubStr) },
+ type: "Get",
+ data: { "FID": FID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.code == "1") {
layer.msg("瀹℃牳鎴愬姛", {
--
Gitblit v1.9.1