From abe4765c408cf2ca8f6795f24ff53c67f524c98b Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 07 六月 2023 11:04:17 +0800
Subject: [PATCH] 1
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 399 +++++++++------
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 39 -
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 13
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 42 +
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 19
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 19
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 5
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 7
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | 6
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 25
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 19
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 19
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 70 ++
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor_third.html | 44 +
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html | 41 +
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 44
WebTM/views/index.html | 124 ++--
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 24
WebTM/views/车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html | 56 +
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 120 ++++
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 19
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 39 +
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 3
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 65 ++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 44 +
WebTM/views/车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html | 101 +++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 6
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 16
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 19
30 files changed, 1,060 insertions(+), 389 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 622194b..b2cc4c0 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -304,7 +304,70 @@
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd>
</dl>
<dd>
- <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+ <dd>
+ <a>宸ヨ壓璺嚎澶х被</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+ </dl>
+ <dd>
+ <dd>
+ <a>鏃ヨ鍒掑钩鍙�</a>
+ <dl class="layui-nav-child">
+ <dd>
+ <a>鐢熶骇璁″垝骞冲彴</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
+ <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鏃ヨ鍒掑伐鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+ </dl>
+ </dd>
+ <dd>
+ <a>瑕佹枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎻愭枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鍩虹璧勬枡</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鍗虫椂搴撳瓨</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 鐢熶骇绠＄悊 -->
@@ -378,64 +441,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
</dl>
</dd>
- <dd>
- <a>鏃ヨ鍒掑钩鍙�</a>
- <dl class="layui-nav-child">
- <dd>
- <a>鐢熶骇璁″垝骞冲彴</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
- <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鏃ヨ鍒掑伐鍗�</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
- </dl>
- </dd>
- <dd>
- <a>瑕佹枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎻愭枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鍩虹璧勬枡</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鍗虫椂搴撳瓨</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎶ヨ〃</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
- </dl>
- </dd>
- </dl>
- </dd>
+
</dl>
</li>-->
<!-- 杞﹂棿绠＄悊 -->
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_DepartmentList.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_DepartmentList.html"
index 7e797f2..37280bf 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_DepartmentList.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_DepartmentList.html"
@@ -185,6 +185,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
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_EmployeeList.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_EmployeeList.html"
index 39a4805..f591bd7 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_EmployeeList.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_EmployeeList.html"
@@ -139,14 +139,14 @@
//#region 鏈〉闈㈣皟鐢ㄧ殑鎵�鏈夋柟娉�
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 澶村伐鍏锋爮浜嬩欢
+ //#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
//鏂板鎸夐挳
case 'btn-Add':
set_AddNew();
- break;
+ break;
case 'btn-Edit':
set_ShowBill();
break;
@@ -179,7 +179,26 @@
});
//#endregion
- //#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;
+ }
+ });
+ })
+
+ //#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
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_Material.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_Material.html"
index bd4adcc..3f33ac5 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_Material.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_Material.html"
@@ -237,6 +237,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
//#region 鍒濆鍖栫晫闈�
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_WorkCenter.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_WorkCenter.html"
index a094696..108ed84 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_WorkCenter.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_WorkCenter.html"
@@ -166,6 +166,25 @@
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index f26096e..a588896 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -161,6 +161,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 3a4baf8..bf5b443 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -161,6 +161,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 717db7f..2f6658c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -167,6 +167,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery(2);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 19e1514..a261098 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -50,8 +50,35 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
- <div class="layui-colla-content">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<!--鍏朵粬鏉′欢-->
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-search="" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -63,6 +90,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
</script>
</form>
@@ -121,6 +149,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -241,7 +272,11 @@
option.data = result.data;
table.render(option);
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
} else {
layer.close(ajaxLoad);
layer.alert(result.code + result.Message, { icon: 5 });
@@ -370,6 +405,31 @@
var HBillNo = $("#HBillNo").val();
var Organization = $("#Organization").val();//閲囪喘缁勭粐
var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -391,6 +451,10 @@
$("#Organization").val("");//閲囪喘缁勭粐
$("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
$("#HWorkShopID").val("");//鐢熶骇杞﹂棿
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
sWhere = "";
}
//#endregion
@@ -498,6 +562,44 @@
}
}
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/CancelClosePODemandPlanBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -540,6 +642,20 @@
}
//#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ }
+ }
+ $("#ColName").empty(); //绉婚櫎涓嬫媺妗嗘暟鎹�
+ $("#ColName").append(Organization); //娣诲姞涓嬫媺妗嗘暟鎹�
+ form.render('select');
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index b63c1ab..1938806 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -708,7 +708,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -720,7 +720,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
$("#HSupplierID").val(checkStatus.data[0].HItemID);
- $("#HSupplierIDName").val(checkStatus.data[0].HName);
+ $("#HSupplierIDName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -988,9 +988,10 @@
}
})
}
+
+ obj.event = "";
return false;
}
-
})
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index cce1f71..06f5a20 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -349,7 +349,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -362,8 +362,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSupplierID": checkStatus.data[0].HItemID
- , "HSupplierNumber": checkStatus.data[0].HNumber
- , "HSupplierName": checkStatus.data[0].HName
+ , "HSupplierNumber": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+ , "HSupplierName": checkStatus.data[0].渚涘簲鍟嗗悕绉�
})
layer.close(index);//鍏抽棴寮圭獥
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 989d883..a43bd46 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -313,9 +313,10 @@
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
layer.close(index);
}
});
@@ -368,23 +369,53 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
}
+ //鑾峰彇鏁版嵁
+ var NumData = checkStatus.data;
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = obj.tr.data('index') + 1;
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HWHID": checkStatus.data[0].HItemID
- , "HWHNumber": checkStatus.data[0].HNumber
- , "HWHName": checkStatus.data[0].HName
- })
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (NumData.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = NumData.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + NumData.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+ }
+ table.render(option);
+
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -473,6 +504,21 @@
layer.msg("缁勭粐娌℃湁閫夋嫨");
return false;
}
+
+ for (var i = 0; i < option.data.length; i++) {
+ //鐢熶骇杞﹂棿
+ if (option.data[i]["HWorkShopID"] == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ //浠撳簱
+ if (option.data[i]["HWHID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:浠撳簱涓嶈兘涓虹┖!");
+ return false;
+ }
+ }
+
return true;
}
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 bae83ae..074204d 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"
@@ -570,22 +570,6 @@
//, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
]]
- , done: function (res, curr, count) {
- var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
- var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
- var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
- for (var i = 0; i < $data.length; i++) {
- var l1 = $data.eq(i).find('div').width();
- var l2 = $head.eq(i).find('div').width();
- if (l1 > l2) {
- $head.eq(i).find('div').width(l1);
- $total.eq(i).find('div').width(l1);
- } else {
- $data.eq(i).find('div').width(l2);
- $total.eq(i).find('div').width(l2);
- }
- }
- }
};
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index b77ef26..f33f315 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -98,6 +98,7 @@
<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="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></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>
@@ -155,6 +156,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//涓嬫帹
case 'set_TuiBill': set_TuiBill();
@@ -466,6 +470,46 @@
}
}
+
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillSortBill/CancelCloseBillWorkBillSortBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
+
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index ba3dcba..7c23c21 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -24,6 +24,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
</div>
<div class="layui-collapse">
@@ -297,6 +298,11 @@
get_btnCompleteSetAnalysis();
})
+ //鎻愭枡杩愮畻
+ form.on('submit(btnTLYS)', function (data) {
+ get_btnTLYS();
+ })
+
//鐢熶骇璁㈠崟閫夊崟
form.on('submit(btnICMOBill)', function (data) {
get_btnICMOBill();
@@ -336,7 +342,7 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//缁勭粐
Organ();
@@ -886,6 +892,37 @@
});
}
+ //鎻愭枡杩愮畻
+ function get_btnTLYS() {
+ if ($("#HWorkShopID").val() == 0) {
+ return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ }
+ sWhere = {
+ HProdORGID: $("#HProdORGID").val()
+ , HWorkShopID: $("#HWorkShopID").val()
+ }
+ sWhere = JSON.stringify(sWhere);
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery(2);
+ layer.msg(data1.Message);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鐢熶骇璁㈠崟閫夊崟
function get_btnICMOBill() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 9fde80b..7cce13d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -838,6 +838,8 @@
}
})
}
+
+ obj.event = "";
return false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index e983876..7317df2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -63,6 +63,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
</script>
</form>
@@ -121,6 +122,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -508,6 +512,44 @@
}
}
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkDemandPlanBill/CancelCloseWorkDemandPlanBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
//#region 鏂板
function set_AddNew() {
layer.open({
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 0b5da50..ae8b64f 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"
@@ -482,14 +482,17 @@
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length > 0) {
+ var InterID = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID.push(data[i].hmainid.toString());
+ }
//閫昏緫瀹℃牳鏂规硶
var wait = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -505,7 +508,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
}
}
@@ -513,14 +516,17 @@
function set_AbandonCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length > 0) {
+ var InterID = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID.push(data[i].hmainid.toString());
+ }
//閫昏緫瀹℃牳鏂规硶
var wait = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -536,7 +542,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
}
}
@@ -626,7 +632,7 @@
function set_ClearQuery() {
$("#HWorkBillNo").val("");
$("#HBillNo").val("");
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HProcExchBillNo").val("");
$("#ColContent").val("");
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/MES_StationInBill_PDA_QiaoYi.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/MES_StationInBill_PDA_QiaoYi.html"
index 9be68f8..4ce4361 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/MES_StationInBill_PDA_QiaoYi.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/MES_StationInBill_PDA_QiaoYi.html"
@@ -1310,28 +1310,28 @@
//#endregion
//#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
- $('body').on('keydown', function (e) {
- var HinteID = $("#HProcExchHinteID").val();
- if (e.key == "F7") {
- if (HinteID == "" || HinteID == null || HinteID == undefined) {
- layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
- }
- else {
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
- closeBtn: 1,
- shift: 2,
- area: ['90%', '90%'],
- maxmin: true,
- content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
- end: function () {
- }
- });
- }
- }
- })
+ //$('body').on('keydown', function (e) {
+ // var HinteID = $("#HProcExchHinteID").val();
+ // if (e.key == "F7") {
+ // if (HinteID == "" || HinteID == null || HinteID == undefined) {
+ // layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
+ // }
+ // else {
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['90%', '90%'],
+ // maxmin: true,
+ // content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
+ // end: function () {
+ // }
+ // });
+ // }
+ // }
+ //})
//#endregion
//閫夋嫨鐢熶骇鐝粍寮圭獥
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/MES_StationOutBill_PDA_QiaoYi.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/MES_StationOutBill_PDA_QiaoYi.html"
index 1a9121c..ef6764c 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/MES_StationOutBill_PDA_QiaoYi.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/MES_StationOutBill_PDA_QiaoYi.html"
@@ -1408,45 +1408,6 @@
// }
//}
- var HMaterID = $("#HMaterID").val();
- var HWorkProcID = $("#HProcID").val();
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- $.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill_Detail/get_Display2',
- type: "GET",
- data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
- success: function (data1) {
- if (data1.data.length > 1) {
- $('#Detail').removeClass("layui-btn-disabled").attr("disabled", false);//鏄庣粏鎸夐挳鍚敤
-
- var HBillNo = $("#HBillNo").val();
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- var HProcNo = $("#HProcNo").val();
- var HPlanQty = $("#HPlanQty").val();
- var HProcID = $("#HProcID").val();
- var HMaterID = $("#HMaterID").val();
- var HProcExchHinteID = $("#HProcExchHinteID").val();
- var HInterID = $("#HInterID").val();
-
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鍑虹珯鏄庣粏'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
if (data.Verify == "Y") {
location.replace('MES_StationOutBill_PDA_QiaoYi.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
}
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 04a0ebd..8f2c989 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"
@@ -1740,7 +1740,8 @@
"HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "HSupFlag": data[i].濮斿鏍囪 == 0 ? "false" : "true",
"HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�,
+ "HRelationQty_OutBad":"0"
});
}
option.data = 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_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 bb4ba90..10466fa 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"
@@ -387,7 +387,7 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栦富琛ㄥ垪琛�
set_InitGrid();
@@ -408,7 +408,7 @@
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
$("input[type='checkbox'][name='wybj']").prop('checked', false);
form.render("checkbox");//濮斿鏍囪
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
@@ -520,6 +520,7 @@
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
type: "GET",
data: { "sWhere": HMainID },
+ async: false,
//success: function (data1) {
// if (data1.count == 1) {
// option2.data = data1.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 529a4e0..49986f1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -341,7 +341,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
@@ -437,7 +437,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-50'
, page: true
, cellMinWidth: 90
, limit: 50
@@ -547,7 +547,7 @@
$("#HWorkBillNo").val("");
$("#HBillNo").val("");
$("#宸ュ簭娴佽浆鍗″彿").val("");
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#ColContent").val("");
$("#ColName").val("0");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
index 24bfa0a..47374ee 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
@@ -181,6 +181,7 @@
var option = [];
var HModName = "MaterOutEntryReport_Cloth";
+ var detailBar = 0; //鐢ㄤ簬姹囨�绘姤琛ㄦ煡鐪嬫槑缁嗘姤琛紝褰撲负0鏃舵樉绀烘槑缁嗘眹鎬绘姤琛ㄥ搴旀槑缁嗘姤琛ㄣ��
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -212,6 +213,24 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -323,7 +342,9 @@
}
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
}
-
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -410,7 +431,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
@@ -525,6 +546,22 @@
com = " and (" + ColName + " " + com + ")";
}
+ var params = get_UrlVars();
+ if (params[params[0]] != null && detailBar == 0) {
+ //姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
+ HBillNo = params[params[0]];
+ //璁剧疆鐢熶骇璁㈠崟鍙锋爣绛�
+ $("#HBillNo").val(HBillNo);
+
+ //璁剧疆鏃堕棿涓轰竴涓緢澶х殑鍊硷紝榛樿鎼滅储鎵�鏈夋椂闂寸殑鏄庣粏
+ HBeginDate = "1900-01-01 00:00:00";
+ HEndDate = "2200-01-01 00:00:00";
+
+ detailBar = 1;
+ } else {
+ HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ }
+
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
@@ -578,8 +615,8 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
- var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -618,38 +655,38 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
//闅愯棌鍒�
if (dataCols[1] == 1) {
- option.cols[0][i]["hide"] = true;
+ option.cols[0][i + 1]["hide"] = true;
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] = "font-size:100%";
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i]["width"] = dataCols[3];
+ option.cols[0][i + 1]["width"] = dataCols[3];
}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i]["title"], titleData) == -1) {
- option.cols[0][i]["hide"] = false;
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
- option.cols[0][i]["align"] = "left";
+ option.cols[0][i + 1]["align"] = "left";
break;
case "M":
- option.cols[0][i]["align"] = "center";
+ option.cols[0][i + 1]["align"] = "center";
break;
case "R":
- option.cols[0][i]["align"] = "right";
+ option.cols[0][i + 1]["align"] = "right";
break;
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
index a7c824c..f3fe177 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
@@ -133,6 +133,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="btn-detail"><i class="layui-icon layui-icon-return"></i>鏄庣粏鎶ヨ〃</button>
</div>
</script>
</form>
@@ -182,6 +183,10 @@
case 'HideColumn':
get_HideColumn();
break;
+ //鏄庣粏鎶ヨ〃
+ case 'btn-detail':
+ get_EntryReport();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -192,6 +197,63 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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;
+ }
+ });
+ });
+
+ //琛岀洃鍚簨浠�-鍙屽嚮
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ //涓嬫帹
+ var sBillNo = obj.data["鍗曟嵁鍙�"];
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Kf_MaterOutEntryReport_Cloth.html?sBillNo=' + sBillNo
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ });
+
//#endregion
@@ -277,7 +339,9 @@
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
}
-
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -348,7 +412,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
@@ -483,7 +547,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -522,7 +586,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
@@ -585,7 +649,36 @@
}
})
}
+ //鏄庣粏鎶ヨ〃
+ function get_EntryReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var sBillNo = data[0]["鍗曟嵁鍙�"];
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Kf_MaterOutEntryReport_Cloth.html?sBillNo=' + sBillNo
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//#endregion
});
</script>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
index 483c07f..57f32c7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
@@ -231,6 +231,24 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -334,7 +352,8 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
}
-
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -405,7 +424,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
@@ -539,8 +558,17 @@
}
var params = get_UrlVars();
- if (params[params[0]] != null && detailBar==0) {
+ if (params[params[0]] != null && detailBar == 0) {
+ //姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
HBillNo = params[params[0]];
+ //璁剧疆鐢熶骇璁㈠崟鍙锋爣绛�
+ $("#HBillNo").val(HBillNo);
+
+ //璁剧疆鏃堕棿涓轰竴涓緢澶х殑鍊硷紝榛樿鎼滅储鎵�鏈夋椂闂寸殑鏄庣粏
+ HBeginDate = "1900-01-01 00:00:00";
+ HEndDate = "2200-01-01 00:00:00";
+
+
detailBar = 1;
} else {
HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -616,7 +644,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -655,38 +683,38 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
//闅愯棌鍒�
if (dataCols[1] == 1) {
- option.cols[0][i]["hide"] = true;
+ option.cols[0][i + 1]["hide"] = true;
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] = "font-size:100%";
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i]["width"] = dataCols[3];
+ option.cols[0][i + 1]["width"] = dataCols[3];
}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i]["title"], titleData) == -1) {
- option.cols[0][i]["hide"] = false;
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
- option.cols[0][i]["align"] = "left";
+ option.cols[0][i + 1]["align"] = "left";
break;
case "M":
- option.cols[0][i]["align"] = "center";
+ option.cols[0][i + 1]["align"] = "center";
break;
case "R":
- option.cols[0][i]["align"] = "right";
+ option.cols[0][i + 1]["align"] = "right";
break;
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
index b0fe471..f6614f7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
@@ -195,8 +195,10 @@
case 'HideColumn':
get_HideColumn();
break;
+ //鏄庣粏鎶ヨ〃
case 'btn-detail':
get_EntryReport();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -226,6 +228,42 @@
});
});
+ //琛岀洃鍚簨浠�-鍙屽嚮
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ //涓嬫帹
+ var sBillNo = obj.data["鐢熶骇璁㈠崟鍙�"];
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Kf_MaterOutEntryReport_Cloth.html?sBillNo=' + sBillNo
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ });
//#endregion
@@ -568,7 +606,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
@@ -632,6 +670,7 @@
})
}
+ //鏄庣粏鎶ヨ〃
function get_EntryReport() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
index 1d2bc7e..99ec2a7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
@@ -212,6 +212,24 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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
@@ -314,6 +332,8 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -384,7 +404,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
@@ -551,7 +571,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -590,38 +610,38 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
//闅愯棌鍒�
if (dataCols[1] == 1) {
- option.cols[0][i]["hide"] = true;
+ option.cols[0][i + 1]["hide"] = true;
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] = "font-size:100%";
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i]["width"] = dataCols[3];
+ option.cols[0][i + 1]["width"] = dataCols[3];
}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i]["title"], titleData) == -1) {
- option.cols[0][i]["hide"] = false;
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
- option.cols[0][i]["align"] = "left";
+ option.cols[0][i + 1]["align"] = "left";
break;
case "M":
- option.cols[0][i]["align"] = "center";
+ option.cols[0][i + 1]["align"] = "center";
break;
case "R":
- option.cols[0][i]["align"] = "right";
+ option.cols[0][i + 1]["align"] = "right";
break;
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 30d99ed..23b4cf7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -43,6 +43,7 @@
</select>
</div>
</div>
+
<div class="layui-inline">
<label class="layui-form-label">涓嬭揪鏃ユ湡</label>
<div class="layui-input-block">
@@ -101,6 +102,16 @@
<label class="layui-form-label">鎵瑰彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
+ <option value="0" >鍏ㄩ儴</option>
+ <option value="4" selected="selected">寮�宸�</option>
+ <option value="6">缁撴</option>
+ </select>
</div>
</div>
</div>
@@ -330,6 +341,7 @@
var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HState = $("#HState").val();//鐘舵��
+ var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
var HOrgID = sessionStorage["OrganizationID"];
var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
@@ -350,6 +362,7 @@
, HBillNo: HBillNo
, IsTrue: checkWRuku
, HState: HState
+ , HSTATUS: HSTATUS
}
get_Display(JSON.stringify(sWhere));
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 378958c..25cdbe7 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -1107,183 +1107,244 @@
var sMouldManagerCtl = 'N'
var sFIFOCtl = 'N'
var HBillType = '1203'
- //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
- if (sBarCode == '') {
- playSound();
- layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sBarCode != "") {
- $('#HBarCode').val("");
- //sessionStorage["SourceFlag"] = false;
- }
- //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
- $.ajax({
- //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
- type: "GET",
- data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
- success: function (result) {
- if (result.count == 1) {
- if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
- $("#HStockPlaceName").val("");
- $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-Kf_OtherInBill', '2'); //璺宠浆椤电
- return;
- }
- else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HStockPlaceID").val(result.data.hSPIDField);
- $("#HWHNAME").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
- $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
- return;
- }
- else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.hDeptNameField);
- $("#HDeptID").val(result.data.hDeptIDField);
- $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
- return;
- }
- else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.hSupNameField);
- $("#HSupID").val(result.data.hSupIDField);
- $("#HDeptName").val(result.data.hDeptNameField);
- $("#HDeptID").val(result.data.hDeptIDField);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- HSourceFlag = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.hSourceBillType == "1241") {
- $("#HBillType").val("1241");
+ var HDeleteFlag = sBarCode.substring(0, 1);
+ if (HDeleteFlag == "*") {
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ var sBarCode_Del = sBarCode.slice(1);
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/ProductIn/Delete_Json",
+ async: true,
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HBarCode": sBarCode_Del },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound1();
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ //, toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , page: true
+ , limit: 100
+ , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HBarcodeQtys', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
+ playSound();
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
- element.tabChange('tab-Kf_OtherInBill', '3');
+ },
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ } else {
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ //sessionStorage["SourceFlag"] = false;
+ }
+
+ //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
+ $.ajax({
+ //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
+ type: "GET",
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2'); //璺宠浆椤电
+ return;
+ }
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ return;
+ }
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ return;
+ }
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ HSourceFlag = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillType == "1241") {
+ $("#HBillType").val("1241");
+
+ }
+ else {
+ $("#HBillType").val("鎵嬪伐褰曞叆");
+ }
+ $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+ element.tabChange('tab-Kf_OtherInBill', '3');
+ }
+ else {
+ if (HSourceFlag == true) {
+ element.tabChange('tab-Kf_OtherInBill', '3');
+ }
+ else {
+ //$("#HSupName").val(result.data.HSupName);
+ //$("#HSupID").val(result.data.HSupID);
+ //$("#HDeptName").val(result.data.HDeptName);
+ //$("#HDeptID").val(result.data.HDeptID);
+ //$("#HSourceBillNo").val(result.data.HSourceBillNo);
+ //sessionStorage["SourceFlag"] = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ //if (result.data.HSourceBillType == "1241") {
+ // $("#HBillType").val("1241");
+
+ //}
+ //else if (result.data.HSourceBillType == "1601") {
+ // $("#HBillType").val("1601");
+ //}
+
+
+ HSourceFlag = true;
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1241") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1241");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").empty();
+ $("#HBillType").val("-1");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ $("#HNote").val(";鐗╂枡鏉＄爜");
+ element.tabChange('tab-Kf_OtherInBill', '3');
+ }
+ }
+ //$("#HSupID").val(result.data.HSupID);
+ //$("#HSupName").val(result.data.HSupName);
+ //$("#HDeptID").val(result.data.HDeptID);
+ //$("#HDeptName").val(result.data.HDeptName);
+ layer.load(3)
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ // //, toolbar: '#toolbarDemo'
+ // , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ // , cellMinWidth: 90
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
+ // , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
+ });
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
- if (HSourceFlag == true) {
- element.tabChange('tab-Kf_OtherInBill', '3');
- }
- else {
- //$("#HSupName").val(result.data.HSupName);
- //$("#HSupID").val(result.data.HSupID);
- //$("#HDeptName").val(result.data.HDeptName);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HSourceBillNo").val(result.data.HSourceBillNo);
- //sessionStorage["SourceFlag"] = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- //if (result.data.HSourceBillType == "1241") {
- // $("#HBillType").val("1241");
-
- //}
- //else if (result.data.HSourceBillType == "1601") {
- // $("#HBillType").val("1601");
- //}
-
-
- HSourceFlag = true;
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.hSourceBillTypeField == "1241") {
- $("#HBillType").empty();
- $("#HBillType").val("1241");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- else {
- //$("#HBillType").empty();
- $("#HBillType").val("-1");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- $("#HSourceBillNo").attr("readonly", "readonly");
- $("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-Kf_OtherInBill', '3');
- }
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- //$("#HSupID").val(result.data.HSupID);
- //$("#HSupName").val(result.data.HSupName);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HDeptName").val(result.data.HDeptName);
- layer.load(3)
- //table.render({
- // elem: '#wl-table'
- // , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- // //, toolbar: '#toolbarDemo'
- // , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
- // , cellMinWidth: 90
- // , cols: [[
- // { type: 'radio' }
- // , { field: 'HQty', title: '鏁伴噺', width: 150 }
- // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- // , { field: 'HBatchNo', title: '鎵规', width: 150 }
- // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
- // , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
- // ]]
- // , height: 500
- // , done: function () {
- // layer.closeAll("loading");
- // }
- //});
- $.ajax({
- url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- listOption1.data = result.data.list2;
- table.render(listOption1);
-
- //console.log(result.data.list2);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.list.length; i++) {
- count += result.data.list[i].HQty;
- count1 += result.data.list[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
- //娓呯┖鏁伴噺
- $("#HQty").val("");
+ layer.closeAll("loading");
}
- else {
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
- layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- layer.closeAll("loading");
- }
- });
+ });
+ }
}
function playSound() {
//var audio = document.getElementById("cs");
--
Gitblit v1.9.1